upversion to FW0210, new sample rate 128 kS/s (ID: 113)

Signed-off-by: Martin <[email protected]>
Ho-Ro · Feb 28, 2022 · f4755d2 · f4755d2
1 parent 6c9d2d7
commit f4755d2
Show file tree

Hide file tree

Showing 16 changed files with 172 additions and 113 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+2022-02-08: more tool programs in examples [6c9d2d7]
 2022-02-05: Merge branch 'main' of github.com:Ho-Ro/Hantek6022API fix last commit [078dffd]
 2022-02-05: fix github workflow [0966f8b]
 2022-02-05: fix github workflow [5a50a99]

diff --git a/PyHT6022/Firmware/DDS120/dds120-firmware.hex b/PyHT6022/Firmware/DDS120/dds120-firmware.hex
@@ -39,8 +39,8 @@
 :2003E300E6E27401F08D828C838EF01216EE90E625F074012DFAE43CFB8E078A828B838F9B
 :20040300F01216EE90E624F02290E61274D8F090E614E4F090E6D204F08D828C838EF0121B
 :2004230016EE90E621F00DBD00010C8D828C838EF01216EEFF90E62074075FF08D828C8328
-:200443008EF01216EEC423541F90E64004F0020294AF827E00EE75F005A4FCADF024B7F555
-:2004630082ED341AF583E493FBB5070280080EBE16E375820022EC24B7FCED341AFD8C82A5
+:200443008EF01216EEC423541F90E64004F0020294AF827E00EE75F005A4FCADF024D7F535
+:2004630082ED341AF583E493FBB5070280080EBE17E375820022EC24D7FCED341AFD8C8284
 :200483008D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E493FEA3E493FF75AF0775D9
 :2004A3009DE4759E007C208C031CEB60168D828E838FF01216EEFBA3AD82AE8390E67CEB6D
 :2004C300F080E47F608F061FEE600790E67CE4F080F375820122E582FF70087B64FCFDFED6
@@ -101,26 +101,27 @@
 :20187700C8C8C70000000000020000010000000050555555000000000000000000000000A8
 :20189700FAFAF90000000000020000010000000050555555000000000000000000000000F2
 :2018B7009695000000000000020001000000000050555500000000000000000000000000E9
-:2018D7000201000000000000020001000000000050555500000000000000000000000000F1
-:2018F7004B4A0000000000000200010000000000505555000000000000000000000000003F
-:20191700252500000000000002000100000000005055550000000000000000000000000069
-:201937000100000000000000020100000000000050550000000000000000000000000000E7
-:201957001E1D00000000000002000100000000005055550000000000000000000000000038
-:20197700010100000000000002000100000000005055550000000000000000000000000051
-:20199700070700000000000002000100000000005055550000000000000000000000000025
-:2019B700010000000000000002010000000000005055000000000000000000000000000067
-:2019D7000504000000000000020001000000000050555500000000000000000000000000EA
-:2019F70080000000000000000300000000000000000000000000000000000000000000004D
-:201A17000605000000000000020001000000000050555500000000000000000000000000A7
-:201A370080000000000000000300000000000000000000000000000000000000000000000C
-:201A570003020000000000000200010000000000505555000000000000000000000000006D
-:201A770002020000000000000200010000000000505555000000000000000000000000004E
-:201A970003020000000000000200010000000000505555000000000000000000000000002D
-:201AB70030371A80EA1EF71980AA18B71980CA10771980CA0F3719808A0CD71880CA0A17E1
-:201AD70018808A08971A80CA06771A808A05571A808A04171A80CA03D719808A02971980FB
-:201AF7008A01F717808A965719808A8C1719808A78F718808A6EB718808A6A971880CA69B2
-:0E1B17007718808A685718808A663718808A87
-:203D000012010002FFFFFF40B50420010902010203010A060002000000400100090289007E
+:2018D700BBBB0000000000000200010000000000505555000000000000000000000000007E
+:2018F7000201000000000000020001000000000050555500000000000000000000000000D1
+:201917004B4A0000000000000200010000000000505555000000000000000000000000001E
+:20193700252500000000000002000100000000005055550000000000000000000000000049
+:201957000100000000000000020100000000000050550000000000000000000000000000C7
+:201977001E1D00000000000002000100000000005055550000000000000000000000000018
+:20199700010100000000000002000100000000005055550000000000000000000000000031
+:2019B700070700000000000002000100000000005055550000000000000000000000000005
+:2019D700010000000000000002010000000000005055000000000000000000000000000047
+:2019F7000504000000000000020001000000000050555500000000000000000000000000CA
+:201A170080000000000000000300000000000000000000000000000000000000000000002C
+:201A3700060500000000000002000100000000005055550000000000000000000000000087
+:201A57008000000000000000030000000000000000000000000000000000000000000000EC
+:201A770003020000000000000200010000000000505555000000000000000000000000004D
+:201A970002020000000000000200010000000000505555000000000000000000000000002E
+:201AB70003020000000000000200010000000000505555000000000000000000000000000D
+:201AD70030571A80EA1E171A80AA18D71980CA10971980CA0F5719808A0CF71880CA0A1700
+:201AF70018808A08B71A80CA06971A808A05771A808A04371A80CA03F719808A02B719801B
+:201B17008A01F717808A967719808A8C3719808A781719808A71D71880CA6EB718808A6AE8
+:131B3700971880CA697718808A685718808A663718808A00
+:203D000012010002FFFFFF40B50420011002010203010A0600020000004001000902890077
 :203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
 :203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
 :203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5
@@ -210,7 +211,7 @@
 :201413000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E66E
 :20143300B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF4307019029
 :05145300E6A0EFF0220D
-:200066007900E94400601B7A00901B25780175923CE493F2A308B800020592D9F4DAF275E0
+:200066007900E94400601B7A00901B4A780175923CE493F2A308B800020592D9F4DAF275BB
 :0200860092FFE7
 :12145800AA82AB83A2F73392D1F5826002D2F7ACF02299
 :1B146A0020F71130F6138883A88220F509F6A8837583002280FEF280F5F02281

diff --git a/PyHT6022/Firmware/DSO6021/dso6021-firmware.hex b/PyHT6022/Firmware/DSO6021/dso6021-firmware.hex
@@ -36,8 +36,8 @@
 :20038300FB8E078A828B838FF012166F90E624F02290E61274D8F090E614E4F090E6D20480
 :2003A300F08D828C838EF012166F90E621F00DBD00010C8D828C838EF012166FFF90E620F1
 :2003C30074075FF08D828C838EF012166FC423541F90E64004F002021EAF827E00EE75F0F5
-:2003E30005A4FCADF02438F582ED341AF583E493FBB5070280080EBE16E375820022EC248C
-:2004030038FCED341AFD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E493FE98
+:2003E30005A4FCADF02458F582ED341AF583E493FBB5070280080EBE17E375820022EC246B
+:2004030058FCED341AFD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E493FE78
 :20042300A3E493FF75AF07759DE4759E007C208C031CEB60168D828E838FF012166FFBA3F0
 :20044300AD82AE8390E67CEBF080E47F608F061FEE600790E67CE4F080F375820122E58266
 :20046300FF70087B64FCFDFE0204EEEF249B401D8F4C754D00754E00754F009003E8E4F5B5
@@ -97,26 +97,27 @@
 :2017F800C8C8C7000000000002000001000000005055555500000000000000000000000028
 :20181800FAFAF9000000000002000001000000005055555500000000000000000000000071
 :20183800969500000000000002000100000000005055550000000000000000000000000068
-:20185800020100000000000002000100000000005055550000000000000000000000000070
-:201878004B4A000000000000020001000000000050555500000000000000000000000000BE
-:201898002525000000000000020001000000000050555500000000000000000000000000E9
-:2018B800010000000000000002010000000000005055000000000000000000000000000067
-:2018D8001E1D000000000000020001000000000050555500000000000000000000000000B8
-:2018F8000101000000000000020001000000000050555500000000000000000000000000D1
-:201918000707000000000000020001000000000050555500000000000000000000000000A4
-:201938000100000000000000020100000000000050550000000000000000000000000000E6
-:20195800050400000000000002000100000000005055550000000000000000000000000069
-:201978008000000000000000030000000000000000000000000000000000000000000000CC
-:20199800060500000000000002000100000000005055550000000000000000000000000027
-:2019B80080000000000000000300000000000000000000000000000000000000000000008C
-:2019D8000302000000000000020001000000000050555500000000000000000000000000ED
-:2019F8000202000000000000020001000000000050555500000000000000000000000000CE
-:201A18000302000000000000020001000000000050555500000000000000000000000000AC
-:201A380030B81980EA1E781980AA18381980CA10F81880CA0FB818808A0C581880CA0A98DC
-:201A580017808A08181A80CA06F819808A05D819808A04981980CA035819808A0218198078
-:201A78008A017817808A96D818808A8C9818808A787818808A6E3818808A6A181880CA692D
-:0E1A9800F817808A68D817808A66B817808A87
-:203D000012010002FFFFFF40B50421600902010203010A060002000000400100090289001E
+:20185800BBBB000000000000020001000000000050555500000000000000000000000000FD
+:20187800020100000000000002000100000000005055550000000000000000000000000050
+:201898004B4A0000000000000200010000000000505555000000000000000000000000009E
+:2018B8002525000000000000020001000000000050555500000000000000000000000000C9
+:2018D800010000000000000002010000000000005055000000000000000000000000000047
+:2018F8001E1D00000000000002000100000000005055550000000000000000000000000098
+:201918000101000000000000020001000000000050555500000000000000000000000000B0
+:20193800070700000000000002000100000000005055550000000000000000000000000084
+:201958000100000000000000020100000000000050550000000000000000000000000000C6
+:20197800050400000000000002000100000000005055550000000000000000000000000049
+:201998008000000000000000030000000000000000000000000000000000000000000000AC
+:2019B800060500000000000002000100000000005055550000000000000000000000000007
+:2019D80080000000000000000300000000000000000000000000000000000000000000006C
+:2019F8000302000000000000020001000000000050555500000000000000000000000000CD
+:201A18000202000000000000020001000000000050555500000000000000000000000000AD
+:201A380003020000000000000200010000000000505555000000000000000000000000008C
+:201A580030D81980EA1E981980AA18581980CA10181980CA0FD818808A0C781880CA0A98FB
+:201A780017808A08381A80CA06181A808A05F819808A04B81980CA037819808A0238198097
+:201A98008A017817808A96F818808A8CB818808A789818808A71581880CA6E3818808A6A65
+:131AB800181880CA69F817808A68D817808A66B817808A7F
+:203D000012010002FFFFFF40B50421601002010203010A0600020000004001000902890017
 :203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
 :203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
 :203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5
@@ -206,7 +207,7 @@
 :201394000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6EE
 :2013B400B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF43070190A9
 :0513D400E6A0EFF0228D
-:200066007900E94400601B7A00901AA6780175923CE493F2A308B800020592D9F4DAF27560
+:200066007900E94400601B7A00901ACB780175923CE493F2A308B800020592D9F4DAF2753B
 :0200860092FFE7
 :1213D900AA82AB83A2F73392D1F5826002D2F7ACF02219
 :1B13EB0020F71130F6138883A88220F509F6A8837583002280FEF280F5F02201

diff --git a/PyHT6022/Firmware/DSO6022BE/descriptor.inc b/PyHT6022/Firmware/DSO6022BE/descriptor.inc
@@ -37,7 +37,7 @@
 ;;
 
 ; Firmware version and USB power requirement
-VER = 0x0902	; FW version 0x0209
+VER = 0x1002	; FW version 0x0210
 POWER = 500/2	; Max 500 mA (1=2mA)
 
 

diff --git a/PyHT6022/Firmware/DSO6022BE/dso6022be-firmware.hex b/PyHT6022/Firmware/DSO6022BE/dso6022be-firmware.hex
@@ -37,8 +37,8 @@
 :2003A300F074012DFAE43CFB8E078A828B838FF01216A390E624F02290E61274D8F090E6B4
 :2003C30014E4F090E6D204F08D828C838EF01216A390E621F00DBD00010C8D828C838EF095
 :2003E3001216A3FF90E62074075FF08D828C838EF01216A3C423541F90E64004F00202451C
-:20040300AF827E00EE75F005A4FCADF0246CF582ED341AF583E493FBB5070280080EBE1641
-:20042300E375820022EC246CFCED341AFD8C828D83A3A3A3A3E49390E601F08C828D83A3C4
+:20040300AF827E00EE75F005A4FCADF0248CF582ED341AF583E493FBB5070280080EBE1720
+:20042300E375820022EC248CFCED341AFD8C828D83A3A3A3A3E49390E601F08C828D83A3A4
 :20044300E493FDA3E493FEA3E493FF75AF07759DE4759E007C208C031CEB60168D828E83F8
 :200463008FF01216A3FBA3AD82AE8390E67CEBF080E47F608F061FEE600790E67CE4F080D2
 :20048300F375820122E582FF70087B64FCFDFE020515EF249B401D8F4C754D00754E00759C
@@ -98,26 +98,27 @@
 :20182C00C8C8C70000000000020000010000000050555555000000000000000000000000F3
 :20184C00FAFAF900000000000200000100000000505555550000000000000000000000003D
 :20186C00969500000000000002000100000000005055550000000000000000000000000034
-:20188C0002010000000000000200010000000000505555000000000000000000000000003C
-:2018AC004B4A0000000000000200010000000000505555000000000000000000000000008A
-:2018CC002525000000000000020001000000000050555500000000000000000000000000B5
-:2018EC00010000000000000002010000000000005055000000000000000000000000000033
-:20190C001E1D00000000000002000100000000005055550000000000000000000000000083
-:20192C0001010000000000000200010000000000505555000000000000000000000000009C
-:20194C00070700000000000002000100000000005055550000000000000000000000000070
-:20196C000100000000000000020100000000000050550000000000000000000000000000B2
-:20198C00050400000000000002000100000000005055550000000000000000000000000035
-:2019AC00800000000000000003000000000000000000000000000000000000000000000098
-:2019CC000605000000000000020001000000000050555500000000000000000000000000F3
-:2019EC00800000000000000003000000000000000000000000000000000000000000000058
-:201A0C000302000000000000020001000000000050555500000000000000000000000000B8
-:201A2C00020200000000000002000100000000005055550000000000000000000000000099
-:201A4C00030200000000000002000100000000005055550000000000000000000000000078
-:201A6C0030EC1980EA1EAC1980AA186C1980CA102C1980CA0FEC18808A0C8C1880CA0ACC3B
-:201A8C0017808A084C1A80CA062C1A808A050C1A808A04CC1980CA038C19808A024C19800A
-:201AAC008A01AC17808A960C19808A8CCC18808A78AC18808A6E6C18808A6A4C1880CA69C0
-:0E1ACC002C18808A680C18808A66EC17808AB5
-:203D000012010002FFFFFF40B50422600902010203010A060002000000400100090289001D
+:20188C00BBBB000000000000020001000000000050555500000000000000000000000000C9
+:2018AC0002010000000000000200010000000000505555000000000000000000000000001C
+:2018CC004B4A0000000000000200010000000000505555000000000000000000000000006A
+:2018EC00252500000000000002000100000000005055550000000000000000000000000095
+:20190C00010000000000000002010000000000005055000000000000000000000000000012
+:20192C001E1D00000000000002000100000000005055550000000000000000000000000063
+:20194C0001010000000000000200010000000000505555000000000000000000000000007C
+:20196C00070700000000000002000100000000005055550000000000000000000000000050
+:20198C00010000000000000002010000000000005055000000000000000000000000000092
+:2019AC00050400000000000002000100000000005055550000000000000000000000000015
+:2019CC00800000000000000003000000000000000000000000000000000000000000000078
+:2019EC000605000000000000020001000000000050555500000000000000000000000000D3
+:201A0C00800000000000000003000000000000000000000000000000000000000000000037
+:201A2C00030200000000000002000100000000005055550000000000000000000000000098
+:201A4C00020200000000000002000100000000005055550000000000000000000000000079
+:201A6C00030200000000000002000100000000005055550000000000000000000000000058
+:201A8C00300C1A80EA1ECC1980AA188C1980CA104C1980CA0F0C19808A0CAC1880CA0ACC59
+:201AAC0017808A086C1A80CA064C1A808A052C1A808A04EC1980CA03AC19808A026C19802A
+:201ACC008A01AC17808A962C19808A8CEC18808A78CC18808A718C1880CA6E6C18808A6AF8
+:131AEC004C1880CA692C18808A680C18808A66EC17808A79
+:203D000012010002FFFFFF40B50422601002010203010A0600020000004001000902890016
 :203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
 :203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
 :203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5
@@ -207,7 +208,7 @@
 :2013C8000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6BA
 :2013E800B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF4307019075
 :05140800E6A0EFF02258
-:200066007900E94400601B7A00901ADA780175923CE493F2A308B800020592D9F4DAF2752C
+:200066007900E94400601B7A00901AFF780175923CE493F2A308B800020592D9F4DAF27507
 :0200860092FFE7
 :12140D00AA82AB83A2F73392D1F5826002D2F7ACF022E4
 :1B141F0020F71130F6138883A88220F509F6A8837583002280FEF280F5F022CC

diff --git a/PyHT6022/Firmware/DSO6022BE/scope6022.inc b/PyHT6022/Firmware/DSO6022BE/scope6022.inc
@@ -218,6 +218,7 @@ static const struct samplerate_info samplerates[] = {
     {150, waveform_150, ifconfig_150}, // 500 kS/s
     {140, waveform_140, ifconfig_140}, // 400 kS/s
     {120, waveform_120, ifconfig_120}, // 200 kS/s
+    {113, waveform_113, ifconfig_113}, // 128 kS/s
     {110, waveform_110, ifconfig_110}, // 100 kS/s
     {106, waveform_106, ifconfig_106}, //  64 kS/s
     {105, waveform_105, ifconfig_105}, //  50 kS/s

diff --git a/PyHT6022/Firmware/DSO6022BE/waveforms.inc b/PyHT6022/Firmware/DSO6022BE/waveforms.inc
@@ -61,6 +61,15 @@ static const unsigned char waveform_110[ 32 ] = {
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 };
 
+#define ifconfig_113 0xca
+
+static const unsigned char waveform_113[ 32 ] = {
+	0xBB,0xBB,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+	0x50,0x55,0x55,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+
 #define ifconfig_12 0xca
 
 static const unsigned char waveform_12[ 32 ] = {

diff --git a/PyHT6022/Firmware/DSO6022BE/waveforms/gpif_113.inc b/PyHT6022/Firmware/DSO6022BE/waveforms/gpif_113.inc
@@ -0,0 +1,9 @@
+#define ifconfig_113 0xca
+
+static const unsigned char waveform_113[ 32 ] = {
+	0xBB,0xBB,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+	0x50,0x55,0x55,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+
diff --git a/PyHT6022/Firmware/DSO6022BE/waveforms/gpif_113.wvf b/PyHT6022/Firmware/DSO6022BE/waveforms/gpif_113.wvf
@@ -0,0 +1,17 @@
+; waveform source file for gpif_compiler
+;
+; Comment header
+;
+	.WAVEFORM 	113		; 128 kS/s = 48M / 375
+
+	.TRICTL		1		; Assume TRICTL=1
+
+	.IFCLKSRC	1		; feed internal 30/48 MHz to the GPIF
+	.3048MHZ	1		; 48 MHz
+	.IFCLKOE	0		; IFCLK tri-state, CTL0 CTL2 drives the ADC
+
+	D	187			OE0 OE2			; 187 cycles, CTL0 CTL2 low
+	Z	187			CTL0 CTL2 OE0 OE2	; 187 cycles, CTL0 CTL2 high
+	J	RDY0 AND RDY0 $0 $0	CTL0 CTL2 OE0 OE2	; 1 cycle, jp 0
+
+; End
diff --git a/PyHT6022/Firmware/DSO6022BE/waveforms/waveforms.inc b/PyHT6022/Firmware/DSO6022BE/waveforms/waveforms.inc
@@ -61,6 +61,15 @@ static const unsigned char waveform_110[ 32 ] = {
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 };
 
+#define ifconfig_113 0xca
+
+static const unsigned char waveform_113[ 32 ] = {
+	0xBB,0xBB,0x00,0x00,0x00,0x00,0x00,0x00,
+	0x02,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
+	0x50,0x55,0x55,0x00,0x00,0x00,0x00,0x00,
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+};
+
 #define ifconfig_12 0xca
 
 static const unsigned char waveform_12[ 32 ] = {