diff --git a/openhantek/res/firmware/dds120-firmware.hex b/openhantek/res/firmware/dds120-firmware.hex index bec87956..27006a3f 100644 --- a/openhantek/res/firmware/dds120-firmware.hex +++ b/openhantek/res/firmware/dds120-firmware.hex @@ -1,262 +1,220 @@ -:04000000020059326F +:203D000012010002FFFFFF40B50420010001010203010A0600020000004001000902890088 +:203D200001010080370904000001FF000000070586020002000904000101FF00010007050C +:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502 +:203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5 +:203D800082010004030904000601FF000100070582010004040904000701FF0001000705CD +:053DA000820100020495 +:203DA6000902390002010080370904000001FF000000070586024000000904000101FF0010 +:193DC600010007058201FF03010904000201FF00010007058201000201AF +:203DE000040309040E0373006900670072006F006B0010036600780032006C0061006600B9 +:203E0000770022035300610069006E0053006D006100720074002000440044005300310048 +:063E20003200300000003A +:040000000201B9320E :01000B0032C2 :0100130032BA :01001B0032B2 :0100230032AA -:03002B0002025D71 -:0300330002019433 +:03002B000203AD20 +:030033000202E4E2 :01003B003292 -:03004300023F0079 +:01004300328A :01004B003282 -:03005300023F0069 -:1C00B200750800750900750A02750B00750CF4750D01750EF4750F01C200C201BD -:0300E000020056C5 -:030056000208326B -:2000E300E582FF70407E0EE4FDFC7401B54C02801C7402B54C0280197405B54C02801674D2 -:200103000AB54C0280137414B54C1680107B0280647B0680607B00805C7B0480587B08809A -:200123005475820022BF01497E307D027401B54C02801C7402B54C02801B7405B54C0280F5 -:200143001A740AB54C0280197414B54C2080187B007C0280207B107C02801A7B007C008074 -:20016300147B107C00800E7B207C0080087582002275820022EEF4FFE5A05207EE5B4FF5B6 -:20018300A0EDF4FFE5B15207ED5C4FF5B175820122C2DC32C0E0C082C083D2005391EF906B -:2001A300E65D7401F0D083D082D0E032C021C0E0C0F0C082C083C007C006C005C004C0037E -:2001C300C002C001C000C0D075D00075820012127E5391EF90E65D7410F0D0D0D000D00110 -:2001E300D002D003D004D005D006D007D083D082D0F0D0E0D02132C021C0E0C0F0C082C096 -:2002030083C007C006C005C004C003C002C001C000C0D075D00075820112127E5391EF906A -:20022300E65D7420F0D0D0D000D001D002D003D004D005D006D007D083D082D0F0D0E0D0D3 -:200243002132C0E0C082C083D2015391EF90E65D7408F0D083D082D0E032C0E0C007C0068A -:20026300C0D075D000AEB17F006306048EB1E50E450F6016150E74FFB50E02150FE50E45A8 -:200283000F7007850C0E850D0F00C2CFD0D0D006D007D0E032E582FF30E00BADB17E004335 -:2002A30005088DB1800353B1F7EF30E408AEB14306018EB12253B1FE22850A4C754D00900C -:2002C3005DC012145DAE82AF83AC097D00C3EC9EED64808FF063F08095F0400990E640E013 -:2002E30053E07FF02290E640E0FF43078090E640EFF02285820A7401B50A0280057402B52A -:200303000A18AF0A74072FF50B90E618F090E61AE50BF01202BC758201227582002290E6EE -:20032300F574FFF000000000E5BB60FC90E6047480F00000000090E618E4F0000000009016 -:20034300E61AE4F00000000090E6047402F00000000090E6047406F00000000090E618E58F -:200363000BF00000000090E61AE50BF00000000090E604E4F02290E6F574FFF000000000D1 -:20038300E50870057E06FF80047E027F0090E648EEF022D2871203217EE87F03EE24FFFCB0 -:2003A300EF34FFFD8C068D07EC4D70F0E5BB30E7FB0000000090E6D07428F0000000009048 -:2003C300E6D1E4F0E50870057E06FF80047E047F008EBB22AF8290E680E030E7067D1C7E7F -:2003E3003D80047DA67E3DEF75F010A42416FBE435F0FCEB2DFDEC3EFC7E80EFF50870354F -:2004030090E612E4F090E61474E0F090E6E27401F08D828C838EF012144090E625F07401F0 -:200423002DFAE43CFB8E078A828B838FF012144090E624F02290E61274D8F090E614E4F015 -:2004430090E6D204F08D828C838EF012144090E621F00DBD00010C8D828C838EF0121440FB -:20046300FF90E62074075FF08D828C838EF0121440C423541F90E64004F00202BCAF827EA5 -:2004830000EE75F005A4FCADF02425F582ED3417F583E493FBB5070280080EBE14E37582E2 -:2004A3000022EC2425FCED3417FD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDF4 -:2004C300A3E493FEA3E493FF75AF07759DE4759E007C208C031CEB60168D828E838FF0125B -:2004E3001440FBA3AD82AE8390E67CEBF080E47F608F061FEE600790E67CE4F080F375825E -:200503000122AF82BF00028064BF010302059CBF02030205AABF05030205B8BF0A030205AB -:20052300C6BF14030205D4BF32030205E2BF64030205F0BF69028017BF6A028021BF6E028B -:20054300802BBF78028035BF9602803F0205FE750C19750D0075CAC075CB63020602750C9B -:200563001E750D0075CACB75CB7D020602750C32750D0075CAE075CBB1020602750C64755E -:200583000D0075CAF075CBD8020602750CFA750D0075CA6075CBF08066750CF4750D0175DB -:2005A300CA3075CBF88058750CE8750D0375CA1875CBFC804A750CC4750D0975CA7075CB24 -:2005C300FE803C750C88750D1375CA3875CBFF802E750C10750D2775CA9C75CBFF802075F3 -:2005E3000CA8750D6175CAD875CBFF8012750C50750DC375CAEC75CBFF80047582002275E7 -:20060300820122AD4CAE4DAF4E8D828E838FF0E50812138E75820122E582700685108212E2 -:2006230003D775820122758200227582012290E6BBE0FE7F0090E6BAE07C004207EC4206F9 -:2006430090E6BFE0FC7D0090E6BEE07A004205EA420490E6A0E020E1F990E6B8E0FBBB4010 -:20066300028073BBC0028003020732ED4C7003020736C374409DE49C50067A407B008004B9 -:200683008D028C0390E6A0E020E1F98A457546007547407548E77549008F438E4475825175 -:2006A300C007C006C005C004C002120EC5D002D004D005D006D00790E68AE4F0000000007E -:2006C30090E68BEAF07B00EDC39AFDEC9BFCEA2FFFEB3EFE8095ED4C605990E68BE4F0904C -:2006E300E6A0E020E1F990E68BE0FB8B38753900753A40753BE7753C008F368E3775825141 -:20070300C007C006C005C004C003120E30E582D003D004D005D006D0077003F582227A0097 -:20072300EB2FFFEA3EFEEDC39BFDEC9AFC80A7758200227582012275820022AF82C0071230 -:200743000379D00700850C0E850D0FBFE0004015EF2419401090E68AE4F090E68BF090E658 -:20076300A0E020E1F9BFA2028023BFE0028021BFE1028028BFE202802FBFE3028033BFE41E -:20078300028043BFE5028047BFE65A804F02063190E740E0F54C7582000200E390E740E0D2 -:2007A300F54C7582010200E390E740E0F58202048090E740E0FFBF010900E4F50EF50F1228 -:2007C30003967582012290E740E0F5820202F690E740E0F5821202987582012290E740E0F0 -:2007E300F5820205057582002290E613E4F090E615F0D28790E6C2E4F090E6C37480F09070 -:20080300E6C0E4F090E6F4F0120379754C017582001200E3754C017582011200E37582011E -:200823001204807582021202F67582000203D790E600E054E74410F012094B1207ECD2E84F -:2008430090E668E0FF43070890E668EFF090E65CE0FF43070190E65CEFF0E0FF4307109053 -:20086300E65CEFF0E0FF43072090E65CEFF0E0FF43070890E65CEFF0D2DDD2AF75CA307564 -:20088300CBF875C800D2ADD2CA90E680E043E00AF09005DC1213E990E680E053E0F7F09048 -:2008A300E672E4F090E671F090E670F075B109F5A0F58075B6FF75B4FF75B2FF0010000299 -:2008C3008003120F2910010280F390E682E043E0C0F090E6817401F0AE877F004306018E2F -:2008E3008700000000000000E513701C90E682E030E60790E682E020E0D090E682E030E75E -:200903000790E682E020E1C290E682E030E60790E682E020E00E90E682E030E7A090E682D0 -:20092300E030E1999000051213E990E680E0FF43070190E680EFF090000F1213E990E680EF -:20094300E053E0FEF00208C07E087F3E754C30754D31754E32754F337550347551357552FB -:2009630036755337755438755539755641755742755843755944755A45755B4674182EFC1F -:20098300E43FFD90E507E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CBF -:2009A300F987038C828D83EBF074162EFCE43FFD90E507E0FB53030FEB244CF987038C823C -:2009C3008D83EBF074142EFCE43FFD90E508E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB85 -:2009E30030E30244F0EB244CF987038C828D83EBF074122EFCE43FFD90E508E0FB53030F47 -:200A0300EB244CF987038C828D83EBF074102EFCE43FFD90E509E0FB5303F0E4C4CBC45404 -:200A23000F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF0740E2EFCE43FFD1E -:200A430090E509E0FB53030FEB244CF987038C828D83EBF0740C2EFCE43FFD90E50AE0FBDA -:200A63005303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBC9 -:200A8300F0740A2EFCE43FFD90E50AE0FB53030FEB244CF987038C828D83EBF074082EFC5F -:200AA300E43FFD90E50BE0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244C9A -:200AC300F987038C828D83EBF074062EFCE43FFD90E50BE0FB53030FEB244CF987038C8227 -:200AE3008D83EBF074042EFCE43FFD90E50CE0FB5303F0E4C4CBC4540F6BCB540FCB6BCB70 -:200B030030E30244F0EB244CF987038C828D83EBF074022EFEE43FFF90E50CE0FD53050F29 -:0D0B2300ED244CF987058E828F83EDF022C2 -:2014A5000F0E0000000000000200010000000000505555000000000000000000000000000D -:2014C500010100000000000002000100000000005055550000000000000000000000000008 -:2014E500FAFAFAFAFAF90000020000000000010050555555555555000000000000000000BB -:20150500C8C8C700000000000200000100000000505555550000000000000000000000001D -:20152500FAFAF9000000000002000001000000005055555500000000000000000000000067 -:2015450096950000000000000200010000000000505555000000000000000000000000005E -:20156500020100000000000002000100000000005055550000000000000000000000000066 -:201585004B4A000000000000020001000000000050555500000000000000000000000000B4 -:2015A50001000000000000000201000000000000505500000000000000000000000000007D -:2015C5001E1D000000000000020001000000000050555500000000000000000000000000CE -:2015E5000101000000000000020001000000000050555500000000000000000000000000E7 -:201605000707000000000000020001000000000050555500000000000000000000000000BA -:201625000100000000000000020100000000000050550000000000000000000000000000FC -:2016450005040000000000000200010000000000505555000000000000000000000000007F -:201665008000000000000000030000000000000000000000000000000000000000000000E2 -:2016850006050000000000000200010000000000505555000000000000000000000000003D -:2016A5008000000000000000030000000000000000000000000000000000000000000000A2 -:2016C500030200000000000002000100000000005055550000000000000000000000000003 -:2016E5000202000000000000020001000000000050555500000000000000000000000000E4 -:201705000302000000000000020001000000000050555500000000000000000000000000C2 -:2017250030A51680EA1E651680AA18251680CA10E51580CA0FA515808A0C651580CA0AC529 -:2017450014808A08051780CA06E516808A05C516808A04851680CA034516808A0205168015 -:201765008A01A514808A96C515808A788515808A6E4515808A6A251580CA690515808A66CD -:04178500E514808A5D -:203D000012010002FFFFFF40B50420010602010203010A0600020000004001000902890081 -:203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549 -:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502 -:203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5 -:203D800082010004030904000601FF000100070582010004040904000701FF0001000705CD -:053DA000820100020495 -:203DA6000902390002010080FA0904000001FF000000070586024000000904000101FF004D -:193DC600010007058201FF03010904000201FF00010007058201000201AF -:203DE0000403090416034F00700065006E00480061006E00740065006B000E034400440010 -:203E000053003100320030001A03300030003000300030003000300030003000300030008F -:043E2000300000006E -:200B300085822CE5272522FDE5283523FE752D02903C00E4F0903C00E060047582002290C2 -:200B5000E678E0FB7A0043038090E678EBF0E030E21090000AC006C0051213E9D005D00663 -:200B700080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E06004758248 -:200B9000002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E67892 -:200BB000E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F58222908C -:200BD000000AC006C0051213E9D005D006020B457A007B00C3EA9DEB9E4003020C7AC3EA25 -:200BF0009522EB95235016EA2524F8EB3525F9AC26888289838CF0121440FC801DEAC39517 -:200C100022F8EB9523F9E82529F8E9352AF9AF2B888289838FF0121440FC90E679ECF00AF9 -:200C3000BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E030E4 -:200C5000E203020B4590E678E020E18890E678E0FF43074090E678EFF090E678E030E606E8 -:200C7000903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903C72 -:200C900000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B53C -:200CB0002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E6F2 -:200CD00078EBF0E030E20C90000AC0061213E9D00680D5E53325E0FB3395E0FA4303019089 -:200CF000E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E020C0 -:200D1000E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C0080 -:200D3000E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F534AC -:200D5000F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E06095 -:200D7000F3903C00E060047582002290E678E030E203020CB874022534F8E43535F9E8B5F3 -:200D90002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B5340205F7 -:200DB00035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF012138E020D525B -:200DD00090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020C16 -:200DF000B890E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D83AC -:200E10008FF012138E90E678E030E606903C00E060F3903C00E06004758200227582012264 -:200E300085823DE4F541F542AB36AC37C3E5419538E54295394003020EC17A0090E678E042 -:200E500030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF420509 -:200E700041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF0121440F78A227523002C -:200E900075243E752500752640E4F527F528F529F52AF52B853D82C004C003120B30E582FD -:200EB000D003D0047003F582220BBB00010C020E3C75820122AF827E0090E678E030E4069F -:200ED0007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E456 -:200EF000F527F528F529F52AF52B8F82C007120B30E582D0077003F5822285452E85462FEB -:190F10008547308548318549328F82120CA2E5827003F582227582012270 -:06008800E478FFF6D8FD4C -:1200CE007512007513007514A675153D75161C75173DAB -:200F290090E6B9E0FF24F45003021057EF240A83F582EF241083F583E4735B7757935757D0 -:200F4900AF57BFD6F8320F0F100F10100F100F0F0F101210D9E582600302107390E6A0E0CA -:200F6900FF7E0043070190E6A0EFF002107312116DE582600302107390E6A0E0FF7E004391 -:200F8900070190E6A0EFF00210731211E8E582600302107390E6A0E0FF7E0043070190E638 -:200FA900A0EFF002107312073AE58260030210731212A9021073120629AF8290E740EFF028 -:200FC90090E68AE4F090E68B04F002107390E6BAE0F58212062DE582600302107390E6A089 -:200FE900E0FF7E0043070190E6A0EFF002107390E6BCE0FF754C11754D00754E408F8212FB -:201009000606E582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68AB0 -:20102900E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F8212061BE582702D90E6A099 -:20104900E0FF7E0043070190E6A0EFF0801C90E6B9E0F58212073EE582700F90E6A0E0FF96 -:201069007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F737 -:2010890050030210D5EE240A83F582EE240D83F583E473AEB2C5D5C9D5CDD5D1101010103B -:2010A900101010101090E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A32287 -:2010C90090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BF25 -:2010E9008202803702116590E740E4F090E741F090E68AF090E68B7402F08064E51325E0C9 -:20110900FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F542 -:2011290082121081AE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F00A2 -:2011490080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F0800475820022F0 -:201169007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BAB0 -:20118900E0FFBF060280547582002290E6BAE0703D90E6BCE0F582121081AE82AF83E0FD8B -:2011A9005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E68330 -:2011C900EFF07E0043072090E683EFF0800D7582002290E6B9E0F58202073E75820122904A -:2011E900E6B8E0FF6008BF0202802902127190E6BAE0FFBF020302127A90E6BAE0FFBF01E0 -:2012090005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F58229 -:20122900121081AE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF09004 -:20124900E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E683B4 -:20126900EFF0800D7582002290E6B9E0F58202073E75820122AF827E0110AF027E00EF60BB -:201289000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF227B -:2012A90090E6BBE0FFBF01028019BF02028024BF0302802CBF0603021363BF070302137352 -:2012C9000213807E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F02236 -:2012E9007DE07E3D7F8090E6BAE0F54C7B008B020BEAB54C0280428D008E018F028D828E71 -:20130900838FF012144028F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF09B -:20132900121440F9B9030280067D007E007F00ED4E6006C3E54C9B50B5ED4E600F8D038E8A -:201349000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E639 -:20136900B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF43070190F4 -:05138900E6A0EFF022D8 -:200066007900E94400601B7A00901789780175923CE493F2A308B800020592D9F4DAF27580 -:0200860092FFE7 -:1B138E0020F71130F6138883A88220F509F6A8837583002280FEF280F5F0225E -:203F0000020197000214A30002149800020245000201AF000201FA00021495000213DD000B -:203F20000213DF000213E0000213E1000213E4000214A2000214A4000213A9000213AB00B9 -:203F400002149A000213DD0002145C0002149600021497000214990002149B0002149C00E2 -:203F600002143F000213DD000213DD000213DD000213DE000213E2000213E5000213E70036 -:203F80000213E3000213E6000213E80002143E000213AC000213D7000213D9000213DB0052 -:183FA0000213AD000213D8000213DA000213DC000213AA000214A10004 -:0113A9003211 -:0113AA003210 -:0113AB00320F -:0113AC00320E -:0113AD00320D -:20008E007800E84400600A790075923CE4F309D8FC7801E84400600C7901903C00E4F0A306 -:0400AE00D8FCD9FAA7 -:2013AE007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB954CF5F0EC954D4006CB -:0913CE00FCABF0438201DADD22E0 -:0113D70032E3 -:0113D80032E2 -:0113D90032E1 -:0113DA0032E0 -:0113DB0032DF -:0113DC0032DE -:0113DD0032DD -:0113DE0032DC -:0113DF0032DB -:0113E00032DA -:0113E10032D9 -:0113E20032D8 -:0113E30032D7 -:0113E40032D6 -:0113E50032D5 -:0113E60032D4 -:0113E70032D3 -:0113E80032D2 -:2013E900AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFB14 -:20140900BB01067A617B0180047AC27B028A048B058C4C8D4D154C74FFB54C02154DE54C33 -:15142900454D70F1EE24FFFAEF34FFFB8A068B07EA4B70DD22CD -:01143E00327B -:01143F00327A -:0D00590075815B12149DE582600302005664 -:1C14400020F71430F6148883A88220F507E6A88375830022E280F7E49322E022BB -:01145C00325D -:20145D00C2D5E58330E70DD2D5E4C39582F582E49583F583E54D30E70DB2D5E4C3954CF5A2 -:18147D004CE4954DF54D1213AE30D50BE4C39582F582E49583F5832255 -:011495003224 -:011496003223 -:011497003222 -:011498003221 -:011499003220 -:01149A00321F -:01149B00321E -:01149C00321D -:04149D007582002232 -:0114A1003218 -:0114A2003217 -:0114A3003216 -:0114A4003215 +:01005300327A +:01005B003272 +:01006300326A +:03006B000202E7A7 +:03007300020D2A51 +:03007B000208EA8E +:03008300020395E0 +:03008B000202FF6F +:0300930002034A1B +:03009B000208E771 +:0300A300020D54F7 +:0300AB00020D55EE +:0300B300020D56E5 +:0300BB00020D59DA +:0300C300020D2902 +:0300CB00020D46DD +:0300D300020D47D4 +:0300DB00020D49CA +:0300E3000208EC24 +:0300EB00020DD132 +:0300F3000208E818 +:0300FB000208E90F +:030103000208EB04 +:03010B000208EDFA +:030113000208EEF1 +:03011B00020DB41E +:03012300020D5278 +:03012B00020D576B +:03013300020D5A60 +:03013B00020D5C56 +:03014300020D5357 +:03014B00020D584A +:03015300020D5B3F +:03015B00020D5D35 +:03016300020DB3D7 +:03016B00020D4A38 +:03017300020D4C2E +:03017B00020D4E24 +:03018300020D501A +:03018B00020D4B17 +:03019300020D4D0D +:03019B00020D4F03 +:0301A300020D51F9 +:0301AB00020D48FA +:0301B300020D2812 +:0C021200750800E4F509F50AC200C201FD +:030230000201B612 +:0301B6000207D865 +:20023300E582FF70407E0EE4FDFC7401B51302801C7402B5130280197405B513028016742B +:200253000AB5130280137414B5131680107B0280647B0680607B00805C7B0480587B0880BB +:200273005475820022BF01497E307D027401B51302801C7402B51302801B7405B51302804F +:200293001A740AB5130280197414B5132080187B007C0280207B107C02801A7B007C008095 +:2002B300147B107C00800E7B207C0080087582002275820022EEF4FFE5A05207EE5B4FF565 +:2002D300A0EDF4FFE5B15207ED5C4FF5B175820122C2DC32C0E0C082C083D2005391EF901A +:2002F300E65D7401F0D083D082D0E032C021C0E0C0F0C082C083C007C006C005C004C0032D +:20031300C002C001C000C0D075D000758200120C185391EF90E65D7410F0D0D0D000D0012A +:20033300D002D003D004D005D006D007D083D082D0F0D0E0D02132C021C0E0C0F0C082C044 +:2003530083C007C006C005C004C003C002C001C000C0D075D000758201120C185391EF9085 +:20037300E65D7420F0D0D0D000D001D002D003D004D005D006D007D083D082D0F0D0E0D082 +:200393002132C0E0C082C083D2015391EF90E65D7408F0D083D082D0E032C0E0C007C00639 +:2003B300C0D075D000AEB17F006306048EB1E509450A6010150974FFB50902150AE509457B +:2003D3000A700100C2CFD0D0D006D007D0E032E582FF30E00BADB17E004305088DB1800361 +:2003F30053B1F7EF30E408AEB14306018EB12253B1FE22AF82BF01028003BF021174072FC4 +:20041300FF90E618F090E61AEFF0758201227582002290E6F574FFF000000090E60474806E +:20043300F000000090E6047482F000000090E6047486F000000090E604E4F02290E6F574A6 +:20045300FFF0000000E50870057E06FF80047E027F0090E648EEF022D2871204257EE87FFB +:2004730003EE24FFFCEF34FFFD8C068D07EC4D70F0E5BB30E7FB00000090E6D07428F000F7 +:20049300000090E6D1E4F0E50870057E06FF80047E047F008EBB00E4F509F50A22AF8290B7 +:2004B300E680E030E7067D1C7E3D80047DA67E3D8F03E4CBC4CB6BCB54F0CB6BFC74162BDF +:2004D300FBE43CFCEB2DFDEC3EFC7E80EFF508703590E612E4F090E61474E0F090E6E27432 +:2004F30001F08D828C838EF0120DB590E625F074012DFAE43CFB8E078A828B838FF0120DF9 +:20051300B590E624F02290E61274D8F090E614E4F090E6D204F08D828C838EF0120DB59009 +:20053300E621F00DBD00010C8D828C838EF0120DB5FF90E62074075FF08D828C838EF0125D +:200553000DB5C423541F90E64004F022AF827E00EE75F007A4FCADF024D6F582ED340DF5C6 +:2005730083E493FBB5070280080EBE11E375820022EC24D6FCED340DFD74062CF582E43D09 +:20059300F583E49390E601F075AF07759DE4759E008C828D83A3E49390E67CF08C828D8386 +:2005B300A3A3E49390E67CF07401F0E4F0F0F0F0F08C828D83A3A3A39390E67CF08C828D79 +:2005D30083A3A3A3A3E49390E67CF07401F0E4F0F0F0F0F08C828D83A3A3A3A3A39390E651 +:2005F3007CF07444F0F0E4F0F0F0F0F0F0F0F0F0F0F0F0F07F0090E67CE4F00FBF6000401D +:20061300F575820122AF82BF00028049BF01028062BF02028067BF050302069ABF0A030278 +:2006330006A4BF14030206AEBF69028014BF6A028019BF6E02801EBF78028023BF9666800B +:200653002875CAF075CBD87582012275CAF575CBE57582012275CA7875CBEC758201227519 +:20067300CA3C75CBF67582012275CA1875CBFC7582012275CA0C75CBFE7582012275CA067C +:2006930075CBFF7582012275CA9C75CBFF7582012275CACE75CBFF7582012275CAE775CBEE +:2006B300FF7582012275820022AD13AE14AF158D828E838FF0E508120D2B75820122E58258 +:2006D3007006850B821204B0758201227582002275820122AF82C00712044FD007007509BA +:2006F300E8750A03BFE0004015EF2419401090E68AE4F090E68BF090E6A0E020E1F9BFE0B9 +:2007130000500302078EEF2419500302078EEF2420FE2E90072A73800C800A801B8026805C +:2007330033803E8049EF2420FF90E740E0F5138F821202337582012290E740E0F582120584 +:200753005F7582012290E740E0FFBF010312046B7582012290E740E0F582120406758201F7 +:200773002290E740E0F5821203E27582012290E740E0F58212061875820122758200229024 +:20079300E613E4F090E615F0D28790E6C2E4F090E6C37480F090E6C0E4F090E6F4F0120402 +:2007B3004F75130175820012023375130175820112023375820112055F7582021204067550 +:2007D30082000204B090E600E053E0E7F0120792E500D2E890E668E0FF43070890E668EF48 +:2007F300F090E65CE0FF43070190E65CEFF0E0FF43071090E65CEFF0E0FF43072090E65C44 +:20081300EFF0E0FF43070890E65CEFF0D2DDD2AF75CA0C75CBFE75C800D2ADD2CA90E680FD +:20083300E043E00AF09005DC120D5E90E680E053E0F7F090E672E4F090E671F090E670F061 +:2008530075B6FF75B4FF75B2FF10000280031208EF10010280F390E682E043E0C0F090E6C8 +:20087300817401F0AE877F004306018E8700000000000000E50E701C90E682E030E6079068 +:20089300E682E020E0D090E682E030E70790E682E020E1C290E682E030E60790E682E020AF +:2008B300E00E90E682E030E7A090E682E030E199900005120D5E90E680E0FF43070190E67E +:1408D30080EFF090000F120D5E90E680E053E0FEF002085C39 +:200DD600308000030000EA1E8000030000AA180100020140EA100101020040EA0F0100027F +:200DF6000140AA0C0201020040EA0B0101020040AA080302020040EA060202020040AA058A +:200E16000302020040AA040605020040EA030504020040AA020C0B020040EA011817020021 +:170E360040EA32302F020040EA147877020040EA0AF0EF020040EA7A +:0108E70032DE +:0108E80032DD +:0108E90032DC +:0108EA0032DB +:0108EB0032DA +:0108EC0032D9 +:0108ED0032D8 +:0108EE0032D7 +:0601E800E478FFF6D8FDEB +:12021E00750D00750E00750FA675103D75111C75123D77 +:2008EF0090E6B9E0FF24F45003020A13EF240A83F582EF241083F583E473213D13591313D5 +:20090F0075137B92B4EE09090A090A0A090A09090909120A95E5826003020A2F90E6A0E075 +:20092F00FF7E0043070190E6A0EFF0020A2F120B29E5826003020A2F90E6A0E0FF7E0043AF +:20094F00070190E6A0EFF0020A2F120B77E5826003020A2F90E6A0E0FF7E0043070190E683 +:20096F00A0EFF0020A2F120C43020A2F1206DFAF8290E740EFF090E68AE4F090E68B04F08B +:20098F00020A2F90E6BAE0F5821206E3E5826003020A2F90E6A0E0FF7E0043070190E6A0B2 +:2009AF00EFF0020A2F90E6BCE0FF75130C7514007515408F821206BCE582701190E6A0E053 +:2009CF00FF7E0043070190E6A0EFF0805390E740E50CF090E68AE4F090E68B04F0804190C6 +:2009EF00E6BCE0FF90E6BAE0F50B8F821206D1E582702D90E6A0E0FF7E0043070190E6A085 +:200A0F00EFF0801C90E6B9E0F5821206E7E582700F90E6A0E0FF7E0043070190E6A0EFF02E +:200A2F0090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F75003020A91EE240A83F5B1 +:200A4F0082EE240D83F583E4736A6E8191859189918D0A0A0A0A0A0A0A0A0A90E6A022EF6C +:200A6F0030E7067EA27FE680047EA17FE68E828F832290E6A32290E6A42290E6A52290E64F +:200A8F00A6229000002290E6B8E0FFBF80028022BF81028008BF82028037020B2190E74034 +:200AAF00E4F090E741F090E68AF090E68B7402F08064E50E25E0FFE50D420790E740EFF0A8 +:200ACF0090E741E4F090E68AF090E68B7402F0804590E6BCE0F582120A3DAE82AF838E0489 +:200AEF008F05EE4F7003F582228C828D83E0FC30E0067E017F0080047E007F0090E740EED6 +:200B0F00F090E741E4F090E68AF090E68B7402F08004758200227582012290E6B8E0FF60CF +:200B2F0005BF0237801190E6BAE0FFBF0105750E0080317582002290E6BAE0701A90E6BC2B +:200B4F00E0F582120A3DAE82AF83E0FD5305FE8E828F83EDF0800D7582002290E6B9E0F598 +:200B6F00820206E77582012290E6B8E0FF6008BF02028020020C0B90E6BAE0FFBF02030215 +:200B8F000C1490E6BAE0FFBF0106750E01020C147582002290E6BAE0705E90E6BCE0F5822B +:200BAF00120A3DAE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF090CF +:200BCF00E6BCE0FF53070F90E6BCE0FE530680E4C423CEC423541F6ECE541FCE6ECE30E473 +:200BEF000244E0FD90E683EE2FF0E0FF7E0043072090E683EFF0800D7582002290E6B9E069 +:200C0F00F5820206E775820122AF827E0110AF027E00EF600E750F1C75103D7511A67512E4 +:200C2F003D800C750FA675103D75111C75123DEE1392AF2290E6BBE0FFBF01028019BF02FA +:200C4F00028024BF0302802CBF0603020CFDBF0703020D0D020D1A7E007F3D90E6B3EFF04C +:200C6F0090E6B47400F02290E6B3E510F090E6B4E50FF0227DE07E3D7F8090E6BAE0F51348 +:200C8F007B008B020BEAB5130280428D008E018F028D828E838FF0120DB528F8E439F988DE +:200CAF000589068A0774012DF9E43EFA8F0489828A838CF0120DB5F9B9030280067D007E16 +:200CCF00007F00ED4E6006C3E5139B50B5ED4E600F8D038E0490E6B3ECF090E6B4EDF02290 +:200CEF0090E6A0E0FF43070190E6A0EFF0227E127F3D90E6B3EFF090E6B47412F02290E602 +:190D0F00B3E512F090E6B4E511F02290E6A0E0FF43070190E6A0EFF022A8 +:2001C6007900E94400601B7A00900E4D780075923CE493F2A308B800020592D9F4DAF27565 +:0201E60092FF86 +:010D28003298 +:010D29003297 +:010D2A003296 +:1B0D2B0020F71130F6138883A88220F509F6A8837583002280FEF280F5F022C7 +:010D4600327A +:010D47003279 +:010D48003278 +:010D49003277 +:03004300023F0079 +:203F00000202E700020D2A000208EA00020395000202FF0002034A000208E700020D53004A +:203F2000020D5400020D5500020D5600020D5900020D2900020D4600020D4700020D4900B2 +:203F40000208EC00020D5300020DD1000208E8000208E9000208EB000208ED000208EE0060 +:203F6000020DB400020D5300020D5300020D5300020D5200020D5700020D5A00020D5C00BD +:203F8000020D5800020D5B00020D5D00020DB300020D4A00020D4C00020D4E00020D5000B2 +:183FA000020D4B00020D4D00020D4F00020D5100020D4800020D280007 +:010D4A003276 +:010D4B003275 +:2001EE007800E84400600A790075923CE4F309D8FC7800E84400600C7900903C00E4F0A3A7 +:04020E00D8FCD9FA45 +:010D4C003274 +:010D4D003273 +:010D4E003272 +:010D4F003271 +:010D50003270 +:010D5100326F +:010D5200326E +:010D5300326D +:010D5400326C +:010D5500326B +:010D5600326A +:010D57003269 +:010D58003268 +:010D59003267 +:010D5A003266 +:010D5B003265 +:010D5C003264 +:010D5D003263 +:200D5E00AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFBA5 +:200D7E00BB01067A617B0180047AC27B028A048B058C138D14151374FFB513021514E5131B +:150D9E00451470F1EE24FFFAEF34FFFB8A068B07EA4B70DD2298 +:010DB300320D +:010DB400320C +:0D01B900758121120DD2E58260030201B6AE +:1C0DB50020F71430F6148883A88220F507E6A88375830022E280F7E49322E0224D +:010DD10032EF +:040DD2007582002204 :00000001FF diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h index 3eae96fb..330aa8b5 100644 --- a/openhantek/src/OH_BUILD.h +++ b/openhantek/src/OH_BUILD.h @@ -1,2 +1,2 @@ // Do not edit, will be re-created at each commit! -#define OH_BUILD "20200406 build 636" +#define OH_BUILD "20200406 build 637" diff --git a/openhantek/src/hantekdso/controlspecification.h b/openhantek/src/hantekdso/controlspecification.h index 80c12875..eabe7b5c 100644 --- a/openhantek/src/hantekdso/controlspecification.h +++ b/openhantek/src/hantekdso/controlspecification.h @@ -15,14 +15,13 @@ using namespace Hantek; struct ControlSamplerateLimits { double base; ///< The base for sample rate calculations double max; ///< The maximum sample rate - unsigned int maxDownsampler; ///< The maximum downsampling ratio std::vector recordLengths; ///< Available record lengths, UINT_MAX means rolling }; /// \brief Stores the samplerate limits. struct ControlSpecificationSamplerate { - ControlSamplerateLimits single = {50e6, 50e6, 0, std::vector()}; ///< The limits for single channel mode - ControlSamplerateLimits multi = {100e6, 100e6, 0, std::vector()}; ///< The limits for multi channel mode + ControlSamplerateLimits single = {50e6, 50e6, std::vector()}; ///< The limits for single channel mode + ControlSamplerateLimits multi = {100e6, 100e6, std::vector()}; ///< The limits for multi channel mode }; struct ControlSpecificationGainLevel { @@ -52,7 +51,7 @@ struct ControlSpecification { // Calibration /// DSO6022 has calibration in small EEPROM, DDS120 has big fw EEPROM - bool hasCalibrationStorage = true; + bool hasCalibrationEEPROM = true; /// The sample values at the top of the screen typedef std::vector VoltageScale; std::vector voltageScale; // Per channel diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp index ddab5c2d..eda499f5 100644 --- a/openhantek/src/hantekdso/hantekdsocontrol.cpp +++ b/openhantek/src/hantekdso/hantekdsocontrol.cpp @@ -377,7 +377,7 @@ Dso::ErrorCode HantekDsoControl::retrieveChannelLevelData() { // Get calibration data from EEPROM //printf( "retrieveChannelLevelData()\n" ); int errorCode = -1; - if ( specification->hasCalibrationStorage ) + if ( specification->hasCalibrationEEPROM ) errorCode = device->controlRead(&controlsettings.cmdGetLimits); if ( errorCode < 0) { // invalidate the calibration values. diff --git a/openhantek/src/hantekdso/models/modelDDS120.cpp b/openhantek/src/hantekdso/models/modelDDS120.cpp index fe9423b5..773b50de 100644 --- a/openhantek/src/hantekdso/models/modelDDS120.cpp +++ b/openhantek/src/hantekdso/models/modelDDS120.cpp @@ -19,14 +19,6 @@ static void initSpecifications(Dso::ControlSpecification& specification) { // the screen two times (for pre/post trigger) at 10ms/div = 100ms/screen // SAMPLESIZE defined in modelDDS120.h // adapt accordingly in HantekDsoControl::convertRawDataToSamples() - specification.samplerate.single.base = 1e6; - specification.samplerate.single.max = 30e6; - specification.samplerate.single.maxDownsampler = 100; - specification.samplerate.single.recordLengths = { UINT_MAX }; - specification.samplerate.multi.base = 1e6; - specification.samplerate.multi.max = 15e6; - specification.samplerate.multi.maxDownsampler = 100; - specification.samplerate.multi.recordLengths = { UINT_MAX }; specification.bufferDividers = { 1000 , 1 , 1 }; // This data was based on testing and depends on divider. // The sample value at the top of the screen with gain error correction @@ -89,54 +81,44 @@ static void initSpecifications(Dso::ControlSpecification& specification) { }; - // Possible raw sample rates with custom fw from https://github.com/Ho-Ro/Hantek6022API - // 20k, 50k, 64k, 100k, 200k, 500k, 1M, 2M, 3M, 4M, 5M, 6M, 8M, 10M, 12M, 15M, 16M, 24M, 30M (, 48M) - // 48M is unusable in 1 channel mode due to massive USB overrun - // 24M, 30M and 48M are unusable in 2 channel mode - // these unstable settings are disabled - // Lower effective sample rates < 10 MS/s use oversampling to increase the SNR - specification.samplerate.single.base = 1e6; specification.samplerate.single.max = 30e6; - specification.samplerate.single.maxDownsampler = 10; specification.samplerate.single.recordLengths = { UINT_MAX }; specification.samplerate.multi.base = 1e6; specification.samplerate.multi.max = 15e6; - specification.samplerate.multi.maxDownsampler = 10; specification.samplerate.multi.recordLengths = { UINT_MAX }; -// define VERY_SLOW_SAMPLES to get timebase up to 1s/div at the expense of very slow reaction time (up to 20 s) -//#define VERY_SLOW_SAMPLES - specification.fixedSampleRates = { // samplerate, sampleId, downsampling -#ifdef VERY_SLOW_SAMPLES - { 1e3, 110, 100}, // 100x downsampling from 100, 200, 500 kS/s! - { 2e3, 120, 100}, // - { 5e3, 150, 100}, // -#endif - { 10e3, 1, 100}, // 100x downsampling from 1, 2, 5, 10 MS/s! - { 20e3, 2, 100}, // - { 50e3, 5, 100}, // - {100e3, 10, 100}, // - {200e3, 10, 50}, // 50x, 20x 10x, 5x, 2x downsampling from 10 MS/s - {500e3, 10, 20}, // - { 1e6, 10, 10}, // - { 2e6, 10, 5}, // - { 5e6, 10, 2}, // - { 10e6, 10, 1}, // no oversampling - { 12e6, 12, 1}, // - { 15e6, 15, 1}, // - { 24e6, 24, 1}, // - { 30e6, 30, 1}, // - { 48e6, 48, 1} // +// This model uses the sigrok firmware that has a slightly different coding for the sample rate than my Hantek6022API version. +// 10=100k, 20=200k, 50=500k, 11=10M (Hantek: 110=100k, 120=200k, 150=500k, 10=10M) + + // 48M is unstable in 1 channel mode + // 24M, 30M and 48M are unstable in 2 channel mode + + specification.fixedSampleRates = { + // samplerate, sampleId, downsampling + { 10e3, 1, 100}, // 100x downsampling from 1 MS/s! + { 20e3, 2, 100}, // 100x downsampling from 2 MS/s! + { 50e3, 5, 100}, // 100x downsampling from 5 MS/s! + {100e3, 8, 80}, // 80x downsampling from 8 MS/s + {200e3, 8, 40}, // 40x downsampling from 8 MS/s + {500e3, 8, 16}, // 16x downsampling from 8 MS/s + { 1e6, 8, 8}, // 8x downsampling from 8 MS/s + { 2e6, 8, 4}, // 4x downsampling from 8 MS/s + { 5e6, 15, 3}, // 3x downsampling from 15 MS/s + { 10e6, 11, 1}, // no downsampling, 11 means 10 MS/s + { 15e6, 15, 1}, // no downsampling + { 24e6, 24, 1}, // no downsampling + { 30e6, 30, 1}, // no downsampling + { 48e6, 48, 1} // no downsampling }; specification.couplings = {Dso::Coupling::DC, Dso::Coupling::AC}; specification.triggerModes = {Dso::TriggerMode::AUTO, Dso::TriggerMode::NORMAL, Dso::TriggerMode::SINGLE}; specification.fixedUSBinLength = 0; - // calibration frequency (requires >FW0206) - specification.calfreqSteps = { 50, 60, 100, 200, 500, 1e3, 2e3, 5e3, 10e3, 20e3, 50e3, 100e3 }; - specification.hasCalibrationStorage = false; + // use calibration frequency steps of modified sigrok FW (<= 20 kHz) + specification.calfreqSteps = { 50, 60, 100, 200, 500, 1000, 2000, 5000, 10000, 20000 }; + specification.hasCalibrationEEPROM = false; } static void applyRequirements_(HantekDsoControl *dsoControl) { @@ -151,7 +133,7 @@ static void applyRequirements_(HantekDsoControl *dsoControl) { // VID/PID active VID/PID no FW FW ver FW name Scope name // |------------| |------------| |----| |------| |------| -ModelDDS120::ModelDDS120() : DSOModel(ID, 0x04b5, 0x0120, 0x8102, 0x8102, 0x0206, "dds120", "DDS120", +ModelDDS120::ModelDDS120() : DSOModel(ID, 0x04b5, 0x0120, 0x8102, 0x8102, 0x0100, "dds120", "DDS120", Dso::ControlSpecification(2)) { initSpecifications(specification); } diff --git a/openhantek/src/hantekdso/models/modelDSO6022.cpp b/openhantek/src/hantekdso/models/modelDSO6022.cpp index fd3a678d..7103017f 100644 --- a/openhantek/src/hantekdso/models/modelDSO6022.cpp +++ b/openhantek/src/hantekdso/models/modelDSO6022.cpp @@ -95,11 +95,9 @@ static void initSpecifications(Dso::ControlSpecification& specification) { specification.samplerate.single.base = 1e6; specification.samplerate.single.max = 30e6; - specification.samplerate.single.maxDownsampler = 10; specification.samplerate.single.recordLengths = { UINT_MAX }; specification.samplerate.multi.base = 1e6; specification.samplerate.multi.max = 15e6; - specification.samplerate.multi.maxDownsampler = 10; specification.samplerate.multi.recordLengths = { UINT_MAX }; // define VERY_SLOW_SAMPLES to get timebase up to 1s/div at the expense of very slow reaction time (up to 20 s) @@ -138,7 +136,7 @@ static void initSpecifications(Dso::ControlSpecification& specification) { // calibration frequency (requires >FW0206) specification.calfreqSteps = { 50, 60, 100, 200, 500, 1e3, 2e3, 5e3, 10e3, 20e3, 50e3, 100e3 }; - specification.hasCalibrationStorage = true; + specification.hasCalibrationEEPROM = true; } static void applyRequirements_(HantekDsoControl *dsoControl) { diff --git a/utils/udev_rules/60-hantek.rules b/utils/udev_rules/60-hantek.rules index e0cc5e52..07deea40 100644 --- a/utils/udev_rules/60-hantek.rules +++ b/utils/udev_rules/60-hantek.rules @@ -13,4 +13,4 @@ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="0 # BUUDAI DDS120 SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="8102", ATTRS{idProduct}=="8102", TAG+="uaccess", TAG+="udev-acl" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="608e", TAG+="uaccess", TAG+="udev-acl" +SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="0120", TAG+="uaccess", TAG+="udev-acl"