mirror of
https://github.com/DreamSourceLab/DSView.git
synced 2025-01-13 13:32:53 +08:00
Merge branch 'master' of https://github.com/dreamsourcelab/DSView into dev-1.3
This commit is contained in:
commit
3917d817ab
@ -140,5 +140,7 @@
|
|||||||
<file>icons/logo.svg</file>
|
<file>icons/logo.svg</file>
|
||||||
<file>icons/light/update.svg</file>
|
<file>icons/light/update.svg</file>
|
||||||
<file>icons/dark/update.svg</file>
|
<file>icons/dark/update.svg</file>
|
||||||
|
<file>icons/light/log.svg</file>
|
||||||
|
<file>icons/dark/log.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
171
DSView/icons/dark/log.svg
Normal file
171
DSView/icons/dark/log.svg
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="700pt"
|
||||||
|
height="700pt"
|
||||||
|
version="1.1"
|
||||||
|
viewBox="0 0 700 700"
|
||||||
|
id="svg89"
|
||||||
|
sodipodi:docname="log.svg"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||||
|
<metadata
|
||||||
|
id="metadata93">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1269"
|
||||||
|
inkscape:window-height="1208"
|
||||||
|
id="namedview91"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="0.25285714"
|
||||||
|
inkscape:cx="414.63882"
|
||||||
|
inkscape:cy="466.66666"
|
||||||
|
inkscape:window-x="1848"
|
||||||
|
inkscape:window-y="581"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="g87" />
|
||||||
|
<defs
|
||||||
|
id="defs41">
|
||||||
|
<symbol
|
||||||
|
id="m"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m29.312-1.75c-1.5117 0.78125-3.0898 1.3711-4.7344 1.7656-1.6367 0.40625-3.3398 0.60938-5.1094 0.60938-5.3125 0-9.5273-1.4844-12.641-4.4531-3.1055-2.9688-4.6562-7-4.6562-12.094s1.5508-9.125 4.6562-12.094c3.1133-2.9688 7.3281-4.4531 12.641-4.4531 1.7695 0 3.4727 0.19922 5.1094 0.59375 1.6445 0.39844 3.2227 0.99219 4.7344 1.7812v6.5938c-1.5312-1.0391-3.0391-1.8008-4.5156-2.2812-1.4805-0.48828-3.0391-0.73438-4.6719-0.73438-2.9375 0-5.2461 0.94531-6.9219 2.8281-1.6797 1.875-2.5156 4.4648-2.5156 7.7656 0 3.293 0.83594 5.8828 2.5156 7.7656 1.6758 1.875 3.9844 2.8125 6.9219 2.8125 1.6328 0 3.1914-0.23828 4.6719-0.71875 1.4766-0.48828 2.9844-1.2539 4.5156-2.2969z"
|
||||||
|
id="path2" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="j"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m21.453-17.406c-0.67969-0.3125-1.3516-0.53906-2.0156-0.6875-0.65625-0.15625-1.3203-0.23438-1.9844-0.23438-1.9688 0-3.4844 0.63281-4.5469 1.8906-1.0547 1.2617-1.5781 3.0703-1.5781 5.4219v11.016h-7.6562v-23.922h7.6562v3.9219c0.97656-1.5625 2.1016-2.7031 3.375-3.4219 1.2812-0.71875 2.8125-1.0781 4.5938-1.0781 0.25 0 0.52344 0.011719 0.82812 0.03125 0.30078 0.023438 0.73438 0.070312 1.2969 0.14062z"
|
||||||
|
id="path5" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="b"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m27.562-12.031v2.1875h-17.891c0.1875 1.793 0.83203 3.1367 1.9375 4.0312 1.1133 0.89844 2.6719 1.3438 4.6719 1.3438 1.6016 0 3.25-0.23438 4.9375-0.70312 1.6875-0.47656 3.4219-1.2031 5.2031-2.1719v5.8906c-1.8047 0.6875-3.6094 1.2031-5.4219 1.5469-1.8125 0.35156-3.6211 0.53125-5.4219 0.53125-4.3359 0-7.7031-1.0977-10.109-3.2969-2.3984-2.207-3.5938-5.2969-3.5938-9.2656 0-3.9062 1.1758-6.9727 3.5312-9.2031 2.3633-2.2383 5.6094-3.3594 9.7344-3.3594 3.7578 0 6.7695 1.1367 9.0312 3.4062 2.2578 2.2617 3.3906 5.2812 3.3906 9.0625zm-7.8594-2.5312c0-1.457-0.42969-2.6289-1.2812-3.5156-0.84375-0.89453-1.9492-1.3438-3.3125-1.3438-1.4922 0-2.6992 0.41797-3.625 1.25-0.91797 0.83594-1.4922 2.0391-1.7188 3.6094z"
|
||||||
|
id="path8" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="i"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m14.391-10.766c-1.5938 0-2.793 0.27344-3.5938 0.8125-0.80469 0.54297-1.2031 1.3398-1.2031 2.3906 0 0.96875 0.32031 1.7305 0.96875 2.2812 0.64453 0.54297 1.5469 0.8125 2.7031 0.8125 1.4375 0 2.6445-0.51562 3.625-1.5469 0.98828-1.0312 1.4844-2.3203 1.4844-3.875v-0.875zm11.688-2.8906v13.656h-7.7031v-3.5469c-1.0312 1.4492-2.1875 2.5078-3.4688 3.1719s-2.8398 1-4.6719 1c-2.4805 0-4.4961-0.72266-6.0469-2.1719-1.543-1.4453-2.3125-3.3203-2.3125-5.625 0-2.8125 0.96094-4.8672 2.8906-6.1719 1.9375-1.3125 4.9688-1.9688 9.0938-1.9688h4.5156v-0.60938c0-1.207-0.48047-2.0938-1.4375-2.6562-0.94922-0.5625-2.4375-0.84375-4.4688-0.84375-1.6367 0-3.1562 0.16797-4.5625 0.5-1.4062 0.32422-2.7188 0.8125-3.9375 1.4688v-5.8281c1.6445-0.40625 3.2891-0.70703 4.9375-0.90625 1.6562-0.20703 3.3047-0.3125 4.9531-0.3125 4.3203 0 7.4375 0.85547 9.3438 2.5625 1.9141 1.6992 2.875 4.4609 2.875 8.2812z"
|
||||||
|
id="path11" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="h"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m12.031-30.719v6.7969h7.875v5.4688h-7.875v10.141c0 1.1172 0.21875 1.8711 0.65625 2.2656 0.4375 0.38672 1.3125 0.57812 2.625 0.57812h3.9375v5.4688h-6.5625c-3.0234 0-5.1641-0.62891-6.4219-1.8906-1.2617-1.2578-1.8906-3.3984-1.8906-6.4219v-10.141h-3.7969v-5.4688h3.7969v-6.7969z"
|
||||||
|
id="path14" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="g"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m19.953-20.422v-12.812h7.6875v33.234h-7.6875v-3.4531c-1.0547 1.4062-2.2148 2.4375-3.4844 3.0938-1.2734 0.65625-2.7422 0.98438-4.4062 0.98438-2.9492 0-5.3711-1.1719-7.2656-3.5156-1.8867-2.3438-2.8281-5.3594-2.8281-9.0469s0.94141-6.7031 2.8281-9.0469c1.8945-2.3438 4.3164-3.5156 7.2656-3.5156 1.6562 0 3.1172 0.33594 4.3906 1 1.2812 0.65625 2.4453 1.6836 3.5 3.0781zm-5.0469 15.484c1.6445 0 2.8945-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.85547-1.1953-2.1055-1.7969-3.75-1.7969-1.625 0-2.8711 0.60156-3.7344 1.7969-0.85547 1.1992-1.2812 2.9375-1.2812 5.2188 0 2.2734 0.42578 4.0078 1.2812 5.2031 0.86328 1.1992 2.1094 1.7969 3.7344 1.7969z"
|
||||||
|
id="path17" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="f"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m16.406-4.9375c1.6328 0 2.8828-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.86719-1.1953-2.1172-1.7969-3.75-1.7969-1.6367 0-2.8906 0.60547-3.7656 1.8125-0.875 1.1992-1.3125 2.9336-1.3125 5.2031 0 2.2617 0.4375 3.9961 1.3125 5.2031 0.875 1.1992 2.1289 1.7969 3.7656 1.7969zm-5.0781-15.484c1.0508-1.3945 2.2188-2.4219 3.5-3.0781 1.2812-0.66406 2.7539-1 4.4219-1 2.9453 0 5.3672 1.1719 7.2656 3.5156 1.8945 2.3438 2.8438 5.3594 2.8438 9.0469s-0.94922 6.7031-2.8438 9.0469c-1.8984 2.3438-4.3203 3.5156-7.2656 3.5156-1.668 0-3.1406-0.33594-4.4219-1s-2.4492-1.6914-3.5-3.0781v3.4531h-7.6562v-33.234h7.6562z"
|
||||||
|
id="path20" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="e"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m0.53125-23.922h7.6562l6.4219 16.234 5.4688-16.234h7.6562l-10.062 26.188c-1.0117 2.6641-2.1953 4.5234-3.5469 5.5781-1.3438 1.0625-3.1211 1.5938-5.3281 1.5938h-4.4219v-5.0156h2.3906c1.3008 0 2.2422-0.21094 2.8281-0.625 0.59375-0.40625 1.0547-1.1484 1.3906-2.2188l0.20312-0.65625z"
|
||||||
|
id="path23" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="d"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m26.219-30.891v6.75c-1.7617-0.78125-3.4766-1.3672-5.1406-1.7656-1.668-0.40625-3.2422-0.60938-4.7188-0.60938-1.9609 0-3.4141 0.27344-4.3594 0.8125-0.9375 0.54297-1.4062 1.3867-1.4062 2.5312 0 0.85547 0.31641 1.5234 0.95312 2 0.63281 0.46875 1.7852 0.875 3.4531 1.2188l3.5 0.70312c3.5391 0.71875 6.0625 1.8047 7.5625 3.25 1.5 1.4492 2.25 3.5117 2.25 6.1875 0 3.5234-1.0469 6.1406-3.1406 7.8594-2.0859 1.7188-5.2734 2.5781-9.5625 2.5781-2.0234 0-4.0547-0.19531-6.0938-0.57812-2.0312-0.38281-4.0625-0.95703-6.0938-1.7188v-6.9375c2.0312 1.0859 3.9922 1.9023 5.8906 2.4531 1.9062 0.54297 3.7422 0.8125 5.5156 0.8125 1.7891 0 3.1602-0.29688 4.1094-0.89062 0.95703-0.60156 1.4375-1.457 1.4375-2.5625 0-1-0.32422-1.7695-0.96875-2.3125-0.64844-0.53906-1.9375-1.0234-3.875-1.4531l-3.1875-0.70312c-3.1875-0.6875-5.5234-1.7734-7-3.2656-1.4688-1.5-2.2031-3.5156-2.2031-6.0469 0-3.1758 1.0234-5.6172 3.0781-7.3281 2.0508-1.707 5-2.5625 8.8438-2.5625 1.75 0 3.5508 0.13281 5.4062 0.39062 1.8516 0.26172 3.7695 0.65625 5.75 1.1875z"
|
||||||
|
id="path26" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="c"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m4.0156-31.891h8.2188v12.156h12.141v-12.156h8.2188v31.891h-8.2188v-13.516h-12.141v13.516h-8.2188z"
|
||||||
|
id="path29" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="a"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m23.375-5.8125h-12.859l-2.0312 5.8125h-8.2656l11.812-31.891h9.7969l11.812 31.891h-8.2656zm-10.812-5.9219h8.7344l-4.3594-12.688z"
|
||||||
|
id="path32" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="l"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m15.703-17.75c1.7188 0 2.9531-0.31641 3.7031-0.95312 0.75-0.64453 1.125-1.7031 1.125-3.1719 0-1.4453-0.375-2.4844-1.125-3.1094-0.75-0.63281-1.9844-0.95312-3.7031-0.95312h-3.4688v8.1875zm-3.4688 5.6875v12.062h-8.2188v-31.891h12.562c4.1953 0 7.2734 0.70312 9.2344 2.1094 1.957 1.4062 2.9375 3.6367 2.9375 6.6875 0 2.1055-0.51172 3.8359-1.5312 5.1875-1.0117 1.3555-2.543 2.3555-4.5938 3 1.125 0.25 2.1289 0.82812 3.0156 1.7344 0.89453 0.90625 1.7969 2.2773 2.7031 4.1094l4.4688 9.0625h-8.7656l-3.875-7.9219c-0.79297-1.5938-1.5898-2.6797-2.3906-3.2656-0.80469-0.58203-1.875-0.875-3.2188-0.875z"
|
||||||
|
id="path35" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="k"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m4.0156-31.891h22.203v6.2188h-13.984v5.9375h13.141v6.2188h-13.141v7.2969h14.453v6.2188h-22.672z"
|
||||||
|
id="path38" />
|
||||||
|
</symbol>
|
||||||
|
</defs>
|
||||||
|
<g
|
||||||
|
id="g87">
|
||||||
|
<path
|
||||||
|
d="m 323.76255,564.21767 c -7.11637,-0.0763 -14.08491,2.07395 -19.925,6.15056 -5.86585,4.04108 -10.32372,9.81038 -12.74837,16.51047 -1.36737,3.64459 -2.09934,7.49751 -2.16544,11.38608 -0.1067,8.35153 2.85159,16.45452 8.3108,22.77216 6.48095,7.94996 16.27624,12.44844 26.52892,12.18415 9.20034,0.21349 18.0902,-3.28869 24.67331,-9.7189 6.57751,-6.43007 10.28807,-15.23913 10.283,-24.43908 0.21857,-8.37183 -2.75505,-16.51047 -8.3108,-22.77216 -6.62319,-7.81775 -16.40247,-12.24518 -26.64603,-12.07224 z"
|
||||||
|
id="path43"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#d7d7d7;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="m 94.687605,500.11728 v 115.7971 c 0.147408,21.48651 8.748025,42.04652 23.940705,57.24011 15.19267,15.19358 35.75489,23.79365 57.2401,23.9407 h 358.31672 c 21.52165,-0.0304 42.15453,-8.59045 57.36763,-23.80928 15.21831,-15.21831 23.78325,-35.85119 23.81448,-57.37283 V 500.11598 Z M 239.40144,659.52242 H 169.03676 V 536.89367 h 31.99294 v 96.32365 h 38.37174 z m 135.8392,-17.07912 c -13.0582,14.52734 -31.95259,22.42602 -51.46638,21.52164 -17.8768,0.8743 -35.32678,-5.64216 -48.24836,-18.02904 -12.92626,-12.38233 -20.18004,-29.54266 -20.06813,-47.44027 0.0915,-8.03129 1.63673,-15.97565 4.55443,-23.45793 4.68157,-12.91104 13.42907,-23.95632 24.92706,-31.47504 11.50294,-7.51273 25.13006,-11.09121 38.835,-10.19659 17.89761,-0.87937 35.36842,5.65752 48.2939,18.06548 12.92626,12.41291 20.16963,29.59861 20.02258,47.51705 0.0966,16.21508 -5.91672,31.86541 -16.8501,43.83706 z m 161.1098,-17.98871 c -4.06646,12.10789 -12.08759,22.49239 -22.77216,29.4919 -10.75575,6.77062 -23.27055,10.21703 -35.97742,9.90186 -19.96142,1.20469 -39.28653,-7.26875 -51.92313,-22.77216 -9.29182,-12.69243 -14.09532,-28.11907 -13.6633,-43.84618 0.43206,-15.7271 6.07939,-30.85953 16.05763,-43.02767 12.95164,-14.26839 31.65721,-21.92374 50.89643,-20.83588 13.21046,-0.34057 26.16717,3.65981 36.8883,11.38608 7.86356,6.02851 14.18121,13.83116 18.44676,22.77216 l -30.28438,12.52469 c -2.04845,-4.78319 -5.11866,-9.05798 -8.99708,-12.52469 -4.95601,-4.0969 -11.21835,-6.27756 -17.64778,-6.15056 -6.54185,-0.14233 -12.94148,1.89594 -18.20211,5.79467 -5.25595,3.89365 -9.06306,9.4291 -10.832,15.7271 -2.04338,5.22537 -3.08544,10.78633 -3.07529,16.39856 -0.24398,10.84216 3.85292,21.33817 11.38608,29.14577 5.72349,5.94718 13.72967,9.13931 21.97449,8.76832 7.14682,0.3914 14.14086,-2.16036 19.35634,-7.06041 3.4667,-3.82247 5.61678,-8.64626 6.15056,-13.77521 h -26.64603 v -24.82556 h 63.42112 c 0.35073,11.14717 -1.18943,22.27378 -4.55443,32.90773 z"
|
||||||
|
id="path45"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#d7d7d7;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="M 615.24622,189.27076 434.66948,5.2716943 V 130.51858 c 0,15.48768 6.15564,30.34554 17.10905,41.2996 10.95406,10.95406 25.81192,17.10905 41.2996,17.10905 z"
|
||||||
|
id="path47"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#d7d7d7;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="M 131.00595,468.92593 H 94.687605 V 86.470714 c -0.03045,-20.79033 7.929655,-40.7973 22.233435,-55.88288 C 131.22456,15.495744 150.78,6.4844743 171.5443,5.4018213 H 402.67524 V 41.608254 H 173.35306 c -11.44711,0.61506 -22.22302,5.59649 -30.1074,13.92225 -7.87877,8.32603 -12.26547,19.36155 -12.25025,30.82831 z"
|
||||||
|
id="path49"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#d7d7d7;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="m 578.92788,221.95857 h 36.32355 v 246.96736 h -36.32355 z"
|
||||||
|
id="path51"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#d7d7d7;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 13 KiB |
171
DSView/icons/light/log.svg
Normal file
171
DSView/icons/light/log.svg
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="700pt"
|
||||||
|
height="700pt"
|
||||||
|
version="1.1"
|
||||||
|
viewBox="0 0 700 700"
|
||||||
|
id="svg89"
|
||||||
|
sodipodi:docname="log.svg"
|
||||||
|
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
|
||||||
|
<metadata
|
||||||
|
id="metadata93">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1254"
|
||||||
|
inkscape:window-height="1141"
|
||||||
|
id="namedview91"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="0.25285714"
|
||||||
|
inkscape:cx="381.54426"
|
||||||
|
inkscape:cy="466.66666"
|
||||||
|
inkscape:window-x="3199"
|
||||||
|
inkscape:window-y="666"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="g87" />
|
||||||
|
<defs
|
||||||
|
id="defs41">
|
||||||
|
<symbol
|
||||||
|
id="m"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m29.312-1.75c-1.5117 0.78125-3.0898 1.3711-4.7344 1.7656-1.6367 0.40625-3.3398 0.60938-5.1094 0.60938-5.3125 0-9.5273-1.4844-12.641-4.4531-3.1055-2.9688-4.6562-7-4.6562-12.094s1.5508-9.125 4.6562-12.094c3.1133-2.9688 7.3281-4.4531 12.641-4.4531 1.7695 0 3.4727 0.19922 5.1094 0.59375 1.6445 0.39844 3.2227 0.99219 4.7344 1.7812v6.5938c-1.5312-1.0391-3.0391-1.8008-4.5156-2.2812-1.4805-0.48828-3.0391-0.73438-4.6719-0.73438-2.9375 0-5.2461 0.94531-6.9219 2.8281-1.6797 1.875-2.5156 4.4648-2.5156 7.7656 0 3.293 0.83594 5.8828 2.5156 7.7656 1.6758 1.875 3.9844 2.8125 6.9219 2.8125 1.6328 0 3.1914-0.23828 4.6719-0.71875 1.4766-0.48828 2.9844-1.2539 4.5156-2.2969z"
|
||||||
|
id="path2" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="j"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m21.453-17.406c-0.67969-0.3125-1.3516-0.53906-2.0156-0.6875-0.65625-0.15625-1.3203-0.23438-1.9844-0.23438-1.9688 0-3.4844 0.63281-4.5469 1.8906-1.0547 1.2617-1.5781 3.0703-1.5781 5.4219v11.016h-7.6562v-23.922h7.6562v3.9219c0.97656-1.5625 2.1016-2.7031 3.375-3.4219 1.2812-0.71875 2.8125-1.0781 4.5938-1.0781 0.25 0 0.52344 0.011719 0.82812 0.03125 0.30078 0.023438 0.73438 0.070312 1.2969 0.14062z"
|
||||||
|
id="path5" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="b"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m27.562-12.031v2.1875h-17.891c0.1875 1.793 0.83203 3.1367 1.9375 4.0312 1.1133 0.89844 2.6719 1.3438 4.6719 1.3438 1.6016 0 3.25-0.23438 4.9375-0.70312 1.6875-0.47656 3.4219-1.2031 5.2031-2.1719v5.8906c-1.8047 0.6875-3.6094 1.2031-5.4219 1.5469-1.8125 0.35156-3.6211 0.53125-5.4219 0.53125-4.3359 0-7.7031-1.0977-10.109-3.2969-2.3984-2.207-3.5938-5.2969-3.5938-9.2656 0-3.9062 1.1758-6.9727 3.5312-9.2031 2.3633-2.2383 5.6094-3.3594 9.7344-3.3594 3.7578 0 6.7695 1.1367 9.0312 3.4062 2.2578 2.2617 3.3906 5.2812 3.3906 9.0625zm-7.8594-2.5312c0-1.457-0.42969-2.6289-1.2812-3.5156-0.84375-0.89453-1.9492-1.3438-3.3125-1.3438-1.4922 0-2.6992 0.41797-3.625 1.25-0.91797 0.83594-1.4922 2.0391-1.7188 3.6094z"
|
||||||
|
id="path8" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="i"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m14.391-10.766c-1.5938 0-2.793 0.27344-3.5938 0.8125-0.80469 0.54297-1.2031 1.3398-1.2031 2.3906 0 0.96875 0.32031 1.7305 0.96875 2.2812 0.64453 0.54297 1.5469 0.8125 2.7031 0.8125 1.4375 0 2.6445-0.51562 3.625-1.5469 0.98828-1.0312 1.4844-2.3203 1.4844-3.875v-0.875zm11.688-2.8906v13.656h-7.7031v-3.5469c-1.0312 1.4492-2.1875 2.5078-3.4688 3.1719s-2.8398 1-4.6719 1c-2.4805 0-4.4961-0.72266-6.0469-2.1719-1.543-1.4453-2.3125-3.3203-2.3125-5.625 0-2.8125 0.96094-4.8672 2.8906-6.1719 1.9375-1.3125 4.9688-1.9688 9.0938-1.9688h4.5156v-0.60938c0-1.207-0.48047-2.0938-1.4375-2.6562-0.94922-0.5625-2.4375-0.84375-4.4688-0.84375-1.6367 0-3.1562 0.16797-4.5625 0.5-1.4062 0.32422-2.7188 0.8125-3.9375 1.4688v-5.8281c1.6445-0.40625 3.2891-0.70703 4.9375-0.90625 1.6562-0.20703 3.3047-0.3125 4.9531-0.3125 4.3203 0 7.4375 0.85547 9.3438 2.5625 1.9141 1.6992 2.875 4.4609 2.875 8.2812z"
|
||||||
|
id="path11" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="h"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m12.031-30.719v6.7969h7.875v5.4688h-7.875v10.141c0 1.1172 0.21875 1.8711 0.65625 2.2656 0.4375 0.38672 1.3125 0.57812 2.625 0.57812h3.9375v5.4688h-6.5625c-3.0234 0-5.1641-0.62891-6.4219-1.8906-1.2617-1.2578-1.8906-3.3984-1.8906-6.4219v-10.141h-3.7969v-5.4688h3.7969v-6.7969z"
|
||||||
|
id="path14" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="g"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m19.953-20.422v-12.812h7.6875v33.234h-7.6875v-3.4531c-1.0547 1.4062-2.2148 2.4375-3.4844 3.0938-1.2734 0.65625-2.7422 0.98438-4.4062 0.98438-2.9492 0-5.3711-1.1719-7.2656-3.5156-1.8867-2.3438-2.8281-5.3594-2.8281-9.0469s0.94141-6.7031 2.8281-9.0469c1.8945-2.3438 4.3164-3.5156 7.2656-3.5156 1.6562 0 3.1172 0.33594 4.3906 1 1.2812 0.65625 2.4453 1.6836 3.5 3.0781zm-5.0469 15.484c1.6445 0 2.8945-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.85547-1.1953-2.1055-1.7969-3.75-1.7969-1.625 0-2.8711 0.60156-3.7344 1.7969-0.85547 1.1992-1.2812 2.9375-1.2812 5.2188 0 2.2734 0.42578 4.0078 1.2812 5.2031 0.86328 1.1992 2.1094 1.7969 3.7344 1.7969z"
|
||||||
|
id="path17" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="f"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m16.406-4.9375c1.6328 0 2.8828-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.86719-1.1953-2.1172-1.7969-3.75-1.7969-1.6367 0-2.8906 0.60547-3.7656 1.8125-0.875 1.1992-1.3125 2.9336-1.3125 5.2031 0 2.2617 0.4375 3.9961 1.3125 5.2031 0.875 1.1992 2.1289 1.7969 3.7656 1.7969zm-5.0781-15.484c1.0508-1.3945 2.2188-2.4219 3.5-3.0781 1.2812-0.66406 2.7539-1 4.4219-1 2.9453 0 5.3672 1.1719 7.2656 3.5156 1.8945 2.3438 2.8438 5.3594 2.8438 9.0469s-0.94922 6.7031-2.8438 9.0469c-1.8984 2.3438-4.3203 3.5156-7.2656 3.5156-1.668 0-3.1406-0.33594-4.4219-1s-2.4492-1.6914-3.5-3.0781v3.4531h-7.6562v-33.234h7.6562z"
|
||||||
|
id="path20" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="e"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m0.53125-23.922h7.6562l6.4219 16.234 5.4688-16.234h7.6562l-10.062 26.188c-1.0117 2.6641-2.1953 4.5234-3.5469 5.5781-1.3438 1.0625-3.1211 1.5938-5.3281 1.5938h-4.4219v-5.0156h2.3906c1.3008 0 2.2422-0.21094 2.8281-0.625 0.59375-0.40625 1.0547-1.1484 1.3906-2.2188l0.20312-0.65625z"
|
||||||
|
id="path23" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="d"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m26.219-30.891v6.75c-1.7617-0.78125-3.4766-1.3672-5.1406-1.7656-1.668-0.40625-3.2422-0.60938-4.7188-0.60938-1.9609 0-3.4141 0.27344-4.3594 0.8125-0.9375 0.54297-1.4062 1.3867-1.4062 2.5312 0 0.85547 0.31641 1.5234 0.95312 2 0.63281 0.46875 1.7852 0.875 3.4531 1.2188l3.5 0.70312c3.5391 0.71875 6.0625 1.8047 7.5625 3.25 1.5 1.4492 2.25 3.5117 2.25 6.1875 0 3.5234-1.0469 6.1406-3.1406 7.8594-2.0859 1.7188-5.2734 2.5781-9.5625 2.5781-2.0234 0-4.0547-0.19531-6.0938-0.57812-2.0312-0.38281-4.0625-0.95703-6.0938-1.7188v-6.9375c2.0312 1.0859 3.9922 1.9023 5.8906 2.4531 1.9062 0.54297 3.7422 0.8125 5.5156 0.8125 1.7891 0 3.1602-0.29688 4.1094-0.89062 0.95703-0.60156 1.4375-1.457 1.4375-2.5625 0-1-0.32422-1.7695-0.96875-2.3125-0.64844-0.53906-1.9375-1.0234-3.875-1.4531l-3.1875-0.70312c-3.1875-0.6875-5.5234-1.7734-7-3.2656-1.4688-1.5-2.2031-3.5156-2.2031-6.0469 0-3.1758 1.0234-5.6172 3.0781-7.3281 2.0508-1.707 5-2.5625 8.8438-2.5625 1.75 0 3.5508 0.13281 5.4062 0.39062 1.8516 0.26172 3.7695 0.65625 5.75 1.1875z"
|
||||||
|
id="path26" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="c"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m4.0156-31.891h8.2188v12.156h12.141v-12.156h8.2188v31.891h-8.2188v-13.516h-12.141v13.516h-8.2188z"
|
||||||
|
id="path29" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="a"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m23.375-5.8125h-12.859l-2.0312 5.8125h-8.2656l11.812-31.891h9.7969l11.812 31.891h-8.2656zm-10.812-5.9219h8.7344l-4.3594-12.688z"
|
||||||
|
id="path32" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="l"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m15.703-17.75c1.7188 0 2.9531-0.31641 3.7031-0.95312 0.75-0.64453 1.125-1.7031 1.125-3.1719 0-1.4453-0.375-2.4844-1.125-3.1094-0.75-0.63281-1.9844-0.95312-3.7031-0.95312h-3.4688v8.1875zm-3.4688 5.6875v12.062h-8.2188v-31.891h12.562c4.1953 0 7.2734 0.70312 9.2344 2.1094 1.957 1.4062 2.9375 3.6367 2.9375 6.6875 0 2.1055-0.51172 3.8359-1.5312 5.1875-1.0117 1.3555-2.543 2.3555-4.5938 3 1.125 0.25 2.1289 0.82812 3.0156 1.7344 0.89453 0.90625 1.7969 2.2773 2.7031 4.1094l4.4688 9.0625h-8.7656l-3.875-7.9219c-0.79297-1.5938-1.5898-2.6797-2.3906-3.2656-0.80469-0.58203-1.875-0.875-3.2188-0.875z"
|
||||||
|
id="path35" />
|
||||||
|
</symbol>
|
||||||
|
<symbol
|
||||||
|
id="k"
|
||||||
|
overflow="visible">
|
||||||
|
<path
|
||||||
|
d="m4.0156-31.891h22.203v6.2188h-13.984v5.9375h13.141v6.2188h-13.141v7.2969h14.453v6.2188h-22.672z"
|
||||||
|
id="path38" />
|
||||||
|
</symbol>
|
||||||
|
</defs>
|
||||||
|
<g
|
||||||
|
id="g87">
|
||||||
|
<path
|
||||||
|
d="m 329.69474,564.21767 c -7.11636,-0.0763 -14.08491,2.07396 -19.92498,6.15056 -5.86586,4.04108 -10.32373,9.81038 -12.74839,16.51047 -1.36736,3.64459 -2.09933,7.49751 -2.16543,11.38608 -0.10674,8.35153 2.85159,16.45452 8.3108,22.77217 6.48096,7.94995 16.27624,12.44843 26.52891,12.18414 9.20035,0.21349 18.09021,-3.28869 24.67332,-9.71889 6.57751,-6.43009 10.28807,-15.23914 10.28299,-24.43909 0.21858,-8.37183 -2.75503,-16.51047 -8.31079,-22.77217 -6.62319,-7.81774 -16.40247,-12.24517 -26.64604,-12.07223 z"
|
||||||
|
id="path43"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#2a2a2a;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="m 100.61981,500.11728 v 115.7971 c 0.1474,21.48651 8.74803,42.04652 23.94069,57.24011 15.19268,15.19358 35.7549,23.79365 57.24011,23.94069 h 358.31672 c 21.52165,-0.0304 42.15453,-8.59043 57.36763,-23.80926 15.21831,-15.21832 23.78325,-35.8512 23.81448,-57.37284 V 500.11598 Z M 245.33364,659.52242 H 174.96897 V 536.89367 h 31.99293 v 96.32365 h 38.37174 z m 135.8392,-17.07913 c -13.0582,14.52735 -31.95259,22.42603 -51.46638,21.52165 -17.8768,0.8743 -35.32679,-5.64216 -48.24836,-18.02904 -12.92626,-12.38233 -20.18004,-29.54266 -20.06813,-47.44027 0.0915,-8.03129 1.63673,-15.97565 4.55443,-23.45793 4.68157,-12.91104 13.42907,-23.95632 24.92706,-31.47504 11.50294,-7.51272 25.13006,-11.09121 38.835,-10.19659 17.89761,-0.87937 35.36842,5.65751 48.29389,18.06549 12.92627,12.4129 20.16964,29.5986 20.0226,47.51703 0.0966,16.21509 -5.91673,31.86542 -16.85011,43.83707 z m 161.1098,-17.9887 c -4.06646,12.10789 -12.08759,22.49239 -22.77216,29.4919 -10.75575,6.77062 -23.27055,10.21703 -35.97741,9.90186 -19.96144,1.20469 -39.28654,-7.26874 -51.92314,-22.77216 -9.29182,-12.69243 -14.09532,-28.11907 -13.6633,-43.84617 0.43206,-15.72711 6.07939,-30.85954 16.05763,-43.02768 12.95163,-14.26838 31.65721,-21.92374 50.89643,-20.83588 13.21046,-0.34057 26.16717,3.65981 36.88831,11.38608 7.86355,6.02851 14.1812,13.83117 18.44674,22.77217 l -30.28436,12.52468 c -2.04846,-4.78319 -5.11867,-9.05798 -8.99709,-12.52468 -4.95601,-4.09691 -11.21835,-6.27758 -17.64778,-6.15057 -6.54186,-0.14233 -12.94148,1.89595 -18.20211,5.79467 -5.25595,3.89365 -9.06306,9.4291 -10.832,15.7271 -2.04338,5.22537 -3.08544,10.78633 -3.07528,16.39856 -0.24399,10.84215 3.85292,21.33817 11.38607,29.14577 5.7235,5.94718 13.72967,9.13931 21.97449,8.76832 7.14682,0.3914 14.14087,-2.16036 19.35634,-7.06041 3.4667,-3.82247 5.61678,-8.64626 6.15056,-13.7752 h -26.64603 v -24.82557 h 63.42112 c 0.35073,11.14718 -1.18943,22.27378 -4.55443,32.90773 z"
|
||||||
|
id="path45"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#2a2a2a;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="M 621.17842,189.27076 440.60168,5.2716943 V 130.51858 c 0,15.48767 6.15564,30.34553 17.10905,41.2996 10.95406,10.95405 25.81192,17.10905 41.2996,17.10905 z"
|
||||||
|
id="path47"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#2a2a2a;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="M 136.93815,468.92592 H 100.61981 V 86.470715 C 100.58936,65.680381 108.54947,45.67341 122.85325,30.587837 137.15676,15.495744 156.71219,6.4844747 177.4765,5.4018205 H 408.60744 V 41.608262 H 179.28527 c -11.44712,0.615056 -22.22303,5.596486 -30.10741,13.922246 -7.87878,8.326021 -12.26548,19.361541 -12.25025,30.828301 z"
|
||||||
|
id="path49"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#2a2a2a;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
<path
|
||||||
|
d="m 584.86008,221.95857 h 36.32354 v 246.96735 h -36.32354 z"
|
||||||
|
id="path51"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:#2a2a2a;fill-opacity:1;stroke-width:1.30126643" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 13 KiB |
@ -152,7 +152,7 @@ void LogoBar::reStyle()
|
|||||||
_manual->setIcon(QIcon(iconPath+"/manual.svg"));
|
_manual->setIcon(QIcon(iconPath+"/manual.svg"));
|
||||||
_issue->setIcon(QIcon(iconPath+"/bug.svg"));
|
_issue->setIcon(QIcon(iconPath+"/bug.svg"));
|
||||||
_update->setIcon(QIcon(iconPath+"/update.svg"));
|
_update->setIcon(QIcon(iconPath+"/update.svg"));
|
||||||
_log->setIcon(QIcon(iconPath+"/file.svg"));
|
_log->setIcon(QIcon(iconPath+"/log.svg"));
|
||||||
|
|
||||||
if (_connected)
|
if (_connected)
|
||||||
_logo_button.setIcon(QIcon(iconPath+"/logo_color.svg"));
|
_logo_button.setIcon(QIcon(iconPath+"/logo_color.svg"));
|
||||||
|
17
NEWS25
17
NEWS25
@ -1,3 +1,20 @@
|
|||||||
|
1.2.1 -- (2022-08-27)
|
||||||
|
----------
|
||||||
|
(通用)
|
||||||
|
*修复安装路径的多语言支持
|
||||||
|
*修复某些云桌面系统无法识别设备的问题
|
||||||
|
*增加日志记录,以及日志级别设置功能
|
||||||
|
|
||||||
|
(逻辑分析仪)
|
||||||
|
*修复保存文件时,I2C解码器无法自动保存的问题
|
||||||
|
*修复保存文件时,中文通道名称的乱码问题
|
||||||
|
*修复某些解码器对无效数据的解码报错问题
|
||||||
|
*添加parallel解码器的数据格式选择
|
||||||
|
*修复DSLogic U3Pro32在USB2.0连接下的通道模式选择问题
|
||||||
|
|
||||||
|
(示波器)
|
||||||
|
*修复特定情况下缩放波形,中心位置偏移的问题
|
||||||
|
|
||||||
1.2.0 -- (2022-07-05)
|
1.2.0 -- (2022-07-05)
|
||||||
-----------------
|
-----------------
|
||||||
(通用)
|
(通用)
|
||||||
|
17
NEWS31
17
NEWS31
@ -1,3 +1,20 @@
|
|||||||
|
1.2.1 -- (2022-08-27)
|
||||||
|
-----------------
|
||||||
|
--common
|
||||||
|
*add multilingual support for installation paths
|
||||||
|
*fix the problem that some cloud desktop systems cannot recognize devices
|
||||||
|
*Add logging and log level setting function
|
||||||
|
|
||||||
|
--for logic analyzer
|
||||||
|
*fix I2C decoder save issue when saving dsl files
|
||||||
|
*add multingual supoort for channel name when saving dsl files
|
||||||
|
*fix decoder errors when decoding invalid data
|
||||||
|
*add data format selection of parallel decoder
|
||||||
|
*fix channel mode issue of DSLogic U3Pro32 under USB2.0 connection
|
||||||
|
|
||||||
|
--for oscilloscope
|
||||||
|
*fix center position offset issue when scaling waveform
|
||||||
|
|
||||||
1.2.0 -- (2022-07-05)
|
1.2.0 -- (2022-07-05)
|
||||||
-----------------
|
-----------------
|
||||||
--common
|
--common
|
||||||
|
@ -22,30 +22,6 @@ import sigrokdecode as srd
|
|||||||
from common.srdhelper import bitpack
|
from common.srdhelper import bitpack
|
||||||
from math import floor, ceil
|
from math import floor, ceil
|
||||||
|
|
||||||
'''
|
|
||||||
OUTPUT_PYTHON format:
|
|
||||||
|
|
||||||
Packet:
|
|
||||||
[<ptype>, <rxtx>, <pdata>]
|
|
||||||
|
|
||||||
This is the list of <ptype>s and their respective <pdata> values:
|
|
||||||
- 'STARTBIT': The data is the (integer) value of the start bit (0/1).
|
|
||||||
- 'DATA': This is always a tuple containing two items:
|
|
||||||
- 1st item: the (integer) value of the UART data. Valid values
|
|
||||||
range from 0 to 511 (as the data can be up to 9 bits in size).
|
|
||||||
- 2nd item: the list of individual data bits and their ss/es numbers.
|
|
||||||
- 'PARITYBIT': The data is the (integer) value of the parity bit (0/1).
|
|
||||||
- 'STOPBIT': The data is the (integer) value of the stop bit (0 or 1).
|
|
||||||
- 'INVALID STARTBIT': The data is the (integer) value of the start bit (0/1).
|
|
||||||
- 'INVALID STOPBIT': The data is the (integer) value of the stop bit (0/1).
|
|
||||||
- 'PARITY ERROR': The data is a tuple with two entries. The first one is
|
|
||||||
the expected parity value, the second is the actual parity value.
|
|
||||||
- 'FRAME': The data is always a tuple containing two items: The (integer)
|
|
||||||
value of the UART data, and a boolean which reflects the validity of the
|
|
||||||
UART frame.
|
|
||||||
|
|
||||||
'''
|
|
||||||
|
|
||||||
# Given a parity type to check (odd, even, zero, one), the value of the
|
# Given a parity type to check (odd, even, zero, one), the value of the
|
||||||
# parity bit, the value of the data, and the length of the data (5-9 bits,
|
# parity bit, the value of the data, and the length of the data (5-9 bits,
|
||||||
# usually 8 bits) return True if the parity is correct, False otherwise.
|
# usually 8 bits) return True if the parity is correct, False otherwise.
|
||||||
@ -81,7 +57,7 @@ class Decoder(srd.Decoder):
|
|||||||
desc = 'Asynchronous, serial bus.'
|
desc = 'Asynchronous, serial bus.'
|
||||||
license = 'gplv2+'
|
license = 'gplv2+'
|
||||||
inputs = ['logic']
|
inputs = ['logic']
|
||||||
outputs = ['uart']
|
outputs = []
|
||||||
tags = ['Embedded/industrial']
|
tags = ['Embedded/industrial']
|
||||||
channels = (
|
channels = (
|
||||||
{'id': 'rxtx', 'type': 209, 'name': 'RX/TX', 'desc': 'UART transceive line'},
|
{'id': 'rxtx', 'type': 209, 'name': 'RX/TX', 'desc': 'UART transceive line'},
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
# severely limited in its number of input channels, and dramatically
|
# severely limited in its number of input channels, and dramatically
|
||||||
# widening the parallel decoder may be undesirable.
|
# widening the parallel decoder may be undesirable.
|
||||||
|
|
||||||
|
# update: 2022.9.8, the wait() function returns variables is error.
|
||||||
|
|
||||||
from common.srdhelper import bitpack
|
from common.srdhelper import bitpack
|
||||||
import json
|
import json
|
||||||
import sigrokdecode as srd
|
import sigrokdecode as srd
|
||||||
@ -363,11 +365,20 @@ class Decoder(srd.Decoder):
|
|||||||
}.get(self.options['format'])
|
}.get(self.options['format'])
|
||||||
self.format_string = None
|
self.format_string = None
|
||||||
|
|
||||||
pins = self.wait()
|
bFirst = True
|
||||||
|
cur_cond = None
|
||||||
|
|
||||||
|
while True:
|
||||||
|
(clk, d0, d1, d2, d3, d4, d5, d6, d7,d8, d9,d10 ,d11 ,d12 ,d13 ,d14 ,d15) = self.wait(cur_cond)
|
||||||
|
pins = (clk, d0, d1, d2, d3, d4, d5, d6, d7,d8, d9, d10, d11, d12,d13 ,d14 ,d15)
|
||||||
|
|
||||||
|
if bFirst:
|
||||||
|
bFirst = False
|
||||||
ss = self.samplenum
|
ss = self.samplenum
|
||||||
prev_pattern = self.grab_pattern(pins[Pin.BIT_0:])
|
prev_pattern = self.grab_pattern(pins[Pin.BIT_0:])
|
||||||
while True:
|
cur_cond = wait_cond
|
||||||
pins = self.wait(wait_cond)
|
continue
|
||||||
|
|
||||||
es = self.samplenum
|
es = self.samplenum
|
||||||
pattern = self.grab_pattern(pins[Pin.BIT_0:])
|
pattern = self.grab_pattern(pins[Pin.BIT_0:])
|
||||||
if pattern == prev_pattern:
|
if pattern == prev_pattern:
|
||||||
|
@ -53,6 +53,9 @@ CTRL_TYPES = {
|
|||||||
19: 'FR_Swap',
|
19: 'FR_Swap',
|
||||||
20: 'Get_PPS_Status',
|
20: 'Get_PPS_Status',
|
||||||
21: 'Get_Country_Codes',
|
21: 'Get_Country_Codes',
|
||||||
|
22: 'Get_Sink_Cap_Extended',
|
||||||
|
23: 'Get_Source_Info',
|
||||||
|
24: 'Get_Revision',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Data message type
|
# Data message type
|
||||||
@ -435,6 +438,9 @@ class Decoder(srd.Decoder):
|
|||||||
if self.head_ext() == 1:
|
if self.head_ext() == 1:
|
||||||
shortm = EXTENDED_TYPES[t] if t in EXTENDED_TYPES else 'EXTENDED???'
|
shortm = EXTENDED_TYPES[t] if t in EXTENDED_TYPES else 'EXTENDED???'
|
||||||
elif self.head_count() == 0:
|
elif self.head_count() == 0:
|
||||||
|
if t >= 25 and t <= 31:
|
||||||
|
shortm = "reserved"
|
||||||
|
else:
|
||||||
shortm = CTRL_TYPES[t]
|
shortm = CTRL_TYPES[t]
|
||||||
else:
|
else:
|
||||||
shortm = DATA_TYPES[t] if t in DATA_TYPES else 'DAT???'
|
shortm = DATA_TYPES[t] if t in DATA_TYPES else 'DAT???'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user