Merge pull request #35 from sp5wwp/master

Update
pull/39/head
Wojciech Kaczmarski 2021-03-12 09:49:50 +01:00 zatwierdzone przez GitHub
commit 3fc55a7157
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 96 dodań i 98 usunięć

Wyświetl plik

@ -6,8 +6,6 @@ addresses) are encoded into these 6 bytes in the following ways:
* An address of 0 is invalid.
.. todo:: Do we want to use zero as a flag value of some kind?
* Address values between 1 and 262143999999999 (which is
:math:`40^9-1`), up to 9 characters of text are encoded using
base40, described below.
@ -173,32 +171,28 @@ Multiple Stations
To allow for multiple stations by the same operator, we borrow the use
of the '-' character from AX.25 and the SSID field. A callsign such as
"KR6ZY-1" is considered a different station than "KR6ZY-2" or even
"KR6ZY", but it is understood that these all belong to the same
operator, "KR6ZY"
"AB1CD-1" is considered a different station than "AB1CD-2" or even
"AB1CD", but it is understood that these all belong to the same
operator, "AB1CD"
Temporary Modifiers
~~~~~~~~~~~~~~~~~~~
Similarly, suffixes are often added to callsign to indicate temporary
changes of status, such as "KR6ZY/M" for a mobile station, or
"KR6ZY/AE" to signify that I have Amateur Extra operating privileges
changes of status, such as "AB1CD/M" for a mobile station, or
"AB1CD/AE" to signify that I have Amateur Extra operating privileges
even though the FCC database may not yet be updated. So the '/' is
included in the base40 alphabet. The difference between '-' and '/'
is that '-' are considered different stations, but '/' are NOT. They
are considered to be a temporary modification to the same
station.
.. todo:: I'm not sure what impact this actually has.
Interoperability
~~~~~~~~~~~~~~~~
It may be desirable to bridge information between M17 and other
networks. The 9 character base40 encoding allows for this:
.. todo:: Define more interoperability standards here. System Fusion? P25? IRLP? AllStar?
DMR
+++
@ -219,18 +213,3 @@ D-Star
++++++
D-Star reflectors have well defined names: REFxxxY which are encoded directly into base40.
.. todo:: Individuals? Just callsigns?
Interoperability Challenges
+++++++++++++++++++++++++++
We'll need to provide a source ID on the other network. Not sure how
to do that, and it'll probably be unique for each network we want to
interoperate with. Maybe write the DMR/BM gateway to automatically
lookup a callsign in the DMR database and map it to a DMR ID? Just
thinking out loud.
We will have to transcode CODEC2 to whatever the other network uses
(pretty much AMBE of one flavor or another.) I'd be curious to see how
that sounds.

Wyświetl plik

@ -54,7 +54,7 @@ Preamble
--------
Every transmission starts with a preamble, which shall consist of at
least 40ms of alternating -3, +3... symbols. This is equivalent to 40
least 40 ms of alternating -3, +3... symbols. This is equivalent to 40
milliseconds of a 2400 Hz tone
@ -94,7 +94,7 @@ Two distinct :term:`ECC`/:term:`FEC` schemes are used for different parts of
the transmission.
Link setup frame
Link setup frame (LSF)
~~~~~~~~~~~~~~~~
.. figure:: ../images/link_setup_frame_encoding.*
@ -121,9 +121,9 @@ Subsequent frames
ECC stages of subsequent frames
A 48-bit (type 1) chunk of LICH is partitioned into 4 12-bit parts and
encoded using Golay (24, 12) code. This produces 96 encoded LICH bits
of type 2.
A 48-bit (type 1) chunk of the LSF is partitioned into 4 12-bit parts and
encoded using Golay (24, 12) code. This produces 96 encoded bits
of type 2. These bits are used in the Link Information Channel (LICH).
FN, payload and CRC is 160 bits which are convolutionally encoded in a manner
analogous to that of the link setup frame. A total of 164 bits is
@ -151,15 +151,17 @@ the 12 bit data, resulting in a 24 bit encoded chunk.
G =& x^{11} + x^{10} + x^6 + x^5 + x^4 + x^2 + 1
\end{align}
The output of the Golay encoder looks like:
The output of the Golay encoder is shown in the table below.
+-----------------+----------------+---------------+
| Data | Check bits | Parity |
+-----------------+----------------+---------------+
| 23-12 (12 bits) | 11-1 (11 bits) | 0 (1 bit) |
+-----------------+----------------+---------------+
+------------+----------+-------------+---------+
| Field | Data | Check bits | Parity |
+------------+----------+-------------+---------+
| Position | 23..12 | 11..1 | 0 |
+------------+----------+-------------+---------+
| Length | 12 | 11 | 1 |
+------------+----------+-------------+---------+
Four of these 24-bit blocks are used to encode the LICH.
Four of these 24-bit blocks are used to reconstruct the LSF.
Convolutional encoder
~~~~~~~~~~~~~~~~~~~~~

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@ -14,7 +12,7 @@
viewBox="0 0 252.30742 120.5"
version="1.1"
id="svg8"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)"
sodipodi:docname="link_setup_frame_encoding.svg"
inkscape:export-filename="C:\Users\SP5WWP\Desktop\frame_1_encoding.png"
inkscape:export-xdpi="400"
@ -28,26 +26,27 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="542.69488"
inkscape:cy="315.6766"
inkscape:zoom="11.2"
inkscape:cx="501.59347"
inkscape:cy="75.127576"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
showguides="true"
showguides="false"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
inkscape:snap-bbox-midpoints="true"
inkscape:bbox-nodes="true"
inkscape:window-width="1600"
inkscape:window-height="851"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-width="1920"
inkscape:window-height="1017"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
fit-margin-top="10"
fit-margin-bottom="10"
fit-margin-left="10"
fit-margin-right="10">
fit-margin-right="10"
inkscape:document-rotation="0">
<sodipodi:guide
position="25.46293,73.190479"
orientation="1,0"
@ -162,7 +161,7 @@
y="77" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511717"
y="84.397797"
id="text919"><tspan
@ -170,10 +169,10 @@
x="21.511717"
y="84.397797"
id="tspan917"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511717"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan915">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -183,7 +182,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="45.356995"
y="84.397804"
id="text913"><tspan
@ -191,14 +190,14 @@
x="45.356995"
y="84.397804"
id="tspan911"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="45.356995"
y="84.397804"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan909">DST</tspan></tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="67.232513"
y="84.397797"
id="text4565"><tspan
@ -206,10 +205,10 @@
id="tspan4563"
x="67.232513"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332">SRC</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">SRC</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="89.08889"
y="84.397797"
id="text4569"><tspan
@ -217,21 +216,21 @@
id="tspan4567"
x="89.08889"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332">TYPE</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">TYPE</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="127.24599"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="116.5937"
y="84.397797"
id="text4565-7"><tspan
sodipodi:role="line"
id="tspan4563-4"
x="127.24599"
x="116.5937"
y="84.397797"
style="font-size:6.3499999px;stroke-width:0.26458332">NONCE</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">NONCE</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="172.10127"
y="84.400902"
id="text4565-79"><tspan
@ -239,7 +238,7 @@
id="tspan4563-45"
x="172.10127"
y="84.400902"
style="font-size:6.3499999px;stroke-width:0.26458332">TAIL</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">TAIL</tspan></text>
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect3719-7"
@ -249,7 +248,7 @@
y="107" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511717"
y="114.3978"
id="text925"><tspan
@ -257,10 +256,10 @@
x="21.511717"
y="114.3978"
id="tspan923"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511717"
y="114.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan921">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -270,7 +269,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="119.55951"
y="114.3978"
id="text4569-7"><tspan
@ -278,7 +277,7 @@
id="tspan4567-6"
x="119.55951"
y="114.3978"
style="font-size:6.3499999px;stroke-width:0.26458332">ENC PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">ENC PAYLOAD</tspan></text>
<rect
style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect3719-7-7"
@ -288,7 +287,7 @@
y="137" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511715"
y="144.3978"
id="text907"><tspan
@ -296,10 +295,10 @@
x="21.511715"
y="144.3978"
id="tspan905"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511715"
y="144.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan903">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -309,7 +308,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="99.033241"
y="144.3978"
id="text4569-7-0"><tspan
@ -317,7 +316,7 @@
id="tspan4567-6-3"
x="99.033241"
y="144.3978"
style="font-size:6.3499999px;stroke-width:0.26458332">ENC PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">ENC PAYLOAD</tspan></text>
<path
style="fill:none;stroke:#0000ff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.50000004, 1.50000004;stroke-dashoffset:0;stroke-opacity:1"
d="m 189.55505,87 47.03943,20"
@ -351,7 +350,7 @@
y="167" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="21.511711"
y="174.3978"
id="text901"><tspan
@ -359,10 +358,10 @@
x="21.511711"
y="174.3978"
id="tspan899"
style="stroke-width:0.26458332"><tspan
style="stroke-width:0.264583"><tspan
x="21.511711"
y="174.3978"
style="font-size:6.3499999px;stroke-width:0.26458332"
style="font-size:6.35px;stroke-width:0.264583"
id="tspan897">SYNC</tspan></tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -372,7 +371,7 @@
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="100.38509"
y="174.3978"
id="text4569-7-0-1"><tspan
@ -380,7 +379,7 @@
id="tspan4567-6-3-9"
x="100.38509"
y="174.3978"
style="font-size:6.3499999px;stroke-width:0.26458332">INT PAYLOAD</tspan></text>
style="font-size:6.35px;stroke-width:0.264583">INT PAYLOAD</tspan></text>
<path
style="fill:none;stroke:#0000ff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.50000004, 1.50000004;stroke-dashoffset:0;stroke-opacity:1"
d="m 40,147 -6e-6,19.99999"
@ -396,41 +395,42 @@
<flowRoot
xml:space="preserve"
id="flowRoot4850"
style="font-style:normal;font-weight:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
style="font-style:normal;font-weight:normal;font-size:13.3333px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
transform="matrix(0.26458333,0,0,0.26458333,0,-103)"><flowRegion
id="flowRegion4852"
style="font-size:13.33333302px"><rect
style="font-size:13.3333px"><rect
id="rect4854"
width="213.14218"
height="41.416256"
x="913.17792"
y="740.0545"
style="font-size:13.33333302px" /></flowRegion><flowPara
id="flowPara4856" /></flowRoot> <text
id="flowPara4856" /></flowRoot>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="115.46071"
y="98.4533"
id="text4860"><tspan
sodipodi:role="line"
x="115.46071"
y="98.4533"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862">(1)</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="115.46071"
y="129.44734"
id="text4860-7"><tspan
sodipodi:role="line"
x="115.46071"
y="129.44734"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862-1">(2)</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5611858"
y="83.005295"
id="text4911"><tspan
@ -438,10 +438,10 @@
id="tspan4909"
x="4.5611858"
y="83.005295"
style="stroke-width:0.26458332">Type 1</tspan></text>
style="stroke-width:0.264583">Type 1</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5611858"
y="113.02855"
id="text4911-3"><tspan
@ -449,10 +449,10 @@
id="tspan4909-4"
x="4.5611858"
y="113.02855"
style="stroke-width:0.26458332">Type 2</tspan></text>
style="stroke-width:0.264583">Type 2</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5474052"
y="143.00526"
id="text4911-6"><tspan
@ -460,10 +460,10 @@
id="tspan4909-0"
x="4.5474052"
y="143.00526"
style="stroke-width:0.26458332">Type 3</tspan></text>
style="stroke-width:0.264583">Type 3</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="4.5474052"
y="173.02853"
id="text4911-3-9"><tspan
@ -471,17 +471,17 @@
id="tspan4909-4-5"
x="4.5474052"
y="173.02853"
style="stroke-width:0.26458332">Type 4</tspan></text>
style="stroke-width:0.264583">Type 4</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:3.52777767px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
style="font-style:normal;font-weight:normal;font-size:3.52778px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="115.46071"
y="158.98744"
id="text4860-7-9-5"><tspan
sodipodi:role="line"
x="115.46071"
y="158.98744"
style="font-size:5.64444447px;stroke-width:0.26458332"
style="font-size:5.64444px;stroke-width:0.264583"
id="tspan4862-1-9-9">(3)</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@ -507,5 +507,22 @@
id="path3733-6-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
x="150.46822"
y="84.397804"
id="text4565-6"><tspan
sodipodi:role="line"
id="tspan4563-0"
x="150.46822"
y="84.397804"
style="font-size:6.35px;stroke-width:0.264583">CRC</tspan></text>
<path
style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 146.59933,77.086318 V 87.086321"
id="path3733-6-6-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
</svg>

Przed

Szerokość:  |  Wysokość:  |  Rozmiar: 21 KiB

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 21 KiB