diff --git a/CHANGELOG b/CHANGELOG
index 29ab732a..6dbc4504 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2024-02-23 (52fc328): Merge branch 'wakass-main' - Instrustar 205X support #394
+2024-02-23 (5531981): small fw update - functional change
+2024-02-19 (b8fb40b): Instrustar 205X support (PR #394)
+2024-02-05 (0e2c641): Updated calibration values after measurement.
+2024-02-04 (211e9c8): doc update, add windows driver license info
2024-01-08 (1b56a17): use static fftw, usb and z libs
2024-01-01 (e6d863d): next build system update
2024-01-01 (7f9eb94): build system update
@@ -16,6 +21,8 @@
2023-12-17 (d9a62fe): Add Qt binaries to MSVC package
2023-12-17 (795b78f): Build MINGW and MSVC Windows packages
2023-12-15 (5c44615): test for macos-12 build
+2023-10-14 (81eb42d): Instrustar 205B: Update samplerate table
+2023-10-14 (59d7aa3): Initial support for Instrustar 205A/B
2023-08-30 (d5ef54e): change tooltip colors according to discussion #378
2023-08-30 (62a1230): modify unstable package versioning
2023-08-30 (af6dc75): unstable package names with git versioning
diff --git a/openhantek/res/firmware/dso6021-firmware.hex b/openhantek/res/firmware/dso6021-firmware.hex
index 447f7d42..d28fd94a 100644
--- a/openhantek/res/firmware/dso6021-firmware.hex
+++ b/openhantek/res/firmware/dso6021-firmware.hex
@@ -11,18 +11,18 @@
:03005300023F0069
:1C00B200750800750900750A02750B00750CF4750D01750EF4750F01C200C201BD
:0300E000020056C5
-:030056000207A8F6
+:0300560002080B92
:2000E300E582FF30E0055380FB8003438004EF30E4055380BF800343804075820122AF82FF
-:200103007401B54C0280157402B54C0280127405B54C02800F740AB54C12800C7E2280106C
+:200103007401B5180280157402B5180280127405B51802800F740AB51812800C7E2280103C
:200123007E11800C7E0080087E33800475820022EF60067D307F0080047D037F00EDF4FF69
:20014300E5805207ED5E4FF58075820122C2DC32C0E0C082C083D2005391EF90E65D7401D3
:20016300F0D083D082D0E032C021C0E0C0F0C082C083C007C006C005C004C003C002C001F3
-:20018300C000C0D075D0007582001212C25391EF90E65D7410F0D0D0D000D001D002D003EA
+:20018300C000C0D075D0007582001211405391EF90E65D7410F0D0D0D000D001D002D0036D
:2001A300D004D005D006D007D083D082D0F0D0E0D02132C021C0E0C0F0C082C083C007C071
-:2001C30006C005C004C003C002C001C000C0D075D0007582011212C25391EF90E65D74209A
+:2001C30006C005C004C003C002C001C000C0D075D0007582011211405391EF90E65D74201D
:2001E300F0D0D0D000D001D002D003D004D005D006D007D083D082D0F0D0E0D02132C0E0F8
-:20020300C082C083D2015391EF90E65D7408F0D083D082D0E032B287C2CF32850A4C754D51
-:2002230000905DC0121685AE82AF83AC097D00C3EC9EED64808FF063F08095F0400990E619
+:20020300C082C083D2015391EF90E65D7408F0D083D082D0E032B287C2CF32850A187519B9
+:2002230000905DC0121503AE82AF83AC097D00C3EC9EED64808FF063F08095F0400990E69C
:2002430040E053E07FF02290E640E043E080F02285820A7401B50A0280057402B50A18AFA4
:200263000A74072FF50B90E618F090E61AE50BF012021E758201227582002290E6F574FF96
:20028300F000000000E5BB30E7FB90E6047480F00000000090E618E4F00000000090E61A69
@@ -32,93 +32,82 @@
:20030300F7E5BB30E7FB0000000090E6D07428F00000000090E6D1E4F0E50870057E06FF5F
:2003230080047E047F008EBB22AF8290E680E030E7067D1C7E3D80047DA67E3DEF75F0108C
:20034300A42416FBE435F0FCEB2DFDEC3EFC7E80EFF508703590E612E4F090E61474E0F0C8
-:2003630090E6E27401F08D828C838EF012166890E625F074012DFAE43CFB8E078A828B83A0
-:200383008FF012166890E624F02290E61274D8F090E614E4F090E6D204F08D828C838EF0A5
-:2003A30012166890E621F00DBD00010C8D828C838EF0121668FF90E62074075FF08D828C26
-:2003C300838EF0121668C423541F90E64004F002021EAF827E00EE75F005A4FCADF024916A
-:2003E300F582ED341AF583E493FBB5070280080EBE19E375820022EC2491FCED341AFD8CD6
+:2003630090E6E27401F08D828C838EF01214E690E625F074012DFAE43CFB8E078A828B8324
+:200383008FF01214E690E624F02290E61274D8F090E614E4F090E6D204F08D828C838EF029
+:2003A3001214E690E621F00DBD00010C8D828C838EF01214E6FF90E62074075FF08D828C2E
+:2003C300838EF01214E6C423541F90E64004F002021EAF827E00EE75F005A4FCADF0240F70
+:2003E300F582ED3419F583E493FBB5070280080EBE19E375820022EC240FFCED3419FD8C5A
:20040300828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E493FEA3E493FF75AF074C
-:20042300759DE4759E007C208C031CEB60168D828E838FF0121668FBA3AD82AE8390E67CE9
+:20042300759DE4759E007C208C031CEB60168D828E838FF01214E6FBA3AD82AE8390E67C6D
:20044300EBF080E47F608F061FEE600790E67CE4F080F375820122E582FF70087B64FCFD69
-:20046300FE0204E7EF249B401D8F4C754D00754E00754F009003E8E4F5F0121402AB82AC1A
+:20046300FE0204E7EF249B401D8F18751900751A00751B009003E8E4F5F0121280AB82AC6E
:2004830083ADF0FE805EBF670A7B207C007D007E008051EF243740288F017A00E9249CF9EC
-:2004A300EA34FF894CF54D3395E0F54EF54F90000AE4F5F0121402AB82AC83ADF0FE8024B0
-:2004C3007A00EF2438FFEA34FF8F4CF54D3395E0F54EF54F900064E4F5F0121402AB82AC2E
+:2004A300EA34FF8918F5193395E0F51AF51B90000AE4F5F0121280AB82AC83ADF0FE802404
+:2004C3007A00EF2438FFEA34FF8F18F5193395E0F51AF51B900064E4F5F0121280AB82AC82
:2004E30083ADF0FEC3EB9420EC9400ED9400EE64809480401474A09B74869C74019D7480F3
-:200503008EF063F08095F0500475820022754C02E4F54DF54EF54F8B828C838DF0EEC006D8
-:20052300C005C004C0031214A0A882A983D003D004D005D006880C890D8B828C838DF0EE4D
-:20054300120EE5AC82AD83AEF0FFC004C005C006C00790240075F0F474C91215A5AC82AD91
-:2005630083AEF0FFE58124FCF5818C828D838EF0EF120F12AC82AD838CCA8DCB7582012278
-:20058300AD4CAE4DAF4E8D828E838FF0E5081213E475820122E582700685108212032C750E
+:200503008EF063F08095F0500475820022751802E4F519F51AF51B8B828C838DF0EEC006A8
+:20052300C005C004C00312131EA882A983D003D004D005D006880C890D8B828C838DF0EED0
+:20054300120D63AC82AD83AEF0FFC004C005C006C00790240075F0F474C9121423AC82AD97
+:2005630083AEF0FFE58124FCF5818C828D838EF0EF120D90AC82AD838CCA8DCB75820122FC
+:20058300AD18AE19AF1A8D828E838FF0E50812126275820122E582700685108212032C752D
:2005A300820122758200227582012290E6BBE0FE7F0090E6BAE07C004207EC420690E6BF94
:2005C300E0FC7D0090E6BEE07A004205EA420490E6A0E020E1F990E6B8E0FBBB40028073D1
:2005E300BBC00280030206AFED4C70030206B3C374409DE49C50067A407B0080048D028C1C
:200603000390E6A0E020E1F98A457546007547407548E77549008F438E44758251C007C089
-:2006230006C005C004C002120E1CD002D004D005D006D00790E68AE4F00000000090E68B2D
+:2006230006C005C004C002120C9AD002D004D005D006D00790E68AE4F00000000090E68BB1
:20064300EAF07B00EDC39AFDEC9BFCEA2FFFEB3EFE8095ED4C605990E68BE4F090E6A0E067
:2006630020E1F990E68BE0FB8B38753900753A40753BE7753C008F368E37758251C007C0A0
-:2006830006C005C004C003120D87E582D003D004D005D006D0077003F582227A00EB2FFF30
+:2006830006C005C004C003120C05E582D003D004D005D006D0077003F582227A00EB2FFFB3
:2006A300EA3EFEEDC39BFDEC9AFC80A7758200227582012275820022AF82C0071202D7D021
:2006C30007850C0E850D0FBFE0004015EF2419401090E68AE4F090E68BF090E6A0E020E1A4
:2006E300F9BFA2028023BFE0028021BFE1028028BFE202802FBFE3028033BFE4028044BF9B
-:20070300E5028048BFE657804C0205AE90E740E0F54C75820002010190E740E0F54C758208
+:20070300E5028048BFE657804C0205AE90E740E0F51875820002010190E740E0F518758270
:200723000102010190E740E0F5820203D590E740E0FFBF010AD283E4F50EF50F1202F475AC
:2007430082012290E740E0F58202025390E740E0F5820200E390E740E0F58202045A758234
:20076300002290E613E4F090E615F090E6C2F090E6C37480F090E6C0E4F090E6F4F01202BF
-:20078300D7754C01758200120101754C017582011201017582011203D5758202120253752D
-:2007A300820002032C90E600E054E74410F01208A2120765D2E890E668E043E008F090E66B
-:2007C3005CE043E001F090E65CE043E010F090E65CE043E020F090E65CE043E008F0D2DD90
-:2007E300D2AF75CA3075CBF875C800D2ADD2CA90E680E043E00AF09005DC1214FF90E680F7
-:20080300E053E0F7F090E672E4F090E671F090E670F0F5B1F5A0F580F5B6F5B475B2FF1038
-:2008230000028003120F6D10010280F390E682E043E0C0F090E6817401F04387010000004A
-:2008430000000000E513701C90E682E030E60790E682E020E0D690E682E030E70790E68280
-:20086300E020E1C890E682E030E60790E682E020E00E90E682E030E7A690E682E030E19FD4
-:200883009000051214FF90E680E043E001F090000F1214FF90E680E053E0FEF00208227E4C
-:2008A3000C7F3E754C30754D31754E32754F337550347551357552367553377554387555E1
-:2008C30039755641755742755843755944755A45755B4674182EFCE43FFD90E507E0FB53F6
-:2008E30003F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF0AE
-:2009030074162EFCE43FFD90E507E0FB53030FEB244CF987038C828D83EBF074142EFCE4D7
-:200923003FFD90E508E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF909
-:2009430087038C828D83EBF074122EFCE43FFD90E508E0FB53030FEB244CF987038C828D0B
-:2009630083EBF074102EFCE43FFD90E509E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB3045
-:20098300E30244F0EB244CF987038C828D83EBF0740E2EFCE43FFD90E509E0FB53030FEBEF
-:2009A300244CF987038C828D83EBF0740C2EFCE43FFD90E50AE0FB5303F0E4C4CBC4540F44
-:2009C3006BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF0740A2EFCE43FFD9002
-:2009E300E50AE0FB53030FEB244CF987038C828D83EBF074082EFCE43FFD90E50BE0FB537A
-:200A030003F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF08C
-:200A230074062EFCE43FFD90E50BE0FB53030FEB244CF987038C828D83EBF074042EFCE4D2
-:200A43003FFD90E50CE0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF9E4
-:200A630087038C828D83EBF074022EFEE43FFF90E50CE0FD53050FED244CF987058E828FE6
-:040A830083EDF022ED
-:201771000F0E0000000000000200010000000000505555000000000000000000000000003E
-:20179100010100000000000002000100000000005055550000000000000000000000000039
-:2017B100FAFAFAFAFAF90000020000000000010050555555555555000000000000000000EC
-:2017D100FAFAFAFAFAF90000020000000000010050555555555555000000000000000000CC
-:2017F100FAFAF9000000000002000001000000005055555500000000000000000000000099
-:20181100C8C8C700000000000200000100000000505555550000000000000000000000000E
-:20183100FAFAF9000000000002000001000000005055555500000000000000000000000058
-:2018510096950000000000000200010000000000505555000000000000000000000000004F
-:20187100BBBB000000000000020001000000000050555500000000000000000000000000E4
-:20189100020100000000000002000100000000005055550000000000000000000000000037
-:2018B1004B4A00000000000002000100000000005055550000000000000000000000000085
-:2018D1002525000000000000020001000000000050555500000000000000000000000000B0
-:2018F10001000000000000000201000000000000505500000000000000000000000000002E
-:201911001E1D0000000000000200010000000000505555000000000000000000000000007E
-:20193100010100000000000002000100000000005055550000000000000000000000000097
-:2019510025250000000000000200010000000000505555000000000000000000000000002F
-:2019710007070000000000000200010000000000505555000000000000000000000000004B
-:2019910001000000000000000201000000000000505500000000000000000000000000008D
-:2019B100050400000000000002000100000000005055550000000000000000000000000010
-:2019D100800000000000000003000000000000000000000000000000000000000000000073
-:2019F1000605000000000000020001000000000050555500000000000000000000000000CE
-:201A1100800000000000000003000000000000000000000000000000000000000000000032
-:201A3100030200000000000002000100000000005055550000000000000000000000000093
-:201A5100020200000000000002000100000000005055550000000000000000000000000074
-:201A7100030200000000000002000100000000005055550000000000000000000000000053
-:201A910030111A80EA1ED11980AA18911980CA10311980CA0FF118808A0C911880CA0A91D2
-:201AB10017808A08711A80CA06511A808A05311A808A04F11980CA03B119808A0271198007
-:201AD1008A017117808AA45119808A961119808A8CD118808A78B118808A71711880CA6E7A
-:1D1AF1005118808A6A311880CA691118808A68F117808A67D11780CA66B117808A81
+:20078300D77518017582001201017518017582011201017582011203D57582021202537595
+:2007A300820002032C7E0C7F3E751806AC181518EC605474022EFBE43FFC8B018C02E51843
+:2007C3002407F582E434E5F583E0F853000F7D00E8248CF582ED3419F583E49389828A83F8
+:2007E300F074022BFBE43CFC8B068C07E5182407F582E434E5F583E0C4540F90198C93FD4A
+:200803008B828C83F080A52290E600E054E74410F01207A8120765D2E890E668E043E008CB
+:20082300F090E65CE043E001F090E65CE043E010F090E65CE043E020F090E65CE043E00868
+:20084300F0D2DDD2AF75CA3075CBF875C800D2ADD2CA90E680E043E00AF09005DC12137D70
+:2008630090E680E053E0F7F090E672E4F090E671F090E670F0F5B1F5A0F580F5B6F5B475A3
+:20088300B2FF1000028003120DEB10010280F390E682E043E0C0F090E6817401F0438701AD
+:2008A30000000000000000E513701C90E682E030E60790E682E020E0D690E682E030E70718
+:2008C30090E682E020E1C890E682E030E60790E682E020E00E90E682E030E7A690E682E02C
+:2008E30030E19F90000512137D90E680E043E001F090000F12137D90E680E053E0FEF002EA
+:02090300088565
+:2015EF000F0E000000000000020001000000000050555500000000000000000000000000C2
+:20160F000101000000000000020001000000000050555500000000000000000000000000BC
+:20162F00FAFAFAFAFAF900000200000000000100505555555555550000000000000000006F
+:20164F00FAFAFAFAFAF900000200000000000100505555555555550000000000000000004F
+:20166F00FAFAF900000000000200000100000000505555550000000000000000000000001C
+:20168F00C8C8C7000000000002000001000000005055555500000000000000000000000092
+:2016AF00FAFAF90000000000020000010000000050555555000000000000000000000000DC
+:2016CF009695000000000000020001000000000050555500000000000000000000000000D3
+:2016EF00BBBB00000000000002000100000000005055550000000000000000000000000068
+:20170F000201000000000000020001000000000050555500000000000000000000000000BA
+:20172F004B4A00000000000002000100000000005055550000000000000000000000000008
+:20174F00252500000000000002000100000000005055550000000000000000000000000033
+:20176F000100000000000000020100000000000050550000000000000000000000000000B1
+:20178F001E1D00000000000002000100000000005055550000000000000000000000000002
+:2017AF0001010000000000000200010000000000505555000000000000000000000000001B
+:2017CF002525000000000000020001000000000050555500000000000000000000000000B3
+:2017EF000707000000000000020001000000000050555500000000000000000000000000CF
+:20180F00010000000000000002010000000000005055000000000000000000000000000010
+:20182F00050400000000000002000100000000005055550000000000000000000000000093
+:20184F008000000000000000030000000000000000000000000000000000000000000000F6
+:20186F00060500000000000002000100000000005055550000000000000000000000000051
+:20188F008000000000000000030000000000000000000000000000000000000000000000B6
+:2018AF00030200000000000002000100000000005055550000000000000000000000000017
+:2018CF000202000000000000020001000000000050555500000000000000000000000000F8
+:2018EF000302000000000000020001000000000050555500000000000000000000000000D7
+:20190F00308F1880EA1E4F1880AA180F1880CA10AF1780CA0F6F17808A0C0F1780CA0A0FEB
+:20192F0016808A08EF1880CA06CF18808A05AF18808A046F1880CA032F18808A02EF1780A1
+:20194F008A01EF15808AA4CF17808A968F17808A8C4F17808A782F17808A71EF1680CA6E13
+:20196F00CF16808A6AAF1680CA698F16808A686F16808A674F1680CA662F16808A30313283
+:0D198F00333435363738394142434445463C
:203D000012010002FFFFFF40B50421601002010203010A0600020000004001000902890017
:203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
@@ -130,167 +119,167 @@
:203DE0000403090416034F00700065006E00480061006E00740065006B00120344005300FD
:203E00004F002D0036003000320031001A0330003000300030003000300030003000300090
:083E200030003000300000000A
-:200A870085822CE5272522FDE5283523FE752D02903C00E4F0903C00E0600475820022906C
-:200AA700E678E0FB7A0043038090E678EBF0E030E21090000AC006C0051214FFD005D006F6
-:200AC70080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E060047582F2
-:200AE700002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E6783C
-:200B0700E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F582229035
-:200B2700000AC006C0051214FFD005D006020A9C7A007B00C3EA9DEB9E4003020BD1C3EA0B
-:200B47009522EB95235016EA2524F8EB3525F9AC26888289838CF0121668FC801DEAC39596
-:200B670022F8EB9523F9E82529F8E9352AF9AF2B888289838FF0121668FC90E679ECF00A79
-:200B8700BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E0308E
-:200BA700E203020A9C90E678E020E18890E678E0FF43074090E678EFF090E678E030E6063C
-:200BC700903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903C1C
-:200BE70000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B5E6
-:200C07002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E69B
-:200C270078EBF0E030E20C90000AC0061214FFD00680D5E53325E0FB3395E0FA430301901B
-:200C4700E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E02069
-:200C6700E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C002A
-:200C8700E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F53456
-:200CA700F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E0603F
-:200CC700F3903C00E060047582002290E678E030E203020C0F74022534F8E43535F9E8B546
-:200CE7002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B5340205A1
-:200D070035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF01213E4020CA958
-:200D270090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020CBF
-:200D47000F90E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D83FE
-:200D67008FF01213E490E678E030E606903C00E060F3903C00E060047582002275820122B8
-:200D870085823DE4F541F542AB36AC37C3E5419538E54295394003020E187A0090E678E095
-:200DA70030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF4205B3
-:200DC70041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF0121668F78A22752300AC
-:200DE70075243E752500752640E4F527F528F529F52AF52B853D82C004C003120A87E58251
-:200E0700D003D0047003F582220BBB00010C020D9375820122AF827E0090E678E030E406F2
-:200E27007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E4FF
-:200E4700F527F528F529F52AF52B8F82C007120A87E582D0077003F5822285452E85462F3E
-:190E67008547308548318549328F82120BF9E5827003F5822275820122C4
-:200E8000FB7A20E4FCFDFEFFE5822582F582E58333F583E5F033F5F0EB33FB4017DAE980AB
-:200EA00042E5822582F582E58333F583E5F033F5F0EB33FBEC33FCED33FDEE33FEEF33FFDA
-:200EC000EC954CED954DEE954EEF954F4013EC954CFCED954DFDEE954EFEEF954FFF438284
-:050EE00001DABEEB2267
+:2009050085822CE5272522FDE5283523FE752D02903C00E4F0903C00E060047582002290EF
+:20092500E678E0FB7A0043038090E678EBF0E030E21090000AC006C00512137DD005D006FC
+:2009450080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E06004758275
+:20096500002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E678BF
+:20098500E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F5822290B9
+:2009A500000AC006C00512137DD005D00602091A7A007B00C3EA9DEB9E4003020A4FC3EA18
+:2009C5009522EB95235016EA2524F8EB3525F9AC26888289838CF01214E6FC801DEAC3959E
+:2009E50022F8EB9523F9E82529F8E9352AF9AF2B888289838FF01214E6FC90E679ECF00A81
+:200A0500BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E03011
+:200A2500E20302091A90E678E020E18890E678E0FF43074090E678EFF090E678E030E60642
+:200A4500903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903C9F
+:200A650000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B569
+:200A85002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E61F
+:200AA50078EBF0E030E20C90000AC00612137DD00680D5E53325E0FB3395E0FA4303019022
+:200AC500E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E020ED
+:200AE500E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C00AE
+:200B0500E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F534D9
+:200B2500F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E060C2
+:200B4500F3903C00E060047582002290E678E030E203020A8D74022534F8E43535F9E8B54D
+:200B65002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B534020524
+:200B850035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF0121262020B27E2
+:200BA50090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020A45
+:200BC5008D90E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D8304
+:200BE5008FF012126290E678E030E606903C00E060F3903C00E060047582002275820122BF
+:200C050085823DE4F541F542AB36AC37C3E5419538E54295394003020C967A0090E678E09C
+:200C250030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF420536
+:200C450041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF01214E6F78A22752300B3
+:200C650075243E752500752640E4F527F528F529F52AF52B853D82C004C003120905E58257
+:200C8500D003D0047003F582220BBB00010C020C1175820122AF827E0090E678E030E406F9
+:200CA5007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E483
+:200CC500F527F528F529F52AF52B8F82C007120905E582D0077003F5822285452E85462F45
+:190CE5008547308548318549328F82120A77E5827003F5822275820122CB
+:200CFE00FB7A20E4FCFDFEFFE5822582F582E58333F583E5F033F5F0EB33FB4017DAE9802F
+:200D1E0042E5822582F582E58333F583E5F033F5F0EB33FBEC33FCED33FDEE33FEEF33FF5D
+:200D3E00EC9518ED9519EE951AEF951B4013EC9518FCED9519FDEE951AFEEF951BFF4382A7
+:050D5E0001DABEEB22EA
:06008800E478FFF6D8FD4C
-:200EE500FCABF0AA83A982749EF582C2D1EC30E716D2D1E9F42401F9EAF43400FAEBF4340C
-:0D0F050000FBECF43400FC12173602155509
-:200F12001213D2C3749E9582403979001216F330D126E9F42401F582EAF43400F583EBF4C6
-:200F32003400F5F0ECF43400700AE582458345F0700122E430E70F22EC20E71489828A83B6
-:1B0F52008BF02230D10AE4F582F583F5F074802274FFF582F583F5F0747F22B2
+:200D6300FCABF0AA83A982749EF582C2D1EC30E716D2D1E9F42401F9EAF43400FAEBF4348F
+:0D0D830000FBECF43400FC1215B40213D395
+:200D9000121250C3749E95824039790012157130D126E9F42401F582EAF43400F583EBF450
+:200DB0003400F5F0ECF43400700AE582458345F0700122E430E70F22EC20E71489828A833A
+:1B0DD0008BF02230D10AE4F582F583F5F074802274FFF582F583F5F0747F2236
:1200CE007512007513007514A675153D75161C75173DAB
-:200F6D0090E6B9E0FF24F4500302109BEF240A83F582EF241083F583E4739FBB9BD79B9BB0
-:200F8D00F39B031A3C760F0F100F10100F101010101012111DE58260030210B790E6A0E062
-:200FAD00FF7E0043070190E6A0EFF00210B71211B1E58260030210B790E6A0E0FF7E004381
-:200FCD00070190E6A0EFF00210B712122CE58260030210B790E6A0E0FF7E0043070190E627
-:200FED00A0EFF00210B71206B7E58260030210B71212ED0210B71205A6AF8290E740EFF0DC
-:20100D0090E68AE4F090E68B04F00210B790E6BAE0F5821205AAE58260030210B790E6A040
-:20102D00E0FF7E0043070190E6A0EFF00210B790E6BCE0FF754C11754D00754E408F821272
-:20104D000583E582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68AF0
-:20106D00E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F82120598E582702D90E6A0D9
-:20108D00E0FF7E0043070190E6A0EFF0801C90E6B9E0F5821206BBE582700F90E6A0E0FFD6
-:2010AD007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F7F3
-:2010CD005003021119EE240A83F582EE240D83F583E473F2F609190D19111915101011114C
-:2010ED00111111111190E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A3223E
-:20110D0090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BFE0
-:20112D00820280370211A990E740E4F090E741F090E68AF090E68B7402F08064E51325E040
-:20114D00FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F5FE
-:20116D00821210C5AE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F001A
-:20118D0080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F0800475820022AC
-:2011AD007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BA6C
-:2011CD00E0FFBF060280547582002290E6BAE0703D90E6BCE0F5821210C5AE82AF83E0FD03
-:2011ED005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E683EC
-:20120D00EFF07E0043072090E683EFF0800D7582002290E6B9E0F5820206BB758201229089
-:20122D00E6B8E0FF6008BF020280290212B590E6BAE0FFBF02030212BE90E6BAE0FFBF0113
-:20124D0005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F582E5
-:20126D001210C5AE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF0907C
-:20128D00E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E68370
-:2012AD00EFF0800D7582002290E6B9E0F5820206BB75820122AF827E0110AF027E00EF60FB
-:2012CD000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF2237
-:2012ED0090E6BBE0FFBF01028019BF02028024BF0302802CBF06030213A7BF07030213B786
-:20130D000213C47E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F022AD
-:20132D007DE07E3D7F8090E6BAE0F54C7B008B020BEAB54C0280428D008E018F028D828E2C
-:20134D00838FF012166828F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF02D
-:20136D00121668F9B9030280067D007E007F00ED4E6006C3E54C9B50B5ED4E600F8D038E1C
-:20138D000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6F5
-:2013AD00B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF43070190B0
-:0513CD00E6A0EFF02294
-:200066007900E94400601B7A00901B0E780175923CE493F2A308B800020592D9F4DAF275F7
+:200DEB0090E6B9E0FF24F45003020F19EF240A83F582EF241083F583E4731D3919551919C3
+:200E0B0071198198BAF40E0E0F0E0F0F0E0F0E0E0E0E120F9BE5826003020F3590E6A0E008
+:200E2B00FF7E0043070190E6A0EFF0020F3512102FE5826003020F3590E6A0E0FF7E00438D
+:200E4B00070190E6A0EFF0020F351210AAE5826003020F3590E6A0E0FF7E0043070190E634
+:200E6B00A0EFF0020F351206B7E5826003020F3512116B020F351205A6AF8290E740EFF06B
+:200E8B0090E68AE4F090E68B04F0020F3590E6BAE0F5821205AAE5826003020F3590E6A0CA
+:200EAB00E0FF7E0043070190E6A0EFF0020F3590E6BCE0FF751811751900751A408F821215
+:200ECB000583E582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68A74
+:200EEB00E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F82120598E582702D90E6A05D
+:200F0B00E0FF7E0043070190E6A0EFF0801C90E6B9E0F5821206BBE582700F90E6A0E0FF59
+:200F2B007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F776
+:200F4B005003020F97EE240A83F582EE240D83F583E473707487978B978F97930F0F0F0FEB
+:200F6B000F0F0F0F0F90E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A322CB
+:200F8B0090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BF64
+:200FAB008202803702102790E740E4F090E741F090E68AF090E68B7402F08064E51325E047
+:200FCB00FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F582
+:200FEB0082120F43AE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F0021
+:20100B0080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F08004758200222F
+:20102B007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BAEF
+:20104B00E0FFBF060280547582002290E6BAE0703D90E6BCE0F582120F43AE82AF83E0FD09
+:20106B005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E6836F
+:20108B00EFF07E0043072090E683EFF0800D7582002290E6B9E0F5820206BB75820122900D
+:2010AB00E6B8E0FF6008BF0202802902113390E6BAE0FFBF020302113C90E6BAE0FFBF019D
+:2010CB0005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F58269
+:2010EB00120F43AE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF09083
+:20110B00E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E683F3
+:20112B00EFF0800D7582002290E6B9E0F5820206BB75820122AF827E0110AF027E00EF607E
+:20114B000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF22BA
+:20116B0090E6BBE0FFBF01028019BF02028024BF0302802CBF0603021225BF07030212350F
+:20118B000212427E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F022B4
+:2011AB007DE07E3D7F8090E6BAE0F5187B008B020BEAB5180280428D008E018F028D828E18
+:2011CB00838FF01214E628F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF035
+:2011EB001214E6F9B9030280067D007E007F00ED4E6006C3E5189B50B5ED4E600F8D038E58
+:20120B000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E678
+:20122B00B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF4307019033
+:05124B00E6A0EFF02217
+:200066007900E94400601B7A0090199C780175923CE493F2A308B800020592D9F4DAF2756B
:0200860092FFE7
-:1213D200AA82AB83A2F73392D1F5826002D2F7ACF02220
-:1B13E40020F71130F6138883A88220F509F6A8837583002280FEF280F5F02208
-:203F00000201530002176F000216C0000202010002016B000201B6000216BD000214F300E1
-:203F20000214F5000214F6000214F7000214FA0002176E00021770000213FF000214010012
-:203F40000216C2000214F300021684000216BE000216BF000216C1000216C3000216F20077
-:203F60000215A4000214F3000214F3000214F3000214F4000214F8000214FB000214FD002F
-:203F80000214F9000214FC000214FE00021554000214700002149B0002149D0002149F00E2
-:183FA0000214710002149C0002149E000214F2000214000002176D0078
-:0113FF0032BB
-:0114000032B9
-:0114010032B8
-:20140200AAF0FBE582854CF0A4FCADF0E583854CF0A42DFDE435F0FEE582854DF0A42DFDDB
-:20142200E5F03EFEE433FFEA854CF0A42EFEE5F03FFFE583854DF0A42EFEE5F03FFFE58281
-:20144200854EF0A42EFEE5F03FFFEB854CF0A42FFFEA854DF0A42FFFE583854EF0A42FFFEB
-:0E146200E582854FF0A42F8EF08D838C8222C0
-:011470003249
-:011471003248
+:12125000AA82AB83A2F73392D1F5826002D2F7ACF022A3
+:1B12620020F71130F6138883A88220F509F6A8837583002280FEF280F5F0228B
+:203F0000020153000215ED0002153E000202010002016B000201B60002153B0002137100EE
+:203F2000021373000213740002137500021378000215EC000215EE0002127D0002127F002D
+:203F400002154000021371000215020002153C0002153D0002153F0002154100021570008F
+:203F60000214220002137100021371000213710002137200021376000213790002137B0047
+:203F80000213770002137A0002137C000213D2000212EE000213190002131B0002131D00FC
+:183FA0000212EF0002131A0002131C000213700002127E000215EB008D
+:01127D00323E
+:01127E00323D
+:01127F00323C
+:20128000AAF0FBE5828518F0A4FCADF0E5838518F0A42DFDE435F0FEE5828519F0A42DFDFB
+:2012A000E5F03EFEE433FFEA8518F0A42EFEE5F03FFFE5838519F0A42EFEE5F03FFFE5826D
+:2012C000851AF0A42EFEE5F03FFFEB8518F0A42FFFEA8519F0A42FFFE583851AF0A42FFF3F
+:0E12E000E582851BF0A42F8EF08D838C822278
+:0112EE0032CD
+:0112EF0032CC
:20008E007800E84400600A790075923CE4F309D8FC7801E84400600C7901903C00E4F0A306
:0400AE00D8FCD9FAA7
-:201472007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB954CF5F0EC954D400606
-:09149200FCABF0438201DADD221B
-:01149B00321E
-:01149C00321D
-:01149D00321C
-:01149E00321B
-:01149F00321A
-:2014A000FBC2D530E715D2D5E4C39582F582E49583F583E495F0F5F0E49BFBE54F30E717F4
-:2014C000B2D5E4C3954CF54CE4954DF54DE4954EF54EE4954FF54FEB120E8030D513FBE41C
-:1214E000C39582F582E49583F583E495F0F5F0E49B2246
-:0114F20032C7
-:0114F30032C6
-:0114F40032C5
-:0114F50032C4
-:0114F60032C3
-:0114F70032C2
-:0114F80032C1
-:0114F90032C0
-:0114FA0032BF
-:0114FB0032BE
-:0114FC0032BD
-:0114FD0032BC
-:0114FE0032BB
-:2014FF00AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFBFD
-:20151F00BB01067A617B0180047AC27B028A048B058C4C8D4D154C74FFB54C02154DE54C1C
-:15153F00454D70F1EE24FFFAEF34FFFB8A068B07EA4B70DD22B6
-:011554003264
-:20155500B98003EA13B34010EA2401FAE43BFBE43CFC50047C800582BC000EBB000BBA00DA
-:2015750008E4F5F0F583F58222A2D1E582138CF092F78B838A8222E4F583F58275F080F49A
-:0F159500A2D11322E4F583F58275F0C0747F2292
-:0115A4003214
-:2015A5001216C430D502B2D1BF0009BC000302159902158CBC0003021576E583B4FF0BE57F
-:2015C50082B4FF03021599021576E582B4FF0302158CC395835007247F400B021576248080
-:2015E50014500302158CF582C3ED9AEE9BEF9C40111582C3EA33F9EB33FAEC33FBE433FC01
-:201605008005E4CCCBCAF9C08275F019C3E99DEA9EEB9FEC9400D5F002802D400EE99DF926
-:20162500EA9EFAEB9FFBEC9400FCC3B3E833F8E58233F582E58333F583C3E933F9EA33FA86
-:20164500EB33FBEC33FC80C4B3E4F938FAE43582FBE43583FCD082500405827C8012173695
-:0316650002156DFE
-:0D00590075815B121769E582600302005695
-:1C16680020F71430F6148883A88220F507E6A88375830022E280F7E49322E02291
-:011684003233
-:20168500C2D5E58330E70DD2D5E4C39582F582E49583F583E54D30E70DB2D5E4C3954CF578
-:1816A5004CE4954DF54D12147230D50BE4C39582F582E49583F5832266
-:0116BD0032FA
-:0116BE0032F9
-:0116BF0032F8
-:0116C00032F7
-:0116C10032F6
-:0116C20032F5
-:0116C30032F4
-:2016C400AA82AB83A2F73392D1F5826002D2F7ACF0E58124F9F8E6FD08E6FE0886F008E689
-:0E16E400A2F73392D5F5836002D2F7AFF02261
-:0116F20032C5
-:2016F3006040F82582500274FFF582E824F8501ECCCBCAF9E4CC24F85014CBCAF9E4CB24FF
-:20171300F8500BCAF9E4CA24F8500379002224086010F8C3EC13FCEB13FBEA13FAE913F9B1
-:03173300D8F122C8
-:201736007804EC7011E58224F8500AF582E4C9CACBFCD8EF22EC7820058220E713D58201B2
-:1317560022C3E933F9EA33FAEB33FBEC33FCD8EA158222C0
-:041769007582002263
-:01176D003249
-:01176E003248
-:01176F003247
-:011770003246
+:2012F0007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB9518F5F0EC95194006F2
+:09131000FCABF0438201DADD229E
+:0113190032A1
+:01131A0032A0
+:01131B00329F
+:01131C00329E
+:01131D00329D
+:20131E00FBC2D530E715D2D5E4C39582F582E49583F583E495F0F5F0E49BFBE51B30E717AB
+:20133E00B2D5E4C39518F518E49519F519E4951AF51AE4951BF51BEB120CFE30D513FBE4C3
+:12135E00C39582F582E49583F583E495F0F5F0E49B22C9
+:01137000324A
+:011371003249
+:011372003248
+:011373003247
+:011374003246
+:011375003245
+:011376003244
+:011377003243
+:011378003242
+:011379003241
+:01137A003240
+:01137B00323F
+:01137C00323E
+:20137D00AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFB80
+:20139D00BB01067A617B0180047AC27B028A048B058C188D19151874FFB518021519E518D8
+:1513BD00451970F1EE24FFFAEF34FFFB8A068B07EA4B70DD226E
+:0113D20032E8
+:2013D300B98003EA13B34010EA2401FAE43BFBE43CFC50047C800582BC000EBB000BBA005E
+:2013F30008E4F5F0F583F58222A2D1E582138CF092F78B838A8222E4F583F58275F080F41E
+:0F141300A2D11322E4F583F58275F0C0747F2215
+:011422003297
+:2014230012154230D502B2D1BF0009BC000302141702140ABC00030213F4E583B4FF0BE50F
+:2014430082B4FF030214170213F4E582B4FF0302140AC395835007247F400B0213F4248011
+:2014630014500302140AF582C3ED9AEE9BEF9C40111582C3EA33F9EB33FAEC33FBE433FC07
+:201483008005E4CCCBCAF9C08275F019C3E99DEA9EEB9FEC9400D5F002802D400EE99DF9AA
+:2014A300EA9EFAEB9FFBEC9400FCC3B3E833F8E58233F582E58333F583C3E933F9EA33FA0A
+:2014C300EB33FBEC33FC80C4B3E4F938FAE43582FBE43583FCD082500405827C801215B49D
+:0314E3000213EB06
+:0D00590075814B1215E7E582600302005629
+:1C14E60020F71430F6148883A88220F507E6A88375830022E280F7E49322E02215
+:0115020032B6
+:20150300C2D5E58330E70DD2D5E4C39582F582E49583F583E51930E70DB2D5E4C39518F563
+:1815230018E49519F5191212F030D50BE4C39582F582E49583F5832209
+:01153B00327D
+:01153C00327C
+:01153D00327B
+:01153E00327A
+:01153F003279
+:011540003278
+:011541003277
+:20154200AA82AB83A2F73392D1F5826002D2F7ACF0E58124F9F8E6FD08E6FE0886F008E60C
+:0E156200A2F73392D5F5836002D2F7AFF022E4
+:011570003248
+:201571006040F82582500274FFF582E824F8501ECCCBCAF9E4CC24F85014CBCAF9E4CB2482
+:20159100F8500BCAF9E4CA24F8500379002224086010F8C3EC13FCEB13FBEA13FAE913F935
+:0315B100D8F1224C
+:2015B4007804EC7011E58224F8500AF582E4C9CACBFCD8EF22EC7820058220E713D5820136
+:1315D40022C3E933F9EA33FAEB33FBEC33FCD8EA15822244
+:0415E70075820022E7
+:0115EB0032CD
+:0115EC0032CC
+:0115ED0032CB
+:0115EE0032CA
:00000001FF
diff --git a/openhantek/res/firmware/dso6022be-firmware.hex b/openhantek/res/firmware/dso6022be-firmware.hex
index 921d89fe..6f73a0f2 100644
--- a/openhantek/res/firmware/dso6022be-firmware.hex
+++ b/openhantek/res/firmware/dso6022be-firmware.hex
@@ -11,19 +11,19 @@
:03005300023F0069
:1C00B200750800750900750A02750B00750CF4750D01750EF4750F01C200C201BD
:0300E000020056C5
-:030056000207D5C9
+:0300560002083865
:2000E300E582FF30E00543B108800353B1F7EF30E40543B101800353B1FE75820122AF823B
-:200103007401B54C0280157402B54C0280127405B54C02800F740AB54C12800C7E48801046
+:200103007401B5180280157402B5180280127405B51802800F740AB51812800C7E48801016
:200123007E24800C7E0080087E6C800475820022EF60067DE07F0080047D1C7F00EDF4FF54
:20014300E5A05207ED5E4FF5A075820122C2DC32C0E0C082C083D2005391EF90E65D740193
:20016300F0D083D082D0E032C021C0E0C0F0C082C083C007C006C005C004C003C002C001F3
-:20018300C000C0D075D0007582001212F85391EF90E65D7410F0D0D0D000D001D002D003B4
+:20018300C000C0D075D0007582001211765391EF90E65D7410F0D0D0D000D001D002D00337
:2001A300D004D005D006D007D083D082D0F0D0E0D02132C021C0E0C0F0C082C083C007C071
-:2001C30006C005C004C003C002C001C000C0D075D0007582011212F85391EF90E65D742064
+:2001C30006C005C004C003C002C001C000C0D075D0007582011211765391EF90E65D7420E7
:2001E300F0D0D0D000D001D002D003D004D005D006D007D083D082D0F0D0E0D02132C0E0F8
:20020300C082C083D2015391EF90E65D7408F0D083D082D0E032C0E0C0D0B287E50E450F3A
:200223006019150E74FFB50E02150FE50E450F700A850C0E850D0FB2A0D2A1C2CFD0D0D0FC
-:20024300E032850A4C754D00905DC01216BBAE82AF83AC097D00C3EC9EED64808FF063F0D8
+:20024300E032850A18751900905DC0121539AE82AF83AC097D00C3EC9EED64808FF063F0C3
:200263008095F0400990E640E053E07FF02290E640E043E080F02285820A7401B50A0280C1
:20028300057402B50A18AF0A74072FF50B90E618F090E61AE50BF01202457582012275824E
:2002A300002290E6F574FFF000000000E5BB30E7FB90E6047480F00000000090E618E4F0D9
@@ -33,93 +33,82 @@
:20032300BEFF011FEE4F70F7E5BB30E7FB0000000090E6D07428F00000000090E6D1E4F09A
:20034300E50870057E06FF80047E047F008EBB22AF8290E680E030E7067D1C7E3D80047D4C
:20036300A67E3DEF75F010A42416FBE435F0FCEB2DFDEC3EFC7E80EFF508703590E612E4A1
-:20038300F090E61474E0F090E6E27401F08D828C838EF012169E90E625F074012DFAE43C36
-:2003A300FB8E078A828B838FF012169E90E624F02290E61274D8F090E614E4F090E6D20431
-:2003C300F08D828C838EF012169E90E621F00DBD00010C8D828C838EF012169EFF90E62073
-:2003E30074075FF08D828C838EF012169EC423541F90E64004F0020245AF827E00EE75F07F
-:2004030005A4FCADF024C7F582ED341AF583E493FBB5070280080EBE19E375820022EC24D9
-:20042300C7FCED341AFD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E493FEE9
-:20044300A3E493FF75AF07759DE4759E007C208C031CEB60168D828E838FF012169EFBA3A1
+:20038300F090E61474E0F090E6E27401F08D828C838EF012151C90E625F074012DFAE43CB9
+:2003A300FB8E078A828B838FF012151C90E624F02290E61274D8F090E614E4F090E6D204B4
+:2003C300F08D828C838EF012151C90E621F00DBD00010C8D828C838EF012151CFF90E62079
+:2003E30074075FF08D828C838EF012151CC423541F90E64004F0020245AF827E00EE75F002
+:2004030005A4FCADF02445F582ED3419F583E493FBB5070280080EBE19E375820022EC245C
+:2004230045FCED3419FD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E493FE6C
+:20044300A3E493FF75AF07759DE4759E007C208C031CEB60168D828E838FF012151CFBA324
:20046300AD82AE8390E67CEBF080E47F608F061FEE600790E67CE4F080F375820122E58246
-:20048300FF70087B64FCFDFE02050EEF249B401D8F4C754D00754E00754F009003E8E4F574
-:2004A300F0121438AB82AC83ADF0FE805EBF670A7B207C007D007E008051EF243740288FC2
-:2004C300017A00E9249CF9EA34FF894CF54D3395E0F54EF54F90000AE4F5F0121438AB82AB
-:2004E300AC83ADF0FE80247A00EF2438FFEA34FF8F4CF54D3395E0F54EF54F900064E4F591
-:20050300F0121438AB82AC83ADF0FEC3EB9420EC9400ED9400EE64809480401474A09B74D3
-:20052300869C74019D74808EF063F08095F0500475820022754C02E4F54DF54EF54F8B82D0
-:200543008C838DF0EEC006C005C004C0031214D6A882A983D003D004D005D006880C890D3E
-:200563008B828C838DF0EE120F1BAC82AD83AEF0FFC004C005C006C00790240075F0F47423
-:20058300C91215DBAC82AD83AEF0FFE58124FCF5818C828D838EF0EF120F48AC82AD838CB8
-:2005A300CA8DCB75820122AD4CAE4DAF4E8D828E838FF0E50812141A75820122E582700648
+:20048300FF70087B64FCFDFE02050EEF249B401D8F18751900751A00751B009003E8E4F544
+:2004A300F01212B6AB82AC83ADF0FE805EBF670A7B207C007D007E008051EF243740288F46
+:2004C300017A00E9249CF9EA34FF8918F5193395E0F51AF51B90000AE4F5F01212B6AB82FF
+:2004E300AC83ADF0FE80247A00EF2438FFEA34FF8F18F5193395E0F51AF51B900064E4F561
+:20050300F01212B6AB82AC83ADF0FEC3EB9420EC9400ED9400EE64809480401474A09B7457
+:20052300869C74019D74808EF063F08095F0500475820022751802E4F519F51AF51B8B82A0
+:200543008C838DF0EEC006C005C004C003121354A882A983D003D004D005D006880C890DC1
+:200563008B828C838DF0EE120D99AC82AD83AEF0FFC004C005C006C00790240075F0F474A7
+:20058300C9121459AC82AD83AEF0FFE58124FCF5818C828D838EF0EF120DC6AC82AD838CBF
+:2005A300CA8DCB75820122AD18AE19AF1A8D828E838FF0E50812129875820122E582700668
:2005C30085108212035375820122758200227582012290E6BBE0FE7F0090E6BAE07C0042F0
:2005E30007EC420690E6BFE0FC7D0090E6BEE07A004205EA420490E6A0E020E1F990E6B80C
:20060300E0FBBB40028073BBC00280030206D6ED4C70030206DAC374409DE49C50067A40FC
:200623007B0080048D028C0390E6A0E020E1F98A457546007547407548E77549008F438E62
-:2006430044758251C007C006C005C004C002120E52D002D004D005D006D00790E68AE4F0C5
+:2006430044758251C007C006C005C004C002120CD0D002D004D005D006D00790E68AE4F049
:200663000000000090E68BEAF07B00EDC39AFDEC9BFCEA2FFFEB3EFE8095ED4C605990E69B
:200683008BE4F090E6A0E020E1F990E68BE0FB8B38753900753A40753BE7753C008F368E31
-:2006A30037758251C007C006C005C004C003120DBDE582D003D004D005D006D0077003F50B
+:2006A30037758251C007C006C005C004C003120C3BE582D003D004D005D006D0077003F58E
:2006C30082227A00EB2FFFEA3EFEEDC39BFDEC9AFC80A7758200227582012275820022AFCE
:2006E30082C0071202FED007C2A0D2A1850C0E850D0FBFE0004015EF2419401090E68AE45C
:20070300F090E68BF090E6A0E020E1F9BFA2028023BFE0028021BFE1028028BFE202802F21
-:20072300BFE3028033BFE4028046BFE502804ABFE659804E0205D590E740E0F54C7582000D
-:2007430002010190E740E0F54C75820102010190E740E0F5820203FC90E740E0FFBF010C4D
+:20072300BFE3028033BFE4028046BFE502804ABFE659804E0205D590E740E0F51875820041
+:2007430002010190E740E0F51875820102010190E740E0F5820203FC90E740E0FFBF010C81
:20076300D2A0C2A1E4F50EF50F12031B7582012290E740E0F58202027A90E740E0F58202D0
:2007830000E390E740E0F5820204817582002290E613E4F090E615F090E6C2F090E6C37418
-:2007A30080F090E6C0E4F090E6F4F01202FE754C01758200120101754C01758201120101B5
-:2007C3007582011203FC75820212027A75820002035390E600E054E74410F01208D8120757
-:2007E30092D2E890E668E043E008F090E65CE043E001F090E65CE043E010F090E65CE04341
-:20080300E020F090E65CE043E008F0D2DDD2AF75CA3075CBF875C800D2ADD2CA90E680E013
-:2008230043E00AF09005DC12153590E680E053E0F7F090E6727404F090E671E4F090E670EA
-:20084300F075B109F5A0F58075B6FF75B4FF75B2FFC2A0D2A11000028003120FA3100102B3
-:2008630080F390E682E043E0C0F090E6817401F043870100000000000000E513701C90E636
-:2008830082E030E60790E682E020E0D690E682E030E70790E682E020E1C890E682E030E6A3
-:2008A3000790E682E020E00E90E682E030E7A690E682E030E19F90000512153590E680E064
-:2008C30043E001F090000F12153590E680E053E0FEF00208587E107F3E754C30754D317509
-:2008E3004E32754F3375503475513575523675533775543875553975564175574275584360
-:20090300755944755A45755B4674182EFCE43FFD90E507E0FB5303F0E4C4CBC4540F6BCB55
-:20092300540FCB6BCB30E30244F0EB244CF987038C828D83EBF074162EFCE43FFD90E507E0
-:20094300E0FB53030FEB244CF987038C828D83EBF074142EFCE43FFD90E508E0FB5303F00D
-:20096300E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF074129A
-:200983002EFCE43FFD90E508E0FB53030FEB244CF987038C828D83EBF074102EFCE43FFDA8
-:2009A30090E509E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987033A
-:2009C3008C828D83EBF0740E2EFCE43FFD90E509E0FB53030FEB244CF987038C828D83EBAA
-:2009E300F0740C2EFCE43FFD90E50AE0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30251
-:200A030044F0EB244CF987038C828D83EBF0740A2EFCE43FFD90E50AE0FB53030FEB244CE6
-:200A2300F987038C828D83EBF074082EFCE43FFD90E50BE0FB5303F0E4C4CBC4540F6BCB00
-:200A4300540FCB6BCB30E30244F0EB244CF987038C828D83EBF074062EFCE43FFD90E50BCB
-:200A6300E0FB53030FEB244CF987038C828D83EBF074042EFCE43FFD90E50CE0FB5303F0F8
-:200A8300E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF0740289
-:1A0AA3002EFEE43FFF90E50CE0FD53050FED244CF987058E828F83EDF02223
-:2017A7000F0E00000000000002000100000000005055550000000000000000000000000008
-:2017C700010100000000000002000100000000005055550000000000000000000000000003
-:2017E700FAFAFAFAFAF90000020000000000010050555555555555000000000000000000B6
-:20180700FAFAFAFAFAF9000002000000000001005055555555555500000000000000000095
-:20182700FAFAF9000000000002000001000000005055555500000000000000000000000062
-:20184700C8C8C70000000000020000010000000050555555000000000000000000000000D8
-:20186700FAFAF9000000000002000001000000005055555500000000000000000000000022
-:20188700969500000000000002000100000000005055550000000000000000000000000019
-:2018A700BBBB000000000000020001000000000050555500000000000000000000000000AE
-:2018C700020100000000000002000100000000005055550000000000000000000000000001
-:2018E7004B4A0000000000000200010000000000505555000000000000000000000000004F
-:20190700252500000000000002000100000000005055550000000000000000000000000079
-:201927000100000000000000020100000000000050550000000000000000000000000000F7
-:201947001E1D00000000000002000100000000005055550000000000000000000000000048
-:20196700010100000000000002000100000000005055550000000000000000000000000061
-:201987002525000000000000020001000000000050555500000000000000000000000000F9
-:2019A700070700000000000002000100000000005055550000000000000000000000000015
-:2019C700010000000000000002010000000000005055000000000000000000000000000057
-:2019E7000504000000000000020001000000000050555500000000000000000000000000DA
-:201A070080000000000000000300000000000000000000000000000000000000000000003C
-:201A2700060500000000000002000100000000005055550000000000000000000000000097
-:201A47008000000000000000030000000000000000000000000000000000000000000000FC
-:201A670003020000000000000200010000000000505555000000000000000000000000005D
-:201A870002020000000000000200010000000000505555000000000000000000000000003E
-:201AA70003020000000000000200010000000000505555000000000000000000000000001D
-:201AC70030471A80EA1E071A80AA18C71980CA10671980CA0F2719808A0CC71880CA0AC720
-:201AE70017808A08A71A80CA06871A808A05671A808A04271A80CA03E719808A02A719808C
-:201B07008A01A717808AA48719808A964719808A8C0719808A78E718808A71A71880CA6EFE
-:1D1B27008718808A6A671880CA694718808A682718808A67071880CA66E717808A04
+:2007A30080F090E6C0E4F090E6F4F01202FE7518017582001201017518017582011201011D
+:2007C3007582011203FC75820212027A7582000203537E107F3E751806AC181518EC6054C8
+:2007E30074022EFBE43FFC8B018C02E5182407F582E434E5F583E0F853000F7D00E824C285
+:20080300F582ED3419F583E49389828A83F074022BFBE43CFC8B068C07E5182407F582E4CE
+:2008230034E5F583E0C4540F9019C293FD8B828C83F080A52290E600E054E74410F01207E1
+:20084300D5120792D2E890E668E043E008F090E65CE043E001F090E65CE043E010F090E671
+:200863005CE043E020F090E65CE043E008F0D2DDD2AF75CA3075CBF875C800D2ADD2CA907A
+:20088300E680E043E00AF09005DC1213B390E680E053E0F7F090E6727404F090E671E4F0AE
+:2008A30090E670F075B109F5A0F58075B6FF75B4FF75B2FFC2A0D2A11000028003120E2103
+:2008C30010010280F390E682E043E0C0F090E6817401F043870100000000000000E5137055
+:2008E3001C90E682E030E60790E682E020E0D690E682E030E70790E682E020E1C890E682A7
+:20090300E030E60790E682E020E00E90E682E030E7A690E682E030E19F9000051213B390D7
+:18092300E680E043E001F090000F1213B390E680E053E0FEF00208BB2F
+:201625000F0E0000000000000200010000000000505555000000000000000000000000008B
+:20164500010100000000000002000100000000005055550000000000000000000000000086
+:20166500FAFAFAFAFAF9000002000000000001005055555555555500000000000000000039
+:20168500FAFAFAFAFAF9000002000000000001005055555555555500000000000000000019
+:2016A500FAFAF90000000000020000010000000050555555000000000000000000000000E6
+:2016C500C8C8C700000000000200000100000000505555550000000000000000000000005C
+:2016E500FAFAF90000000000020000010000000050555555000000000000000000000000A6
+:2017050096950000000000000200010000000000505555000000000000000000000000009C
+:20172500BBBB00000000000002000100000000005055550000000000000000000000000031
+:20174500020100000000000002000100000000005055550000000000000000000000000084
+:201765004B4A000000000000020001000000000050555500000000000000000000000000D2
+:201785002525000000000000020001000000000050555500000000000000000000000000FD
+:2017A50001000000000000000201000000000000505500000000000000000000000000007B
+:2017C5001E1D000000000000020001000000000050555500000000000000000000000000CC
+:2017E5000101000000000000020001000000000050555500000000000000000000000000E5
+:2018050025250000000000000200010000000000505555000000000000000000000000007C
+:20182500070700000000000002000100000000005055550000000000000000000000000098
+:201845000100000000000000020100000000000050550000000000000000000000000000DA
+:2018650005040000000000000200010000000000505555000000000000000000000000005D
+:201885008000000000000000030000000000000000000000000000000000000000000000C0
+:2018A50006050000000000000200010000000000505555000000000000000000000000001B
+:2018C500800000000000000003000000000000000000000000000000000000000000000080
+:2018E5000302000000000000020001000000000050555500000000000000000000000000E1
+:201905000202000000000000020001000000000050555500000000000000000000000000C1
+:201925000302000000000000020001000000000050555500000000000000000000000000A0
+:2019450030C51880EA1E851880AA18451880CA10E51780CA0FA517808A0C451780CA0A453B
+:2019650016808A08251980CA060519808A05E518808A04A51880CA036518808A0225188024
+:201985008A012516808AA40518808A96C517808A8C8517808A786517808A71251780CA6E96
+:2019A5000517808A6AE51680CA69C516808A68A516808A67851680CA666516808A30313208
+:0D19C5003334353637383941424344454606
:203D000012010002FFFFFF40B50422601002010203010A0600020000004001000902890016
:203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
@@ -131,167 +120,167 @@
:203DE0000403090416034F00700065006E00480061006E00740065006B00160344005300F9
:203E00004F002D003600300032003200420045001A03300030003000300030003000300068
:0C3E2000300030003000300030000000A6
-:200ABD0085822CE5272522FDE5283523FE752D02903C00E4F0903C00E06004758200229036
-:200ADD00E678E0FB7A0043038090E678EBF0E030E21090000AC006C005121535D005D00689
-:200AFD0080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E060047582BC
-:200B1D00002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E67805
-:200B3D00E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F5822290FF
-:200B5D00000AC006C005121535D005D006020AD27A007B00C3EA9DEB9E4003020C07C3EA31
-:200B7D009522EB95235016EA2524F8EB3525F9AC26888289838CF012169EFC801DEAC3952A
-:200B9D0022F8EB9523F9E82529F8E9352AF9AF2B888289838FF012169EFC90E679ECF00A0D
-:200BBD00BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E03058
-:200BDD00E203020AD290E678E020E18890E678E0FF43074090E678EFF090E678E030E606D0
-:200BFD00903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903CE6
-:200C1D0000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B5AF
-:200C3D002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E665
-:200C5D0078EBF0E030E20C90000AC006121535D00680D5E53325E0FB3395E0FA43030190AE
-:200C7D00E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E02033
-:200C9D00E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C00F4
-:200CBD00E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F53420
-:200CDD00F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E06009
-:200CFD00F3903C00E060047582002290E678E030E203020C4574022534F8E43535F9E8B5DA
-:200D1D002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B53402056A
-:200D3D0035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF012141A020CDFB5
-:200D5D0090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020C89
-:200D7D004590E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D8392
-:200D9D008FF012141A90E678E030E606903C00E060F3903C00E0600475820022758201224B
-:200DBD0085823DE4F541F542AB36AC37C3E5419538E54295394003020E4E7A0090E678E029
-:200DDD0030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF42057D
-:200DFD0041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF012169EF78A2275230040
-:200E1D0075243E752500752640E4F527F528F529F52AF52B853D82C004C003120ABDE582E4
-:200E3D00D003D0047003F582220BBB00010C020DC975820122AF827E0090E678E030E40686
-:200E5D007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E4C9
-:200E7D00F527F528F529F52AF52B8F82C007120ABDE582D0077003F5822285452E85462FD2
-:190E9D008547308548318549328F82120C2FE5827003F582227582012257
-:200EB600FB7A20E4FCFDFEFFE5822582F582E58333F583E5F033F5F0EB33FB4017DAE98075
-:200ED60042E5822582F582E58333F583E5F033F5F0EB33FBEC33FCED33FDEE33FEEF33FFA4
-:200EF600EC954CED954DEE954EEF954F4013EC954CFCED954DFDEE954EFEEF954FFF43824E
-:050F160001DABEEB2230
+:20093B0085822CE5272522FDE5283523FE752D02903C00E4F0903C00E060047582002290B9
+:20095B00E678E0FB7A0043038090E678EBF0E030E21090000AC006C0051213B3D005D00690
+:20097B0080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E0600475823F
+:20099B00002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E67889
+:2009BB00E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F582229083
+:2009DB00000AC006C0051213B3D005D0060209507A007B00C3EA9DEB9E4003020A85C3EA40
+:2009FB009522EB95235016EA2524F8EB3525F9AC26888289838CF012151CFC801DEAC39531
+:200A1B0022F8EB9523F9E82529F8E9352AF9AF2B888289838FF012151CFC90E679ECF00A13
+:200A3B00BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E030DB
+:200A5B00E20302095090E678E020E18890E678E0FF43074090E678EFF090E678E030E606D6
+:200A7B00903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903C69
+:200A9B0000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B533
+:200ABB002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E6E9
+:200ADB0078EBF0E030E20C90000AC0061213B3D00680D5E53325E0FB3395E0FA43030190B6
+:200AFB00E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E020B7
+:200B1B00E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C0077
+:200B3B00E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F534A3
+:200B5B00F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E0608C
+:200B7B00F3903C00E060047582002290E678E030E203020AC374022534F8E43535F9E8B5E1
+:200B9B002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B5340205EE
+:200BBB0035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF0121298020B5D40
+:200BDB0090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020A0F
+:200BFB00C390E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D8398
+:200C1B008FF012129890E678E030E606903C00E060F3903C00E06004758200227582012252
+:200C3B0085823DE4F541F542AB36AC37C3E5419538E54295394003020CCC7A0090E678E030
+:200C5B0030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF420500
+:200C7B0041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF012151CF78A2275230046
+:200C9B0075243E752500752640E4F527F528F529F52AF52B853D82C004C00312093BE582EB
+:200CBB00D003D0047003F582220BBB00010C020C4775820122AF827E0090E678E030E4068D
+:200CDB007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E44D
+:200CFB00F527F528F529F52AF52B8F82C00712093BE582D0077003F5822285452E85462FD9
+:190D1B008547308548318549328F82120AADE5827003F58222758201225E
+:200D3400FB7A20E4FCFDFEFFE5822582F582E58333F583E5F033F5F0EB33FB4017DAE980F8
+:200D540042E5822582F582E58333F583E5F033F5F0EB33FBEC33FCED33FDEE33FEEF33FF27
+:200D7400EC9518ED9519EE951AEF951B4013EC9518FCED9519FDEE951AFEEF951BFF438271
+:050D940001DABEEB22B4
:06008800E478FFF6D8FD4C
-:200F1B00FCABF0AA83A982749EF582C2D1EC30E716D2D1E9F42401F9EAF43400FAEBF434D5
-:0D0F3B0000FBECF43400FC12176C02158B67
-:200F4800121408C3749E95824039790012172930D126E9F42401F582EAF43400F583EBF422
-:200F68003400F5F0ECF43400700AE582458345F0700122E430E70F22EC20E71489828A8380
-:1B0F88008BF02230D10AE4F582F583F5F074802274FFF582F583F5F0747F227C
+:200D9900FCABF0AA83A982749EF582C2D1EC30E716D2D1E9F42401F9EAF43400FAEBF43459
+:0D0DB90000FBECF43400FC1215EA021409F2
+:200DC600121286C3749E9582403979001215A730D126E9F42401F582EAF43400F583EBF4AE
+:200DE6003400F5F0ECF43400700AE582458345F0700122E430E70F22EC20E71489828A8304
+:1B0E06008BF02230D10AE4F582F583F5F074802274FFF582F583F5F0747F22FF
:1200CE007512007513007514A675153D75161C75173DAB
-:200FA30090E6B9E0FF24F450030210D1EF240A83F582EF241083F583E473D5F1D10DD1D100
-:200FC30029D1395072AC0F0F10101010101010101010121153E58260030210ED90E6A0E07A
-:200FE300FF7E0043070190E6A0EFF00210ED1211E7E58260030210ED90E6A0E0FF7E0043A9
-:20100300070190E6A0EFF00210ED121262E58260030210ED90E6A0E0FF7E0043070190E64E
-:20102300A0EFF00210ED1206DEE58260030210ED1213230210ED1205CDAF8290E740EFF07E
-:2010430090E68AE4F090E68B04F00210ED90E6BAE0F5821205D1E58260030210ED90E6A077
-:20106300E0FF7E0043070190E6A0EFF00210ED90E6BCE0FF754C11754D00754E408F821206
-:2010830005AAE582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68A93
-:2010A300E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F821205BFE582702D90E6A07C
-:2010C300E0FF7E0043070190E6A0EFF0801C90E6B9E0F5821206E2E582700F90E6A0E0FF79
-:2010E3007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F7BD
-:20110300500302114FEE240A83F582EE240D83F583E473282C3F4F434F474F4B11111111F7
-:20112300111111111190E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A32207
-:2011430090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BFAA
-:20116300820280370211DF90E740E4F090E741F090E68AF090E68B7402F08064E51325E0D4
-:20118300FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F5C8
-:2011A300821210FBAE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F00AE
-:2011C30080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F080047582002276
-:2011E3007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BA36
-:20120300E0FFBF060280547582002290E6BAE0703D90E6BCE0F5821210FBAE82AF83E0FD96
-:201223005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E683B5
-:20124300EFF07E0043072090E683EFF0800D7582002290E6B9E0F5820206E275820122902C
-:20126300E6B8E0FF6008BF020280290212EB90E6BAE0FFBF02030212F490E6BAE0FFBF0171
-:2012830005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F582AF
-:2012A3001210FBAE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF09010
-:2012C300E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E6833A
-:2012E300EFF0800D7582002290E6B9E0F5820206E275820122AF827E0110AF027E00EF609E
-:201303000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF2200
-:2013230090E6BBE0FFBF01028019BF02028024BF0302802CBF06030213DDBF07030213EDE3
-:201343000213FA7E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F02241
-:201363007DE07E3D7F8090E6BAE0F54C7B008B020BEAB54C0280428D008E018F028D828EF6
-:20138300838FF012169E28F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF0C1
-:2013A30012169EF9B9030280067D007E007F00ED4E6006C3E54C9B50B5ED4E600F8D038EB0
-:2013C3000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6BF
-:2013E300B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF430701907A
-:05140300E6A0EFF0225D
-:200066007900E94400601B7A00901B44780175923CE493F2A308B800020592D9F4DAF275C1
+:200E210090E6B9E0FF24F45003020F4FEF240A83F582EF241083F583E473536F4F8B4F4F12
+:200E4100A74FB7CEF02A0E0E0F0E0F0F0E0F0E0E0E0F120FD1E5826003020F6B90E6A0E021
+:200E6100FF7E0043070190E6A0EFF0020F6B121065E5826003020F6B90E6A0E0FF7E0043B5
+:200E8100070190E6A0EFF0020F6B1210E0E5826003020F6B90E6A0E0FF7E0043070190E65C
+:200EA100A0EFF0020F6B1206DEE5826003020F6B1211A1020F6B1205CDAF8290E740EFF00F
+:200EC10090E68AE4F090E68B04F0020F6B90E6BAE0F5821205D1E5826003020F6B90E6A001
+:200EE100E0FF7E0043070190E6A0EFF0020F6B90E6BCE0FF751811751900751A408F8212A9
+:200F010005AAE582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68A16
+:200F2100E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F821205BFE582702D90E6A0FF
+:200F4100E0FF7E0043070190E6A0EFF0801C90E6B9E0F5821206E2E582700F90E6A0E0FFFC
+:200F61007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F740
+:200F81005003020FCDEE240A83F582EE240D83F583E473A6AABDCDC1CDC5CDC90F0F0F0F99
+:200FA1000F0F0F0F0F90E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A32295
+:200FC10090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BF2E
+:200FE1008202803702105D90E740E4F090E741F090E68AF090E68B7402F08064E51325E0DB
+:20100100FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F54B
+:2010210082120F79AE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F00B4
+:2010410080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F0800475820022F9
+:201061007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BAB9
+:20108100E0FFBF060280547582002290E6BAE0703D90E6BCE0F582120F79AE82AF83E0FD9D
+:2010A1005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E68339
+:2010C100EFF07E0043072090E683EFF0800D7582002290E6B9E0F5820206E27582012290B0
+:2010E100E6B8E0FF6008BF0202802902116990E6BAE0FFBF020302117290E6BAE0FFBF01FB
+:2011010005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F58232
+:20112100120F79AE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF09016
+:20114100E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E683BD
+:20116100EFF0800D7582002290E6B9E0F5820206E275820122AF827E0110AF027E00EF6021
+:201181000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF2284
+:2011A10090E6BBE0FFBF01028019BF02028024BF0302802CBF060302125BBF070302126B6D
+:2011C1000212787E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F02248
+:2011E1007DE07E3D7F8090E6BAE0F5187B008B020BEAB5180280428D008E018F028D828EE2
+:20120100838FF012151C28F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF0C7
+:2012210012151CF9B9030280067D007E007F00ED4E6006C3E5189B50B5ED4E600F8D038EEA
+:201241000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E642
+:20126100B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF43070190FD
+:05128100E6A0EFF022E1
+:200066007900E94400601B7A009019D2780175923CE493F2A308B800020592D9F4DAF27535
:0200860092FFE7
-:12140800AA82AB83A2F73392D1F5826002D2F7ACF022E9
-:1B141A0020F71130F6138883A88220F509F6A8837583002280FEF280F5F022D1
-:203F0000020153000217A5000216F6000202010002016B000201B6000216F3000215290008
-:203F200002152B0002152C0002152D00021530000217A4000217A60002143500021437005D
-:203F40000216F800021529000216BA000216F4000216F5000216F7000216F90002172800C5
-:203F60000215DA0002152900021529000215290002152A0002152E00021531000215330078
-:203F800002152F00021532000215340002158A000214A6000214D1000214D3000214D5002F
-:183FA0000214A7000214D2000214D40002152800021436000217A30033
-:011435003284
-:011436003283
-:011437003282
-:20143800AAF0FBE582854CF0A4FCADF0E583854CF0A42DFDE435F0FEE582854DF0A42DFDA5
-:20145800E5F03EFEE433FFEA854CF0A42EFEE5F03FFFE583854DF0A42EFEE5F03FFFE5824B
-:20147800854EF0A42EFEE5F03FFFEB854CF0A42FFFEA854DF0A42FFFE583854EF0A42FFFB5
-:0E149800E582854FF0A42F8EF08D838C82228A
-:0114A6003213
-:0114A7003212
+:12128600AA82AB83A2F73392D1F5826002D2F7ACF0226D
+:1B12980020F71130F6138883A88220F509F6A8837583002280FEF280F5F02255
+:203F00000201530002162300021574000202010002016B000201B600021571000213A70015
+:203F20000213A9000213AA000213AB000213AE0002162200021624000212B3000212B5007B
+:203F4000021576000213A70002153800021572000215730002157500021577000215A600DF
+:203F6000021458000213A7000213A7000213A7000213A8000213AC000213AF000213B10097
+:203F80000213AD000213B0000213B200021408000213240002134F0002135100021353004A
+:183FA0000213250002135000021352000213A6000212B4000216210047
+:0112B3003208
+:0112B4003207
+:0112B5003206
+:2012B600AAF0FBE5828518F0A4FCADF0E5838518F0A42DFDE435F0FEE5828519F0A42DFDC5
+:2012D600E5F03EFEE433FFEA8518F0A42EFEE5F03FFFE5838519F0A42EFEE5F03FFFE58237
+:2012F600851AF0A42EFEE5F03FFFEB8518F0A42FFFEA8519F0A42FFFE583851AF0A42FFF09
+:0E131600E582851BF0A42F8EF08D838C822241
+:011324003296
+:011325003295
:20008E007800E84400600A790075923CE4F309D8FC7801E84400600C7901903C00E4F0A306
:0400AE00D8FCD9FAA7
-:2014A8007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB954CF5F0EC954D4006D0
-:0914C800FCABF0438201DADD22E5
-:0114D10032E8
-:0114D20032E7
-:0114D30032E6
-:0114D40032E5
-:0114D50032E4
-:2014D600FBC2D530E715D2D5E4C39582F582E49583F583E495F0F5F0E49BFBE54F30E717BE
-:2014F600B2D5E4C3954CF54CE4954DF54DE4954EF54EE4954FF54FEB120EB630D513FBE4B0
-:12151600C39582F582E49583F583E495F0F5F0E49B220F
-:011528003290
-:01152900328F
-:01152A00328E
-:01152B00328D
-:01152C00328C
-:01152D00328B
-:01152E00328A
-:01152F003289
-:011530003288
-:011531003287
-:011532003286
-:011533003285
-:011534003284
-:20153500AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFBC6
-:20155500BB01067A617B0180047AC27B028A048B058C4C8D4D154C74FFB54C02154DE54CE6
-:15157500454D70F1EE24FFFAEF34FFFB8A068B07EA4B70DD2280
-:01158A00322E
-:20158B00B98003EA13B34010EA2401FAE43BFBE43CFC50047C800582BC000EBB000BBA00A4
-:2015AB0008E4F5F0F583F58222A2D1E582138CF092F78B838A8222E4F583F58275F080F464
-:0F15CB00A2D11322E4F583F58275F0C0747F225C
-:0115DA0032DE
-:2015DB001216FA30D502B2D1BF0009BC00030215CF0215C2BC00030215ACE583B4FF0BE571
-:2015FB0082B4FF030215CF0215ACE582B4FF030215C2C395835007247F400B0215AC248072
-:20161B001450030215C2F582C3ED9AEE9BEF9C40111582C3EA33F9EB33FAEC33FBE433FC94
-:20163B008005E4CCCBCAF9C08275F019C3E99DEA9EEB9FEC9400D5F002802D400EE99DF9F0
-:20165B00EA9EFAEB9FFBEC9400FCC3B3E833F8E58233F582E58333F583C3E933F9EA33FA50
-:20167B00EB33FBEC33FC80C4B3E4F938FAE43582FBE43583FCD082500405827C8012176C29
-:03169B000215A392
-:0D00590075815B12179FE58260030200565F
-:1C169E0020F71430F6148883A88220F507E6A88375830022E280F7E49322E0225B
-:0116BA0032FD
-:2016BB00C2D5E58330E70DD2D5E4C39582F582E49583F583E54D30E70DB2D5E4C3954CF542
-:1816DB004CE4954DF54D1214A830D50BE4C39582F582E49583F58322FA
-:0116F30032C4
-:0116F40032C3
-:0116F50032C2
-:0116F60032C1
-:0116F70032C0
-:0116F80032BF
-:0116F90032BE
-:2016FA00AA82AB83A2F73392D1F5826002D2F7ACF0E58124F9F8E6FD08E6FE0886F008E653
-:0E171A00A2F73392D5F5836002D2F7AFF0222A
-:01172800328E
-:201729006040F82582500274FFF582E824F8501ECCCBCAF9E4CC24F85014CBCAF9E4CB24C8
-:20174900F8500BCAF9E4CA24F8500379002224086010F8C3EC13FCEB13FBEA13FAE913F97B
-:03176900D8F12292
-:20176C007804EC7011E58224F8500AF582E4C9CACBFCD8EF22EC7820058220E713D582017C
-:13178C0022C3E933F9EA33FAEB33FBEC33FCD8EA1582228A
-:04179F00758200222D
-:0117A3003213
-:0117A4003212
-:0117A5003211
-:0117A6003210
+:201326007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB9518F5F0EC95194006BB
+:09134600FCABF0438201DADD2268
+:01134F00326B
+:01135000326A
+:011351003269
+:011352003268
+:011353003267
+:20135400FBC2D530E715D2D5E4C39582F582E49583F583E495F0F5F0E49BFBE51B30E71775
+:20137400B2D5E4C39518F518E49519F519E4951AF51AE4951BF51BEB120D3430D513FBE456
+:12139400C39582F582E49583F583E495F0F5F0E49B2293
+:0113A6003214
+:0113A7003213
+:0113A8003212
+:0113A9003211
+:0113AA003210
+:0113AB00320F
+:0113AC00320E
+:0113AD00320D
+:0113AE00320C
+:0113AF00320B
+:0113B000320A
+:0113B1003209
+:0113B2003208
+:2013B300AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFB4A
+:2013D300BB01067A617B0180047AC27B028A048B058C188D19151874FFB518021519E518A2
+:1513F300451970F1EE24FFFAEF34FFFB8A068B07EA4B70DD2238
+:0114080032B1
+:20140900B98003EA13B34010EA2401FAE43BFBE43CFC50047C800582BC000EBB000BBA0027
+:2014290008E4F5F0F583F58222A2D1E582138CF092F78B838A8222E4F583F58275F080F4E7
+:0F144900A2D11322E4F583F58275F0C0747F22DF
+:011458003261
+:2014590012157830D502B2D1BF0009BC000302144D021440BC000302142AE583B4FF0BE500
+:2014790082B4FF0302144D02142AE582B4FF03021440C395835007247F400B02142A248001
+:20149900145003021440F582C3ED9AEE9BEF9C40111582C3EA33F9EB33FAEC33FBE433FC9B
+:2014B9008005E4CCCBCAF9C08275F019C3E99DEA9EEB9FEC9400D5F002802D400EE99DF974
+:2014D900EA9EFAEB9FFBEC9400FCC3B3E833F8E58233F582E58333F583C3E933F9EA33FAD4
+:2014F900EB33FBEC33FC80C4B3E4F938FAE43582FBE43583FCD082500405827C801215EA31
+:0315190002142198
+:0D00590075814B12161DE5826003020056F2
+:1C151C0020F71430F6148883A88220F507E6A88375830022E280F7E49322E022DE
+:011538003280
+:20153900C2D5E58330E70DD2D5E4C39582F582E49583F583E51930E70DB2D5E4C39518F52D
+:1815590018E49519F51912132630D50BE4C39582F582E49583F583229C
+:011571003247
+:011572003246
+:011573003245
+:011574003244
+:011575003243
+:011576003242
+:011577003241
+:20157800AA82AB83A2F73392D1F5826002D2F7ACF0E58124F9F8E6FD08E6FE0886F008E6D6
+:0E159800A2F73392D5F5836002D2F7AFF022AE
+:0115A6003212
+:2015A7006040F82582500274FFF582E824F8501ECCCBCAF9E4CC24F85014CBCAF9E4CB244C
+:2015C700F8500BCAF9E4CA24F8500379002224086010F8C3EC13FCEB13FBEA13FAE913F9FF
+:0315E700D8F12216
+:2015EA007804EC7011E58224F8500AF582E4C9CACBFCD8EF22EC7820058220E713D5820100
+:13160A0022C3E933F9EA33FAEB33FBEC33FCD8EA1582220D
+:04161D0075820022B0
+:011621003296
+:011622003295
+:011623003294
+:011624003293
:00000001FF
diff --git a/openhantek/res/firmware/dso6022bl-firmware.hex b/openhantek/res/firmware/dso6022bl-firmware.hex
index a4be312c..d05eafbc 100644
--- a/openhantek/res/firmware/dso6022bl-firmware.hex
+++ b/openhantek/res/firmware/dso6022bl-firmware.hex
@@ -11,19 +11,19 @@
:03005300023F0069
:1C00B200750800750900750A02750B00750CF4750D01750EF4750F01C200C201BD
:0300E000020056C5
-:030056000207DAC4
+:0300560002083D60
:2000E300E582FF30E00543B10A800353B1F5EF30E40543B101800353B1FE75820122AF823B
-:200103007401B54C0280157402B54C0280127405B54C02800F740AB54C12800C7E2480106A
+:200103007401B5180280157402B5180280127405B51802800F740AB51812800C7E2480103A
:200123007E12800C7E0080087E36800475820022EF60067D707F0080047D0E7F00EDF4FF1A
:20014300E5805207ED5E4FF58075820122C2DC32C0E0C082C083D2005391EF90E65D7401D3
:20016300F0D083D082D0E032C021C0E0C0F0C082C083C007C006C005C004C003C002C001F3
-:20018300C000C0D075D0007582001212FD5391EF90E65D7410F0D0D0D000D001D002D003AF
+:20018300C000C0D075D00075820012117B5391EF90E65D7410F0D0D0D000D001D002D00332
:2001A300D004D005D006D007D083D082D0F0D0E0D02132C021C0E0C0F0C082C083C007C071
-:2001C30006C005C004C003C002C001C000C0D075D0007582011212FD5391EF90E65D74205F
+:2001C30006C005C004C003C002C001C000C0D075D00075820112117B5391EF90E65D7420E2
:2001E300F0D0D0D000D001D002D003D004D005D006D007D083D082D0F0D0E0D02132C0E0F8
:20020300C082C083D2015391EF90E65D7408F0D083D082D0E032C0E0C0D0B2A2E50E450F1F
:200223006019150E74FFB50E02150FE50E450F700A850C0E850D0FB2A0D2A1C2CFD0D0D0FC
-:20024300E032850A4C754D00905DC01216C0AE82AF83AC097D00C3EC9EED64808FF063F0D3
+:20024300E032850A18751900905DC012153EAE82AF83AC097D00C3EC9EED64808FF063F0BE
:200263008095F0400990E640E053E07FF02290E640E043E080F02285820A7401B50A0280C1
:20028300057402B50A18AF0A74072FF50B90E618F090E61AE50BF01202457582012275824E
:2002A300002290E6F574FFF000000000E5BB30E7FB90E6047480F00000000090E618E4F0D9
@@ -33,93 +33,82 @@
:20032300031EBEFF011FEE4F70F7E5BB30E7FB0000000090E6D07428F00000000090E6D14D
:20034300E4F0E50870057E06FF80047E047F008EBB22AF8290E680E030E7067D1C7E3D80F9
:20036300047DA67E3DEF75F010A42416FBE435F0FCEB2DFDEC3EFC7E80EFF508703590E616
-:2003830012E4F090E61474E0F090E6E27401F08D828C838EF01216A390E625F074012DFA5B
-:2003A300E43CFB8E078A828B838FF01216A390E624F02290E61274D8F090E614E4F090E6E2
-:2003C300D204F08D828C838EF01216A390E621F00DBD00010C8D828C838EF01216A3FF9099
-:2003E300E62074075FF08D828C838EF01216A3C423541F90E64004F0020245AF827E00EED9
-:2004030075F005A4FCADF024CCF582ED341AF583E493FBB5070280080EBE19E3758200227F
-:20042300EC24CCFCED341AFD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E465
-:2004430093FEA3E493FF75AF07759DE4759E007C208C031CEB60168D828E838FF01216A3A9
+:2003830012E4F090E61474E0F090E6E27401F08D828C838EF012152190E625F074012DFADE
+:2003A300E43CFB8E078A828B838FF012152190E624F02290E61274D8F090E614E4F090E665
+:2003C300D204F08D828C838EF012152190E621F00DBD00010C8D828C838EF0121521FF909F
+:2003E300E62074075FF08D828C838EF0121521C423541F90E64004F0020245AF827E00EE5C
+:2004030075F005A4FCADF0244AF582ED3419F583E493FBB5070280080EBE19E37582002202
+:20042300EC244AFCED3419FD8C828D83A3A3A3A3E49390E601F08C828D83A3E493FDA3E4E8
+:2004430093FEA3E493FF75AF07759DE4759E007C208C031CEB60168D828E838FF01215212C
:20046300FBA3AD82AE8390E67CEBF080E47F608F061FEE600790E67CE4F080F3758201220F
-:20048300E582FF70087B64FCFDFE020510EF249B401D8F4C754D00754E00754F009003E8E4
-:2004A300E4F5F012143DAB82AC83ADF0FE805EBF670A7B207C007D007E008051EF2437409B
-:2004C300288F017A00E9249CF9EA34FF894CF54D3395E0F54EF54F90000AE4F5F012143D1C
-:2004E300AB82AC83ADF0FE80247A00EF2438FFEA34FF8F4CF54D3395E0F54EF54F9000643D
-:20050300E4F5F012143DAB82AC83ADF0FEC3EB9420EC9400ED9400EE64809480401474A004
-:200523009B74869C74019D74808EF063F08095F0500475820022754C02E4F54DF54EF54FCE
-:200543008B828C838DF0EEC006C005C004C0031214DBA882A983D003D004D005D006880CC2
-:20056300890D8B828C838DF0EE120F20AC82AD83AEF0FFC004C005C006C00790240075F0F0
-:20058300F474C91215E0AC82AD83AEF0FFE58124FCF5818C828D838EF0EF120F4DAC82AD55
-:2005A300838CCA8DCB75820122AD4CAE4DAF4E8D828E838FF0E50812141F75820122E582AA
+:20048300E582FF70087B64FCFDFE020510EF249B401D8F18751900751A00751B009003E8B4
+:2004A300E4F5F01212BBAB82AC83ADF0FE805EBF670A7B207C007D007E008051EF2437401F
+:2004C300288F017A00E9249CF9EA34FF8918F5193395E0F51AF51B90000AE4F5F01212BB70
+:2004E300AB82AC83ADF0FE80247A00EF2438FFEA34FF8F18F5193395E0F51AF51B9000640D
+:20050300E4F5F01212BBAB82AC83ADF0FEC3EB9420EC9400ED9400EE64809480401474A088
+:200523009B74869C74019D74808EF063F08095F0500475820022751802E4F519F51AF51B9E
+:200543008B828C838DF0EEC006C005C004C003121359A882A983D003D004D005D006880C45
+:20056300890D8B828C838DF0EE120D9EAC82AD83AEF0FFC004C005C006C00790240075F074
+:20058300F474C912145EAC82AD83AEF0FFE58124FCF5818C828D838EF0EF120DCBAC82AD5C
+:2005A300838CCA8DCB75820122AD18AE19AF1A8D828E838FF0E50812129D75820122E582CA
:2005C300700685108212035575820122758200227582012290E6BBE0FE7F0090E6BAE07CBA
:2005E300004207EC420690E6BFE0FC7D0090E6BEE07A004205EA420490E6A0E020E1F99068
:20060300E6B8E0FBBB40028073BBC00280030206D8ED4C70030206DCC374409DE49C500614
:200623007A407B0080048D028C0390E6A0E020E1F98A457546007547407548E77549008F79
-:20064300438E44758251C007C006C005C004C002120E57D002D004D005D006D00790E68AC3
+:20064300438E44758251C007C006C005C004C002120CD5D002D004D005D006D00790E68A47
:20066300E4F00000000090E68BEAF07B00EDC39AFDEC9BFCEA2FFFEB3EFE8095ED4C60593D
:2006830090E68BE4F090E6A0E020E1F990E68BE0FB8B38753900753A40753BE7753C008F7F
-:2006A300368E37758251C007C006C005C004C003120DC2E582D003D004D005D006D007703A
+:2006A300368E37758251C007C006C005C004C003120C40E582D003D004D005D006D00770BD
:2006C30003F582227A00EB2FFFEA3EFEEDC39BFDEC9AFC80A77582002275820122758200A7
:2006E30022AF82C0071202FED007C2A0D2A1850C0E850D0FBFE0004015EF2419401090E6F9
:200703008AE4F090E68BF090E6A0E020E1F9BFA2028023BFE0028021BFE1028028BFE20262
-:20072300802FBFE3028033BFE4028046BFE502804ABFE659804E0205D790E740E0F54C75DE
-:20074300820002010190E740E0F54C75820102010190E740E0F5820203FE90E740E0FFBFD6
+:20072300802FBFE3028033BFE4028046BFE502804ABFE659804E0205D790E740E0F5187512
+:20074300820002010190E740E0F51875820102010190E740E0F5820203FE90E740E0FFBF0A
:20076300010CD2A0C2A1E4F50EF50F12031B7582012290E740E0F58202027A90E740E0F547
:20078300820200E390E740E0F5820204837582002290E613E4F090E615F0D28790E6C2E4F2
-:2007A300F090E6C37480F090E6C0E4F090E6F4F01202FE754C01758200120101754C0175AF
-:2007C30082011201017582011203FE75820212027A75820002035590E600E054E74410F0C7
-:2007E3001208DD120794D2E890E668E043E008F090E65CE043E001F090E65CE043E010F024
-:2008030090E65CE043E020F090E65CE043E008F0D2DDD2AF75CA3075CBF875C800D2ADD2BE
-:20082300CA90E680E043E00AF09005DC12153A90E680E053E0F7F090E6727404F090E671FF
-:20084300E4F090E670F075B10BF5A0F58075B6FF75B4FF75B2FFC2A0D2A1100002800312BC
-:200863000FA810010280F390E682E043E0C0F090E6817401F043870100000000000000E581
-:2008830013701C90E682E030E60790E682E020E0D690E682E030E70790E682E020E1C890EC
-:2008A300E682E030E60790E682E020E00E90E682E030E7A690E682E030E19F900005121511
-:2008C3003A90E680E043E001F090000F12153A90E680E053E0FEF002085D7E107F3E754C87
-:2008E30030754D31754E32754F337550347551357552367553377554387555397556417571
-:200903005742755843755944755A45755B4674182EFCE43FFD90E507E0FB5303F0E4C4CB09
-:20092300C4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF074162EFCE43B
-:200943003FFD90E507E0FB53030FEB244CF987038C828D83EBF074142EFCE43FFD90E50876
-:20096300E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D5D
-:2009830083EBF074122EFCE43FFD90E508E0FB53030FEB244CF987038C828D83EBF074100E
-:2009A3002EFCE43FFD90E509E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EBE3
-:2009C300244CF987038C828D83EBF0740E2EFCE43FFD90E509E0FB53030FEB244CF98703C0
-:2009E3008C828D83EBF0740C2EFCE43FFD90E50AE0FB5303F0E4C4CBC4540F6BCB540FCB93
-:200A03006BCB30E30244F0EB244CF987038C828D83EBF0740A2EFCE43FFD90E50AE0FB5308
-:200A2300030FEB244CF987038C828D83EBF074082EFCE43FFD90E50BE0FB5303F0E4C4CBF0
-:200A4300C4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D83EBF074062EFCE42A
-:200A63003FFD90E50BE0FB53030FEB244CF987038C828D83EBF074042EFCE43FFD90E50C5D
-:200A8300E0FB5303F0E4C4CBC4540F6BCB540FCB6BCB30E30244F0EB244CF987038C828D3C
-:1F0AA30083EBF074022EFEE43FFF90E50CE0FD53050FED244CF987058E828F83EDF0224A
-:2017AC000F0E00000000000002000100000000005055550000000000000000000000000003
-:2017CC000101000000000000020001000000000050555500000000000000000000000000FE
-:2017EC00FAFAFAFAFAF90000020000000000010050555555555555000000000000000000B1
-:20180C00FAFAFAFAFAF9000002000000000001005055555555555500000000000000000090
-:20182C00FAFAF900000000000200000100000000505555550000000000000000000000005D
-:20184C00C8C8C70000000000020000010000000050555555000000000000000000000000D3
-:20186C00FAFAF900000000000200000100000000505555550000000000000000000000001D
-:20188C00969500000000000002000100000000005055550000000000000000000000000014
-:2018AC00BBBB000000000000020001000000000050555500000000000000000000000000A9
-:2018CC000201000000000000020001000000000050555500000000000000000000000000FC
-:2018EC004B4A0000000000000200010000000000505555000000000000000000000000004A
-:20190C00252500000000000002000100000000005055550000000000000000000000000074
-:20192C000100000000000000020100000000000050550000000000000000000000000000F2
-:20194C001E1D00000000000002000100000000005055550000000000000000000000000043
-:20196C0001010000000000000200010000000000505555000000000000000000000000005C
-:20198C002525000000000000020001000000000050555500000000000000000000000000F4
-:2019AC00070700000000000002000100000000005055550000000000000000000000000010
-:2019CC00010000000000000002010000000000005055000000000000000000000000000052
-:2019EC000504000000000000020001000000000050555500000000000000000000000000D5
-:201A0C00800000000000000003000000000000000000000000000000000000000000000037
-:201A2C00060500000000000002000100000000005055550000000000000000000000000092
-:201A4C008000000000000000030000000000000000000000000000000000000000000000F7
-:201A6C00030200000000000002000100000000005055550000000000000000000000000058
-:201A8C00020200000000000002000100000000005055550000000000000000000000000039
-:201AAC00030200000000000002000100000000005055550000000000000000000000000018
-:201ACC00304C1A80EA1E0C1A80AA18CC1980CA106C1980CA0F2C19808A0CCC1880CA0ACCF8
-:201AEC0017808A08AC1A80CA068C1A808A056C1A808A042C1A80CA03EC19808A02AC198069
-:201B0C008A01AC17808AA48C19808A964C19808A8C0C19808A78EC18808A71AC1880CA6EDB
-:1D1B2C008C18808A6A6C1880CA694C18808A682C18808A670C1880CA66EC17808AE1
+:2007A300F090E6C37480F090E6C0E4F090E6F4F01202FE7518017582001201017518017517
+:2007C30082011201017582011203FE75820212027A7582000203557E107F3E751806AC18FA
+:2007E3001518EC605474022EFBE43FFC8B018C02E5182407F582E434E5F583E0F853000F03
+:200803007D00E824C7F582ED3419F583E49389828A83F074022BFBE43CFC8B068C07E51804
+:200823002407F582E434E5F583E0C4540F9019C793FD8B828C83F080A52290E600E054E7B3
+:200843004410F01207DA120794D2E890E668E043E008F090E65CE043E001F090E65CE04363
+:20086300E010F090E65CE043E020F090E65CE043E008F0D2DDD2AF75CA3075CBF875C800CF
+:20088300D2ADD2CA90E680E043E00AF09005DC1213B890E680E053E0F7F090E6727404F0B9
+:2008A30090E671E4F090E670F075B10BF5A0F58075B6FF75B4FF75B2FFC2A0D2A11000020A
+:2008C3008003120E2610010280F390E682E043E0C0F090E6817401F04387010000000000F4
+:2008E3000000E513701C90E682E030E60790E682E020E0D690E682E030E70790E682E020E0
+:20090300E1C890E682E030E60790E682E020E00E90E682E030E7A690E682E030E19F9000A3
+:1D092300051213B890E680E043E001F090000F1213B890E680E053E0FEF00208C0AE
+:20162A000F0E00000000000002000100000000005055550000000000000000000000000086
+:20164A00010100000000000002000100000000005055550000000000000000000000000081
+:20166A00FAFAFAFAFAF9000002000000000001005055555555555500000000000000000034
+:20168A00FAFAFAFAFAF9000002000000000001005055555555555500000000000000000014
+:2016AA00FAFAF90000000000020000010000000050555555000000000000000000000000E1
+:2016CA00C8C8C7000000000002000001000000005055555500000000000000000000000057
+:2016EA00FAFAF90000000000020000010000000050555555000000000000000000000000A1
+:20170A00969500000000000002000100000000005055550000000000000000000000000097
+:20172A00BBBB0000000000000200010000000000505555000000000000000000000000002C
+:20174A0002010000000000000200010000000000505555000000000000000000000000007F
+:20176A004B4A000000000000020001000000000050555500000000000000000000000000CD
+:20178A002525000000000000020001000000000050555500000000000000000000000000F8
+:2017AA00010000000000000002010000000000005055000000000000000000000000000076
+:2017CA001E1D000000000000020001000000000050555500000000000000000000000000C7
+:2017EA000101000000000000020001000000000050555500000000000000000000000000E0
+:20180A00252500000000000002000100000000005055550000000000000000000000000077
+:20182A00070700000000000002000100000000005055550000000000000000000000000093
+:20184A000100000000000000020100000000000050550000000000000000000000000000D5
+:20186A00050400000000000002000100000000005055550000000000000000000000000058
+:20188A008000000000000000030000000000000000000000000000000000000000000000BB
+:2018AA00060500000000000002000100000000005055550000000000000000000000000016
+:2018CA0080000000000000000300000000000000000000000000000000000000000000007B
+:2018EA000302000000000000020001000000000050555500000000000000000000000000DC
+:20190A000202000000000000020001000000000050555500000000000000000000000000BC
+:20192A0003020000000000000200010000000000505555000000000000000000000000009B
+:20194A0030CA1880EA1E8A1880AA184A1880CA10EA1780CA0FAA17808A0C4A1780CA0A4A13
+:20196A0016808A082A1980CA060A19808A05EA18808A04AA1880CA036A18808A022A188001
+:20198A008A012A16808AA40A18808A96CA17808A8C8A17808A786A17808A712A1780CA6E73
+:2019AA000A17808A6AEA1680CA69CA16808A68AA16808A678A1680CA666A16808A303132E5
+:0D19CA003334353637383941424344454601
:203D000012010002FFFFFF40B5042A601002010203010A060002000000400100090289000E
:203D200001010080FA0904000001FF000000070586020002000904000101FF000100070549
:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
@@ -131,167 +120,167 @@
:203DE0000403090416034F00700065006E00480061006E00740065006B00160344005300F9
:203E00004F002D00360030003200320042004C001A03300030003000300030003000300061
:0C3E2000300030003000300030000000A6
-:200AC20085822CE5272522FDE5283523FE752D02903C00E4F0903C00E06004758200229031
-:200AE200E678E0FB7A0043038090E678EBF0E030E21090000AC006C00512153AD005D0067F
-:200B020080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E060047582B6
-:200B2200002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E67800
-:200B4200E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F5822290FA
-:200B6200000AC006C00512153AD005D006020AD77A007B00C3EA9DEB9E4003020C0CC3EA1D
-:200B82009522EB95235016EA2524F8EB3525F9AC26888289838CF01216A3FC801DEAC39520
-:200BA20022F8EB9523F9E82529F8E9352AF9AF2B888289838FF01216A3FC90E679ECF00A03
-:200BC200BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E03053
-:200BE200E203020AD790E678E020E18890E678E0FF43074090E678EFF090E678E030E606C6
-:200C0200903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903CE0
-:200C220000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B5AA
-:200C42002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E660
-:200C620078EBF0E030E20C90000AC00612153AD00680D5E53325E0FB3395E0FA43030190A4
-:200C8200E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E0202E
-:200CA200E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C00EF
-:200CC200E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F5341B
-:200CE200F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E06004
-:200D0200F3903C00E060047582002290E678E030E203020C4A74022534F8E43535F9E8B5CF
-:200D22002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B534020565
-:200D420035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF012141F020CE4A6
-:200D620090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020C84
-:200D82004A90E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D8388
-:200DA2008FF012141F90E678E030E606903C00E060F3903C00E06004758200227582012241
-:200DC20085823DE4F541F542AB36AC37C3E5419538E54295394003020E537A0090E678E01F
-:200DE20030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF420578
-:200E020041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF01216A3F78A2275230035
-:200E220075243E752500752640E4F527F528F529F52AF52B853D82C004C003120AC2E582DA
-:200E4200D003D0047003F582220BBB00010C020DCE75820122AF827E0090E678E030E4067C
-:200E62007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E4C4
-:200E8200F527F528F529F52AF52B8F82C007120AC2E582D0077003F5822285452E85462FC8
-:190EA2008547308548318549328F82120C34E5827003F58222758201224D
-:200EBB00FB7A20E4FCFDFEFFE5822582F582E58333F583E5F033F5F0EB33FB4017DAE98070
-:200EDB0042E5822582F582E58333F583E5F033F5F0EB33FBEC33FCED33FDEE33FEEF33FF9F
-:200EFB00EC954CED954DEE954EEF954F4013EC954CFCED954DFDEE954EFEEF954FFF438249
-:050F1B0001DABEEB222B
+:2009400085822CE5272522FDE5283523FE752D02903C00E4F0903C00E060047582002290B4
+:20096000E678E0FB7A0043038090E678EBF0E030E21090000AC006C0051213B8D005D00686
+:2009800080D3E52C25E0FB90E679F090E678E020E006903C00E060F3903C00E0600475823A
+:2009A000002290E678E020E2AC90E678E020E14090E678E0FB43034090E678EBF090E67884
+:2009C000E030E606903C00E060F3903C00E0600475820022E52D14FB8B2D7003F58222907E
+:2009E000000AC006C0051213B8D005D0060209557A007B00C3EA9DEB9E4003020A8AC3EA2C
+:200A00009522EB95235016EA2524F8EB3525F9AC26888289838CF0121521FC801DEAC39526
+:200A200022F8EB9523F9E82529F8E9352AF9AF2B888289838FF0121521FC90E679ECF00A09
+:200A4000BA00010B90E678E020E006903C00E060F3903C00E060047582002290E678E030D6
+:200A6000E20302095590E678E020E18890E678E0FF43074090E678EFF090E678E030E606CC
+:200A8000903C00E060F37582002290E678E0FF43074090E678EFF090E678E030E606903C64
+:200AA00000E060F3903C00E060047582002275820122858233903C00E4F004B52E0814B52E
+:200AC0002F0474018001E4FE903C00E06004758200227C007D0090E678E0FB43038090E6E4
+:200AE00078EBF0E030E20C90000AC0061213B8D00680D5E53325E0FB3395E0FA43030190AC
+:200B0000E679EBF090E678E020E006903C00E060F3903C00E060047582002290E678E020B1
+:200B2000E2A690E678E020E11E90E678E0FB43034090E678EBF090E678E030E606903C0072
+:200B4000E060F375820022EE600F90E678E0FB7A0043032090E678EBF090E679E0E4F5349E
+:200B6000F53574012534F8E43535F9C3E8952EE9952F506C90E678E020E006903C00E06087
+:200B8000F3903C00E060047582002290E678E030E203020AC874022534F8E43535F9E8B5D7
+:200BA0002E13E9B52F0F90E678E0F8790043002090E678E8F0A834A9350534E4B5340205E9
+:200BC00035AC34AD35E82530F8E93531F9AF3290E679E0FB888289838FF012129D020B6231
+:200BE00090E678E020E006903C00E060F3903C00E060047582002290E678E030E203020A0A
+:200C0000C890E678E0FF43074090E678EFF0EC2530FCED3531FDAF3290E679E08C828D838D
+:200C20008FF012129D90E678E030E606903C00E060F3903C00E06004758200227582012248
+:200C400085823DE4F541F542AB36AC37C3E5419538E54295394003020CD17A0090E678E026
+:200C600030E4067A018C078F3EEA04FFEA243EF98B02A702EF04FAEF243EF9AE41AF4205FB
+:200C800041E4B541020542EE253AFEEF353BFFAD3C8E828F838DF0121521F78A227523003C
+:200CA00075243E752500752640E4F527F528F529F52AF52B853D82C004C003120940E582E1
+:200CC000D003D0047003F582220BBB00010C020C4C75820122AF827E0090E678E030E40683
+:200CE0007E01AD448D4AEE04FDEE244AF9AE43A7068D2275230075244A752500752640E448
+:200D0000F527F528F529F52AF52B8F82C007120940E582D0077003F5822285452E85462FCE
+:190D20008547308548318549328F82120AB2E5827003F582227582012254
+:200D3900FB7A20E4FCFDFEFFE5822582F582E58333F583E5F033F5F0EB33FB4017DAE980F3
+:200D590042E5822582F582E58333F583E5F033F5F0EB33FBEC33FCED33FDEE33FEEF33FF22
+:200D7900EC9518ED9519EE951AEF951B4013EC9518FCED9519FDEE951AFEEF951BFF43826C
+:050D990001DABEEB22AF
:06008800E478FFF6D8FD4C
-:200F2000FCABF0AA83A982749EF582C2D1EC30E716D2D1E9F42401F9EAF43400FAEBF434D0
-:0D0F400000FBECF43400FC12177102159058
-:200F4D0012140DC3749E95824039790012172E30D126E9F42401F582EAF43400F583EBF413
-:200F6D003400F5F0ECF43400700AE582458345F0700122E430E70F22EC20E71489828A837B
-:1B0F8D008BF02230D10AE4F582F583F5F074802274FFF582F583F5F0747F2277
+:200D9E00FCABF0AA83A982749EF582C2D1EC30E716D2D1E9F42401F9EAF43400FAEBF43454
+:0D0DBE0000FBECF43400FC1215EF02140EE3
+:200DCB0012128BC3749E9582403979001215AC30D126E9F42401F582EAF43400F583EBF49F
+:200DEB003400F5F0ECF43400700AE582458345F0700122E430E70F22EC20E71489828A83FF
+:1B0E0B008BF02230D10AE4F582F583F5F074802274FFF582F583F5F0747F22FA
:1200CE007512007513007514A675153D75161C75173DAB
-:200FA80090E6B9E0FF24F450030210D6EF240A83F582EF241083F583E473DAF6D612D6D6D8
-:200FC8002ED63E5577B10F0F10101010101010101010121158E58260030210F290E6A0E04D
-:200FE800FF7E0043070190E6A0EFF00210F21211ECE58260030210F290E6A0E0FF7E004395
-:20100800070190E6A0EFF00210F2121267E58260030210F290E6A0E0FF7E0043070190E63A
-:20102800A0EFF00210F21206E0E58260030210F21213280210F21205CFAF8290E740EFF061
-:2010480090E68AE4F090E68B04F00210F290E6BAE0F5821205D3E58260030210F290E6A066
-:20106800E0FF7E0043070190E6A0EFF00210F290E6BCE0FF754C11754D00754E408F8212FC
-:2010880005ACE582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68A8C
-:2010A800E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F821205C1E582702D90E6A075
-:2010C800E0FF7E0043070190E6A0EFF0801C90E6B9E0F5821206E4E582700F90E6A0E0FF72
-:2010E8007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F7B8
-:201108005003021154EE240A83F582EE240D83F583E4732D31445448544C545011111111C0
-:20112800111111111190E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A32202
-:2011480090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BFA5
-:20116800820280370211E490E740E4F090E741F090E68AF090E68B7402F08064E51325E0CA
-:20118800FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F5C3
-:2011A80082121100AE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F00A3
-:2011C80080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F080047582002271
-:2011E8007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BA31
-:20120800E0FFBF060280547582002290E6BAE0703D90E6BCE0F582121100AE82AF83E0FD8B
-:201228005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E683B0
-:20124800EFF07E0043072090E683EFF0800D7582002290E6B9E0F5820206E4758201229025
-:20126800E6B8E0FF6008BF020280290212F090E6BAE0FFBF02030212F990E6BAE0FFBF0162
-:2012880005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F582AA
-:2012A800121100AE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF09005
-:2012C800E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E68335
-:2012E800EFF0800D7582002290E6B9E0F5820206E475820122AF827E0110AF027E00EF6097
-:201308000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF22FB
-:2013280090E6BBE0FFBF01028019BF02028024BF0302802CBF06030213E2BF07030213F2D4
-:201348000213FF7E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F02237
-:201368007DE07E3D7F8090E6BAE0F54C7B008B020BEAB54C0280428D008E018F028D828EF1
-:20138800838FF01216A328F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF0B7
-:2013A8001216A3F9B9030280067D007E007F00ED4E6006C3E54C9B50B5ED4E600F8D038EA6
-:2013C8000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E6BA
-:2013E800B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF4307019075
-:05140800E6A0EFF02258
-:200066007900E94400601B7A00901B49780175923CE493F2A308B800020592D9F4DAF275BC
+:200E260090E6B9E0FF24F45003020F54EF240A83F582EF241083F583E473587454905454EA
+:200E4600AC54BCD3F52F0E0E0F0E0F0F0E0F0E0E0E0F120FD6E5826003020F7090E6A0E0F4
+:200E6600FF7E0043070190E6A0EFF0020F7012106AE5826003020F7090E6A0E0FF7E0043A1
+:200E8600070190E6A0EFF0020F701210E5E5826003020F7090E6A0E0FF7E0043070190E648
+:200EA600A0EFF0020F701206E0E5826003020F701211A6020F701205CFAF8290E740EFF0F2
+:200EC60090E68AE4F090E68B04F0020F7090E6BAE0F5821205D3E5826003020F7090E6A0F0
+:200EE600E0FF7E0043070190E6A0EFF0020F7090E6BCE0FF751811751900751A408F82129F
+:200F060005ACE582701190E6A0E0FF7E0043070190E6A0EFF0805390E740E511F090E68A0F
+:200F2600E4F090E68B04F0804190E6BCE0FF90E6BAE0F5108F821205C1E582702D90E6A0F8
+:200F4600E0FF7E0043070190E6A0EFF0801C90E6B9E0F5821206E4E582700F90E6A0E0FFF5
+:200F66007E0043070190E6A0EFF090E6A0E0FF43078090E6A0EFF022AF82747F5FFE24F73B
+:200F86005003020FD2EE240A83F582EE240D83F583E473ABAFC2D2C6D2CAD2CE0F0F0F0F62
+:200FA6000F0F0F0F0F90E6A022EF30E7067EA27FE680047EA17FE68E828F832290E6A32290
+:200FC60090E6A42290E6A52290E6A6229000002290E6B8E0FFBF80028022BF81028008BF29
+:200FE6008202803702106290E740E4F090E741F090E68AF090E68B7402F08064E51325E0D1
+:20100600FFE512420790E740EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F546
+:2010260082120F7EAE82AF838E048F05EE4F7003F582228C828D83E0FC30E0067E017F00AA
+:2010460080047E007F0090E740EEF090E741E4F090E68AF090E68B7402F0800475820022F4
+:201066007582012290E6B8E0FF6005BF0264801B90E6BAE0FFBF0105751300805E90E6BAB4
+:20108600E0FFBF060280547582002290E6BAE0703D90E6BCE0F582120F7EAE82AF83E0FD93
+:2010A6005305FE8E828F83EDF090E6BCE0FF30E7098F057E004305108D0753071F90E68334
+:2010C600EFF07E0043072090E683EFF0800D7582002290E6B9E0F5820206E47582012290A9
+:2010E600E6B8E0FF6008BF0202802902116E90E6BAE0FFBF020302117790E6BAE0FFBF01EC
+:2011060005751301806B90E6BAE0FFBF060280617582002290E6BAE0704A90E6BCE0F5822D
+:20112600120F7EAE82AF83EE4F7003F582228E828F83E0FD7C004305018E828F83EDF0900C
+:20114600E6BCE0FF30E7098F057E004305108D0753071F90E683EFF07E0043072090E683B8
+:20116600EFF0800D7582002290E6B9E0F5820206E475820122AF827E0110AF027E00EF601A
+:201186000E75141C75153D7516A675173D800C7514A675153D75161C75173DEE1392AF227F
+:2011A60090E6BBE0FFBF01028019BF02028024BF0302802CBF0603021260BF07030212705E
+:2011C60002127D7E007F3D90E6B3EFF090E6B47400F02290E6B3E515F090E6B4E514F0223E
+:2011E6007DE07E3D7F8090E6BAE0F5187B008B020BEAB5180280428D008E018F028D828EDD
+:20120600838FF012152128F8E439F9880589068A0774012DF9E43EFA8F0489828A838CF0BD
+:20122600121521F9B9030280067D007E007F00ED4E6006C3E5189B50B5ED4E600F8D038EE0
+:201246000490E6B3ECF090E6B4EDF02290E6A0E0FF43070190E6A0EFF0227E127F3D90E63D
+:20126600B3EFF090E6B47412F02290E6B3E517F090E6B4E516F02290E6A0E0FF43070190F8
+:05128600E6A0EFF022DC
+:200066007900E94400601B7A009019D7780175923CE493F2A308B800020592D9F4DAF27530
:0200860092FFE7
-:12140D00AA82AB83A2F73392D1F5826002D2F7ACF022E4
-:1B141F0020F71130F6138883A88220F509F6A8837583002280FEF280F5F022CC
-:203F0000020153000217AA000216FB000202010002016B000201B6000216F80002152E00F4
-:203F2000021530000215310002153200021535000217A9000217AB0002143A0002143C0035
-:203F40000216FD0002152E000216BF000216F9000216FA000216FC000216FE0002172D009D
-:203F60000215DF0002152E0002152E0002152E0002152F0002153300021536000215380050
-:203F800002153400021537000215390002158F000214AB000214D6000214D8000214DA0007
-:183FA0000214AC000214D7000214D90002152D0002143B000217A80015
-:01143A00327F
-:01143B00327E
-:01143C00327D
-:20143D00AAF0FBE582854CF0A4FCADF0E583854CF0A42DFDE435F0FEE582854DF0A42DFDA0
-:20145D00E5F03EFEE433FFEA854CF0A42EFEE5F03FFFE583854DF0A42EFEE5F03FFFE58246
-:20147D00854EF0A42EFEE5F03FFFEB854CF0A42FFFEA854DF0A42FFFE583854EF0A42FFFB0
-:0E149D00E582854FF0A42F8EF08D838C822285
-:0114AB00320E
-:0114AC00320D
+:12128B00AA82AB83A2F73392D1F5826002D2F7ACF02268
+:1B129D0020F71130F6138883A88220F509F6A8837583002280FEF280F5F02250
+:203F00000201530002162800021579000202010002016B000201B600021576000213AC0001
+:203F20000213AE000213AF000213B0000213B30002162700021629000212B8000212BA0053
+:203F400002157B000213AC0002153D00021577000215780002157A0002157C000215AB00B7
+:203F600002145D000213AC000213AC000213AC000213AD000213B1000213B4000213B6006F
+:203F80000213B2000213B5000213B70002140D000213290002135400021356000213580022
+:183FA00002132A0002135500021357000213AB000212B9000216260029
+:0112B8003203
+:0112B9003202
+:0112BA003201
+:2012BB00AAF0FBE5828518F0A4FCADF0E5838518F0A42DFDE435F0FEE5828519F0A42DFDC0
+:2012DB00E5F03EFEE433FFEA8518F0A42EFEE5F03FFFE5838519F0A42EFEE5F03FFFE58232
+:2012FB00851AF0A42EFEE5F03FFFEB8518F0A42FFFEA8519F0A42FFFE583851AF0A42FFF04
+:0E131B00E582851BF0A42F8EF08D838C82223C
+:011329003291
+:01132A003290
:20008E007800E84400600A790075923CE4F309D8FC7801E84400600C7901903C00E4F0A306
:0400AE00D8FCD9FAA7
-:2014AD007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB954CF5F0EC954D4006CB
-:0914CD00FCABF0438201DADD22E0
-:0114D60032E3
-:0114D70032E2
-:0114D80032E1
-:0114D90032E0
-:0114DA0032DF
-:2014DB00FBC2D530E715D2D5E4C39582F582E49583F583E495F0F5F0E49BFBE54F30E717B9
-:2014FB00B2D5E4C3954CF54CE4954DF54DE4954EF54EE4954FF54FEB120EBB30D513FBE4A6
-:12151B00C39582F582E49583F583E495F0F5F0E49B220A
-:01152D00328B
-:01152E00328A
-:01152F003289
-:011530003288
-:011531003287
-:011532003286
-:011533003285
-:011534003284
-:011535003283
-:011536003282
-:011537003281
-:011538003280
-:01153900327F
-:20153A00AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFBC1
-:20155A00BB01067A617B0180047AC27B028A048B058C4C8D4D154C74FFB54C02154DE54CE1
-:15157A00454D70F1EE24FFFAEF34FFFB8A068B07EA4B70DD227B
-:01158F003229
-:20159000B98003EA13B34010EA2401FAE43BFBE43CFC50047C800582BC000EBB000BBA009F
-:2015B00008E4F5F0F583F58222A2D1E582138CF092F78B838A8222E4F583F58275F080F45F
-:0F15D000A2D11322E4F583F58275F0C0747F2257
-:0115DF0032D9
-:2015E0001216FF30D502B2D1BF0009BC00030215D40215C7BC00030215B1E583B4FF0BE558
-:2016000082B4FF030215D40215B1E582B4FF030215C7C395835007247F400B0215B1248058
-:201620001450030215C7F582C3ED9AEE9BEF9C40111582C3EA33F9EB33FAEC33FBE433FC8A
-:201640008005E4CCCBCAF9C08275F019C3E99DEA9EEB9FEC9400D5F002802D400EE99DF9EB
-:20166000EA9EFAEB9FFBEC9400FCC3B3E833F8E58233F582E58333F583C3E933F9EA33FA4B
-:20168000EB33FBEC33FC80C4B3E4F938FAE43582FBE43583FCD082500405827C801217711F
-:0316A0000215A888
-:0D00590075815B1217A4E58260030200565A
-:1C16A30020F71430F6148883A88220F507E6A88375830022E280F7E49322E02256
-:0116BF0032F8
-:2016C000C2D5E58330E70DD2D5E4C39582F582E49583F583E54D30E70DB2D5E4C3954CF53D
-:1816E0004CE4954DF54D1214AD30D50BE4C39582F582E49583F58322F0
-:0116F80032BF
-:0116F90032BE
-:0116FA0032BD
-:0116FB0032BC
-:0116FC0032BB
-:0116FD0032BA
-:0116FE0032B9
-:2016FF00AA82AB83A2F73392D1F5826002D2F7ACF0E58124F9F8E6FD08E6FE0886F008E64E
-:0E171F00A2F73392D5F5836002D2F7AFF02225
-:01172D003289
-:20172E006040F82582500274FFF582E824F8501ECCCBCAF9E4CC24F85014CBCAF9E4CB24C3
-:20174E00F8500BCAF9E4CA24F8500379002224086010F8C3EC13FCEB13FBEA13FAE913F976
-:03176E00D8F1228D
-:201771007804EC7011E58224F8500AF582E4C9CACBFCD8EF22EC7820058220E713D5820177
-:1317910022C3E933F9EA33FAEB33FBEC33FCD8EA15822285
-:0417A4007582002228
-:0117A800320E
-:0117A900320D
-:0117AA00320C
-:0117AB00320B
+:20132B007A10E4FBFCE58225E0F582E58333F583EB33FBEC33FCEB9518F5F0EC95194006B6
+:09134B00FCABF0438201DADD2263
+:011354003266
+:011355003265
+:011356003264
+:011357003263
+:011358003262
+:20135900FBC2D530E715D2D5E4C39582F582E49583F583E495F0F5F0E49BFBE51B30E71770
+:20137900B2D5E4C39518F518E49519F519E4951AF51AE4951BF51BEB120D3930D513FBE44C
+:12139900C39582F582E49583F583E495F0F5F0E49B228E
+:0113AB00320F
+:0113AC00320E
+:0113AD00320D
+:0113AE00320C
+:0113AF00320B
+:0113B000320A
+:0113B1003209
+:0113B2003208
+:0113B3003207
+:0113B4003206
+:0113B5003205
+:0113B6003204
+:0113B7003203
+:2013B800AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFB45
+:2013D800BB01067A617B0180047AC27B028A048B058C188D19151874FFB518021519E5189D
+:1513F800451970F1EE24FFFAEF34FFFB8A068B07EA4B70DD2233
+:01140D0032AC
+:20140E00B98003EA13B34010EA2401FAE43BFBE43CFC50047C800582BC000EBB000BBA0022
+:20142E0008E4F5F0F583F58222A2D1E582138CF092F78B838A8222E4F583F58275F080F4E2
+:0F144E00A2D11322E4F583F58275F0C0747F22DA
+:01145D00325C
+:20145E0012157D30D502B2D1BF0009BC0003021452021445BC000302142FE583B4FF0BE5E7
+:20147E0082B4FF0302145202142FE582B4FF03021445C395835007247F400B02142F2480E8
+:20149E00145003021445F582C3ED9AEE9BEF9C40111582C3EA33F9EB33FAEC33FBE433FC91
+:2014BE008005E4CCCBCAF9C08275F019C3E99DEA9EEB9FEC9400D5F002802D400EE99DF96F
+:2014DE00EA9EFAEB9FFBEC9400FCC3B3E833F8E58233F582E58333F583C3E933F9EA33FACF
+:2014FE00EB33FBEC33FC80C4B3E4F938FAE43582FBE43583FCD082500405827C801215EF27
+:03151E000214268E
+:0D00590075814B121622E5826003020056ED
+:1C15210020F71430F6148883A88220F507E6A88375830022E280F7E49322E022D9
+:01153D00327B
+:20153E00C2D5E58330E70DD2D5E4C39582F582E49583F583E51930E70DB2D5E4C39518F528
+:18155E0018E49519F51912132B30D50BE4C39582F582E49583F5832292
+:011576003242
+:011577003241
+:011578003240
+:01157900323F
+:01157A00323E
+:01157B00323D
+:01157C00323C
+:20157D00AA82AB83A2F73392D1F5826002D2F7ACF0E58124F9F8E6FD08E6FE0886F008E6D1
+:0E159D00A2F73392D5F5836002D2F7AFF022A9
+:0115AB00320D
+:2015AC006040F82582500274FFF582E824F8501ECCCBCAF9E4CC24F85014CBCAF9E4CB2447
+:2015CC00F8500BCAF9E4CA24F8500379002224086010F8C3EC13FCEB13FBEA13FAE913F9FA
+:0315EC00D8F12211
+:2015EF007804EC7011E58224F8500AF582E4C9CACBFCD8EF22EC7820058220E713D58201FB
+:13160F0022C3E933F9EA33FAEB33FBEC33FCD8EA15822208
+:0416220075820022AB
+:011626003291
+:011627003290
+:01162800328F
+:01162900328E
:00000001FF
diff --git a/openhantek/res/firmware/isds205b-firmware.hex b/openhantek/res/firmware/isds205b-firmware.hex
new file mode 100644
index 00000000..0894e7af
--- /dev/null
+++ b/openhantek/res/firmware/isds205b-firmware.hex
@@ -0,0 +1,214 @@
+:203D000012010002FFFFFF40501D8E600500010203010A0600020000004001000902890003
+:203D200001010080370904000001FF000000070586020002000904000101FF00010007050C
+:203D400082010014010904000201FF00010007058201000C010904000301FF000100070502
+:203D600082010004010904000401FF000100070582010004020904000501FF0001000705F5
+:203D800082010004030904000601FF000100070582010004040904000701FF0001000705CD
+:053DA000820100020495
+:203DA6000902390002010080370904000001FF000000070586024000000904000101FF0010
+:193DC600010007058201FF03010904000201FF00010007058201000201AF
+:203DE000040309040E0373006900670072006F006B0010036600780032006C0061006600B9
+:203E00007700280349006E00730074007200750073007400610072002000490053004400C1
+:0C3E20005300320030003500420000006A
+:040000000201B9320E
+:01000B0032C2
+:0100130032BA
+:01001B0032B2
+:0100230032AA
+:03002B000203E1EC
+:03003300020318AD
+:01003B003292
+:01004300328A
+:01004B003282
+:01005300327A
+:01005B003272
+:01006300326A
+:03006B0002031B72
+:03007300020C7507
+:03007B00020889EF
+:030083000203C9AC
+:03008B000203333A
+:0300930002037EE7
+:03009B00020886D2
+:0300A300020C9FAD
+:0300AB00020CA0A4
+:0300B300020CA19B
+:0300BB00020CA490
+:0300C300020C74B8
+:0300CB00020C9193
+:0300D300020C928A
+:0300DB00020C9480
+:0300E30002088B85
+:0300EB00020D18EB
+:0300F30002088779
+:0300FB0002088870
+:0301030002088A65
+:03010B0002088C5B
+:0301130002088D52
+:03011B00020CFBD8
+:03012300020C9D2E
+:03012B00020CA221
+:03013300020CA516
+:03013B00020CA70C
+:03014300020C9E0D
+:03014B00020CA300
+:03015300020CA6F5
+:03015B00020CA8EB
+:03016300020CFA91
+:03016B00020C95EE
+:03017300020C97E4
+:03017B00020C99DA
+:03018300020C9BD0
+:03018B00020C96CD
+:03019300020C98C3
+:03019B00020C9AB9
+:0301A300020C9CAF
+:0301AB00020C93B0
+:0301B300020C73C8
+:0F021200750800750A00E4F50BF50CC200C20177
+:030233000201B60F
+:0301B600020792AB
+:20023600AF82BF0002800FBF01028014BF0A028019BF192A801E75CA7875CBEC75820122D0
+:2002560075CA0C75CBFE7582012275CACE75CBFF7582012275CAF675CBFF758201227582FA
+:200276000022AF827E00C286EF23540124FF9284D2868F05ED2DFF0EBE080040E9D285C294
+:200296008522AF827401B50902801C7402B5090280197405B509028016740AB50902801330
+:2002B600740BB5091680107E0980147E0680107E00800C7E5F80087E50800475820022EF4D
+:2002D60060067D1C7F0080047D437F00EDF4FFE5085207ED5E4FF508850882120278758278
+:2002F6000122E582FF30E00553087F8003430880EF30E4055308DF800343082085088202E1
+:200316000278C2DC32C0E0C082C083D2005391EF90E65D7401F0D083D082D0E032C021C053
+:20033600E0C0F0C082C083C007C006C005C004C003C002C001C000C0D075D0007582001298
+:200356000B715391EF90E65D7410F0D0D0D000D001D002D003D004D005D006D007D083D092
+:2003760082D0F0D0E0D02132C021C0E0C0F0C082C083C007C006C005C004C003C002C00140
+:20039600C000C0D075D000758201120B715391EF90E65D7420F0D0D0D000D001D002D0031C
+:2003B600D004D005D006D007D083D082D0F0D0E0D02132C0E0C082C083D2015391EF90E658
+:2003D6005D7408F0D083D082D0E032C0E0C007C006C0D075D000B280E50B450C6013E50BDF
+:2003F60024FFFEE50C34FFFF8E0B8F0CEE4F700100C2CFD0D0D006D007D0E032E582FF306B
+:20041600E00543B108800353B1F7EF30E40443B1012253B1FE22AF82BF01028003BF0211DD
+:2004360074072FFF90E618F090E61AEFF0758201227582002290E6F574FFF000000090E699
+:20045600047480F000000090E6047482F000000090E6047486F000000090E604E4F02290DA
+:20047600E6F574FFF0000000E50A70057E06FF80047E027F0090E648EEF022D28712044B46
+:200496007EE87F031EBEFF011FEE4F70F7E5BB30E7FB00000090E6D07428F000000090E6C5
+:2004B600D1E4F0E50A70057E06FF80047E047F008EBBE4F50BF50C22AF8290E680E030E7A7
+:2004D600067D1C7E3D80047DA67E3D8F03E4CBC4CB6BCB54F0CB6BFC74162BFBE43CFCEB17
+:2004F6002DFDEC3EFC7E80EFF50A703590E612E4F090E61474E0F090E6E27401F08D828C83
+:20051600838EF0120CFC90E625F074012DFAE43CFB8E078A828B838FF0120CFC90E624F096
+:200536002290E61274D8F090E614E4F090E6D204F08D828C838EF0120CFC90E621F00DBD1E
+:2005560000010C8D828C838EF0120CFCFF90E62074075FF08D828C838EF0120CFCC4235472
+:200576001F90E64004F022AF827E00EE75F007A4FCADF0241DF582ED340DF583E493FBB5AF
+:20059600070280080EBE0CE375820022EC241DFCED340DFD74062CF582E43DF583E49390CF
+:2005B600E601F075AF07759DE4759E008C828D83A3E49390E67CF08C828D83A3A3E4939095
+:2005D600E67CF07401F0E4F0F0F0F0F08C828D83A3A3A39390E67CF08C828D83A3A3A3A394
+:2005F600E49390E67CF07401F0E4F0F0F0F0F08C828D83A3A3A3A3A39390E67CF07411F05C
+:20061600F0E4F0F0F0F0F0F0F0F0F0F0F0F0F0FF90E67CE4F00FBF600040F575820122AFCF
+:2006360082BF0002800FBF01028014BF0A028019BF322A801E75CAF075CBD8758201227589
+:20065600CA1875CBFC7582012275CA9C75CBFF7582012275CAEC75CBFF758201227582009D
+:2006760022AD15AE16AF178D828E838FF0E50A120C7675820122E5827006850D821204CEE5
+:20069600758201227582002275820122AF82C007120475D007750BE8750C03BFE0004015BD
+:2006B600EF2419401090E68AE4F090E68BF090E6A0E020E1F9BFE0005003020748EF241984
+:2006D6005003020748EF2420FE2E9006E473800C800A801B80268033803E8049EF2420FF51
+:2006F60090E740E0F5098F821202987582012290E740E0F58212057D7582012290E740E025
+:20071600FFBF01031204917582012290E740E0F58212042C7582012290E740E0F5821202B4
+:20073600F87582012290E740E0F582120236758201227582002290E613E4F090E615F0D25C
+:200756008790E6C2E4F090E6C37480F090E6C0E4F090E6F4F012047575090175820012025A
+:200776009875090175820112029875820112057D75820212042C7582000204CE90E600E0C0
+:2007960053E0E7F012074CE500D2E890E668E043E008F090E65CE043E001F090E65CE043A1
+:2007B600E010F090E65CE043E020F090E65CE043E008F0D2DDD2AF75CA0C75CBFE75C8009B
+:2007D600D2ADD2CA90E680E043E00AF09005DC120CA990E680E053E0F7F090E672E4F09081
+:2007F600E671F090E670F075B6FF75B4FF75B2FF100002800312088E10010280F390E68293
+:20081600E043E0C0F090E6817401F043870100000000000000E510701C90E682E030E60772
+:2008360090E682E020E0D690E682E030E70790E682E020E1C890E682E030E60790E682E090
+:2008560020E00E90E682E030E7A690E682E030E19F900005120CA990E680E043E001F09081
+:10087600000F120CA990E680E053E0FEF002080695
+:200D1D00308000030000EA1E8000030000AA180100020110CA100101020010CA0C020102D9
+:200D3D000010CA080302020010CA040605020010CA020C0B020010CA011817020010CA32B5
+:140D5D00302F020010CA147877020010CA0AF0EF020010CAA3
+:01088600323F
+:01088700323E
+:01088800323D
+:01088900323C
+:01088A00323B
+:01088B00323A
+:01088C003239
+:01088D003238
+:0601E800E478FFF6D8FDEB
+:12022100750F007510007511A675123D75131C75143D68
+:20088E0090E6B9E0FF24F45003020984EF240A83F582EF241083F583E473C0D584EA8484AB
+:2008AE00FF84051C33660808090809090809090909091209F7E582600302099990E6A0E00F
+:2008CE0043E001F0020999120A8BE582600302099990E6A0E043E001F0020999120AD9E5B5
+:2008EE0082600302099990E6A0E043E001F0020999120B9C02099912069AAF8290E740EFCD
+:20090E00F090E68AE4F090E68B04F002099990E6BAE0F58212069EE582707090E6A0E043AF
+:20092E00E001F0806690E6BCE0FF75150E7516007517408F82120677E582700A90E6A0E07B
+:20094E0043E001F0804590E740E50EF090E68AE4F090E68B04F0803390E6BCE0FF90E6BA59
+:20096E00E0F50D8F8212068CE582701F90E6A0E043E001F0801590E6B9E0F5821206A2E518
+:20098E0082700890E6A0E043E001F090E6A0E043E080F022AF82747F5FFE24F74047EE2465
+:2009AE000A83F582EE240D83F583E473CCD0E3F3E7F3EBF3EF09090909090909090990E6D4
+:2009CE00A022EF30E7067EA27FE680047EA17FE68E828F832290E6A32290E6A42290E6A5D8
+:2009EE002290E6A6229000002290E6B8E0FFBF80028022BF81028008BF82028037020A8394
+:200A0E0090E740E4F090E741F090E68AF090E68B7402F08064E51025E0FFE50F420790E7AD
+:200A2E0040EFF090E741E4F090E68AF090E68B7402F0804590E6BCE0F5821209A2AE82AFBC
+:200A4E00838E048F05EE4F7003F582228C828D83E0FC30E0067E017F0080047E007F009077
+:200A6E00E740EEF090E741E4F090E68AF090E68B7402F08004758200227582012290E6B89B
+:200A8E00E0FF6005BF0237801190E6BAE0FFBF010575100080317582002290E6BAE0701ABE
+:200AAE0090E6BCE0F5821209A2AE82AF83E0FD5305FE8E828F83EDF0800D7582002290E632
+:200ACE00B9E0F5820206A27582012290E6B8E0FF6008BF02028020020B6490E6BAE0FFBF1D
+:200AEE000203020B6D90E6BAE0FFBF0106751001020B6D7582002290E6BAE0705590E6BC74
+:200B0E00E0F5821209A2AE82AF83EE4F7003F582228E828F83E0FD4305018E828F83EDF0C1
+:200B2E0090E6BCE0FF53070F90E6BCE0FE530680E4C423CEC423541F6ECE541FCE6ECE3068
+:200B4E00E40244E0FD90E683EE2FF0E043E020F0800D7582002290E6B9E0F5820206A2751C
+:200B6E00820122AF82D20210AF02C202EF600E75111C75123D7513A675143D800C7511A6C9
+:200B8E0075123D75131C75143DA20292AF2290E6BBE0FFBF01028019BF02028024BF03027C
+:200BAE00802CBF0603020C4DBF0703020C5D020C6A7E007F3D90E6B3EFF090E6B47400F0DC
+:200BCE002290E6B3E512F090E6B4E511F0227DE07E3D7F8090E6BAE0F5157B00EBB5150240
+:200BEE0080430B8D008E018F028D828E838FF0120CFC28F8E439F9880589068A0774012D2E
+:200C0E00F9E43EFA8F0489828A838CF0120CFCF9B9030280067D007E007F00ED4E6006C355
+:200C2E00E5159B50B7ED4E600D8E0490E6B3ECF090E6B4EDF02290E6A0E043E001F0227EF8
+:200C4E00127F3D90E6B3EFF090E6B47412F02290E6B3E514F090E6B4E513F02290E6A0E0B2
+:050C6E0043E001F0224B
+:2001C6007900E94400601B7A00900D71780075923CE493F2A308B800020592D9F4DAF27542
+:0201E60092FF86
+:010C7300324E
+:010C7400324D
+:010C7500324C
+:1B0C760020F71130F6138883A88220F509F6A8837583002280FEF280F5F0227D
+:010C91003230
+:010C9200322F
+:010C9300322E
+:010C9400322D
+:03004300023F0079
+:203F000002031B00020C7500020889000203C9000203330002037E0002088600020C9E00A6
+:203F2000020C9F00020CA000020CA100020CA400020C7400020C9100020C9200020C940062
+:203F400002088B00020C9E00020D1800020887000208880002088A0002088C0002088D0015
+:203F6000020CFB00020C9E00020C9E00020C9E00020C9D00020CA200020CA500020CA70071
+:203F8000020CA300020CA600020CA800020CFA00020C9500020C9700020C9900020C9B0066
+:183FA000020C9600020C9800020C9A00020C9C00020C9300020C73004B
+:010C9500322C
+:010C9600322B
+:2001EE007800E84400600A790075923CE4F309D8FC7800E84400600C7900903C00E4F0A3A7
+:04020E00D8FCD9FA45
+:010C9700322A
+:010C98003229
+:010C99003228
+:010C9A003227
+:010C9B003226
+:010C9C003225
+:010C9D003224
+:010C9E003223
+:010C9F003222
+:010CA0003221
+:010CA1003220
+:010CA200321F
+:010CA300321E
+:010CA400321D
+:010CA500321C
+:010CA600321B
+:010CA700321A
+:010CA8003219
+:200CA900AE82AF8390E600E05418C423541F70057CB1FD801C90E600E05418C423541FFB5B
+:200CC900BB01067A617B0180047AC27B028A048B058C158D16E51524FFFAE51634FFFB8A89
+:110CE900158B16EA4B70EE1EBEFF011FEE4F70E12206
+:010CFA0032C7
+:010CFB0032C6
+:0D01B900758121120D19E58260030201B667
+:1C0CFC0020F71430F6148883A88220F507E6A88375830022E280F7E49322E02207
+:010D180032A8
+:040D190075820022BD
+:00000001FF
diff --git a/openhantek/res/firmwares.qrc b/openhantek/res/firmwares.qrc
index 91a97b45..ee2cb8fa 100644
--- a/openhantek/res/firmwares.qrc
+++ b/openhantek/res/firmwares.qrc
@@ -5,5 +5,6 @@
firmware/dso6022bl-firmware.hex
firmware/dds120-firmware.hex
firmware/mdso-firmware.hex
+ firmware/isds205b-firmware.hex
diff --git a/openhantek/src/hantekdso/models/modelISDS205b.cpp b/openhantek/src/hantekdso/models/modelISDS205b.cpp
new file mode 100644
index 00000000..32e3e27e
--- /dev/null
+++ b/openhantek/src/hantekdso/models/modelISDS205b.cpp
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "modelISDS205b.h"
+#include "hantekdsocontrol.h"
+#include "hantekprotocol/controlStructs.h"
+#include "usb/scopedevice.h"
+#include
+#include
+#include
+
+#include "../res/firmware/dso602x_fw_version.h"
+
+
+#define VERBOSE 0
+
+using namespace Hantek;
+
+static ModelISDS205B modelInstance_isds205b;
+
+
+static void initSpecifications( Dso::ControlSpecification &specification ) {
+ // we drop 2K + 480 sample values due to unreliable start of stream
+ // 20000 samples at 100kS/s = 200 ms gives enough to fill
+ // the screen two times (for pre/post trigger) at 10ms/div = 100ms/screen
+ // SAMPLESIZE defined in hantekdsocontrol.h
+ // adapt accordingly in HantekDsoControl::convertRawDataToSamples()
+
+ // HW gain, voltage steps in V/div (ranges 20,50,100,200,500,1000,2000,5000 mV)
+
+ specification.gain = { { 10, 20e-3 }, { 10, 50e-3 }, { 10, 100e-3 }, { 5, 200e-3 },{ 2, 500e-3 }, { 1, 1.00 }, { 1, 2.00 }, { 1, 5.00 } };
+
+ // ID and actual gain:
+ // 1: 1.1
+ // 2: 2
+ // 5: 4.9
+ // 10: 16
+ // Full scale input == +- 5V according to instrustar.
+ // For low voltages a relay can be switched, so a 10x attenuator is bypassed. i.e. input at ADC +- 0.5V always
+
+ // Define the scaling between ADC sample values and real input voltage
+ // Everything is scaled on the full screen height (8 divs)
+ // ||WITH LV SWITCH||
+ // The voltage/div setting: 20m 50m 100m 200m 500m 1V 2V 5V
+ // Equivalent input voltage: 0.16V 0.4V 0.8V 1.6V 4V 8V 16V 40V
+ // Theoretical gain setting: x16 x16 x16 x4.9 x2 x1.1 x1.1 x1.1
+
+ // Theoretical values: 4096. , 4096. , 4096. , 125.44, 51.2 , 28.16, 28.16, 28.16
+ specification.voltageScale[ 0 ] = { 1330, 1330,1330, 85.36, 37.48, 21.78, 21.78, 21.78 }; //digit/V - Channel 1
+ specification.voltageScale[ 0 ] = { 1330, 1330,1330, 85.36, 37.48, 21.78, 21.78, 21.78 }; //digit/V - Channel 2
+
+ // Gain and offset can be corrected by individual config values from EEPROM or file
+
+ // Possible raw sample rates with custom fw from https://github.com/Ho-Ro/Hantek6022API
+ // 20k, 40k, 50k, 64k, 100k, 200k, 400k, 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.recordLengths = { UINT_MAX };
+ specification.samplerate.multi.base = 1e6;
+ specification.samplerate.multi.max = 15e6;
+ specification.samplerate.multi.recordLengths = { UINT_MAX };
+
+ 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
+ };
+
+ // Instrustar has AC Coupling option
+ specification.couplings = { Dso::Coupling::DC, Dso::Coupling::AC };
+ specification.hasACcoupling = true;
+
+ specification.triggerModes = {
+ Dso::TriggerMode::AUTO,
+ Dso::TriggerMode::NORMAL,
+ Dso::TriggerMode::SINGLE,
+ Dso::TriggerMode::ROLL,
+ };
+ specification.fixedUSBinLength = 0;
+ //Use calibration steps supported by firmware 205b
+ specification.calfreqSteps = { 100,1000,10000,25000 };
+ specification.hasCalibrationEEPROM = false;
+
+}
+
+static void applyRequirements_( HantekDsoControl *dsoControl ) {
+ dsoControl->addCommand( new ControlSetGain_CH1() ); // 0xE0
+ dsoControl->addCommand( new ControlSetGain_CH2() ); // 0xE1
+ dsoControl->addCommand( new ControlSetSamplerate() ); // 0xE2
+ dsoControl->addCommand( new ControlStartSampling() ); // 0xE3
+ dsoControl->addCommand( new ControlSetNumChannels() ); // 0xE4
+ dsoControl->addCommand( new ControlSetCoupling() ); // 0xE5 (no effect w/o AC/DC HW mod)
+ dsoControl->addCommand( new ControlSetCalFreq() ); // 0xE6
+}
+
+
+// Instrustar ISDS20A/B
+//
+// VID/PID active VID/PID no FW FW ver FW name Scope name
+// |------------| |------------| |------------| |-------| |--------|
+ModelISDS205B::ModelISDS205B()
+ : DSOModel( ID, 0x1d50, 0x608e, 0xd4a2, 0x5661, 0x0005, "isds205b", "ISDS-205B", Dso::ControlSpecification( 2 ) ) {
+ initSpecifications( specification );
+}
+
+void ModelISDS205B::applyRequirements( HantekDsoControl *dsoControl ) const { applyRequirements_( dsoControl ); }
\ No newline at end of file
diff --git a/openhantek/src/hantekdso/models/modelISDS205b.h b/openhantek/src/hantekdso/models/modelISDS205b.h
new file mode 100644
index 00000000..6dc77a43
--- /dev/null
+++ b/openhantek/src/hantekdso/models/modelISDS205b.h
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "dsomodel.h"
+
+class HantekDsoControl;
+using namespace Hantek;
+
+
+struct ModelISDS205B : public DSOModel {
+ static const int ID = 0x2050;
+ ModelISDS205B();
+ void applyRequirements( HantekDsoControl *dsoControl ) const override;
+};
diff --git a/utils/udev_rules/60-openhantek.rules b/utils/udev_rules/60-openhantek.rules
index 7ae06a50..726fc456 100644
--- a/utils/udev_rules/60-openhantek.rules
+++ b/utils/udev_rules/60-openhantek.rules
@@ -8,6 +8,10 @@ ENV{DEVTYPE}!="usb_device", GOTO="openhantek_rules_end"
ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="6022", TAG+="uaccess", TAG+="udev-acl", MODE="660", GROUP="plugdev"
ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="6022", TAG+="uaccess", TAG+="udev-acl", MODE="660", GROUP="plugdev"
+# Instrustar isds-205b, without FW, with FW
+ATTRS{idVendor}=="d4a2", ATTRS{idProduct}=="5661", TAG+="uaccess", TAG+="udev-acl", MODE="660", GROUP="plugdev"
+ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="1d50", TAG+="uaccess", TAG+="udev-acl", MODE="660", GROUP="plugdev"
+
# Hantek DSO-6022BL, without FW, with FW
ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="602a", TAG+="uaccess", TAG+="udev-acl", MODE="660", GROUP="plugdev"
ATTRS{idVendor}=="04b5", ATTRS{idProduct}=="602a", TAG+="uaccess", TAG+="udev-acl", MODE="660", GROUP="plugdev"