Skip to content

[pull] master from netkiller:master #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2025
Merged

[pull] master from netkiller:master #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c62849
radio
netkiller Mar 13, 2025
6e4a766
radio
netkiller Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
radio
  • Loading branch information
@netkiller
netkiller committed Mar 13, 2025
commit 6e4a766546eb6ca23086451974a47ecdf1c3a5f6
6 changes: 3 additions & 3 deletions radio/ch17s03.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<p>Fusion 使用C4FM(连续4级频率调制），DRM使用4FSK（4级频移键控），而D-Star使用GMSK（高斯最小频移键控）。Tetra 使用π/4-差分正交相移键控调制(π/4-DQPSK)</p>
<p>DMR 使用TDMA（时分多址），C4FM和D-Star使用FDMA（频分多址）</p>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id799"></a>17.3.1. DMR/YSF</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id799"></a>17.3.1. DMR/YSF/P25</h3></div></div></div>

<div><img src="images/mode/DMR-YSF.png" /></div>
</div>
Expand All @@ -13,9 +13,9 @@
<div><img src="images/mode/D-Star.png" /></div>
<div><img src="images/mode/NXDN.png" /></div>
</div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id801"></a>17.3.3. Tatra/P25</h3></div></div></div>
<div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="id801"></a>17.3.3. Tatra</h3></div></div></div>

<div><img src="images/mode/Tetra-P25.png" /></div>
<div><img src="images/mode/Tetra.png" /></div>

</div>
</div><script xmlns="" type="text/javascript" id="clustrmaps" src="//cdn.clustrmaps.com/map_v2.js?u=r5HG&amp;d=9mi5r_kkDC8uxG8HuY3p4-2qgeeVypAK9vMD-2P6BYM"></script><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch17s02.html">上一页</a> </td><td width="20%" align="center"><a accesskey="u" href="为什么国家会大力推广数字电台.html">上一级</a></td><td width="40%" align="right"> <a accesskey="n" href="ch17s04.html">下一页</a></td></tr><tr><td width="40%" align="left" valign="top">17.2. 声码器 </td><td width="20%" align="center"><a accesskey="h" href="index.html">起始页</a></td><td width="40%" align="right" valign="top"> 17.4. 带宽</td></tr></table></div><script xmlns="">
Expand Down
2 changes: 1 addition & 1 deletion radio/digital.html
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added radio/images/mode/DMR-YSF-P25.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added radio/images/mode/Tetra.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions radio/index.html
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion radio/为什么国家会大力推广数字电台.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>第 17 章 数字电台</title><link rel="stylesheet" type="text/css" href="docbook.css" /><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot" /><meta name="keywords" content="Amateur Radio, ham, ham radio, icom, yaesu, kenwood,, cw,ssb,usb,lsb,am,fm,rtty,fsk,afsk,psk31, fdma,tdma,cdma, dmr,c4fm" /><link rel="home" href="index.html" title="Netkiller Amateur Radio 手札" /><link rel="up" href="digital.html" title="部分 III. 数字业余无线电" /><link rel="prev" href="digital.html" title="部分 III. 数字业余无线电" /><link rel="next" href="ch17s02.html" title="17.2. 声码器" /></head><body><a xmlns="" href="//www.netkiller.cn/">Home</a> | <a xmlns="" href="//netkiller.github.io/">简体中文</a> | <a xmlns="" href="http://netkiller.sourceforge.net/">繁体中文</a> | <a xmlns="" href="/journal/index.html">杂文</a>
| <a xmlns="" href="https://github.com/netkiller">Github</a> | <a xmlns="" href="https://zhuanlan.zhihu.com/netkiller">知乎专栏</a> | <a xmlns="" href="https://www.facebook.com/bg7nyt">Facebook</a> | <a xmlns="" href="http://cn.linkedin.com/in/netkiller/">Linkedin</a> | <a xmlns="" href="https://www.youtube.com/user/bg7nyt/videos">Youtube</a> | <a xmlns="" href="//www.netkiller.cn/home/donations.html">打赏(Donations)</a> | <a xmlns="" href="//www.netkiller.cn/home/about.html">About</a><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">第 17 章 数字电台</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="digital.html">上一页</a> </td><th width="60%" align="center">部分 III. 数字业余无线电</th><td width="20%" align="right"> <a accesskey="n" href="ch17s02.html">下一页</a></td></tr></table><hr /></div><table xmlns=""><tr><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&amp;repo=netkiller.github.io&amp;type=watch&amp;count=true&amp;size=large" height="30" width="170" frameborder="0" scrolling="0" style="width:170px; height: 30px;" allowTransparency="true"></iframe></td><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&amp;repo=netkiller.github.io&amp;type=fork&amp;count=true&amp;size=large" height="30" width="170" frameborder="0" scrolling="0" style="width:170px; height: 30px;" allowTransparency="true"></iframe></td><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&amp;type=follow&amp;count=true&amp;size=large" height="30" width="240" frameborder="0" scrolling="0" style="width:240px; height: 30px;" allowTransparency="true"></iframe></td><td></td><td><a href="https://zhuanlan.zhihu.com/netkiller"><img src="/images/logo/zhihu-card-default.svg" height="25" /></a></td><td valign="middle"><a href="https://zhuanlan.zhihu.com/netkiller">知乎专栏</a></td><td></td><td></td><td></td><td></td></tr></table><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="为什么国家会大力推广数字电台"></a>第 17 章 数字电台</h2></div></div></div><div class="toc"><p><strong>目录</strong></p><dl class="toc"><dt><span class="section"><a href="为什么国家会大力推广数字电台.html#id795">17.1. 为什么国家会大力推广数字电台</a></span></dt><dt><span class="section"><a href="ch17s02.html">17.2. 声码器</a></span></dt><dd><dl><dt><span class="section"><a href="ch17s02.html#id796">17.2.1. Codec2 声码器</a></span></dt><dt><span class="section"><a href="ch17s02.html#id797">17.2.2. Ambe 声码器</a></span></dt><dt><span class="section"><a href="ch17s02.html#id798">17.2.3. ACELP 声码器</a></span></dt></dl></dd><dt><span class="section"><a href="ch17s03.html">17.3. 调制模式</a></span></dt><dd><dl><dt><span class="section"><a href="ch17s03.html#id799">17.3.1. DMR/YSF</a></span></dt><dt><span class="section"><a href="ch17s03.html#id800">17.3.2. D-Star/NXDN</a></span></dt><dt><span class="section"><a href="ch17s03.html#id801">17.3.3. Tatra/P25</a></span></dt></dl></dd><dt><span class="section"><a href="ch17s04.html">17.4. 带宽</a></span></dt><dt><span class="section"><a href="ch17s05.html">17.5. 用户身份验证</a></span></dt><dt><span class="section"><a href="ch17s06.html">17.6. 中继器</a></span></dt></dl></div>
| <a xmlns="" href="https://github.com/netkiller">Github</a> | <a xmlns="" href="https://zhuanlan.zhihu.com/netkiller">知乎专栏</a> | <a xmlns="" href="https://www.facebook.com/bg7nyt">Facebook</a> | <a xmlns="" href="http://cn.linkedin.com/in/netkiller/">Linkedin</a> | <a xmlns="" href="https://www.youtube.com/user/bg7nyt/videos">Youtube</a> | <a xmlns="" href="//www.netkiller.cn/home/donations.html">打赏(Donations)</a> | <a xmlns="" href="//www.netkiller.cn/home/about.html">About</a><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">第 17 章 数字电台</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="digital.html">上一页</a> </td><th width="60%" align="center">部分 III. 数字业余无线电</th><td width="20%" align="right"> <a accesskey="n" href="ch17s02.html">下一页</a></td></tr></table><hr /></div><table xmlns=""><tr><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&amp;repo=netkiller.github.io&amp;type=watch&amp;count=true&amp;size=large" height="30" width="170" frameborder="0" scrolling="0" style="width:170px; height: 30px;" allowTransparency="true"></iframe></td><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&amp;repo=netkiller.github.io&amp;type=fork&amp;count=true&amp;size=large" height="30" width="170" frameborder="0" scrolling="0" style="width:170px; height: 30px;" allowTransparency="true"></iframe></td><td><iframe src="//ghbtns.com/github-btn.html?user=netkiller&amp;type=follow&amp;count=true&amp;size=large" height="30" width="240" frameborder="0" scrolling="0" style="width:240px; height: 30px;" allowTransparency="true"></iframe></td><td></td><td><a href="https://zhuanlan.zhihu.com/netkiller"><img src="/images/logo/zhihu-card-default.svg" height="25" /></a></td><td valign="middle"><a href="https://zhuanlan.zhihu.com/netkiller">知乎专栏</a></td><td></td><td></td><td></td><td></td></tr></table><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="为什么国家会大力推广数字电台"></a>第 17 章 数字电台</h2></div></div></div><div class="toc"><p><strong>目录</strong></p><dl class="toc"><dt><span class="section"><a href="为什么国家会大力推广数字电台.html#id795">17.1. 为什么国家会大力推广数字电台</a></span></dt><dt><span class="section"><a href="ch17s02.html">17.2. 声码器</a></span></dt><dd><dl><dt><span class="section"><a href="ch17s02.html#id796">17.2.1. Codec2 声码器</a></span></dt><dt><span class="section"><a href="ch17s02.html#id797">17.2.2. Ambe 声码器</a></span></dt><dt><span class="section"><a href="ch17s02.html#id798">17.2.3. ACELP 声码器</a></span></dt></dl></dd><dt><span class="section"><a href="ch17s03.html">17.3. 调制模式</a></span></dt><dd><dl><dt><span class="section"><a href="ch17s03.html#id799">17.3.1. DMR/YSF/P25</a></span></dt><dt><span class="section"><a href="ch17s03.html#id800">17.3.2. D-Star/NXDN</a></span></dt><dt><span class="section"><a href="ch17s03.html#id801">17.3.3. Tatra</a></span></dt></dl></dd><dt><span class="section"><a href="ch17s04.html">17.4. 带宽</a></span></dt><dt><span class="section"><a href="ch17s05.html">17.5. 用户身份验证</a></span></dt><dt><span class="section"><a href="ch17s06.html">17.6. 中继器</a></span></dt></dl></div>

<div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id795"></a>17.1. 为什么国家会大力推广数字电台</h2></div></div></div>

Expand Down