Merge pull request #210 from davidgiven/analysis

Add the drive response documentation page.

.appveyor.yml

@@ -1,6 +1,7 @@
 version: '{branch}.{build}'
 clone_depth: 1
 skip_tags: true
+image: Visual Studio 2019
 
 environment:
   MSYSTEM: MINGW32

FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex

@@ -1,246 +1,246 @@
-:400000000080002011000000A10F0000A10F0000064A08B5136843F020031360044B1A6803F53F5302331A6000F0D8FFE8460040FA46004010B5054C237833B9044B13B1EF
-:400040000448AFF300800123237010BD6881FF1F0000000020380000084B10B51BB108490848AFF300800848036803B910BD074B002BFBD0BDE81040184700BF00000000E9
-:400080006C81FF1F20380000C880FF1F000000000A4A0B4B116801310B40002BBEBF03F1FF3363F03F030133136011685368994202BF024B01221A72704700BF8881FF1F64
-:4000C0003F0000800A4A0B4B516801310B40002BBEBF03F1FF3363F03F030133536051681368994202BF024B01221A72704700BF8881FF1F3F000080024B012200205A7293
-:4001000002F012B98881FF1F10B5C4B2204601F027F90128FAD110BD08B572B60F4B0F49DA680132DA601A690132C82A08BF00221A615A6918690132A72A08BF00224A613A
-:400140005B69002B0CBF02230023002814BF184643F0010002F050FE62B608BD8881FF1F38B50446C5B2284602F080F8062002F09DFA44F00200C0B202F078F8062002F055
-:4001800095FA284602F072F8BDE83840062002F077BA10B5642402F063F830B90120FFF7DFFF013CF7D1204610BD012010BD70B5C4B2054620460E4601F0D2F8012805D089
-:4001C000204601F0EBF92846FFF79EFF204601F0CFF8314605460246204601F08BF9204601F0BEF80028FAD1284670BD38B5044D0024285D013402F009FA402CF9D138BDE9
-:40020000A081FF1F08B502F023FC002002F02CFC02F03EFC02F048FC80B208BD10B50446012002F03BF8642002F02AFAFFF7EAFF2080002002F032F8642002F021FAFFF7ED
-:40024000E1FF608010BD08B502F02EFD002002F037FD02F049FD02F053FD80B208BD10B50446FFF796FF322002F00AFAFFF7EBFF20800020FFF774FF322002F001FAFFF740
-:40028000E2FF608010BD0FB400B593B014AB53F8042B402102A8019302F0AAFE02A802F04AF802F054F813B05DF804EB04B0704710B5044601780648FFF7E5FF0420FFF72B
-:4002C00023FF62782146BDE81040042001F0A0B83438000007B50023ADF804308DF80600032301A88DF80530FFF7E2FF03B05DF804FB000010B5074C94F8583043B10020E3
-:4003000001F0A8FF002002F03BFD002384F8583010BD00BF8881FF1F38B5104D837895F85B2004469A4204D0FFF7E4FF002385F85E302368C5F859302279094B1A71A3784D
-:40034000002B14BF0220012002F01AFDE07802F011FD2079BDE8384002F048BD8881FF1FE181FF1F38B50D4C94F8585065B904F15900FFF7D1FF012001F06CFF4FF47A7031
-:4003800002F07EF984F85E50E3682366012384F85830BDE8384002F0B1B900BF8881FF1FF8B51E4C0646FFF7DDFF94F85E3003B15EB91B48FFF767FFFFF7EBFE0120002353
-:4003C00084F85E00636602F071F93246616E1548FFF759FF114D0027636E9E4216D001F03FFF00B16F66636E9E4205DD0020FFF7B7FE6B6E013305E005DA0120FFF7B0FE47
-:400400006B6E013B6B6602F079F9E5E7322002F037F9BDE8F8400448FFF735BF8881FF1F4138000048380000653800002DE9F04F99B062B602F0CCF99949042002F0F0F914
-:40044000984801F019FF984802F0BCFC974801F04DFF02F09DFB02F06FFA002002F090FC01F068FF0221002000F030FF904C012001F0A8F8002384F85B30FFF773FFFFF79A
-:4004800088FE84F86800FFF735FF012384F85B30FFF768FFFFF77DFE84F86900FFF72AFF844B94F86800844994F869202546002A14BF0A461A46002808BF19467F48FFF7E3
-:4004C000E2FE0321084602F0F9F8264602F016F994F8583043B12A6EEB689B1A41F28832934201D9FFF706FF00F028FF18B97448FFF7C9FE04E000F027FF0028F7D10BE0E5
-:4005000000F01CFF10B902F0F9F8F9E76D48FFF7BAFE032001F042F8032000F021FF0128D4D16948FFF7F8FE68490320FFF73FFE94F86A106648FFF7A6FE94F86A30023B1D
-:40054000142B00F2AB83DFE813F01500A9031E00A9032400A9034600A9036C00A903CF00A903AA01A903E202A9030103A9030803A903220303238DF820308DF821300E23FD
-:400580008DF82230FFE294F86C00FFF709FF514BF6E2FFF7E7FE00236372E068627A02F0FF0132B9EB681B1AB3F57A7FF6DD0B4608E03BB100227272F168627A12B9EB68CB
-:4005C0005B1AFAE707228DF8202004228DF82120ADF82230D7E20220FFF796FD4FF000080DF1200A02F08AF84FF480790027C9EB0803DA1907F80A200137402FF9D10220BC
-:40060000FFF782FD3A465146022000F001FFB9F10109EBD108F10108B8F1400FE2D12E4B38E04FF0010A4FF000080DF1200B02F065F84FF0000959460120FFF7B8FD08EBBF
-:40064000090300270493049B1BF807203B44DBB2934209D08DE80C0041463B464A461F48FFF711FE4FF0000A0137402FEBD109F10109B9F5807FDED108F10108B8F1400F92
-:40068000D5D151461648FFF7FEFDBAF1000F00F00E81144B1B8807A8ADF81C3074E200BF19010000F900000091000000C50000008881FF1F77380000733800007A38000022
-:4006C00092380000A5380000E181FF1FF281FF1FAF3800002438000026380000BE380000DA3800002838000094F86C0001F0D6FD606EFFF755FE02F0E7FBB24BDFF8E0825C
-:400700001A78002702F0FB021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A7002F0D5FB0220FFF7EEFC012141F6FF734FF48042084602F028FB84F8AA00FD
-:4007400001F04AFF08F807000137402FF8D1DFF894A200270AF199091FFA89F80137402F14BF3A4600221AF8010F22440623127E402101F065FF424646F24A519AF800005D
-:4007800001F070FF08F14008402F1FFA88F8E5D196F86D3033B100237372637A002BFCD00023737200234FF0FF32236062602372236894F8AA002344197E01F0C5FE94F87B
-:4007C000AA0001F083FE012194F8AA0001F056FE2368002BFCD0002398467360D6F80CA0012701F08BFFE368B4F86E20CAEB030393420DD367B1042195F8AA0001F0B0FEC5
-:4008000094F8AA0001F0BCFE0028F9D107463072237AFBB96A682B689A4202D1002FE0D118E00220FFF770FC6968402209EB8111022000F0EDFD6A68634B01321340002B4F
-:40084000BEBF03F1FF3363F03F03013308F101086360C6E70220277AFFF756FC00221146022000F0D5FDFFB20220FFF74DFCFFF7BDFC37B15548FFF706FD0220FFF72AFDB4
-:4008800006E0534B08A81B88ADF82030FFF710FD627A4146237A4F48FFF7F5FC01E24E48FFF7F1FCD4F86E7017F03F0701D00320F5E1012001F0F8FC95F86C0001F0EEFCF4
-:4008C00002F002FB454BDFF818811A7842F004021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A7002F0F1FA686EFFF756FD01214FF4804341F6FF7208462E
-:4009000001F0D8FC85F8AA0001F066FE08F807000137402FF8D1DFF8CC90002709F199031FFA83F804930137402F14BF3A46002219F8010F22440523127E402101F080FEB9
-:40094000414646F24C4299F8000001F08BFE08F14008402F1FFA88F8E5D100274FF0FF33376098467360BB463B46D6F86E9037725FEA99190CBF4FF0010A4FF0000A216867
-:40098000114A01310A40002ABCBF02F1FF3262F03F026068B8BF013282426BD02BB1227A002A76D16A7A002A73D12068049A059302EB8010BAF1000F16D040223F2102F0C9
-:4009C000E3FA1CE09A6500403F000080E43800002A380000FE380000113900009C640040A081FF1F9F81FF1F014601370120FFF7DEFBC7EB0903D3F1000A4AEB030A21689F
-:400A0000AB4A01310A40002ABEBF02F1FF3262F03F02013222606268059B01322AD12A683F2A27D14FF00008C5F8048001F070FC85F808806B6895F8AA002B44197E01F0BC
-:400A400083FD95F8AA0001F041FD012195F8AA0001F014FD85F80980637A002BFCD04FF00008012086F8098001F05EFC404601F01BFC00E023B1237A5BB96B7A4BB90123A1
-:400A8000626842453FF47BAF0BF1010BD5F8048075E701F043FC012001F006FC002001F043FC042194F8AA0001F05AFD94F8AA0001F066FD0028F9D196F8AA0001F0F4FC07
-:400AC000737A327A0293012303920193CDF800A05B463A4649467748FFF7D5FBBAF1000F08D0FFF783FB237A63B17348FFF7CBFB0220D4E0B945F4D070490120FFF757FBF9
-:400B00000137F7E76E48FFF7BEFB6E4B38E094F86C0001F0C3FB606EFFF742FC6A48FFF7B2FB00236372637A002BFCD0012001F0FBFB00237372637A002BFCD0002001F0AA
-:400B4000F3FB6248FFF79FFB614B19E0002084F85E00FFF725FC5F4B12E094F8683023B195F869200AB985F86C2094F869201AB113B9012385F86C305748FFF7CDFB574B39
-:400B80001B88ADF8203008A8FFF792FB89E0FFF7B1FB02F07BF8002002F01EF82A2701F049FF002001F0ECFE3A46002108A802F0EBF917238DF820308DF8217001F09EFD75
-:400BC000002001F047FB002002F0DAF8C82001F057FD0DF12200FFF721FB0DF13600FFF73EFB01F08BFD012002F0CAF8322001F047FD0DF12600FFF711FB0DF13A00FFF7D3
-:400C00002EFB012001F026FB4FF4967001F038FD01F074FD0DF12E00FFF700FB0DF14200FFF71DFB002001F015FB4FF4967001F027FD01F063FD022002F0A2F8322001F05B
-:400C40001FFD0DEB0700FFF7E9FA0DF13E00FFF706FB012001F0FEFA4FF4967001F010FD01F04CFD0DF13200FFF7D8FA0DF14600FFF7F5FA002001F0EDFA4FF4967001F06F
-:400C8000FFFC01F03BFD002002F07AF8002384F85E3001F07DFF01F04FFE74E70120FFF719FB032000F07AFC0D48FFF7ECFA0DE43F0000801B3900004B3900003892FF1F04
-:400CC000553900002C3800005D3900006B3900002E38000030380000F281FF1F32380000783900002DE9F04172B6884B61221A70A3F5F06301221A801924854A9C7092E8C5
-:400D000003008033062283F8002283E80300522203F580731A707F4B7F4A1B787F4EDBB2137040F618027E4B00251A8041F2512223F8022C33784FF4F07003F0010343EAA5
-:400D4000450502F0B9F8013C05F003052ED0032DF0D1744B4FF480721A8007221A70724A002548211570917002221D705D7103F8032C0422DA716D4A6D4C13786D4E43F049
-:400D80000103137012F8013C062743F0030302F8013C2378012243F0800323705B4B1A70654A137843F02003137000E0FEE707FB056300219A881868013502F0E5F8072D53
-:400DC000F5D15E485E4E002550F8041F05F1105303F1440221F0FF074533C9B20B4452005B0002329A4206D012F802EC12F801CC0EF807C0F5E7B0420D44E5D1514A00239D
-:400E000013609360136193614F4B504F1A68504BDFF888811A604F4B1A684F4B1A604F4A137843F002031370137C43F0020313742378A2F5863243F040032370413A1378DE
-:400E400043F010031370464A464B07CA03C31A80454A2833106843F8250C127903F8212C424A07CA03C31A80414AE83B07CA03C31A80404A083307CA03C31A803E4A3F4B12
-:400E8000A2F5616203CBC2F8100EC2F8141E1378042043F008031370394B02F5AA521B783D78DBB298F80060EDB203F007010C321B091170F6B2537045F003033B7046F096
-:400EC000030388F800302F4B48221A702E4A402313702E49937013729372082382F81F3220220A7048710A72294A0A20137001F0DDFB284B88F8006044223D70264D1A7039
-:400F000094E80F0007C52B80BDE8F08100480040B00900480F010049A146004025420040224200400440004006400040A2430040A04300407D390000E8460040FCFFFF478E
-:400F40008400004800760040B8090048F846004020760040BC090048287600400350014070090048C05100407C09004884090048900900489C09004832510040A8090048D5
-:400F8000CF0100491D51004001590040235B0040585B004076580040B0430040F946004008B501F0C5FF03680C2B00D1FEE7FEE7084908B50B68084A1844821A802A01DC5E
-:400FC000086005E001F0B4FF0C2303604FF0FF33184608BDCC80FF1F8893FF1F80B51148114B0025C0B1A3F1100192C922460439161BB74204D051F8046F42F8046BF7E7D1
-:40100000114653F8046C8C1AA64202D041F8045BF9E701381033E5E701F090FFFFF706FAFEE700BF010000004C3B0000124A134B10B51A60124A134C1368134843F40073A8
-:4010400013600023032B98BF54F823204FEA830188BF0E4A0133302B4250F3D10C4B1A780C4B1A700C4B084A1A60FFF73BFEBDE8104001F0EDB900BF0004FA050CED00E042
-:4010800014ED00E0000000000080FF1FA10F0000BC760040C080FF1F08ED00E0F8B501F013FF4B4A01271378022643F001031370137C484C43F001031374474B02F5E352E3
-:4010C0001F700B3203F8946C1378054603F07F031370002001F0EAFA2378404A03F0F90323701378384603F0DF03137023783B43237001F0DBFA282001F0D8FA384B3046E8
-:401100001A7802F07F021A701A7802F0BF021A7023783343237001F0C9FA2378314A43F0040323700023137053702F4AFF2199540133092BFBD1284601F0CAFE072117206D
-:4011400001F0FCFA2949172001F0EAFA0721182001F0F4FA2649182001F0E2FA0721152001F0ECFA2349152001F0DAFA0721052001F0E4FA2049052001F0D2FA0721062008
-:4011800001F0DCFA1D49062001F0CAFA0721084601F0D4FA1A49072001F0C2FA0721082001F0CCFA1749082001F0BAFA0021162001F0C4FA1449162001F0B2FA07210C20FD
-:4011C00001F0BCFABDE8F84010490C2001F0A8BAA5430040944300409D60004012600040F851004084600040AD92FF1F6B1A0000A5180000691A00009D190000C9190000FE
-:40120000F9190000311A0000711A0000E51A0000214B224A10B5187000231370204A40201370204A0F2413701F4A13701F4A13701F4A13701F4A13701F4B4FF400021A60B6
-:401240004FF080721A604FF400121A6020221A601860802018604FF480701860174804704FF480001860164B1A70933B19B91A7802F0FE0202E01A7842F001021A70114B51
-:4012800003221A70802203F8202C012001F014FE0D4B04221A7010BDC892FF1FCE92FF1FCC92FF1FCD92FF1FC992FF1FB892FF1FCB92FF1F4093FF1F00E100E09E60004062
-:4012C0009C600040286000401260004070B5074C054623780E461BB9FFF7E0FE0123237031462846BDE87040FFF792BF7892FF1F0A4A002313700A4A13700A4A13700A4A82
-:4013000013700A4A13700A4A13700A4A13700A4B03221A70802203F8202C7047CE92FF1FCC92FF1FCD92FF1FC992FF1FB892FF1FCB92FF1F4093FF1F28600040014B187899
-:40134000704700BFCD92FF1F044B1A7802F0FF001AB118780022C0B21A707047CC92FF1F024A0C2303FB002040787047D492FF1F431E072B0CD8074A064B00010344805C33
-:401380005B7800F00F0043EA0020023880B2704700207047FC5F00401A4A38B50C2303FB00231B79090C13F0800F00F1FF35044619BF8AB24FF480438BB24FF48042032DA2
-:4013C00018D8DFE805F002070C110021084601F01BF80DE00021084600F0FAFF08E00021084600F0D9FF03E00021084600F0B8FF054B1855EDB2072D03D801F0EDF8034BBC
-:40140000185538BDD492FF1FA492FF1FAD92FF1F431E072B2DE9F0470446894615465CD82F4F0C2202FB0072D388DFF8B8A09BB2C3F500739D424FF00C0303FB007388BF8B
-:40144000D588DB7884BFC5F50075ADB2254A43EA15230601B354B244EBB28AF80130224B1A5C9846FF2A01D1FFF796FF0C2303FB047200215170B9F1000F28D03DB31B4FEC
-:40148000385D01F011F811232946FE2218F8040001F0D6F806F5C04278321FFA89F118F8040001F0DFF8124D18F80410385D01F04BF80121385D00F0E1FF735D43F0020316
-:4014C0007355735D03F0FD037355BDE8F08703FB04746379DBB28AF80230BDE8F08700BFD492FF1FFC5F0040AD92FF1FA492FF1F706000402DE9F047044615468846002946
-:4015000040D0431E072B3FD8FFF732FFA84203D22046FFF72DFF05461D4E335DFF2B03D141462046FFF738FFDFF868A027011AF8040000F0B9FF1223FE222946305D01F01E
-:401540007FF807F5C0411FFA88F27831305D01F089F8DFF84490315D1AF8040000F0F4FF01211AF8040000F089FF17F8093043F0020307F8093017F8093003F0FD0307F8E8
-:40158000093002E00D4600E000252846BDE8F087AD92FF1FA492FF1F70600040431E072B0AD8064A0C2303FB002300225A705A79034BD2B200011A54704700BFD492FF1F5E
-:4015C000FE5F0040431E072B9FBF024B000108221A547047FE5F004030B51A4A1A491B4D0878138803449BB21380194A00231488D8B2A4B27CB1082B0CD050680078C0B2ED
-:40160000E85450680133013050601088013880B21080ECE718460B780E4C082B0E4A00D040B10E4D2B7883F080032B700F232370022301E0022323701370094B18700870CB
-:4016400030BD00BF4493FF1F4093FF1F00600040BC92FF1FB992FF1FCE92FF1FCA92FF1F4193FF1F074B02221A70074B80221A70064B0F221A70064A00231370054A012089
-:4016800013707047CE92FF1FCA92FF1FB992FF1F4093FF1F4193FF1F30B5164B16491B780A8803F00F03023BDBB21A4492B20A80124C134A0020118889B279B173B155682D
-:4016C000215C013BC9B229705168DBB20131516011880130013989B21180ECE7094A1370094A137883F080031370084B0B221A7030BD00BF296000404493FF1F0060004010
-:40170000BC92FF1F4193FF1FCA92FF1FB992FF1F064A06231370064A01201370054B80221A70054B00221A70704700BFCE92FF1FB992FF1FCA92FF1F4193FF1F054B9A68E5
-:401740003AB19A68044910709A680988518000229A607047BC92FF1F4493FF1F08B5124B1A78D2B21A701B78DBB21A0602D50F4A137008BD0220FFF7E1FF0D4B1B7803F0CF
-:401780006003202B05D0402B06D043B900F012FC04E001F0A1FB01E000F046FD10B9034B03221A7008BD00BF28600040B992FF1F0060004008B5084A084B0120197813881C
-:4017C0000B449BB21380064B00221A70FFF7B6FF044B03221A7008BD4493FF1F4093FF1FCE92FF1FB992FF1F08B50C4B1B78DBB2042B07D0062B09D0022B0DD1BDE8084046
-:40180000FFF7D8BFBDE80840FFF746BF0320FFF795FF034B03221A7008BD00BFCE92FF1FB992FF1F08B5054B002201201A70FFF785FF034B03221A7008BD00BFCE92FF1FCB
-:40184000B992FF1F08B50A4B1A7832B11A78094942F080020A7000221A70074B002201201A70FFF76BFF054B03221A7008BD00BFB892FF1F08600040CE92FF1FB992FF1FC1
-:40188000074B1B78DBB2042B05D0062B05D0022B05D1FFF7A1BEFFF7C5BFFFF7D3BF7047CE92FF1F38B51D4C2378DBB2DD0634D518060AD503F00F03012B2ED1FFF74EFF43
-:4018C000174B1B78190609D538BD5A0602D5FFF7D7FF03E09D0620D5FFF786FF23781B061BD4104B1A78104B1B7813430F4A13701278934211D10A4A0849154613782078EC
-:40190000DBB2000605D41378DBB20B700B7803F00F0328788342F1D138BD38BD28600040B992FF1FCA92FF1F4193FF1F29600040054A00231380054A916819B191680B701E
-:4019400092685380704700BF4493FF1FBC92FF1F0E4808B503889BB213B9FFF783FE13E00B4B02221A700B4B00221A70FFF7E0FF094AD1799379028843EA012392B293422A
-:4019800038BF0380FFF728FE012008BDBC92FF1FCE92FF1FCA92FF1F00600040084B01221A700F3B9B7C074B1A7B02F00302012A1EBFDA7B82F08002DA7301225A73704723
-:4019C0000B600040D492FF1F094B02221A700F3B93F82230074B1A7E02F00302012A1EBFDA7E82F08002DA7601225A76704700BF0B600040D492FF1F0B4B04221A700F3B22
-:401A000093F83230094B93F8242002F00302012A1EBF93F8272082F0800283F82720012283F82520704700BF0B600040D492FF1F0B4B08221A700F3B93F84230094B93F857
-:401A4000302002F00302012A1EBF93F8332082F0800283F83320012283F83120704700BF0B600040D492FF1F7047FFF741BC0000F0B5184B184E19780C27C9B201234FF029
-:401A8000000C31B3CA0720D5144A4FEA031E7244947850782040C5070DD507FB03652C79240608D5147804F0FE0414706D790C4CEDB204F80E50840706D507FB0364257960
-:401AC0002D0658BF84F801C090700133DBB24908D7E7F0BD9F600040D492FF1F70600040FE5F004000F0ACBC70B50446184B88B003AA03F11006154618685968083303C5BA
-:401B0000B3422A46F7D11B782B70FCB12223237001AD03232846637000F08AFE002220461146AB5C08AC04EB131414F8144C03F00F03847008AC234413F8143C0132082A48
-:401B4000C1700371417100F10400EAD108B070BDA73900002DE9F0431C4D01222E460C201F274FF0800E4FF0080C194B00FB02581401234418705F70164998F80590214449
-:401B8000B9F1000F07D098F8044024064CBF887081F802C001E081F802E000FB0261CC880132E4B29C71CC88092AC4F30724DC71CC88E4B21C71C988C1F307215971D4D1CC
-:401BC000054BFF221A70BDE8F08300BFD492FF1F70600040FC5F00400A600040064B074A1B7802EBC30253681A7C824286BF03EBC003586900207047C892FF1F083A0000F6
-:401C00002DE9F84F424B1A78002A7ED01878414D0138C0B2FFF7E2FFA8463F4AC3681478007ADFF800C1E4B203EBC0000C2600274FF0010E834268D01A78A24263D11CF82A
-:401C40000420597891425ED19A7893F8039002F07F0206FB02FA05EB0A01CF7093F802B009F0030981F804B093F803B005F80AB0B3F804A0A1F808A093F902A0BAF1000FB7
-:401C80000BDAB9F1010F0CBF4FF007094FF00D0981F8059081F801E009E0B9F1010F0CBF4FF005094FF0090981F805904F704FEA02191A4906FB0282494481F802E0B2F807
-:401CC00008A0CAF3072A81F800A0B2F808A05FFA8AFA81F801A0B2F806A011495FFA8AFA494481F806A0B2F80690C9F3072981F80790B2F806905FFA89F981F80490D288FB
-:401D0000C2F307224A71083394E7BDE8F88F00BFCD92FF1FD492FF1FC992FF1FFC5F004070600040BA92FF1F08B5064B18780138C0B2FFF753FF20B143681B7900EBC3008B
-:401D4000406908BDCD92FF1F00212DE9F84F0B464E4E0C2707FB01F401313219092933554FF000059370494CD3701381937253705371EFD118B1464B1D70464B1D70464B17
-:401D80001A78002A7FD0187801250138C0B2FFF725FFA8464368DFF8F8E0DB790C2713F0400F3E4B4FF0000C1A7814BF42F0010202F0FE021A70027AD20007FB0541C368D1
-:401DC00003EB02094B4531D093F802A00AF07F06AE4229D10E89B3F804B0B6B25E4538BFA1F808B01E7893F801B01EF80660B3451AD181F804A0DE780E7093F902A0DE78D4
-:401E0000BAF1000F06F0030607DA012E0CBF07260D264E7181F8018006E0012E0CBF052609264E7181F801C00833CBE70135092DC3D1C1680A328B1C0A440C20083393423F
-:401E400009D013F8081C13F80A5C01F07F0100FB01418D72F2E7FFF767FF114B0121186000230C2000FB0142D3801289013113449BB203F00102134409299BB2F2D1BDE88C
-:401E8000F84FFFF767BEBDE8F88F00BFD492FF1FBA92FF1F4293FF1FCD92FF1FCB92FF1FD092FF1F114B1B7903F07F035A1E072A19D80F490C2202FB031291781B0141F08F
-:401EC000010191700021D170517841F002015170127912F0800F074A1A4414BF8D2389239370FFF715BC0020704700BF00600040D492FF1FFC5F004030B4194B1A7902F0D9
-:401F00007F02531E072B27D8164B0C2404FB02339978154D01F0FE0199700021D97029461201505D114400F07F0050555A7802F0FD025A701A795B78120605D5012B01D168
-:401F40008C7006E00D2303E0012B0CBF082309238B7030BCFFF7DCBB002030BC704700BF00600040D492FF1FFC5F004010B50D4B0D4C21791878C9B20138C0B2FFF72EFE81
-:401F800043681B798B4201D2012909D8074A0848535CDBB24354A3780120DBB2535410BD002010BDCD92FF1F00600040BA92FF1F4293FF1F38B58A4A8A4C13780021DBB24F
-:401FC00021801806517840F18D800A2900F20581DFE811F05D00030103010301030103010B0003017E0003018200D3787C49012B09D17D4B1A787D4B03EBC2035B685B68B3
-:402000006360122310E0CB78022B12D18878FFF7E5FD002800F0E180436863606368DA7863689B7843EA02232380BDE83840FFF78FBCCB78032B26D16D4B00228878D5B28F
-:40204000854209D3664A91786A4AEE2908BF1346634A917881B106E0187801320028F1D018780344EAE764499278097C914203D16248FFF739FD614B1A78002A00F0AD80B9
-:402080001A78228018E0BDE8384000F025BF13F0030313D0022B40F0A0802380504B0C211B7903F07F02564B01FB02339A78554BD2B21A7000225A706360B6E70222228083
-:4020C000514A11784F4AC9B2117053706260ACE7012323804D4BEFE70123238013794C4A1344E9E701390A2977D8DFE801F037764F76067676760A7620009378454ADBB2B5
-:402100005AE0937803F0FF0153B9404B1A7891425FD01970404B01201870FFF715FE58E0481EC0B2FFF75AFD0028EED155E0FFF71DFF002851D02A4A384913791279DBB209
-:40214000D2B20A70364A3249D25CCB5C9A4240D0314B01221A70FFF753FD3AE003F00303012B2BD009D3022B37D11D4B9B78002B33D1BDE83840FFF7BFBE194B9B78012B8E
-:402180002BD1214A137803F0FD0315E003F00303012B13D008D3022B1FD1114B9B78E3B9BDE83840FFF77EBE0D4B9B78012B14D1154A137843F0020313700AE0084B1A79FA
-:4021C0005AB998781B791749DBB2CA5C22EA0002CA54BDE83840FFF79BBA002038BD00BF00600040BC92FF1FC892FF1F083A00006C3A0000F4390000DF3A00006093FF1FEA
-:40220000D492FF1F7992FF1FCB92FF1FCD92FF1FBA92FF1FB892FF1FCC92FF1FC992FF1F4293FF1FCF92FF1F074B1A78120609D55B78012B06D1054B054A5A6012781A8093
-:40224000FFF786BB0020704700600040BC92FF1FCC390000014B1870704700BF78640040014B1878704700BF6B650040014B1870704700BF79640040064A0123136002F631
-:4022800088321268E0211064034A1170A2F540721360704780E100E000E400E0014B1870704700BF79650040014B1870704700BF7D64004073B515461E460B4C05230022D4
-:4022C000019200920A4601461846237000F064F932462946207800F01FF90221207800F009F9207802B070BDD080FF1F064A0423136002F688321268E0219064034A1170F2
-:40230000A2F202321360704780E100E002E400E0014B04221A60704700E100E0014B04221A60704780E100E0014B1870704700BF7B650040704738B505460078012428B18D
-:4023400000F062FD285D0134E4B2F8E738BD08B50D2000F059FDBDE808400A2000F054BDF7B516461F460B4C00230325019300930A4601462846257000F00EF93A463146E4
-:40238000207800F0C9F80221207800F0B3F8207803B0F0BDE080FF1FF7B516461F460B4C00230225019300930A4601462846257000F0F2F83A463146207800F0ADF82946CC
-:4023C000207800F097F8207803B0F0BDE180FF1FF7B516461F460B4C00230125019300930A4601462846257000F0D6F83A463146207800F091F80221207800F07BF8207805
-:4024000003B0F0BDE280FF1F73B515461E460B4C0023019300930A4601461846237000F0BBF832462946207800F076F80221207800F060F8207802B070BD00BFE380FF1F72
-:40244000024B1878C0F38010704700BF8F450040074A7F23802113705170064A013BDBB202F80839002BF9D1034A1370704700BFE480FF1FF87B00400078004017280FD838
-:40248000084B0001C25C11B142F0200201E002F0DF02C254C25C42F00102C25400207047012070471070004017280BD8064B0001C25C02F0FE02C254C25C02F0DF02C25451
-:4024C00000207047012070471070004017280DD8074900010B4603441A7942F004021A71435C43F00103435400207047012070471070004017280BD8064A0001835C490093
-:4025000003F0F10301F00E011943815400207047012070471070004041F6FF73994208BF4FF400519A4208BF4FF4005217289FBFC00000F1804000F5EC4081809ABFC28032
-:40254000002001207047000017289FBF034B00011954002088BF0120704700BF1970004017289FBF054B00011A5C01F007019DBF1143195400200120704700BF147000404E
-:4025800017289FBF034B0001185C00F0070088BFFF20704714700040172810B51AD8C00001F07F0100F1804441EAC21204F5EC44D2B222709DF8082003F00F0343EA0213C5
-:4025C000DBB263709DF80C30002003F00F03A370E07010BD012010BD10B500F075FC0A4A5378182B0AD91478013B5370E30003F1804303F5F0431B78137000E0FF2400F0A3
-:4026000067FC204610BD00BFE480FF1F030610B5044611D400F058FC084AE300117803F1804303F5F04319705378147001335370BDE8104000F04CBC10BD00BFE480FF1F18
-:4026400030B504060CD411F4704509D1C40004F1804404F5F0442180A270E370284630BD012030BD03065FBFC00000F1804000F5F04081805ABFC2800020012070470000CD
-:4026800038B50446084DB4F5004F05D9286800F013FCA4F50044F6E7034B58686043BDE8384000F009BC00BFEC80FF1F024B1B7A584300F001BC00BFEC80FF1F0E4B00F0E7
-:4026C00003001A78490102F0FC02104318701A7801F0600142F080021A701A7802F07F021A701A7802F09F020A431A701A7842F010021A70704700BF83430040014B012238
-:402700001A70704784430040044B00F00F021B6853F8220043F82210704700BF08ED00E0054A00F01F00126800F1100352F8230042F82310704700BF08ED00E000F01F0049
-:4027400000F16040490100F56440C9B2017070470F4B10B50F4900240F205C609C60DC601C615C61FFF7D0FF0B4A136843F0040313600A4B4FF47A72DB68B3FBF2F3084A5C
-:402780001360084B4FF400421C60C3F8E82010BD7C92FF1FFD27000010E000E0EC80FF1F14E000E018E000E0024A136843F002031360704710E000E008B5FFF7F5FF034A7F
-:4027C000136843F00103136008BD00BF10E000E010B5054CA3691BB9FFF7BAFF0123A361BDE81040FFF7E8BF7C92FF1F024B1868C0F30040704700BF10E000E038B5FFF7EC
-:40280000F5FF012808D1054D002455F8243003B198470134052CF8D138BD00BF8092FF1F024B03EB80035868596070477C92FF1F134B144A1B78DBB20360127843EA0223B0
-:40284000114A0360127843EA0243104A0360127843EA026303600E4B0E4A1B78DBB24360127843EA02230C4A4360127843EA02430A4A4360127843EA02634360704700BFF1
-:402880000301004904010049EC460040020100490101004900010049050100490601004910B500F011FB204A044613780A2043F002031370137C43F00203137412F80A3C08
-:4028C00043F0010302F80A3C937943F00103937102F5AB52137843F003031370134B18221A7013F8012C42F0400203F8012C13F8012C02F0FC0203F8012CCE2203F8062C7C
-:40290000A3F597530222183B1A70094A137843F008031370FFF7CAFE064B10222046BDE810401A6000F0D4BAAB4300400E5900402F5B004080E200E008B500F0C5FA0F4A3B
-:40294000137803F0FE031370A2F5AA521D3A137803F0FD031370137C03F0FD03137412F80A3C03F0FE0302F80A3C937903F0FE039371BDE8084000F0ABBA00BF0859004037
-:40298000044A137803F03F0343EA8010C0B21070704700BF08590040082804D00A280CBF8223C22300E0422308380E4AC0B20428137098BF0C4B4FF0000298BF33F9101028
-:4029C0000A4B88BF11461A8042F210734B4341F2883103F6C41393FBF1F305490B60054B1A8070470A590040B83900004A93FF1F4C93FF1F5093FF1F08B5102000F0A6F974
-:402A000007210420FFF79AFE07490420FFF788FE064A0C20137843F006031370FFF7BCFF034B00221A8008BDF12A0000095900404893FF1F10B5054C23781BB9FFF7DCFF7A
-:402A400001232370BDE81040FFF72ABF9892FF1F044B1A7802F0FB021A701A7842F001021A7070470859004010B5084B1C7814F0010403D10028F9D0002404E02046FFF7A2
-:402A800015FE024B1B78204610BD00BF09590040034A044B1B881088181A00B2704700BF5093FF1FA25B00400E4A13881BB223B111880A2309B2594301E00B4B19680B4B61
-:402AC0001B88C01A42F2107300B203FB00F2022391FBF3F30028D8BF5B42134493FBF1F000B270474A93FF1F4C93FF1F4893FF1F7047000010B500F0E7F9214A0446137861
-:402B00000A2043F001031370137C43F00103137412F80A3C43F0020302F80A3C937943F00203937102F5AA521832137843F003031370144B18221A7013F8012C42F0400201
-:402B400003F8012C13F8012C02F0FC0203F8012CCE2203F8062CA3F597530222123B1A70094A137843F008031370FFF79FFD074B08222046BDE810401A6000F0A9B900BFB0
-:402B8000AB43004006590040275B004080E200E008B500F099F90F4A137803F0FE031370A2F5AA52153A137803F0FE031370137C03F0FE03137412F80A3C03F0FD0302F87F
-:402BC0000A3C937903F0FD039371BDE8084000F07FB900BF00590040044A137803F03F0343EA8010C0B21070704700BF00590040082804D00A280CBF8223C22300E0422383
-:402C000008380E4AC0B20428137098BF0C4B4FF0000298BF33F910100A4B88BF11461A8042F210734B4341F2883103F6C41393FBF1F305490B60054B1A8070470259004054
-:402C4000C23900005693FF1F5C93FF1F5493FF1F08B5102000F084F807210320FFF76EFD07490320FFF75CFD064A0C20137843F006031370FFF7BCFF034B00221A8008BD33
-:402C8000492D0000015900405893FF1F10B5054C23781BB9FFF7DCFF01232370BDE81040FFF728BF9992FF1F044B1A7802F0FB021A701A7842F001021A70704700590040D8
-:402CC00010B5084B1C7814F0010403D10028F9D0002404E02046FFF7E9FC024B1B78204610BD00BF01590040034A044B1B881088181A00B2704700BF5493FF1FA05B004034
-:402D00000E4A13881BB223B111880A2309B2594301E00B4B19680B4B1B88C01A42F2107300B203FB00F2022391FBF3F30028D8BF5B42134493FBF1F000B270475693FF1FD5
-:402D40005C93FF1F5893FF1F70470000034A00F0F800137803431370704700BF02410040034A00F0F800137803431370704700BF06410040014B1870704700BF7A65004015
-:402D8000014B1870704700BF7E64004073B515461E460B4C04230022019200920A46014618462370FFF7F8FB324629462078FFF7B3FB02212078FFF79DFB207802B070BDA7
-:402DC000FC80FF1F074A0223136002F688321268E0215064044A11706FF440710A441360704700BF80E100E001E400E0014B1870704700BF7A640040014B1870704700BF9D
-:402E00007B64004000000000FEB5494652465B460EB40746244909688A46244A12682448022100F071F8030020480068C018204900F06AF8143883460121C9430C4601254A
-:402E4000002600F041F8814651460B7823400B705846013000F030F83800F04028400B78234003430B70584600F026F80136072EF2D9002001300138013001200B78234041
-:402E800003430B705846043000F016F8484600F01FF800BF00BF00BF0EBC894692469B46FEBD00BFAFF30080D480FF1FF880FF1F00C20100000000000230800803D000BFAA
-:402EC00001380046FCD17047EFF3108072B6704780F31088704700BF094A137803F00303012B0AD0022B09D113790C2103F07F02044B01FB02339B7A00E013790020704714
-:402F000000600040D492FF1F002902D0B0FBF1F0704708B14FF0FF3000F008B80029F8D00246B0FBF1F000FB11217047704700BF014B1868704700BF6081FF1F0E4B70B57A
-:402F40001E460E4C0025E41AA410A54204D056F8253098470135F8E700F0DEFD084B094C1E46E41AA4100025A54204D056F8253098470135F8E770BD243B0000243B00007F
-:402F8000243B00002C3B000003460244934202D003F8011BFAE7704730B5141E05469BB0184604DA8B232B604FF0FF301DE04FF40273ADF80C300CBF234604F1FF33029350
-:402FC00005934FF6FF7300910491ADF80E3002461E9B6946284600F073F8431CBCBF8B232B6014B1009B00221A701BB030BD000007B5009313460A46014603480068FFF741
-:40300000CBFF03B05DF804FB6081FF1F2DE9F0478E6882469E420C46914698463ED88A8912F4906F3AD02568096902236F1A656905EB450595FBF3F57B1C43449D4238BF75
-:403040001D4653050FD5294600F04AFB064698B13A46216900F0D2FAA38923F4906343F08003A38113E02A4600F098FB064670B92169504600F0E8FA0C23CAF80030A38908
-:403080004FF0FF3043F04003A381BDE8F08726613E44266046466561ED1BA560464528BF464649463246206800F0B3FAA36800209B1BA36023681E442660BDE8F087000061
-:4030C0002DE9F04F9DB003938B8980461C060D4616460DD50B695BB9402100F001FB2860286118B90C23C8F80030CDE040236B610023099320238DF82930DFF89CB1302302
-:403100008DF82A3037463C4614F8013B1BB9B7EB060910D003E0252BF9D02746F3E74B46324629464046FFF771FF013000F0A780099B4B4409933B78002B00F0A080002335
-:403140004FF0FF3204930793059206938DF853301A930126052221784E4800F041FA671C049B38B14B4A3C46801A06FA00F018430490EFE7D90644BF20228DF853201A0773
-:4031800044BF2B228DF8532022782A2A03D0079A00210A200BE0039A111D12680391002A10DA524243F00200079204900BE027463B780134303B092B03D800FB0232012141
-:4031C000F5E701B107923B782E2B1ED17B782A2B0AD1039B02371A1D1B680392002BB8BF4FF0FF33059310E0002319460593781C0A2407463A780130303A092A03D804FB46
-:4032000001210123F5E703B1059103223978224800F0E6F940B14023CBEB000003FA00F0049B013718430490397806221B487E1C8DF8281000F0D4F988B1194B33B9039BDF
-:40324000073323F007030833039314E003AB00932A46144B04A94046AFF3008007E003AB00932A460F4B04A9404600F093F8B0F1FF3F824603D0099B5344099342E7AB897F
-:403280005B0601D4099801E04FF0FF301DB0BDE8F08F00BFF33A0000F93A0000FD3A0000000000000D3000002DE9F04791461F460A698B6806469342B8BF1346C9F8003093
-:4032C00091F843200C46DDF8208012B10133C9F800302368990642BFD9F800300233C9F80030256815F0060510D104F1190A07E00123524639463046C04701301AD001355B
-:40330000E368D9F800209B1A9D42F1DB94F843302268003318BF012392060FD5E118302081F843005A1C94F845102244023382F8431003E04FF0FF30BDE8F08704F1430253
-:4033400039463046C0470130F4D02268D9F80050E36802F00602042A08BF5D1B2269A3680CBF25EAE57500259342C4BF9B1AED184FF000091A344D4509D0012322463946F2
-:403380003046C0470130D5D009F10109F3E70020BDE8F0872DE9F04317460A7E85B06E2A984606460C460C9B01F1430E00F0AE8011D8632A22D009D8002A00F0BB80582A01
-:4033C00040F0CA8081F84520834955E0642A1ED0692A1CD0C0E0732A00F0B08009D86F2A2ED0702A40F0B8800A6842F020020A603EE0752A24D0782A3AD0ADE01A6801F114
-:403400004205111D1960136884F84230A8E021681A6811F0800F02D0111D196008E011F0400F02F10401196002D0B2F9003000E01368002B3CDA2D225B4284F8432037E0C5
-:4034400021681A6811F0800F02D0111D196007E011F0400F02F10401196001D0138800E01368227E5C496F2A14BF0A2208221BE078225A4984F845202268186812F0800F0E
-:4034800000F104051D6003D1550601D5038800E00368D00744BF42F0200222601BB9226822F0200222601022002084F8430001E049490A226568002DA56008DB206820F0CC
-:4034C000040020602BB9002D7DD175460CE0002B79D07546B3FBF2F002FB1033CB5C05F8013D03460028F5D1082A0BD12368DA0708D5236962689A42DEBF302305F8013CF7
-:4035000005F1FF35C5EB0E0323612EE008681A6810F0800F496903D0101D1860136808E010F0400F02F104001860136801D0198000E0196000232361754616E01A68111DFC
-:403540001960156800216268284600F049F808B1401B6060636804E004F1420584F8422001232361002384F84330CDF800803B4603AA21463046FFF797FE013002D14FF056
-:40358000FF3026E023692A4639463046C0470130F5D023689B0710D5002504F1190907E001234A4639463046C0470130E7D00135E368039A9B1A9D42F2DBE068039B9842DC
-:4035C000B8BF184605E00B7804F1420584F842308AE705B0BDE8F083A7390000043B000010B5C9B202449042034605D01C7801308C42F8D1184610BD002010BD10B5431EF7
-:403600000A44914204D011F8014B03F8014FF8E710BD884210B501EB020301D8421E0BE09842FBD28118D21AD34204D013F8014D01F8014DF8E710BD994204D011F8014B40
-:4036400002F8014FF8E710BD38B50546002944D051F8043C0C1F002BB8BFE41800F0D4F81E4A1368114613B96360146030E0A3420DD92268A018834201BF18685B68121885
-:40368000226063600C6023E0A24203D813465A68002AF9D118681918A1420BD12168014458188242196013D110685268014419605A600DE002D90C232B6009E021686018A3
-:4036C000824201BF106852680918216062605C602846BDE8384000F098B838BDA092FF1F70B5CD1C25F0030508350C2D38BF0C25002D064601DBA94202D90C23336046E018
-:4037000000F082F8234B1C681A462146A1B10B685B1B0ED40B2B03D90B60CC18CD501EE08C420BBF63684B681360636018BF0C4615E00C464968E9E7174C23681BB9304658
-:4037400000F052F820602946304600F04DF8431C18D0C41C24F00304A0420DD12560304600F053F804F10B00231D20F00700C31A0ED05A42E25070BD211A304600F034F863
-:403780000130EBD10C233360304600F03EF8002070BD00BFA092FF1F9C92FF1FF8B5074615460E4621B91146BDE8F840FFF798BF1AB9FFF749FF2846F8BD00F027F8854208
-:4037C0000ED929463846FFF78BFF044650B131462A46FFF713FF31463846FFF735FF01E03046F8BD2046F8BD38B5064C0023054608462360FDF7DCFB431C02D1236803B13B
-:403800002B6038BD8493FF1F7047704751F8040C0028BEBF091851F8043CC0180438704700000000050209020B020D020F021102130215027265706C792030782530327881
-:4038400000686F6D696E6700626567696E6E696E67207365656B2066726F6D20256420746F2025640066696E6973686564207365656B00796573006E6F00647269766520AA
-:40388000303A20257320647269766520313A2025730057616974696E6720666F72205553422E2E2E0055534220726561647900636F6D6D616E64203078253032780066610F
-:4038C000696C2025642B25642B2564203D3D2025642C206E6F74202564007061737365643D256400756E64657272756E206166746572202564207061636B65747300636FE8
-:40390000756E743D256420693D256420643D256400636D645F777269746500703D25642063723D25642063773D256420663D256420773D256420696E6465783D2564207526
-:403940006E64657272756E3D256400756E64657272756E2100737563636573730073746172742065726173696E670073746F702065726173696E670069646C650000510001
-:4039800040100040510040300000000140001000140140000800400140000A004C014000020050014020003031323334353637383941424344454600000100000004000096
-:4039C00000100001000000040000001028000000000104000100000000000000000157494E5553420000303030303100000000000000000012034D0053004600540031002A
-:403A0000300030000100000001000000103A000001000000DF3A0000000000000000000001000000283A000001000000B13A0000040000004A3A00000000000000000000E9
-:403A400000000000483A0000FF00000001024000FF00000082024000FF00000003034000FF00000084034000FF00020304030904160346006C007500780045006E006700CA
-:403A800069006E0065002A0343006F0077006C00610072006B00200054006500630068006E006F006C006F0067006900650073000009022E0001010080320904000004FFC9
-:403AC00000000107050102400000070582024000000705030340000A0705840340000A12010002FF0001080912006E0100020180014300232D302B2000686C4C00656667E2
-:403B0000454647003031323334353637383961626364656600000000F8B500BFF8BC08BC9E467047590000002D100000F8B500BFF8BC08BC9E46704735000000503B0000FD
-:403B4000C880FF1FA00000002012000000000000000000008893FF1FFF000000675000400C00000007000000FFFFFFFF7F8000003F0000000000007D00FA000040000000DA
-:403B80000090D003FF0000000000000000000000000000000000000000000000000000000000000000000000F13A0000000000000000000000000000000000000000000078
-:403BC000000000000000000000000000000000000000000000000000000000000000000000000000000000000081FF1F000000000000000000000000000000000000000026
-:403C00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000084
-:403C40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044
-:403C80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004
+:4000000000800020110000003110000031100000064A08B5136843F020031360044B1A6803F53F5302331A6001F020F8E8460040FA46004010B5054C237833B9044B13B18B
+:400040000448AFF300800123237010BD6881FF1F00000000B8380000084B10B51BB108490848AFF300800848036803B910BD074B002BFBD0BDE81040184700BF0000000051
+:400080006C81FF1FB8380000C880FF1F000000000A4A0B4B116801310B40002BBEBF03F1FF3363F03F030133136011685368994202BF024B01221A72704700BF8881FF1FCC
+:4000C0003F0000800A4A0B4B516801310B40002BBEBF03F1FF3363F03F030133536051681368994202BF024B01221A72704700BF8881FF1F3F0000800E4BDA681AB901215F
+:4001000019745A7410E05A7C1A741A7C0AB1002207E059699A69D8688A1A82428CBF002201225A745A699A611B7C13B1002002F043B970478881FF1F10B5C4B2204601F054
+:4001400057F90128FAD110BD08B572B60F4B0F495A6901325A61DA690132C82A08BF0022DA611A6AD8690132A72A08BF00220A621B6A002B0CBF02230023002814BF184660
+:4001800043F0010002F080FE62B608BD8881FF1F38B50446C5B2284602F0B0F8062002F0CDFA44F00200C0B202F0A8F8062002F0C5FA284602F0A2F8BDE83840062002F0C2
+:4001C000A7BA10B5642402F093F828B9FFF7E0FF013CF8D1204610BD012010BD70B5C4B2054620460E4601F003F9012805D0204601F01CFA2846FFF79FFF204601F000F9AD
+:40020000314605460246204601F0BCF9204601F0EFF80028FAD1284670BD000038B5044D0024285D013402F039FA402CF9D138BDAC81FF1F08B502F053FC002002F05CFCBD
+:4002400002F06EFC02F078FC80B208BD10B50446012002F06BF8642002F05AFAFFF7EAFF2080002002F062F8642002F051FAFFF7E1FF608010BD08B502F05EFD002002F02B
+:4002800067FD02F079FD02F083FD80B208BD10B50446FFF796FF322002F03AFAFFF7EBFF20800120FFF774FF322002F031FAFFF7E2FF608010BD0FB400B593B014AB53F835
+:4002C000042B402102A8019302F0DEFE02A802F07AF802F084F813B05DF804EB04B0704710B5044601780648FFF7E5FF0420FFF723FF62782146BDE81040042001F0D0B8B5
+:40030000CC38000007B50023ADF804308DF80600032301A88DF80530FFF7E2FF03B05DF804FB000010B5074C94F8643043B1002001F0D8FF002002F06BFD002384F864304E
+:4003400010BD00BF8881FF1F38B5104D837895F8672004469A4204D0FFF7E4FF002385F86A302368C5F865302279094B1A71A378002B14BF0220012002F04AFDE07802F02E
+:4003800041FD2079BDE8384002F078BD8881FF1FED81FF1F38B50D4C94F8645065B904F16500FFF7D1FF012001F09CFF4FF47A7002F0AEF984F86A506369E366012384F84D
+:4003C0006430BDE8384002F0E1B900BF8881FF1FF8B5214C0546FFF7DDFF94F86A3003B15DB91E48FFF767FFFFF7EBFE0120002384F86A00236702F0A1F92A46216F184872
+:40040000FFF759FF144E0027236F9D4216D001F06FFF00B13767236F9D4205DD0120FFF7B7FE336F013305E005DA0020FFF7B0FE336F013B336702F0A9F9E5E7322002F047
+:4004400067F92A2DCCBF0020012002F023FDBDE8F8400448FFF72FBF8881FF1FD9380000E0380000FD3800002DE9F04F99B062B602F0F6F99D49042002F01AFA9C4801F0D9
+:4004800043FF9C4802F0E6FC9B4801F077FF02F0C7FB02F099FA002002F0BAFC01F092FF0221002000F05AFF944C012001F0D2F8002384F86730FFF76DFFFFF782FE84F8A3
+:4004C0007400FFF72FFF012384F86730FFF762FFFFF777FE84F87500FFF724FF884B94F87400884994F875202546002A14BF0A461A46002808BF19468348FFF7DCFE032177
+:40050000084602F023F9264602F040F994F8643043B1EA6E6B699B1A41F28832934201D9FFF700FF00F052FF18B97848FFF7C3FE04E000F051FF0028F7D10BE000F046FF85
+:4005400010B902F023F9F9E77148FFF7B4FE032001F06CF8032000F04BFF0128D4D16D48FFF7F2FE6C490320FFF738FE94F876106A48FFF7A0FE94F87630023B142B00F229
+:40058000D483DFE813F01500D2031E00D2032400D2034F00D2037500D203D700D203BF01D2030603D2032A03D2033103D2034B0303238DF820308DF821300F238DF8223084
+:4005C00028E394F87800FFF703FF554B1FE3FFF7E1FE002323746069227C02F0FF0132B96B691B1AB3F57A7FF6DD0B4611E083B10022174696F878107069277494F810E007
+:40060000BEF1000F02D16B691B1AF7E701329142F3DA07228DF8202004228DF82120ADF82230F7E20220FFF787FD4FF000080DF1200A02F0ABF84FF480790027C9EB080303
+:40064000DA1907F80A200137402FF9D10220FFF773FD3A465146022000F022FFB9F10109EBD108F10108B8F1400FE2D12D4B38E04FF0010A4FF000080DF1200B02F086F844
+:400680004FF0000959460120FFF7A8FD08EB090300270493049B1BF807203B44DBB29A4209D08DE80C0041463B464A461E48FFF702FE4FF0000A0137402FEBD109F101091B
+:4006C000B9F5807FDED108F10108B8F1400FD5D151461648FFF7EFFDBAF1000F00F01A81134B1B8807A8ADF81C3094E249010000F900000091000000C50000008881FF1F0B
+:400700000F3900000B390000123900002A3900003D390000ED81FF1FFE81FF1F47390000BC380000BE3800005639000072390000C0380000206FFFF74BFE94F8780001F081
+:40074000F5FD94F8780001F0D9FD02F009FCB94BDFF8FC821A78002702F0FB021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A7002F0F7FB0220FFF7DCFCF9
+:40078000012141F6FF734FF48042084602F046FB84F8B60001F068FF08F807000137402FF8D1DFF8B0A200270AF195091FFA89F80137402F14BF3A4600221AF8010F2244C0
+:4007C000062392F82420402101F082FF424646F24E419AF8000001F08DFF08F14008402F1FFA88F8E4D196F8793053B196F87C30F36000233374237C002BFCD000233374E1
+:40080000F36000234FF0FF32236062602372236894F8B600234493F8241001F0DDFE94F8B60001F09BFE012194F8B60001F06EFE2368002BFCD0002398467360D6F814A0D4
+:40084000012701F0A3FF6369B4F87A20CAEB030393420DD367B1042195F8B60001F0C8FE94F8B60001F0D4FE0028F9D107463072237AFBB96A682B689A4202D1002FE0D1D9
+:4008800018E00220FFF758FC6968402209EB8111022000F005FE6A68674B01321340002BBEBF03F1FF3363F03F03013308F101086360C6E70220277AFFF73EFC0022114687
+:4008C000022000F0EDFD0220FFF736FCFFB2FFF7A5FC002001F012FD37B15848FFF7EBFC0220FFF70FFD06E0554B08A81B88ADF82030FFF7F5FC227C4146237A5148FFF7BB
+:40090000DAFC15E25048FFF7D6FCD4F87A7017F03F0701D0032009E2286FFFF759FD95F8780001F003FD95F8780001F0E7FC012001F002FD02F014FB444BDFF814811A7857
+:4009400042F004021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A7002F003FB01214FF4804341F6FF72084601F0E9FC85F8B60001F077FE08F8070001378C
+:40098000402FF8D1DFF8CC90002709F195031FFA83F804930137402F14BF3A46002219F8010F2244052392F82420402101F090FE414646F24B5299F8000001F09BFE08F1FF
+:4009C0004008402F1FFA88F8E4D100274FF0FF33376098467360BB463B46D6F87A9037725FEA99190CBF4FF0010A4FF0000A2168114A01310A40002ABCBF02F1FF3262F03B
+:400A00003F026068B8BF013282426FD02BB1227A002A7AD12A7C002A77D12068049A059302EB8010BAF1000F16D040223F2102F0F7FA1CE09E6400403F0000807C390000C9
+:400A4000C238000096390000A93900009B650040AC81FF1FAB81FF1F014601370120FFF7BDFBC7EB0903D3F1000A4AEB030A2168B34A01310A40002ABEBF02F1FF3262F0BB
+:400A80003F02013222606268059B01322ED12A683F2A2BD14FF00008C5F8048001F080FC85F808806B6895F8B6002B4493F8241001F092FD95F8B60001F050FD012195F8BF
+:400AC000B60001F023FD95F87E30EB6085F81080237C002BFCD04FF00008012086F8108001F06AFC404601F027FC00E023B1237A5BB92B7C4BB90123626842453FF477AFC1
+:400B00000BF1010BD5F8048071E701F04FFC012001F012FC002001F04FFC042194F8B60001F066FD94F8B60001F072FD80460028F8D196F8B60001F0FFFC337C327A029318
+:400B4000012303920193CDF800A05B463A4649467C48FFF7B0FBC6F80C80BAF1000F0BD0FFF75CFB002001F0C9FB237A63B17648FFF7A1FB0220D9E0B945F1D07349012035
+:400B8000FFF72CFB0137F7E77148FFF794FB714B3DE094F8780001F0C9FB206FFFF718FC6D48FFF788FB94F87930E36000232374237C002BFCD0012001F0FEFB00233374CE
+:400BC000237C002BFCD0002001F0F6FB00236348F360FFF770FB624B19E0002084F86A00FFF7F6FB5F4B12E094F8743023B195F875200AB985F8782094F875201AB113B9F6
+:400C0000012385F878305848FFF79EFB574B1B88ADF8203008A8FFF763FB89E0FFF782FB02F07CF8002002F01FF82A2701F04AFF002001F0EDFE3A46002108A802F0F0F9E0
+:400C400017238DF820308DF8217001F09FFD002001F048FB002002F0DBF8C82001F058FD0DF12200FFF7F2FA0DF13600FFF70FFB01F08CFD012002F0CBF8322001F048FD4D
+:400C80000DF12600FFF7E2FA0DF13A00FFF7FFFA012001F027FB4FF4967001F039FD01F075FD0DF12E00FFF7D1FA0DF14200FFF7EEFA002001F016FB4FF4967001F028FD84
+:400CC00001F064FD022002F0A3F8322001F020FD0DEB0700FFF7BAFA0DF13E00FFF7D7FA012001F0FFFA4FF4967001F011FD01F04DFD0DF13200FFF7A9FA0DF14600FFF756
+:400D0000C6FA002001F0EEFA4FF4967001F000FD01F03CFD002002F07BF8002384F86A3001F07EFF01F050FE74E70120FFF7EAFA032000F07BFC0E48FFF7BDFAFFF7E4BBB6
+:400D40003F000080B3390000E33900004092FF1FED390000C4380000F5390000033A0000C6380000C8380000FE81FF1FCA380000103A00002DE9F04172B6884B61221A70F9
+:400D8000A3F5F06301221A801924854A9C7092E803008033062283F8002283E80300522203F580731A707F4B7F4A1B787F4EDBB2137040F618027E4B00251A8041F25122A6
+:400DC00023F8022C33784FF4F07003F0010343EA450502F0BDF8013C05F003052ED0032DF0D1744B4FF480721A8007221A70724A002548211570917002221D705D7103F893
+:400E0000032C0422DA716D4A6D4C13786D4E43F00103137012F8013C062743F0030302F8013C2378012243F0800323705B4B1A70654A137843F02003137000E0FEE707FBAD
+:400E4000056300219A881868013502F0E9F8072DF5D15E485E4E002550F8041F05F1105303F1480221F0FF074933C9B20B4452005B0002329A4206D012F802EC12F801CC0C
+:400E80000EF807C0F5E7B0420D44E5D1514A002313609360136193614F4B504F1A68504BDFF888811A604F4B1A684F4B1A604F4A137843F002031370137C43F002031374F7
+:400EC0002378A2F5863243F040032370413A137843F010031370464A464B07CA03C31A80454A2833106843F8250C127903F8212C424A07CA03C31A80414AE83B07CA03C33B
+:400F00001A80404A083307CA03C31A803E4A3F4BA2F5616203CBC2F8100EC2F8141E1378042043F008031370394B02F5AA521B783D78DBB298F80060EDB203F007010C329F
+:400F40001B091170F6B2537045F003033B7046F0030388F800302F4B48221A702E4A402313702E49937013729372082382F81F3220220A7048710A72294A0A20137001F0C7
+:400F8000DDFB284B88F8006044223D70264D1A7094E80F0007C52B80BDE8F081004800405C0900480F010049A146004025420040224200400440004006400040A2430040AF
+:400FC000A0430040153A0000E8460040FCFFFF478C0000480076004064090048F8460040207600406809004828760040035001401C090048C051004028090048300900485A
+:401000003C090048480900483251004054090048CF0100491D51004001590040235B0040585B004076580040B0430040F946004008B501F0C9FF03680C2B00D1FEE7FEE79D
+:40104000084908B50B68084A1844821A802A01DC086005E001F0B8FF0C2303604FF0FF33184608BDCC80FF1F9093FF1F80B51148114B0025C0B1A3F1100192C92246043933
+:40108000161BB74204D051F8046F42F8046BF7E7114653F8046C8C1AA64202D041F8045BF9E701381033E5E701F094FFFFF7DCF9FEE700BF01000000E43B0000124A134BF0
+:4010C00010B51A60124A134C1368134843F4007313600023032B98BF54F823204FEA830188BF0E4A0133302B4250F3D10C4B1A780C4B1A700C4B084A1A60FFF73BFEBDE8CA
+:40110000104001F0EDB900BF0004FA050CED00E014ED00E0000000000080FF1F31100000BC760040C080FF1F08ED00E0F8B501F017FF4B4A01271378022643F001031370EA
+:40114000137C484C43F001031374474B02F5E3521F700B3203F8946C1378054603F07F031370002001F0EAFA2378404A03F0F90323701378384603F0DF03137023783B4325
+:40118000237001F0DBFA282001F0D8FA384B30461A7802F07F021A701A7802F0BF021A7023783343237001F0C9FA2378314A43F0040323700023137053702F4AFF2199544A
+:4011C0000133092BFBD1284601F0CEFE0721172001F0FCFA2949172001F0EAFA0721182001F0F4FA2649182001F0E2FA0721152001F0ECFA2349152001F0DAFA0721052032
+:4012000001F0E4FA2049052001F0D2FA0721062001F0DCFA1D49062001F0CAFA0721084601F0D4FA1A49072001F0C2FA0721082001F0CCFA1749082001F0BAFA0021162047
+:4012400001F0C4FA1449162001F0B2FA07210C2001F0BCFABDE8F84010490C2001F0A8BAA5430040944300409D60004012600040F851004084600040B592FF1FFB1A00008A
+:4012800035190000F91A00002D1A0000591A0000891A0000C11A0000011B0000751B0000214B224A10B5187000231370204A40201370204A0F2413701F4A13701F4A1370D9
+:4012C0001F4A13701F4A13701F4B4FF400021A604FF080721A604FF400121A6020221A601860802018604FF480701860174804704FF480001860164B1A70933B19B91A7851
+:4013000002F0FE0202E01A7842F001021A70114B03221A70802203F8202C012001F018FE0D4B04221A7010BDD092FF1FD692FF1FD492FF1FD592FF1FD192FF1FC092FF1F97
+:40134000D392FF1F4893FF1F00E100E09E6000409C600040286000401260004070B5074C054623780E461BB9FFF7E0FE0123237031462846BDE87040FFF792BF8092FF1F7A
+:401380000A4A002313700A4A13700A4A13700A4A13700A4A13700A4A13700A4A13700A4B03221A70802203F8202C7047D692FF1FD492FF1FD592FF1FD192FF1FC092FF1F05
+:4013C000D392FF1F4893FF1F28600040014B1878704700BFD592FF1F044B1A7802F0FF001AB118780022C0B21A707047D492FF1F024A0C2303FB002040787047DC92FF1FB8
+:40140000431E072B0CD8074A064B00010344805C5B7800F00F0043EA0020023880B2704700207047FC5F00401A4A38B50C2303FB00231B79090C13F0800F00F1FF35044670
+:4014400019BF8AB24FF480438BB24FF48042032D18D8DFE805F002070C110021084601F01BF80DE00021084600F0FAFF08E00021084600F0D9FF03E00021084600F0B8FF3E
+:40148000054B1855EDB2072D03D801F0EDF8034B185538BDDC92FF1FAC92FF1FB592FF1F431E072B2DE9F0470446894615465CD82F4F0C2202FB0072D388DFF8B8A09BB274
+:4014C000C3F500739D424FF00C0303FB007388BFD588DB7884BFC5F50075ADB2254A43EA15230601B354B244EBB28AF80130224B1A5C9846FF2A01D1FFF796FF0C2303FBBF
+:40150000047200215170B9F1000F28D03DB31B4F385D01F011F811232946FE2218F8040001F0D6F806F5C04278321FFA89F118F8040001F0DFF8124D18F80410385D01F004
+:401540004BF80121385D00F0E1FF735D43F002037355735D03F0FD037355BDE8F08703FB04746379DBB28AF80230BDE8F08700BFDC92FF1FFC5F0040B592FF1FAC92FF1FD4
+:40158000706000402DE9F047044615468846002940D0431E072B3FD8FFF732FFA84203D22046FFF72DFF05461D4E335DFF2B03D141462046FFF738FFDFF868A027011AF893
+:4015C000040000F0B9FF1223FE222946305D01F07FF807F5C0411FFA88F27831305D01F089F8DFF84490315D1AF8040000F0F4FF01211AF8040000F089FF17F8093043F0F1
+:40160000020307F8093017F8093003F0FD0307F8093002E00D4600E000252846BDE8F087B592FF1FAC92FF1F70600040431E072B0AD8064A0C2303FB002300225A705A7991
+:40164000034BD2B200011A54704700BFDC92FF1FFE5F0040431E072B9FBF024B000108221A547047FE5F004030B51A4A1A491B4D0878138803449BB21380194A00231488E7
+:40168000D8B2A4B27CB1082B0CD050680078C0B2E85450680133013050601088013880B21080ECE718460B780E4C082B0E4A00D040B10E4D2B7883F080032B700F23237022
+:4016C000022301E0022323701370094B1870087030BD00BF4C93FF1F4893FF1F00600040C492FF1FC192FF1FD692FF1FD292FF1F4993FF1F074B02221A70074B80221A70AE
+:40170000064B0F221A70064A00231370054A012013707047D692FF1FD292FF1FC192FF1F4893FF1F4993FF1F30B5164B16491B780A8803F00F03023BDBB21A4492B20A80CC
+:40174000124C134A0020118889B279B173B15568215C013BC9B229705168DBB20131516011880130013989B21180ECE7094A1370094A137883F080031370084B0B221A70DF
+:4017800030BD00BF296000404C93FF1F00600040C492FF1F4993FF1FD292FF1FC192FF1F064A06231370064A01201370054B80221A70054B00221A70704700BFD692FF1F52
+:4017C000C192FF1FD292FF1F4993FF1F054B9A683AB19A68044910709A680988518000229A607047C492FF1F4C93FF1F08B5124B1A78D2B21A701B78DBB21A0602D50F4A1E
+:40180000137008BD0220FFF7E1FF0D4B1B7803F06003202B05D0402B06D043B900F012FC04E001F0A5FB01E000F046FD10B9034B03221A7008BD00BF28600040C192FF1FC0
+:401840000060004008B5084A084B0120197813880B449BB21380064B00221A70FFF7B6FF044B03221A7008BD4C93FF1F4893FF1FD692FF1FC192FF1F08B50C4B1B78DBB25E
+:40188000042B07D0062B09D0022B0DD1BDE80840FFF7D8BFBDE80840FFF746BF0320FFF795FF034B03221A7008BD00BFD692FF1FC192FF1F08B5054B002201201A70FFF7B6
+:4018C00085FF034B03221A7008BD00BFD692FF1FC192FF1F08B50A4B1A7832B11A78094942F080020A7000221A70074B002201201A70FFF76BFF054B03221A7008BD00BFA5
+:40190000C092FF1F08600040D692FF1FC192FF1F074B1B78DBB2042B05D0062B05D0022B05D1FFF7A1BEFFF7C5BFFFF7D3BF7047D692FF1F38B51D4C2378DBB2DD0634D51B
+:4019400018060AD503F00F03012B2ED1FFF74EFF174B1B78190609D538BD5A0602D5FFF7D7FF03E09D0620D5FFF786FF23781B061BD4104B1A78104B1B7813430F4A13705F
+:401980001278934211D10A4A0849154613782078DBB2000605D41378DBB20B700B7803F00F0328788342F1D138BD38BD28600040C192FF1FD292FF1F4993FF1F29600040AD
+:4019C000054A00231380054A916819B191680B7092685380704700BF4C93FF1FC492FF1F0E4808B503889BB213B9FFF783FE13E00B4B02221A700B4B00221A70FFF7E0FFAC
+:401A0000094AD1799379028843EA012392B2934238BF0380FFF728FE012008BDC492FF1FD692FF1FD292FF1F00600040084B01221A700F3B9B7C074B1A7B02F00302012A07
+:401A40001EBFDA7B82F08002DA7301225A7370470B600040DC92FF1F094B02221A700F3B93F82230074B1A7E02F00302012A1EBFDA7E82F08002DA7601225A76704700BFFE
+:401A80000B600040DC92FF1F0B4B04221A700F3B93F83230094B93F8242002F00302012A1EBF93F8272082F0800283F82720012283F82520704700BF0B600040DC92FF1F78
+:401AC0000B4B08221A700F3B93F84230094B93F8302002F00302012A1EBF93F8332082F0800283F83320012283F83120704700BF0B600040DC92FF1F7047FFF741BC000081
+:401B0000F0B5184B184E19780C27C9B201234FF0000C31B3CA0720D5144A4FEA031E7244947850782040C5070DD507FB03652C79240608D5147804F0FE0414706D790C4C35
+:401B4000EDB204F80E50840706D507FB036425792D0658BF84F801C090700133DBB24908D7E7F0BD9F600040DC92FF1F70600040FE5F004000F0ACBC70B50446184B88B021
+:401B800003AA03F11006154618685968083303C5B3422A46F7D11B782B70FCB12223237001AD03232846637000F08AFE002220461146AB5C08AC04EB131414F8144C03F053
+:401BC0000F03847008AC234413F8143C0132082AC1700371417100F10400EAD108B070BD3F3A00002DE9F0431C4D01222E460C201F274FF0800E4FF0080C194B00FB02580B
+:401C00001401234418705F70164998F805902144B9F1000F07D098F8044024064CBF887081F802C001E081F802E000FB0261CC880132E4B29C71CC88092AC4F30724DC71A2
+:401C4000CC88E4B21C71C988C1F307215971D4D1054BFF221A70BDE8F08300BFDC92FF1F70600040FC5F00400A600040064B074A1B7802EBC30253681A7C824286BF03EB6F
+:401C8000C003586900207047D092FF1FA03A00002DE9F84F424B1A78002A7ED01878414D0138C0B2FFF7E2FFA8463F4AC3681478007ADFF800C1E4B203EBC0000C260027FE
+:401CC0004FF0010E834268D01A78A24263D11CF80420597891425ED19A7893F8039002F07F0206FB02FA05EB0A01CF7093F802B009F0030981F804B093F803B005F80AB0A6
+:401D0000B3F804A0A1F808A093F902A0BAF1000F0BDAB9F1010F0CBF4FF007094FF00D0981F8059081F801E009E0B9F1010F0CBF4FF005094FF0090981F805904F704FEAA3
+:401D400002191A4906FB0282494481F802E0B2F808A0CAF3072A81F800A0B2F808A05FFA8AFA81F801A0B2F806A011495FFA8AFA494481F806A0B2F80690C9F3072981F8FE
+:401D80000790B2F806905FFA89F981F80490D288C2F307224A71083394E7BDE8F88F00BFD592FF1FDC92FF1FD192FF1FFC5F004070600040C292FF1F08B5064B187801384A
+:401DC000C0B2FFF753FF20B143681B7900EBC300406908BDD592FF1F00212DE9F84F0B464E4E0C2707FB01F401313219092933554FF000059370494CD37013819372537031
+:401E00005371EFD118B1464B1D70464B1D70464B1A78002A7FD0187801250138C0B2FFF725FFA8464368DFF8F8E0DB790C2713F0400F3E4B4FF0000C1A7814BF42F0010273
+:401E400002F0FE021A70027AD20007FB0541C36803EB02094B4531D093F802A00AF07F06AE4229D10E89B3F804B0B6B25E4538BFA1F808B01E7893F801B01EF80660B34576
+:401E80001AD181F804A0DE780E7093F902A0DE78BAF1000F06F0030607DA012E0CBF07260D264E7181F8018006E0012E0CBF052609264E7181F801C00833CBE70135092D89
+:401EC000C3D1C1680A328B1C0A440C200833934209D013F8081C13F80A5C01F07F0100FB01418D72F2E7FFF767FF114B0121186000230C2000FB0142D38012890131134463
+:401F00009BB203F00102134409299BB2F2D1BDE8F84FFFF767BEBDE8F88F00BFDC92FF1FC292FF1F4A93FF1FD592FF1FD392FF1FD892FF1F114B1B7903F07F035A1E072A3C
+:401F400019D80F490C2202FB031291781B0141F0010191700021D170517841F002015170127912F0800F074A1A4414BF8D2389239370FFF715BC0020704700BF0060004065
+:401F8000DC92FF1FFC5F004030B4194B1A7902F07F02531E072B27D8164B0C2404FB02339978154D01F0FE0199700021D97029461201505D114400F07F0050555A7802F013
+:401FC000FD025A701A795B78120605D5012B01D18C7006E00D2303E0012B0CBF082309238B7030BCFFF7DCBB002030BC704700BF00600040DC92FF1FFC5F004010B50D4BA5
+:402000000D4C21791878C9B20138C0B2FFF72EFE43681B798B4201D2012909D8074A0848535CDBB24354A3780120DBB2535410BD002010BDD592FF1F00600040C292FF1FB6
+:402040004A93FF1F38B58A4A8A4C13780021DBB221801806517840F18D800A2900F20581DFE811F05D00030103010301030103010B0003017E0003018200D3787C49012B9C
+:4020800009D17D4B1A787D4B03EBC2035B685B686360122310E0CB78022B12D18878FFF7E5FD002800F0E180436863606368DA7863689B7843EA02232380BDE83840FFF7EE
+:4020C0008FBCCB78032B26D16D4B00228878D5B2854209D3664A91786A4AEE2908BF1346634A917881B106E0187801320028F1D018780344EAE764499278097C914203D180
+:402100006248FFF739FD614B1A78002A00F0AD801A78228018E0BDE8384000F029BF13F0030313D0022B40F0A0802380504B0C211B7903F07F02564B01FB02339A78554BC3
+:40214000D2B21A7000225A706360B6E702222280514A11784F4AC9B2117053706260ACE7012323804D4BEFE70123238013794C4A1344E9E701390A2977D8DFE801F0377608
+:402180004F76067676760A7620009378454ADBB25AE0937803F0FF0153B9404B1A7891425FD01970404B01201870FFF715FE58E0481EC0B2FFF75AFD0028EED155E0FFF793
+:4021C0001DFF002851D02A4A384913791279DBB2D2B20A70364A3249D25CCB5C9A4240D0314B01221A70FFF753FD3AE003F00303012B2BD009D3022B37D11D4B9B78002B47
+:4022000033D1BDE83840FFF7BFBE194B9B78012B2BD1214A137803F0FD0315E003F00303012B13D008D3022B1FD1114B9B78E3B9BDE83840FFF77EBE0D4B9B78012B14D1B7
+:40224000154A137843F0020313700AE0084B1A795AB998781B791749DBB2CA5C22EA0002CA54BDE83840FFF79BBA002038BD00BF00600040C492FF1FD092FF1FA03A000049
+:40228000043B00008C3A0000773B00006893FF1FDC92FF1F8192FF1FD392FF1FD592FF1FC292FF1FC092FF1FD492FF1FD192FF1F4A93FF1FD792FF1F074B1A78120609D546
+:4022C0005B78012B06D1054B054A5A6012781A80FFF786BB0020704700600040C492FF1F643A0000014B1870704700BF7A640040014B1878704700BF6B650040014B18702D
+:40230000704700BF79640040064A0123136002F688321268E0211064034A1170A2F540721360704780E100E000E400E0014B1870704700BF7A650040014B1870704700BF89
+:402340007865004073B515461E460B4C05230022019200920A4601461846237000F064F932462946207800F01FF90221207800F009F9207802B070BDD080FF1F064A04232E
+:40238000136002F688321268E0219064034A1170A2F202321360704780E100E002E400E0014B04221A60704700E100E0014B04221A60704780E100E0014B1870704700BF30
+:4023C0007E640040704738B505460078012428B100F066FD285D0134E4B2F8E738BD08B50D2000F05DFDBDE808400A2000F058BDF7B516461F460B4C002303250193009359
+:402400000A4601462846257000F00EF93A463146207800F0C9F80221207800F0B3F8207803B0F0BDE080FF1FF7B516461F460B4C00230225019300930A4601462846257030
+:4024400000F0F2F83A463146207800F0ADF82946207800F097F8207803B0F0BDE180FF1FF7B516461F460B4C00230125019300930A4601462846257000F0D6F83A463146DE
+:40248000207800F091F80221207800F07BF8207803B0F0BDE280FF1F73B515461E460B4C0023019300930A4601461846237000F0BBF832462946207800F076F8022120782A
+:4024C00000F060F8207802B070BD00BFE380FF1F024B1878C0F38010704700BF8F450040074A7F23802113705170064A013BDBB202F80839002BF9D1034A1370704700BFCC
+:40250000E480FF1FF87B00400078004017280FD8084B0001C25C11B142F0200201E002F0DF02C254C25C42F00102C25400207047012070471070004017280BD8064B0001EA
+:40254000C25C02F0FE02C254C25C02F0DF02C25400207047012070471070004017280DD8074900010B4603441A7942F004021A71435C43F001034354002070470120704740
+:402580001070004017280BD8064A0001835C490003F0F10301F00E011943815400207047012070471070004041F6FF73994208BF4FF400519A4208BF4FF4005217289FBF85
+:4025C000C00000F1804000F5EC4081809ABFC280002001207047000017289FBF034B00011954002088BF0120704700BF1970004017289FBF054B00011A5C01F007019DBFDC
+:402600001143195400200120704700BF1470004017289FBF034B0001185C00F0070088BFFF20704714700040172810B51AD8C00001F07F0100F1804441EAC21204F5EC4422
+:40264000D2B222709DF8082003F00F0343EA0213DBB263709DF80C30002003F00F03A370E07010BD012010BD10B500F079FC0A4A5378182B0AD91478013B5370E30003F1FB
+:40268000804303F5F0431B78137000E0FF2400F06BFC204610BD00BFE480FF1F030610B5044611D400F05CFC084AE300117803F1804303F5F0431970537814700133537094
+:4026C000BDE8104000F050BC10BD00BFE480FF1F30B504060CD411F4704509D1C40004F1804404F5F0442180A270E370284630BD012030BD03065FBFC00000F1804000F5D2
+:40270000F04081805ABFC280002001207047000038B50446084DB4F5004F05D9286800F017FCA4F50044F6E7034B58686043BDE8384000F00DBC00BFEC80FF1F024B1B7AB4
+:40274000584300F005BC00BFEC80FF1F0E4B00F003001A78490102F0FC02104318701A7801F0600142F080021A701A7802F07F021A701A7802F09F020A431A701A7842F060
+:4027800010021A70704700BF83430040014B01221A70704784430040044B00F00F021B6853F8220043F82210704700BF08ED00E0054A00F01F00126800F1100352F8230009
+:4027C00042F82310704700BF08ED00E000F01F0000F16040490100F56440C9B2017070470F4B10B50F4900240F205C609C60DC601C615C61FFF7D0FF0B4A136843F0040334
+:4028000013600A4B4FF47A72DB68B3FBF2F3084A1360084B4FF400421C60C3F8E82010BD8492FF1F8D28000010E000E0EC80FF1F14E000E018E000E0024A136843F0020334
+:402840001360704710E000E008B5FFF7F5FF034A136843F00103136008BD00BF10E000E010B5054CA3691BB9FFF7BAFF0123A361BDE81040FFF7E8BF8492FF1F024B186891
+:40288000C0F30040704700BF10E000E038B5FFF7F5FF012808D1054D002455F8243003B198470134052CF8D138BD00BF8892FF1F024B03EB80035868596070478492FF1F1F
+:4028C000134B144A1B78DBB20360127843EA0223114A0360127843EA0243104A0360127843EA026303600E4B0E4A1B78DBB24360127843EA02230C4A4360127843EA024382
+:402900000A4A4360127843EA02634360704700BF0301004904010049EC460040020100490101004900010049050100490601004910B500F015FB204A044613780A2043F07D
+:4029400002031370137C43F00203137412F80A3C43F0010302F80A3C937943F00103937102F5AB52137843F003031370134B18221A7013F8012C42F0400203F8012C13F837
+:40298000012C02F0FC0203F8012CCE2203F8062CA3F597530222183B1A70094A137843F008031370FFF7CAFE064B10222046BDE810401A6000F0D8BAAB4300400E59004026
+:4029C0002F5B004080E200E008B500F0C9FA0F4A137803F0FE031370A2F5AA521D3A137803F0FD031370137C03F0FD03137412F80A3C03F0FE0302F80A3C937903F0FE0388
+:402A00009371BDE8084000F0AFBA00BF08590040044A137803F03F0343EA8010C0B21070704700BF08590040082804D00A280CBF8223C22300E0422308380E4AC0B2042812
+:402A4000137098BF0C4B4FF0000298BF33F910100A4B88BF11461A8042F210734B4341F2883103F6C41393FBF1F305490B60054B1A8070470A590040503A00005293FF1FB7
+:402A80005493FF1F5893FF1F08B5102000F0A6F907210420FFF79AFE07490420FFF788FE064A0C20137843F006031370FFF7BCFF034B00221A8008BD812B0000095900402E
+:402AC0005093FF1F10B5054C23781BB9FFF7DCFF01232370BDE81040FFF72ABFA092FF1F044B1A7802F0FB021A701A7842F001021A7070470859004010B5084B1C7814F0F1
+:402B0000010403D10028F9D0002404E02046FFF715FE024B1B78204610BD00BF09590040034A044B1B881088181A00B2704700BF5893FF1FA25B00400E4A13881BB223B1D5
+:402B400011880A2309B2594301E00B4B19680B4B1B88C01A42F2107300B203FB00F2022391FBF3F30028D8BF5B42134493FBF1F000B270475293FF1F5493FF1F5093FF1F29
+:402B80007047000010B500F0EBF9214A044613780A2043F001031370137C43F00103137412F80A3C43F0020302F80A3C937943F00203937102F5AA521832137843F0030343
+:402BC0001370144B18221A7013F8012C42F0400203F8012C13F8012C02F0FC0203F8012CCE2203F8062CA3F597530222123B1A70094A137843F008031370FFF79FFD074BEE
+:402C000008222046BDE810401A6000F0ADB900BFAB43004006590040275B004080E200E008B500F09DF90F4A137803F0FE031370A2F5AA52153A137803F0FE031370137C9E
+:402C400003F0FE03137412F80A3C03F0FD0302F80A3C937903F0FD039371BDE8084000F083B900BF00590040044A137803F03F0343EA8010C0B21070704700BF0059004016
+:402C8000082804D00A280CBF8223C22300E0422308380E4AC0B20428137098BF0C4B4FF0000298BF33F910100A4B88BF11461A8042F210734B4341F2883103F6C41393FBDD
+:402CC000F1F305490B60054B1A807047025900405A3A00005E93FF1F6493FF1F5C93FF1F08B5102000F084F807210320FFF76EFD07490320FFF75CFD064A0C20137843F035
+:402D000006031370FFF7BCFF034B00221A8008BDD92D0000015900406093FF1F10B5054C23781BB9FFF7DCFF01232370BDE81040FFF728BFA192FF1F044B1A7802F0FB02D6
+:402D40001A701A7842F001021A7070470059004010B5084B1C7814F0010403D10028F9D0002404E02046FFF7E9FC024B1B78204610BD00BF01590040034A044B1B88108822
+:402D8000181A00B2704700BF5C93FF1FA05B00400E4A13881BB223B111880A2309B2594301E00B4B19680B4B1B88C01A42F2107300B203FB00F2022391FBF3F30028D8BF86
+:402DC0005B42134493FBF1F000B270475E93FF1F6493FF1F6093FF1F70470000034A00F0F800137803431370704700BF02410040034A00F0F800137803431370704700BF9A
+:402E000006410040014B1870704700BF78640040014B1870704700BF7965004073B515461E460B4C04230022019200920A46014618462370FFF7F8FB324629462078FFF7AB
+:402E4000B3FB02212078FFF79DFB207802B070BDFC80FF1F074A0223136002F688321268E0215064044A11706FF440710A441360704700BF80E100E001E400E0014B18708C
+:402E8000704700BF7C640040014B1870704700BF7B640040014B1870704700BF7F640040FEB5494652465B460EB40746244909688A46244A12682448022100F071F803009B
+:402EC00020480068C018204900F06AF8143883460121C9430C460125002600F041F8814651460B7823400B705846013000F030F83800F04028400B78234003430B705846AA
+:402F000000F026F80136072EF2D9002001300138013001200B78234003430B705846043000F016F8484600F01FF800BF00BF00BF0EBC894692469B46FEBD00BFAFF3008039
+:402F4000D480FF1FF880FF1F00C20100000000000230800803D000BF01380046FCD17047EFF3108072B6704780F31088704700BF094A137803F00303012B0AD0022B09D181
+:402F800013790C2103F07F02044B01FB02339B7A00E013790020704700600040DC92FF1F002902D0B0FBF1F0704708B14FF0FF3000F008B80029F8D00246B0FBF1F000FB0B
+:402FC00011217047704700BF014B1868704700BF6081FF1F0E4B70B51E460E4C0025E41AA410A54204D056F8253098470135F8E700F0DEFD084B094C1E46E41AA41000251E
+:40300000A54204D056F8253098470135F8E770BDBC3B0000BC3B0000BC3B0000C43B000003460244934202D003F8011BFAE7704730B5141E05469BB0184604DA8B232B6026
+:403040004FF0FF301DE04FF40273ADF80C300CBF234604F1FF33029305934FF6FF7300910491ADF80E3002461E9B6946284600F073F8431CBCBF8B232B6014B1009B0022F6
+:403080001A701BB030BD000007B5009313460A46014603480068FFF7CBFF03B05DF804FB6081FF1F2DE9F0478E6882469E420C46914698463ED88A8912F4906F3AD025685F
+:4030C000096902236F1A656905EB450595FBF3F57B1C43449D4238BF1D4653050FD5294600F04AFB064698B13A46216900F0D2FAA38923F4906343F08003A38113E02A462B
+:4031000000F098FB064670B92169504600F0E8FA0C23CAF80030A3894FF0FF3043F04003A381BDE8F08726613E44266046466561ED1BA560464528BF4646494632462068B9
+:4031400000F0B3FAA36800209B1BA36023681E442660BDE8F08700002DE9F04F9DB003938B8980461C060D4616460DD50B695BB9402100F001FB2860286118B90C23C8F8D4
+:403180000030CDE040236B610023099320238DF82930DFF89CB130238DF82A3037463C4614F8013B1BB9B7EB060910D003E0252BF9D02746F3E74B46324629464046FFF7EA
+:4031C00071FF013000F0A780099B4B4409933B78002B00F0A08000234FF0FF3204930793059206938DF853301A930126052221784E4800F041FA671C049B38B14B4A3C46E7
+:40320000801A06FA00F018430490EFE7D90644BF20228DF853201A0744BF2B228DF8532022782A2A03D0079A00210A200BE0039A111D12680391002A10DA524243F002006C
+:40324000079204900BE027463B780134303B092B03D800FB02320121F5E701B107923B782E2B1ED17B782A2B0AD1039B02371A1D1B680392002BB8BF4FF0FF33059310E010
+:40328000002319460593781C0A2407463A780130303A092A03D804FB01210123F5E703B1059103223978224800F0E6F940B14023CBEB000003FA00F0049B01371843049053
+:4032C000397806221B487E1C8DF8281000F0D4F988B1194B33B9039B073323F007030833039314E003AB00932A46144B04A94046AFF3008007E003AB00932A460F4B04A937
+:40330000404600F093F8B0F1FF3F824603D0099B5344099342E7AB895B0601D4099801E04FF0FF301DB0BDE8F08F00BF8B3B0000913B0000953B000000000000A5300000D1
+:403340002DE9F04791461F460A698B6806469342B8BF1346C9F8003091F843200C46DDF8208012B10133C9F800302368990642BFD9F800300233C9F80030256815F00605F2
+:4033800010D104F1190A07E00123524639463046C04701301AD00135E368D9F800209B1A9D42F1DB94F843302268003318BF012392060FD5E118302081F843005A1C94F84E
+:4033C00045102244023382F8431003E04FF0FF30BDE8F08704F1430239463046C0470130F4D02268D9F80050E36802F00602042A08BF5D1B2269A3680CBF25EAE57500252C
+:403400009342C4BF9B1AED184FF000091A344D4509D00123224639463046C0470130D5D009F10109F3E70020BDE8F0872DE9F04317460A7E85B06E2A984606460C460C9BE3
+:4034400001F1430E00F0AE8011D8632A22D009D8002A00F0BB80582A40F0CA8081F84520834955E0642A1ED0692A1CD0C0E0732A00F0B08009D86F2A2ED0702A40F0B880A0
+:403480000A6842F020020A603EE0752A24D0782A3AD0ADE01A6801F14205111D1960136884F84230A8E021681A6811F0800F02D0111D196008E011F0400F02F104011960E2
+:4034C00002D0B2F9003000E01368002B3CDA2D225B4284F8432037E021681A6811F0800F02D0111D196007E011F0400F02F10401196001D0138800E01368227E5C496F2A40
+:4035000014BF0A2208221BE078225A4984F845202268186812F0800F00F104051D6003D1550601D5038800E00368D00744BF42F0200222601BB9226822F020022260102266
+:40354000002084F8430001E049490A226568002DA56008DB206820F0040020602BB9002D7DD175460CE0002B79D07546B3FBF2F002FB1033CB5C05F8013D03460028F5D131
+:40358000082A0BD12368DA0708D5236962689A42DEBF302305F8013C05F1FF35C5EB0E0323612EE008681A6810F0800F496903D0101D1860136808E010F0400F02F1040087
+:4035C0001860136801D0198000E0196000232361754616E01A68111D1960156800216268284600F049F808B1401B6060636804E004F1420584F8422001232361002384F8A9
+:403600004330CDF800803B4603AA21463046FFF797FE013002D14FF0FF3026E023692A4639463046C0470130F5D023689B0710D5002504F1190907E001234A4639463046F8
+:40364000C0470130E7D00135E368039A9B1A9D42F2DBE068039B9842B8BF184605E00B7804F1420584F842308AE705B0BDE8F0833F3A00009C3B000010B5C9B202449042CF
+:40368000034605D01C7801308C42F8D1184610BD002010BD10B5431E0A44914204D011F8014B03F8014FF8E710BD884210B501EB020301D8421E0BE09842FBD28118D21A41
+:4036C000D34204D013F8014D01F8014DF8E710BD994204D011F8014B02F8014FF8E710BD38B50546002944D051F8043C0C1F002BB8BFE41800F0D4F81E4A1368114613B912
+:403700006360146030E0A3420DD92268A018834201BF18685B681218226063600C6023E0A24203D813465A68002AF9D118681918A1420BD12168014458188242196013D1F2
+:4037400010685268014419605A600DE002D90C232B6009E021686018824201BF106852680918216062605C602846BDE8384000F098B838BDA892FF1F70B5CD1C25F003051A
+:4037800008350C2D38BF0C25002D064601DBA94202D90C23336046E000F082F8234B1C681A462146A1B10B685B1B0ED40B2B03D90B60CC18CD501EE08C420BBF63684B6896
+:4037C0001360636018BF0C4615E00C464968E9E7174C23681BB9304600F052F820602946304600F04DF8431C18D0C41C24F00304A0420DD12560304600F053F804F10B005E
+:40380000231D20F00700C31A0ED05A42E25070BD211A304600F034F80130EBD10C233360304600F03EF8002070BD00BFA892FF1FA492FF1FF8B5074615460E4621B91146D1
+:40384000BDE8F840FFF798BF1AB9FFF749FF2846F8BD00F027F885420ED929463846FFF78BFF044650B131462A46FFF713FF31463846FFF735FF01E03046F8BD2046F8BD40
+:4038800038B5064C0023054608462360FDF7D8FB431C02D1236803B12B6038BD8C93FF1F7047704751F8040C0028BEBF091851F8043CC018043870470000000005020902A2
+:4038C0000B020D020F021102130215027265706C792030782530327800686F6D696E6700626567696E6E696E67207365656B2066726F6D20256420746F2025640066696E08
+:403900006973686564207365656B00796573006E6F00647269766520303A20257320647269766520313A2025730057616974696E6720666F72205553422E2E2E00555342F3
+:4039400020726561647900636F6D6D616E6420307825303278006661696C2025642B25642B2564203D3D2025642C206E6F74202564007061737365643D256400756E646544
+:403980007272756E206166746572202564207061636B65747300636F756E743D256420693D256420643D256400636D645F777269746500703D25642063723D256420637729
+:4039C0003D256420663D256420773D256420696E6465783D256420756E64657272756E3D256400756E64657272756E21007375636365737300737461727420657261736912
+:403A00006E670073746F702065726173696E670069646C650000510040100040510040300000000140001000140140000800400140000A004C0140000200500140200030F9
+:403A400031323334353637383941424344454600000100000004000000100001000000040000001028000000000104000100000000000000000157494E5553420000303043
+:403A800030303100000000000000000012034D005300460054003100300030000100000001000000A83A000001000000773B0000000000000000000001000000C03A000003
+:403AC00001000000493B000004000000E23A0000000000000000000000000000E03A0000FF00000001024000FF00000082024000FF00000003034000FF00000084034000F7
+:403B0000FF00020304030904160346006C007500780045006E00670069006E0065002A0343006F0077006C00610072006B00200054006500630068006E006F006C006F0003
+:403B400067006900650073000009022E0001010080320904000004FF00000107050102400000070582024000000705030340000A0705840340000A12010002FF0001080921
+:403B800012006E0100020180014300232D302B2000686C4C00656667454647003031323334353637383961626364656600000000F8B500BFF8BC08BC9E4670475900000094
+:403BC000BD100000F8B500BFF8BC08BC9E46704735000000E83B0000C880FF1FA00000002812000000000000000000009093FF1FFF000000675000400C0000000700000097
+:403C0000FFFFFFFF7F8000003F0000000000007D00FA0000400000000090D003FF000000000000000000000000000000000000000000000000000000000000000000000031
+:403C4000893B000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080
+:403C80000081FF1F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000065
 :403CC00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C4
 :403D00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083
 :403D40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000043
@@ -4098,45 +4098,45 @@
 :40FF80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041
 :40FFC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
 :0200000480007A
-:400000000145004008520040015B0040016400400101014003050140030701404E0801404A0901406C0A0140550B01405A0C0140490D01405A0E0140340F0140041701403E
-:40004000471801405A1901404F1A01404C1B01400C4001400A4101400F4201400D430140044401400C450140064601400C4701400F4801400B490140194C0140074D0140FA
-:4000800005500140045101407E02080509411080118219026006610A7C4027212A0AE280E640EA05EE10E620EA01EE8C00180220041806E009020A100C010E02100111076F
-:4000C00012041407150216F8170118801A181B011C181E4020FF260828012A062E072F0630FF330335043B083E01580459045B045C905F0181408210833085E18680870885
-:4001000088018A248B108C7C8E828F1091FC92039302961097039B109D209E109FDCA180A210A330A401A648A9E1AA1CAB04AE10B01FB31FB4F0B7E0BA20D608D80BD90B5D
-:40014000DB04DC99DD90DF01012003A20404055208040AA10B010D080EA80F0210201280135015041680175919011A801B301E402180228424202514260429202B802F0167
-:400180003180321433023614370138083B513D2058105980600A68026B046D4078018410884091209358942C9540970199729B599C019F04A240A301A58CA628A792A901F2
-:4001C000AA10B010C0FFC2FDC4FFCA15CCEFCE2FD60CD80CDE01E622E804EE8C004801400311044805F10708081009100A200BE10C5A0E200F0E10C01201144818481C02F7
-:400200001D201E041F112180224023112448288629F12A782B022DF12E042F04303F310F328033F0344038023B023E1440254520480249FF4AFF4BFF4D204EF0511058045A
-:40024000590B5A045B045C995D095F01610862406340648066406740800481018220830E8404861088808A048BC08D018E0291EF92029403952F96FC974099019A049B04BE
-:400280009C049D809E409F2FA0FFA101A302A404A6F9A710A804A901AA08AB08AC01AE02AF20B4FFB51FB7E0BE10D804D904DB04DC90DF01004401020204042405020606B2
-:4002C000084809200A800B280D280E800F021180128813081408174918401A041B051F2023502680270829202B822C802E802F28318034403608375138083B513D903E02AA
-:4003000042044620470849014A0268056E507801830489108A808E409120928093209540965099729A829B519C019D019E209F04A090A160A242A308A405A50CA628A7130E
-:40034000A840AA01B540C0FFC2FFC4FFCAFDCCF8CEBFD004D208DE01E404E640EE1000800102027E044006100702083E09010A400C400E020F041040111812201320147E22
-:400380001703188019021C401D081E04210222012502284029022A082D202F1830FF310833203507371039203E013F05400247EC483049FF4AFF4BFF5004560158045904C1
-:4003C0005A045B045C905D095F0162C080368209842D8612880789028B018C3F9209961299019B029C24A104A480A640A840AA80AEC0B040B104B238B301B407B680B7021B
-:40040000B882B988BE41BF45D80BD904DB04DC09DF01001A010403820408060A07400A700B410C800D280E80102011501711189019A01C80202021402202253026802760C1
-:4004400029012D022E202F11302036A939103C803D283F02472056056A806B016C946D806EA06F18768A780189C08A1091309323942895049620974099129E249F45A0205B
-:40048000A201A480A55CA668A79BA820A950AA80B080B640C0FFC2FDC457CAF1CCF4CEF4D020DE0100020140020C04100550072008040A080E010F10107211041280130203
-:4004C000140E150816F018101B201C801E20201021602310244025022680270528102C082D072E0430FF310133703506370838023F445608580459045B045C995D905F0174
-:40050000810C82078340840185808604870C88018A028B048C408EA08F02900191FF9457950397FC9840990C9A909B109C019D019E069F02A057A302A50CA7F1A840AB0883
-:40054000AD0CAE08AF20B030B1FFB40FB6C0BF01D804D904DC09DF010220034904280540074009180A410C800D080E881004118812801604178119021A401D501E021F114A
-:400580002112224427802B922C842E602F103102321033043628374139043B413DA83E013F025880630169908A048E048F01C0FFC2FFC4DFCAFBCCF7CEFBD608D808E280A8
-:4005C000E404E680EA08EE0B011406410714080109140A120B080CF10E040F201241150A16411714180119041A281C801D0A1E01211422412504264E29042B102D182F0158
-:40060000320F3307353836F039083A085608580859045B045C995D905F018210846088018A048C7C8D018E02921C96039A109C409D04A210A401A608AA10AD02AE10B1016E
-:40064000B21FB304B440B502B620BF15D80BD904DB04DC09DF01012803810524070108100A120B800C200E060F50102011011280135014101501170418081A161E021F885A
-:4006800020202101221024042518262828022D062E802F0430043240330C35103608374039803D283E403F0258405A205D505F086401650867066A806C016F0378017F01D2
-:4006C000814083088501912492489358940C96019702984299339A809B409C059D80A104A280A301A460A508A628A782AC02B048C0EFC2FFC43FCAF8CC78CEF8D67CD870F3
-:40070000DE11E204E402E680EE0B01FC02900302042005C106C0072808C10A240B900CFC0E020F901120120313C018011A481B901E901F032290239C2690279029012A9012
-:400740002B442E9C2F9031E034E0361F371F3A203B02420245E0480249FF4AFF4BFF4F83580B590B5A045B045C995D095F01821084618501860888618A04921096109A0394
-:400780009C409E30A07CA202A61CA820AA50AC80B080B101B260B41FB660BE01BF01D808D904DB04DC09DF01012002C0036204080520074008020A050C400E0A0F50105066
-:4007C0001350141015401608170519401B301C041D041E491F4022422780284029242A4830103242380A3B503F044110484059015A985F80600661406202632069806D40BA
-:4008000078017F018240900A9120921C9356958096019780980199219B059D04A281A302A440AD10B010B580C07FC2FBC4FFCA0FCC0DCE4FD004D61FD80FDE11E004EE085F
-:400840001A401F083328360437103A406A406B108B20C630CCF0CE1032043380364037023A013E809E40A604CCF0CE60502055108D2096089EC09F02A020A110A644A7809D
-:40088000A910AA01B420D460EAA08A809EC09F02A002A120A202A640A780AA06AE04B002EA80EE3014107310C404DC01530164108B1090109710B010B410D401D801E4017C
-:4008C000E808EA041B048301901097029C10C60808080B080E020F408710903097089C10A810AB04AF04C20F240280018A409A209E40A002A120A202AB02AE60AF80C820D3
-:40090000E420EA10EED051205202722074029A20A002A120A202D4A0DC80DE2005400B200C800E401F40501056205C106120824084108B40903097209C10AA01AC08AF40A1
-:40094000C001C20DC601D406D604D802E60182209E20AD40B120B480EC01EE0201010D010F0111011D0100FF01AB020211050000BF0000A09F001F0000000000000000004A
-:40098000100000004000000000000000C0000000FF0000B84700470000010000800000028200820000000000000303000300000027001801270018010004000000050000C9
+:400000000145004009520040015B0040016500400101014003030140010501400307014052080140500901404F0A0140480B0140490C0140470D0140400E0140360F01409E
+:4000400002150140031701405C18014057190140471A0140531B01400B400140124101400B4201400D43014002440140074501400B4601400C470140104801401149014069
+:40008000154C01400D4D014005500140045101407E02080209411080110218041902600C61157C402721290AE204E601EA20EE02E202E608EA10EE04000801080404050568
+:4000C0000708080809080C400D080E1011011201130E143A16401708180819081C021E042305240825042701280629082A782C202D012E402F02307F310F327F330F380AE4
+:400100003B0A580459045B045C995F018203830187018A108C018D018E248F08907C9282930E961097019A809D019E1C9F04A101A210A302A510A610AA10AB01AC01AE48FD
+:40014000B01FB10FB4F0B510BA20BB02BF10D608D80BD90BDB04DC99DD90DF01012202010488051007800A860B100C020DA00E2011011208134414021504162017201804BE
+:4001800019021A041B011CA01E202008220126012790282029202A012C022E282F4032493514360139013B443C803D2A5980614069906F0278417B0288049141928093D450
+:4001C00094249602970A982299249A019B409C019D019EC0A188A208A402A504A709B404B502B604C0FBC2FFC4EFCAF7CCEBCEFBD608D808DE01E608EA10EE0400FC0108A1
+:4002000002020310071408200AD00BE40CE10D100E080F8212031314161017141D1F1E101F4020802110223C2321261028402A302B142CE12E04301F310F33F034E03B08A2
+:40024000580B590B5B045C995F0180368209852A86128740882D89098A128B148E098F209080924093C09440968098079C249D089F13A03FA180A320A840A908ADEAB0076D
+:40028000B1E0B280B301B438B518B640B706BE44D808D904DB04DC99DF0100820120040A07050A420B100EA80F01110112091304171219201A401D8A1E081F4020602101B0
+:4002C000231025102652275029202A012C022F483249364239033B543D283E806102620169406C0C6F0178017F0187058C028D04900292809345946495029642971298206E
+:4003000099049B069C019D219E449F01A041A208A418A701B040B204B7C0C0FBC2FDC45FCAB5CC9BCE7FDE11E40800020104040806140A010C1C101012081301140215050D
+:400340001601170220032B022D062E022F0130043107320336183A083F015608580459045B045C095D905F018128829083118401853F86448A9C8C208D3F8EC090C191FFA2
+:40038000922895149690972199019A039B0E9D409E90A0FCA202A902AA90AB01ADC0AE90B140B330B41FB50FB6E0B780BA80D608D80BD90BDB04DC99DD90DF0101A604240E
+:4003C0000501070208400A240B400EA0120113121401164019801A041B401D841EA02080229C2344260129602C082F0230023294370539063A053B403F01580259025A0213
+:400400005B405F806140670168036A806B026C016F06780182019440950296E4974698209C429D209E049F02A412A580A741B240B420B540C0FFC23FC49BCA3CCCCFCE8BAA
+:40044000D618D818DE01EA20EE0203900401060407900A100B9C0D010E100F4812101520161017C01A031B031DFC1E1C1F02201C2202239025C127242A102B902C012E08A9
+:400480002F9033E0341F351F3B08420147E0482049FF4AFF4BFF4F83580859085A045B045C995D095F018310871C8B108D018F0893109F03A310A501A704AB10AD1CAF0254
+:4004C000B71FD908DB04DC90DF0100400120032008420A281110134219101A0820042120220826802701284229202A042B202C422D202F20312032483402368039123B4544
+:400500003C203D103F454180520159105A445B0160046208638269406E8078807C807F018201C007C20FC40BCAFFCC9ECEFFD008D60FD80FDE18EA01EE08E020E623EE0BF2
+:40054000022005880612083209880C080E010F011049118812321432151017A0182119461A1C1BB81D9A1E091F20206321422204230424322588282029882A022C322D04B6
+:400580003020313F324033C1341F37C1398A3A203E055608580459045B045C995D905F018401860289018D028E039002920199089B049D049F08A004B002B102B204B304D8
+:4005C000B401B501B708B822B988BE15BF55C043C520C802C9FFCAFFCBFFCD20CEF0D110D804D904DA04DB04DD09DF01E108E240E340E480E640E740000801400320051496
+:40060000060107400A800D800EA8108016441799181019021B101C401E081F0420012111220424A02505264227A02D202F52324033203504360137A039903C243E4040504B
+:40064000488049204A0459405A205D045E085F4064016580670268046A806C036E406F01831085118B4491D0938094A89504970A984099449B509C019D119EC89F20A0500A
+:40068000A188A211A402A535A708A980C0F5C2F8C4F8CAF0CCFCCE7CD003D61CD810E022E620EA04EE0B010129022C013102350136013E403F115608580459045B045D9048
+:4006C0005F0180478208830885218626874E880189018A388B708D4E8E40914E92029426974E98269B029D809E11A010A201A321A520A604A701A811AA26AB04AC26AD0FF1
+:40070000AF10B040B380B43FB57FB63FBAA0BB20BF04C003C50EC70CC811C9FFCAFFCBFFD004D601D804D904DA04DB04DC99DD09DF01E2C0040205940DA20E201002150580
+:40074000162017A01B401D111E011F102040221024042530260827082B042E642F40344035043602371038013C803D283E0145084F04570858905C406001630868026C042B
+:400780006D016E046F02768981028410860888808D028E049002910492409380940C96209724984099869A049BB09D119E899F08A040A18CA212A530A74AA881AE04B74049
+:4007C000C0F0C2F0C4F1CAF4CCF0CEF1D040D61CD80CE008E404E602E8041B011F083180330836843B408340C630CCF0CE10E22032043380364037023B043F808180A0042B
+:40080000A340A580A604AE80AF41B004CCF0CE60E680EE40531057208510960897049F02A004A644A780D460E240860491209608972498809F02A004A640A7A0AA04B48062
+:40084000E610EE201680C40458405E019A80A404AC04D401D6011B04844096019C40A404A710B680B710C608EA08EE0808080B080E020F4087048A209601A404A710AB043D
+:40088000C20FE00425808004871089808B04912097249880A004A720AB02AE40AF80C820E6C0EED0511054045880700477809008912098809B80A004AB80AF20D4E0DC8000
+:4008C000DE20EA80EE1005200A400C100F201C0852225620610186029641A220A404A710AA41AC08AF40C001C20DC601D407D80270018001852086018810960198109920A0
+:40090000AA20B501DC01E204EC0201010D010F0111011D0100FF01AB02021105BF0000A09F001F000000000000000000100000004000000000000000C0000000FF0000B88D
+:4009400047004700000100008000000282008200000000000007070007000000270018012700180100040000000500000000000000000000000000000000000000000000C4
+:400980000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000037
 :4009C00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F7
 :400A000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B6
 :400A40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076
@@ -4615,12 +4615,12 @@
 :0200000490105A
 :04000000BC90ACAF55
 :0200000490303A
-:02000000861365
+:02000000CEC56B
 :0200000490402A
 :4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C0
 :400040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080
 :400080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040
 :4000C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 :0200000490501A
-:0C00000000012E16106900002E2F967CC7
+:0C00000000012E16106900002E2FDF2ECC
 :00000001FF

FluxEngine.cydsn/FluxEngine.cydwr

@@ -814,7 +814,7 @@
   </Group>
   <Group key="Component">
     <Group key="v1">
-      <Data key="cy_boot" value="cy_boot_v5_80" />
+      <Data key="cy_boot" value="cy_boot_v5_81" />
       <Data key="Em_EEPROM_Dynamic" value="Em_EEPROM_Dynamic_v2_20" />
       <Data key="LIN_Dynamic" value="LIN_Dynamic_v5_0" />
     </Group>
@@ -871,6 +871,7 @@
       <Data key="c5367cde-21d5-4866-9a32-d16abfea0c61" value="WPT" />
       <Data key="d19368c5-6855-41bb-a9ff-808938abef00" value="INDEX" />
       <Data key="e9f14b5a-b2bf-49b8-98f3-d7b5a43ace8d" value="DRVSB" />
+      <Data key="e16b5ef8-00d3-40a4-bc1c-194983c8eb3d" value="LOW_CURRENT" />
       <Data key="e851a3b9-efb8-48be-bbb8-b303b216c393" value="INDEX300" />
       <Data key="e51063a9-4fad-40c7-a06b-7cc4b137dc18" value="DSKCHG" />
       <Data key="ea7ee228-8b3f-426c-8bb8-cd7a81937769" value="DIR" />
@@ -4161,6 +4162,11 @@
         <Data key="Port Format" value="12,3" />
       </Group>
     </Group>
+    <Group key="e16b5ef8-00d3-40a4-bc1c-194983c8eb3d">
+      <Group key="0">
+        <Data key="Port Format" value="3,2" />
+      </Group>
+    </Group>
     <Group key="e851a3b9-efb8-48be-bbb8-b303b216c393">
       <Group key="0">
         <Data key="Port Format" value="3,0" />

FluxEngine.cydsn/FluxEngine.cyprj

@@ -2847,6 +2847,72 @@
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
 <filters />
 </CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0>
+<CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFolderSerialize" version="3">
+<CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtBaseContainerSerialize" version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43_REG" persistent="">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<CyGuid_0820c2e7-528d-4137-9a08-97257b946089 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemListSerialize" version="2">
+<dependencies>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43_REG.h" persistent="Generated_Source\PSoC5\TK43_REG.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="HEADER;;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43_REG.c" persistent="Generated_Source\PSoC5\TK43_REG.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="SOURCE_C;CortexM3;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43_REG_PM.c" persistent="Generated_Source\PSoC5\TK43_REG_PM.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="SOURCE_C;CortexM3;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+</dependencies>
+</CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
+</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
+<filters />
+</CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0>
+<CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFolderSerialize" version="3">
+<CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtBaseContainerSerialize" version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43" persistent="">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<CyGuid_0820c2e7-528d-4137-9a08-97257b946089 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemListSerialize" version="2">
+<dependencies>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43_aliases.h" persistent="Generated_Source\PSoC5\TK43_aliases.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="HEADER;;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43.c" persistent="Generated_Source\PSoC5\TK43.c">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="SOURCE_C;CortexM3;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+<CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtFileSerialize" version="3" xml_contents_version="1">
+<CyGuid_31768f72-0253-412b-af77-e7dba74d1330 type_name="CyDesigner.Common.ProjMgmt.Model.CyPrjMgmtItemSerialize" version="2" name="TK43.h" persistent="Generated_Source\PSoC5\TK43.h">
+<Hidden v="False" />
+</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
+<build_action v="HEADER;;;;" />
+<PropertyDeltas />
+</CyGuid_8b8ab257-35d3-4473-b57b-36315200b38b>
+</dependencies>
+</CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
+</CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>
+<filters />
+</CyGuid_ebc4f06d-207f-49c2-a540-72acf4adabc0>
 </dependencies>
 </CyGuid_0820c2e7-528d-4137-9a08-97257b946089>
 </CyGuid_2f73275c-45bf-46ba-b3b1-00a2fe0c8dd8>

FluxEngine.cydsn/Sequencer/Sequencer.v

@@ -65,7 +65,8 @@ begin
                 if (dataclocked)
                 begin
                     pulsepending <= opcode[7];
-                    countdown <= opcode[5:0] - 1; /* compensate for delay in last tick */
+                    countdown <= opcode[5:0];
+                    
                     state <= STATE_WRITING;
                 end
             end

FluxEngine.cydsn/main.c

@@ -13,14 +13,18 @@
 #define DISKSTATUS_WPT    1
 #define DISKSTATUS_DSKCHG 2
 
-#define STEP_TOWARDS0 1
-#define STEP_AWAYFROM0 0
+#define STEP_TOWARDS0 0
+#define STEP_AWAYFROM0 1
 
 static bool drive0_present;
 static bool drive1_present;
 
 static volatile uint32_t clock = 0; /* ms */
 static volatile bool index_irq = false;
+/* Duration in ms. 0 causes every pulse to be an index pulse. Durations since
+ * last pulse greater than this value imply sector pulse. Otherwise is an index
+ * pulse. */
+static volatile uint32_t hardsec_index_threshold = 0;
 
 static bool motor_on = false;
 static uint32_t motor_on_time = 0;
@@ -69,12 +73,34 @@ static void system_timer_cb(void)
 
 CY_ISR(index_irq_cb)
 {
-    index_irq = true;
+    /* Hard sectored media has sector pulses at the beginning of every sector
+     * and the index pulse is an extra pulse in the middle of the last sector.
+     * When the extra pulse is seen, the next sector pulse is also the start of
+     * the track. */
+    static bool hardsec_index_irq_primed = false;
+    static uint32_t hardsec_last_pulse_time = 0;
+
+    if (!hardsec_index_threshold)
+    {
+        index_irq = true;
+        hardsec_index_irq_primed = false;
+    }
+    else
+    {
+        index_irq = hardsec_index_irq_primed;
+        if (index_irq)
+            hardsec_index_irq_primed = false;
+        else
+            hardsec_index_irq_primed =
+                clock - hardsec_last_pulse_time <= hardsec_index_threshold;
+        hardsec_last_pulse_time = clock;
+    }
     
     /* Stop writing the instant the index pulse comes along; it may take a few
      * moments for the main code to notice the pulse, and we don't want to overwrite
      * the beginning of the track. */
-    ERASE_REG_Write(0);
+    if (index_irq)
+        ERASE_REG_Write(0);
 }
 
 CY_ISR(capture_dma_finished_irq_cb)
@@ -249,6 +275,8 @@ static void seek_to(int track)
         CyWdtClear();
     }
     CyDelay(STEP_SETTLING_TIME);
+    
+    TK43_REG_Write(track < 43); /* high if 0..42, low if 43 or up */
     print("finished seek");
 }
 
@@ -267,7 +295,7 @@ static void cmd_recalibrate(void)
     send_reply(&r);    
 }
     
-static void cmd_measure_speed(struct any_frame* f)
+static void cmd_measure_speed(struct measurespeed_frame* f)
 {
     start_motor();
     
@@ -286,10 +314,14 @@ static void cmd_measure_speed(struct any_frame* f)
 
     if (elapsed != 0)
     {
-        index_irq = false;
+        int target_pulse_count = f->hard_sector_count + 1;
         start_clock = clock;
-        while (!index_irq)
-            elapsed = clock - start_clock;
+        for (int x=0; x<target_pulse_count; x++)
+        {
+            index_irq = false;
+            while (!index_irq)
+                elapsed = clock - start_clock;
+        }
     }
     
     DECLARE_REPLY_FRAME(struct speed_frame, F_FRAME_MEASURE_SPEED_REPLY);
@@ -381,8 +413,9 @@ static void init_capture_dma(void)
 
 static void cmd_read(struct read_frame* f)
 {
-    SIDE_REG_Write(f->side);
     seek_to(current_track);
+    SIDE_REG_Write(f->side);
+    STEP_REG_Write(f->side); /* for drives which multiplex SIDE and DIR */
     
     /* Do slow setup *before* we go into the real-time bit. */
     
@@ -401,10 +434,12 @@ static void cmd_read(struct read_frame* f)
         
     if (f->synced)
     {
+        hardsec_index_threshold = f->hardsec_threshold_ms;
         index_irq = false;
         while (!index_irq)
             ;
         index_irq = false;
+        hardsec_index_threshold = 0;
     }
     
     dma_writing_to_td = 0;
@@ -478,6 +513,7 @@ abort:;
     wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
     deinit_dma();
 
+    STEP_REG_Write(0);
     if (saved_dma_underrun)
     {
         print("underrun after %d packets");
@@ -523,9 +559,11 @@ static void cmd_write(struct write_frame* f)
         return;
     }
     
-    SEQUENCER_CONTROL_Write(1); /* put the sequencer into reset */
-
+    seek_to(current_track);    
     SIDE_REG_Write(f->side);
+    STEP_REG_Write(f->side); /* for drives which multiplex SIDE and DIR */
+    
+    SEQUENCER_CONTROL_Write(1); /* put the sequencer into reset */
     {
         uint8_t i = CyEnterCriticalSection();        
         REPLAY_FIFO_SET_LEVEL_MID;
@@ -533,7 +571,6 @@ static void cmd_write(struct write_frame* f)
         REPLAY_FIFO_SINGLE_BUFFER_UNSET;
         CyExitCriticalSection(i);
     }
-    seek_to(current_track);    
 
     init_replay_dma();
     bool writing = false; /* to the disk */
@@ -591,6 +628,7 @@ static void cmd_write(struct write_frame* f)
                 /* Wait for the index marker. While this happens, the DMA engine
                  * will prime the FIFO. */
 
+                hardsec_index_threshold = f->hardsec_threshold_ms;
                 index_irq = false;
                 while (!index_irq)
                     ;
@@ -625,6 +663,7 @@ abort:
     }
     
     print("p=%d cr=%d cw=%d f=%d w=%d index=%d underrun=%d", packets, count_read, count_written, finished, writing, index_irq, dma_underrun);
+    hardsec_index_threshold = 0;
     if (!finished)
     {
         /* There's still some data to read, so just read and blackhole it ---
@@ -638,6 +677,7 @@ abort:
     
     deinit_dma();
     
+    STEP_REG_Write(0);
     if (dma_underrun)
     {
         print("underrun!");
@@ -657,6 +697,7 @@ static void cmd_erase(struct erase_frame* f)
     /* Disk is now spinning. */
     
     print("start erasing");
+    hardsec_index_threshold = f->hardsec_threshold_ms;
     index_irq = false;
     while (!index_irq)
         ;
@@ -665,6 +706,7 @@ static void cmd_erase(struct erase_frame* f)
     while (!index_irq)
         ;
     ERASE_REG_Write(0);
+    hardsec_index_threshold = 0;
     print("stop erasing");
 
     DECLARE_REPLY_FRAME(struct any_frame, F_FRAME_ERASE_REPLY);
@@ -790,7 +832,7 @@ static void handle_command(void)
             break;
         
         case F_FRAME_MEASURE_SPEED_CMD:
-            cmd_measure_speed(f);
+            cmd_measure_speed((struct measurespeed_frame*) f);
             break;
             
         case F_FRAME_BULK_WRITE_TEST_CMD:

README.md

@@ -24,6 +24,14 @@ Don't believe me? Watch the demo reel!
 <iframe width="373" height="210" src="https://www.youtube.com/embed/m_s1iw8eW7o" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 </div>
 
+**New!** The FluxEngine client software now works with
+[GreaseWeazle](https://github.com/keirf/Greaseweazle/wiki) hardware. So, if you
+can't find a PSoC5 development kit, or don't want to use the Cypress Windows
+tools for programming it, you can use one of these instead. Very nearly all
+FluxEngine features are available with the GreaseWeazle and it works out-of-the
+box. See the [dedicated GreaseWeazle documentation page](doc/greaseweazle.md)
+for more information.
+
 **Important note.** On 2020-04-02 I changed the bytecode format (and firmware).
 Flux files will need to be upgraded with `fluxengine upgradefluxfile`. The new
 format should be more reliable and use way, way less bandwidth. Sorry for the
@@ -52,8 +60,13 @@ following friendly articles:
   - [Using a FluxEngine](doc/using.md) ∾ what to do with your new hardware ∾
     flux files and image files ∾ knowing what you're doing
 
-  - [Troubleshooting dubious disks](doc/problems.md) ∾ it's not an exact science ∾
-    the sector map ∾ clock detection and the histogram
+  - [Using GreaseWeazle hardware with the FluxEngine client
+	software](doc/greaseweazle.md) ∾ what works ∾ what doesn't work ∾ where to
+	go for help
+
+  - [Troubleshooting dubious disks](doc/problems.md) ∾ it's not an exact
+	science ∾ the sector map ∾ clock detection and the histogram ~
+	(doc/driveresponse.md)[checking your drive]
 
 Which?
 ------
@@ -82,7 +95,7 @@ people who've had it work).
 | [Brother 120kB](doc/disk-brother.md)     |  🦄   |        |                                     |
 | [Brother 240kB](doc/disk-brother.md)     |  🦄   |   🦄   |                                     |
 | [Brother FB-100](doc/disk-fb100.md)      |  🦖   |        | Tandy Model 100, Husky Hunter, knitting machines |
-| [Macintosh 800kB](doc/disk-macintosh.md) |  🦖   |        | and probably the 400kB too          |
+| [Macintosh 800kB](doc/disk-macintosh.md) |  🦄   |   🦄   | and probably the 400kB too          |
 | [TRS-80](doc/disk-trs80.md)              |  🦖   |   🦖*  | a minor variation of the IBM scheme |
 {: .datatable }
 
@@ -103,6 +116,7 @@ at least, check the CRC so what data's there is probably good.
 | [AES Superplus / No Problem](doc/disk-aeslanier.md) |  🦖   | | hard sectors! |
 | [Durango F85](doc/disk-durangof85.md)    |  🦖   |        | 5.25" |
 | [DVK MX](doc/disk-mx.md)                 |  🦖   |        | Soviet PDP-11 clone |
+| [Micropolis](doc/disk-micropolis.md)     |  🦄   |        | Micropolis 100tpi drives |
 | [TI DS990 FD1000](doc/disk-tids990.md)   |  🦄   |  🦄    | 8" |
 | [Victor 9000](doc/disk-victor9k.md)      |  🦖   |        | 8" |
 | [Zilog MCZ](doc/disk-zilogmcz.md)        |  🦖   |        | 8" _and_ hard sectors |

arch/macintosh/decoder.cc

@@ -118,7 +118,7 @@ static Bytes decode_crazy_data(const Bytes& input, Sector::Status& status)
 uint8_t decode_side(uint8_t side)
 {
     /* Mac disks, being weird, use the side byte to encode both the side (in
-     * bit 5) and also whether we're above track 0x3f (in bit 6).
+     * bit 5) and also whether we're above track 0x3f (in bit 0).
      */
 
     return !!(side & 0x20);

arch/macintosh/encoder.cc

@@ -0,0 +1,242 @@
+#include "globals.h"
+#include "record.h"
+#include "decoders/decoders.h"
+#include "encoders/encoders.h"
+#include "macintosh.h"
+#include "crc.h"
+#include "sectorset.h"
+#include "writer.h"
+#include "fmt/format.h"
+#include <ctype.h>
+
+FlagGroup macintoshEncoderFlags;
+
+static DoubleFlag postIndexGapUs(
+	{ "--post-index-gap-us" },
+	"Post-index gap before first sector header (microseconds).",
+	0);
+
+static DoubleFlag clockCompensation(
+	{ "--clock-compensation-factor" },
+	"Scale the output clock by this much.",
+	1.0);
+
+static bool lastBit;
+
+static double clockRateUsForTrack(unsigned track)
+{
+	if (track < 16)
+		return 2.623;
+	if (track < 32)
+		return 2.861;
+	if (track < 48)
+		return 3.148;
+	if (track < 64)
+		return 3.497;
+	return 3.934;
+}
+
+static unsigned sectorsForTrack(unsigned track)
+{
+	if (track < 16)
+		return 12;
+	if (track < 32)
+		return 11;
+	if (track < 48)
+		return 10;
+	if (track < 64)
+		return 9;
+	return 8;
+}
+
+static int encode_data_gcr(uint8_t gcr)
+{
+    switch (gcr)
+    {
+		#define GCR_ENTRY(gcr, data) \
+			case data: return gcr;
+		#include "data_gcr.h"
+		#undef GCR_ENTRY
+    }
+    return -1;
+};
+
+/* This is extremely inspired by the MESS implementation, written by Nathan Woods
+ * and R. Belmont: https://github.com/mamedev/mame/blob/4263a71e64377db11392c458b580c5ae83556bc7/src/lib/formats/ap_dsk35.cpp
+ */
+static Bytes encode_crazy_data(const Bytes& input)
+{
+    Bytes output;
+    ByteWriter bw(output);
+    ByteReader br(input);
+
+	uint8_t w1, w2, w3, w4;
+
+    static const int LOOKUP_LEN = MAC_SECTOR_LENGTH / 3;
+
+    uint8_t b1[LOOKUP_LEN + 1];
+    uint8_t b2[LOOKUP_LEN + 1];
+    uint8_t b3[LOOKUP_LEN + 1];
+
+	uint32_t c1 = 0;
+	uint32_t c2 = 0;
+	uint32_t c3 = 0;
+	for (int j=0;; j++)
+	{
+		c1 = (c1 & 0xff) << 1;
+		if (c1 & 0x0100)
+			c1++;
+
+		uint8_t val = br.read_8();
+		c3 += val;
+		if (c1 & 0x0100)
+		{
+			c3++;
+			c1 &= 0xff;
+		}
+		b1[j] = (val ^ c1) & 0xff;
+
+		val = br.read_8();
+		c2 += val;
+		if (c3 > 0xff)
+		{
+			c2++;
+			c3 &= 0xff;
+		}
+		b2[j] = (val ^ c3) & 0xff;
+
+		if (br.pos == 524)
+			break;
+
+		val = br.read_8();
+		c1 += val;
+		if (c2 > 0xff)
+		{
+			c1++;
+			c2 &= 0xff;
+		}
+		b3[j] = (val ^ c2) & 0xff;
+	}
+	uint32_t c4 = ((c1 & 0xc0) >> 6) | ((c2 & 0xc0) >> 4) | ((c3 & 0xc0) >> 2);
+	b3[LOOKUP_LEN] = 0;
+
+	for (int i = 0; i <= LOOKUP_LEN; i++)
+	{
+		w1 = b1[i] & 0x3f;
+		w2 = b2[i] & 0x3f;
+		w3 = b3[i] & 0x3f;
+		w4 =  ((b1[i] & 0xc0) >> 2);
+		w4 |= ((b2[i] & 0xc0) >> 4);
+		w4 |= ((b3[i] & 0xc0) >> 6);
+
+		bw.write_8(w4);
+		bw.write_8(w1);
+		bw.write_8(w2);
+
+		if (i != LOOKUP_LEN)
+			bw.write_8(w3);
+	}
+
+	bw.write_8(c4 & 0x3f);
+	bw.write_8(c3 & 0x3f);
+	bw.write_8(c2 & 0x3f);
+	bw.write_8(c1 & 0x3f);
+
+	return output;
+}
+
+static void write_bits(std::vector<bool>& bits, unsigned& cursor, const std::vector<bool>& src)
+{
+	for (bool bit : src)
+	{
+		if (cursor < bits.size())
+			bits[cursor++] = bit;
+	}
+}
+
+static void write_bits(std::vector<bool>& bits, unsigned& cursor, uint64_t data, int width)
+{
+	cursor += width;
+	for (int i=0; i<width; i++)
+	{
+		unsigned pos = cursor - i - 1;
+		if (pos < bits.size())
+			bits[pos] = data & 1;
+		data >>= 1;
+	}
+}
+
+static uint8_t encode_side(uint8_t track, uint8_t side)
+{
+    /* Mac disks, being weird, use the side byte to encode both the side (in
+     * bit 5) and also whether we're above track 0x3f (in bit 0).
+     */
+
+	return (side ? 0x20 : 0x00) | ((track>0x3f) ? 0x01 : 0x00);
+}
+
+static void write_sector(std::vector<bool>& bits, unsigned& cursor, const Sector* sector)
+{
+	if ((sector->data.size() != 512) && (sector->data.size() != 524))
+		Error() << "unsupported sector size --- you must pick 512 or 524";
+
+	write_bits(bits, cursor, 0xff, 1*8); /* pad byte */
+	for (int i=0; i<7; i++)
+		write_bits(bits, cursor, 0xff3fcff3fcffLL, 6*8); /* sync */
+	write_bits(bits, cursor, MAC_SECTOR_RECORD, 3*8);
+
+    uint8_t encodedTrack = sector->physicalTrack & 0x3f;
+	uint8_t encodedSector = sector->logicalSector;
+	uint8_t encodedSide = encode_side(sector->physicalTrack, sector->logicalSide);
+	uint8_t formatByte = MAC_FORMAT_BYTE;
+	uint8_t headerChecksum = (encodedTrack ^ encodedSector ^ encodedSide ^ formatByte) & 0x3f;
+
+	write_bits(bits, cursor, encode_data_gcr(encodedTrack), 1*8);
+	write_bits(bits, cursor, encode_data_gcr(encodedSector), 1*8);
+	write_bits(bits, cursor, encode_data_gcr(encodedSide), 1*8);
+	write_bits(bits, cursor, encode_data_gcr(formatByte), 1*8);
+	write_bits(bits, cursor, encode_data_gcr(headerChecksum), 1*8);
+
+	write_bits(bits, cursor, 0xdeaaff, 3*8);
+	write_bits(bits, cursor, 0xff3fcff3fcffLL, 6*8); /* sync */
+	write_bits(bits, cursor, MAC_DATA_RECORD, 3*8);
+	write_bits(bits, cursor, encode_data_gcr(sector->logicalSector), 1*8);
+
+	Bytes wireData;
+	wireData.writer().append(sector->data.slice(512, 12)).append(sector->data.slice(0, 512));
+	for (uint8_t b : encode_crazy_data(wireData))
+		write_bits(bits, cursor, encode_data_gcr(b), 1*8);
+
+	write_bits(bits, cursor, 0xdeaaff, 3*8);
+}
+
+std::unique_ptr<Fluxmap> MacintoshEncoder::encode(
+	int physicalTrack, int physicalSide, const SectorSet& allSectors)
+{
+	if ((physicalTrack < 0) || (physicalTrack >= MAC_TRACKS_PER_DISK))
+		return std::unique_ptr<Fluxmap>();
+
+	double clockRateUs = clockRateUsForTrack(physicalTrack) * clockCompensation;
+	int bitsPerRevolution = 200000.0 / clockRateUs;
+	std::vector<bool> bits(bitsPerRevolution);
+	unsigned cursor = 0;
+
+    fillBitmapTo(bits, cursor, postIndexGapUs / clockRateUs, { true, false });
+	lastBit = false;
+
+	unsigned numSectors = sectorsForTrack(physicalTrack);
+	for (int sectorId=0; sectorId<numSectors; sectorId++)
+	{
+		const auto& sectorData = allSectors.get(physicalTrack, physicalSide, sectorId);
+		write_sector(bits, cursor, sectorData);
+    }
+
+	if (cursor >= bits.size())
+		Error() << fmt::format("track data overrun by {} bits", cursor - bits.size());
+	fillBitmapTo(bits, cursor, bits.size(), { true, false });
+
+	std::unique_ptr<Fluxmap> fluxmap(new Fluxmap);
+	fluxmap->appendBits(bits, clockRateUs*1e3);
+	return fluxmap;
+}
+

arch/macintosh/macintosh.h

@@ -1,11 +1,17 @@
 #ifndef MACINTOSH_H
 #define MACINTOSH_H
 
+#include "decoders/decoders.h"
+#include "encoders/encoders.h"
+
 #define MAC_SECTOR_RECORD   0xd5aa96 /* 1101 0101 1010 1010 1001 0110 */
 #define MAC_DATA_RECORD     0xd5aaad /* 1101 0101 1010 1010 1010 1101 */
 
 #define MAC_SECTOR_LENGTH   524 /* yes, really */
 #define MAC_ENCODED_SECTOR_LENGTH 703
+#define MAC_FORMAT_BYTE     0x22
+
+#define MAC_TRACKS_PER_DISK 80
 
 class Sector;
 class Fluxmap;
@@ -22,5 +28,17 @@ public:
 	std::set<unsigned> requiredSectors(Track& track) const;
 };
 
+class MacintoshEncoder : public AbstractEncoder
+{
+public:
+	virtual ~MacintoshEncoder() {}
+
+public:
+    std::unique_ptr<Fluxmap> encode(int physicalTrack, int physicalSide, const SectorSet& allSectors);
+};
+
+extern FlagGroup macintoshEncoderFlags;
+
+
 #endif
 

doc/building.md

@@ -292,7 +292,7 @@ INDEX300 ---+ 3.0|     | GND+--------------------------+
             +----+     +----+                 +--+--+  |
 INDEX360 ---+ 3.1|     | 1.7+------ DISKCHG --+34+33+--+
             +----+     +----+                 +--+--+
-            + 3.2|     | 1.6+------- SIDE1 ---+32+31+
+    TK43 ---+ 3.2|     | 1.6+------- SIDE1 ---+32+31+
             +----+     +----+                 +--+--+
             + 3.3|     | 1.5+------- RDATA ---+30+29+
             +----+     +----+                 +--+--+
@@ -306,7 +306,7 @@ INDEX360 ---+ 3.1|     | 1.7+------ DISKCHG --+34+33+--+
             +----+     +----+                 +--+--+
             +15.0|     | 1.0+------- STEP ----+20+19+
             +----+     +----+                 +--+--+
-            +15.1|     |12.0+-------- DIR ----+18+17+
+            +15.1|     |12.0+--- DIR/SIDE1 ---+18+17+
             +----+     +----+                 +--+--+
             +15.2|     |12.1+------- MOTEB ---+16+15+
             +----+     +----+                 +--+--+
@@ -343,6 +343,10 @@ INDEX360 ---+ 3.1|     | 1.7+------ DISKCHG --+34+33+--+
 
 Notes:
 
+  - `DIR/SIDE1` is the step direction pin. During reads or writes, `SIDE1` is
+  also multiplexed onto it, because some drives expect this. This is harmless
+  on other drives because the `DIR` pin is ignored during reads or writes.
+
   - `TX` is the debug UART port. It's on pin 12.7 because the board routes it
   to the USB serial port on the programmer, so you can get debug information
   from the FluxEngine by just plugging the programming end into a USB port
@@ -365,6 +369,10 @@ Notes:
   rather exotic things. See the section on flippy disks [in the FAQ](faq.md)
   for more details; you can normally ignore these.
 
+  - `TK43` is an optional output pin which goes low when the drive is seeking
+  to track 43 or above. This is useful when using 8" floppy drives, which
+  require reduced write current when writing to these tracks.
+
 ## Next steps
 
 You should now be ready to go. You'll want to read [the client

doc/disk-macintosh.md

@@ -55,11 +55,25 @@ You should end up with a `mac.diskcopy` file which is compatible with DiskCopy
 different sizes and the odd sector size. If you use a normal `.img` file, then
 FluxEngine will store them in a simple 524 x 12 x 2 x 80 layout, with holes
 where missing sectors should be; this was easiest, but is unlikely to work with
-most Mac emulators and other software. In these files, the The 12 bytes of
+most Mac emulators and other software. In these files, the 12 bytes of
 metadata _follow_ the 512 bytes of user payload in the sector image. If you
 don't want it, specify a geometry in the output file with a 512-byte sectore
 size like `-o mac.img:c=80:h=1:s=12:b=512`.
 
+Writing discs
+-------------
+
+Just do:
+
+```
+fluxengine write mac -i mac.diskcopy
+```
+
+It'll read the DiskCopy 4.2 file and write it out.
+
+The same warning as above applies --- you can use normal `.img` files but it's
+problematic. Use DiskCopy 4.2 files instead.
+
 Useful references
 -----------------
 

doc/disk-micropolis.md

@@ -10,6 +10,12 @@ Some later systems were Micropolis-compatible and so were also 100 TPI, like
 the Vector Graphic Dual-Mode Disk Controller which was paired with a Tandon
 drive.
 
+**Important note:** You _cannot_ read these disks with a normal PC drive, as
+these drives are 96tpi.The track spacing is determined by the physical geometry
+of the drive and can't be changed in software. You'll need to get hold of a
+100tpi Micropolis drive. Luckily these seem to use the same connector and
+pinout as a 96tpi PC 5.25" drive. In use they should be identical.
+
 Reading disks
 -------------
 
@@ -26,10 +32,10 @@ or single-sided disks, you can use `-s :s=0` to read only one side of the disk
 which works around the problem.
 
 The [CP/M BIOS](https://www.seasip.info/Cpm/bios.html) defined SELDSK, SETTRK,
-and SETSEC, but no function to select the head/side. This caused dual-sided
-floppies to be represented as twice the number of tracks with the second side's
-tracks logically following the first side (e.g., tracks 77-153). That produces
-results mostly indistinguishable from HCS.
+and SETSEC, but no function to select the head/side. Double-sided floppies
+could be represented as having either twice the number of sectors, for CHS, or
+twice the number of tracks, HCS; the second side's tracks logically followed
+the first side (e.g., tracks 77-153). Micropolis disks tended to be the latter.
 
 Useful references
 -----------------

doc/disk-trs80.md

@@ -32,3 +32,11 @@ If you've got a 40-track disk, use `-s :t=0-79x2`.
 
 If you've got a single density disk, use `--read-fm=true`. (Double density is
 the default.)
+
+
+Useful references
+-----------------
+
+  - [The JV3 file format](https://www.tim-mann.org/trs80/dskspec.html):
+	documents the most popular emulator disk image.
+

doc/driveresponse.md

@@ -0,0 +1,79 @@
+Analysing drive response
+========================
+
+Not all PC drives are made equal. Some are less equal than others.
+
+The way floppy disk storage works is that the floppy drive controller will
+generate a series of pulses, which the drive stores on the disk. Then, when the
+disk is read, the drive will reproduce the same series of pulses and return it
+to the floppy drive controller. The data is stored in the intervals between
+pulses.
+
+The problem is that some PC drives assume that they're going to be used with
+IBM scheme disks, which use particular pulse intervals --- in the case of DD
+disks, intervals are always 4us, 6us or 8us. So, in a misguided attempt to
+improve reliability, they sometimes... tidy... the incoming pulse stream. This
+can have nasty effects if you're not a disk which _doesn't_ use those intervals.
+
+In addition, they won't work properly if the intervals are too great, or too
+small. Partly this is a limitation of the underlying physics of the magnetic
+media, and partly it's due to the drive's automatic gain adjustment: if the
+drive doesn't see a pulse, it'll start ramping up the gain of its amplifier,
+until it starts interpreting random noise as a valid pulse.
+
+FluxEngine has a tool to analyse a drive and report on this behaviour. It works
+by writing a sequence of timed pulses to the disk, then reading them back and
+seeing what the drive actually reports. To use it, do:
+
+```
+fluxengine analyse driveresponse -d :d=1:t=0 --min-interval-us=0 --max-interval-us=30 --interval-step-us=.1 --write-csv=driveresponse.csv
+python3 scripts/driveresponse.csv
+```
+
+This will scan all intervals from 0us to 30us, at 0.1us steps, and write the
+result as a CSV file. Then the Python script uses matplotlib to render the
+result as a heatmap. They look like this.
+
+<div style="text-align: center">
+<img src="sony-mpf920-dd.png" style="width:40%" alt="Sony MPF-920, DD"></a>
+<img src="sony-mpf920-hd.png" style="width:40%" alt="Sony MPF-920, HD"></a>
+</div>
+
+This is the analysis from the [Sony
+MPF-920](https://docs.sony.com/release/MPF920Z.pdf) 3.5" drive I mostly use for
+testing. The left-hand image shows the result from a DD disk, while the right
+hand image shows the result from a HD disk.
+
+The vertical access is the width of pulse being written; the horizontal axis
+and heatmap shows the distribution of pulses being read back. Yoou can see the
+diagonal line, which represents correct pulses. The triangular smear in the top
+left shows spurious pulses which are being read back because the interval is
+too great; these start at about 12us for DD disks and 7us for HD disks. This is
+an artifact of the different magnetic media for the two types of disk.
+
+(This, by the way, is why you shouldn't use DD formats on HD disks. The
+intervals on a DD disk can go up to 8us, which is on the edge of the ability of
+an HD disk and drive to correctly report back the pulses.)
+
+You also note the hard cut-off on the left: this represents the filter on the
+drive, which will simply refuse to report pulse intervals shorter than about
+1.5us. FluxEngine itself can't write intervals shorter than 2us.
+
+For comparison purposes, here's another set of graphs.
+
+<div style="text-align: center">
+<img src="fdd-90206-dd.png" style="width:40%" alt="FDD-90206, DD"></a>
+<img src="fdd-90206-hd.png" style="width:40%" alt="FDD-90206, HD"></a>
+</div>
+
+This is from another drive I have; it's an unbranded combo
+card-reader-and-floppy drive unit; the 90206 is the only identification mark it
+has. I don't use this because it's problematic, and the graph shows why; you
+can just see some ghosting on the HD graph at at 3us, where some pulses are
+coming back reported at 6us. This won't affect IBM scheme disks because they
+don't use 3us as an interval, but it might effect other formats. And the DD
+graph shows that intervals below about 4us are reported as double what they
+should be: so, this drive won't work on [Macintosh 800kB
+formats](disk-macintosh.md) at all, because they use intervals starting at
+2.6us, below this limit. But it should work on PC formats --- just.
+

doc/greaseweazle.md

@@ -0,0 +1,71 @@
+Using the FluxEngine client software with GreaseWeazle hardware
+===============================================================
+
+The FluxEngine isn't the only project which does this; another one is the
+[GreaseWeazle](https://github.com/keirf/Greaseweazle/wiki), a Blue Pill based
+completely open source solution. This requires more work to set up (or you can
+buy a prebuilt GreaseWeazle board), but provides completely open source
+hardware which doesn't require the use of the Cypress Windows-based tools that
+the FluxEngine does. Luckily, the FluxEngine software supports it
+out-of-the-box --- just plug it in and nearly everything should work.
+
+I am aware that having _software_ called FluxEngine and _hardware_ called
+FluxEngine makes things complicated when you're not using the FluxEngine client
+software with a FluxEngine board, but I'm afraid it's too late to change that
+now. Sorry.
+
+If you're using Windows
+-----------------------
+
+In order to access the GreaseWeazle from Windows, you need to install a WinUSB
+driver for it. You can do this with the [Zadig](https://zadig.akeo.ie/)
+program. Download it, plug in the GreaseWeazle, and run it; select Options,
+List All Devices, and then open the big dropdown box and select the
+GreaseWeazle. You should see something like this.
+
+<div style="text-align: center">
+<img src="zadig.png" style="width:80%" alt="Zadig screenshot"></a>
+</div>
+
+Ensure that the Driver boxes say `usbser` and `WinUSB`. Then press 'Replace
+Driver'. Once done, the GreaseWeazle will be visible to the FluxEngine client.
+
+**Important note!** Unfortunately, now, the original GreaseWeazle client won't
+work --- you can't use both drivers at once. I'm working on this. To switch
+back to the original driver, for using the GreaseWeazle client software
+instead, open up Zadig again, go through the same process, but make sure the left Driver box says `WinUSB` and the right one says `USB Serial (CDC)`. Now, when you press 'Replace Driver' the original driver will be restored.
+
+What works
+----------
+
+Supported features with the GreaseWeazle include:
+
+  - simple reading and writing of disks, seeking etc
+  - erasing disks
+  - determining disk rotation speed
+
+What doesn't work
+-----------------
+
+(I'm still working on this. If you have an urgent need for anything, please
+[file an issue](https://github.com/davidgiven/fluxengine/issues/new) and I'll
+see what I can do.)
+
+  - voltage measurement
+  - hard sectored disks (you can still read these, but you can't use
+	`--hard-sector-count`).
+
+Who to contact
+--------------
+
+I want to make it clear that the FluxEngine code is _not_ supported by the
+GreaseWeazle team. If you have any problems, please [contact
+me](https://github.com/davidgiven/fluxengine/issues/new) and not them.
+
+In addition, the GreaseWeazle release cycle is not synchronised to the
+FluxEngine release cycle, so it's possible you'll have a version of the
+GreaseWeazle firmware which is not supported by FluxEngine. Hopefully, it'll
+detect this and complain. Again, [file an
+issue](https://github.com/davidgiven/fluxengine/issues/new) and I'll look into
+it.
+

doc/problems.md

@@ -10,6 +10,11 @@ been written to be largely fire-and-forget and is mostly self-adjusting.
 However, there are still some things that can be tuned to produce better
 reads.
 
+Also, it's important to remember that some drives are problematic --- in
+particular, some 3.5" floppy drives are designed to work with just IBM scheme
+disks with a certain set of pulse intervals. There's a tool to let you diagnose
+this; see [the drive response](driveresponse.md) page.
+
 The sector map
 --------------
 

doc/technical.md

@@ -82,16 +82,10 @@ FluxEngine hardware on a $2 Blue Pill.
 I am _not_ planning on replacing the PSoC5 with a Blue Pill, because someone
 already has: [the GreaseWeazle](https://github.com/keirf/Greaseweazle/wiki) is
 a completely open source firmware package which will read and write Supercard
-Pro files via a standard Blue Pill. The GreaseWeazle's USB protocol is
-different from the FluxEngine's so they're not directly interchangeable. You
-can, however, read a Supercard Pro file with a GreaseWeazle and then use the
-FluxEngine client to decode it. It should work the other way around, too, but
-FluxEngine's SCP export [is curently
-broken](https://github.com/davidgiven/fluxengine/issues/134).
-
-I _am_ considering adding direct support for the GreaseWeazle to the FluxEngine
-client, which will let you just plug one in and make it go as a direct
-replacement to the FluxEngine hardware.
+Pro files via a standard Blue Pill or via a prebuilt board. It's supported by
+the FluxEngine client software, and you should, mostly, be able to use
+GreaseWeazle hardware interchangeably with FluxEngine hardware. See the
+[dedicated page](greaseweazle.md) for more information.
 
 
 ### Some useful links

doc/using.md

@@ -136,6 +136,10 @@ exact format varies according to the extension:
 	format due to the weird layout of Mac GCR disks, but it can also support
 	720kB and 1440kB IBM disks (although there's no real benefit).
 
+  - `.jv3`: a disk image format mainly used by the TRS-80. These images can be
+	read, but not yet written. You only get the data; the density and DAM bits
+	are ignored.
+
 ### High density disks
 
 High density disks use a different magnetic medium to low and double density
@@ -228,21 +232,16 @@ directory.
 	format in a non-backwards-compatible way; this tool will upgrade flux files
 	to the new format.
 
-  - `fluxengine convert`: converts flux files from various formats to various
-	other formats. You can use this to convert Catweasel flux files to
+  - `fluxengine convert`: converts files from various formats to various other
+	formats. The main use of this is probably `fluxengine convert image`, which
+	will convert a disk image from one format to another.
+
+	There are also subcommands for converting Catweasel flux files to
 	FluxEngine's native format, FluxEngine flux files to various other formats
 	useful for debugging (including VCD which can be loaded into
 	[sigrok](http://sigrok.org)), and bidirectional conversion to and from
 	Supercard Pro `.scp` format.
 
-	**Important SCP note:** import (`fluxengine convert scptoflux`) should be
-	fairly robust, but export (`fluxengine convert fluxtoscp`) should only be
-	done with great caution as FluxEngine files contain features which can't be
-	represented very well in `.scp` format and they're probably pretty dubious.
-	As ever, please [get in
-	touch](https://github.com/davidgiven/fluxengine/issues/new) with any
-	reports.
-
 Commands which normally take `--source` or `--dest` get a sensible default if
 left unspecified. `fluxengine read ibm` on its own will read drive 0 and
 write an `ibm.img` file.

lib/bytes.cc

@@ -41,6 +41,12 @@ Bytes::Bytes(const uint8_t* ptr, size_t len):
     _high(len)
 {}
 
+Bytes::Bytes(const std::string& s):
+	_data(createVector((const uint8_t*)&s[0], s.size())),
+	_low(0),
+	_high(s.size())
+{}
+
 Bytes::Bytes(std::initializer_list<uint8_t> data):
     _data(createVector(data)),
     _low(0),

lib/bytes.h

@@ -41,6 +41,8 @@ public:
     uint8_t* begin()              { checkWritable(); return &(*_data)[_low]; }
     uint8_t* end()                { checkWritable(); return &(*_data)[_high]; }
 
+	operator const std::string () const { return std::string(cbegin(), cend()); }
+
     void boundsCheck(unsigned pos) const;
     void checkWritable();
     void adjustBounds(unsigned pos);

lib/fluxsink/fluxsink.h

@@ -24,6 +24,7 @@ public:
 };
 
 extern void setHardwareFluxSinkDensity(bool high_density);
+extern void setHardwareFluxSinkHardSectorCount(int sectorCount);
 
 #endif
 

lib/fluxsink/hardwarefluxsink.cc

@@ -3,6 +3,7 @@
 #include "fluxmap.h"
 #include "usb/usb.h"
 #include "fluxsink/fluxsink.h"
+#include "fmt/format.h"
 
 FlagGroup hardwareFluxSinkFlags = {
 	&usbFlags,
@@ -15,17 +16,37 @@ static IntFlag indexMode(
     "index pulse source (0=drive, 1=300 RPM fake source, 2=360 RPM fake source",
     0);
 
+static IntFlag hardSectorCount(
+    { "--write-hard-sector-count" },
+    "number of hard sectors on the disk (0=soft sectors)",
+    0);
+
 void setHardwareFluxSinkDensity(bool high_density)
 {
 	::high_density = high_density;
 }
 
+void setHardwareFluxSinkHardSectorCount(int sectorCount)
+{
+	::hardSectorCount.setDefaultValue(sectorCount);
+}
+
 class HardwareFluxSink : public FluxSink
 {
 public:
     HardwareFluxSink(unsigned drive):
         _drive(drive)
     {
+		if (hardSectorCount != 0)
+		{
+			usbSetDrive(_drive, high_density, indexMode);
+			std::cerr << "Measuring rotational speed... " << std::flush;
+			nanoseconds_t oneRevolution = usbGetRotationalPeriod(hardSectorCount);
+			_hardSectorThreshold = oneRevolution * 3 / (4 * hardSectorCount);
+			std::cerr << fmt::format("{}ms\n", oneRevolution / 1e6);
+		}
+		else
+			_hardSectorThreshold = 0;
     }
 
     ~HardwareFluxSink()
@@ -38,11 +59,12 @@ public:
         usbSetDrive(_drive, high_density, indexMode);
         usbSeek(track);
 
-        return usbWrite(side, fluxmap.rawBytes());
+        return usbWrite(side, fluxmap.rawBytes(), _hardSectorThreshold);
     }
 
 private:
     unsigned _drive;
+    nanoseconds_t _hardSectorThreshold;
 };
 
 std::unique_ptr<FluxSink> FluxSink::createHardwareFluxSink(unsigned drive)

lib/fluxsource/fluxsource.h

@@ -30,6 +30,7 @@ public:
 extern void setHardwareFluxSourceRevolutions(double revolutions);
 extern void setHardwareFluxSourceDensity(bool high_density);
 extern void setHardwareFluxSourceSynced(bool synced);
+extern void setHardwareFluxSourceHardSectorCount(int sectorCount);
 
 #endif
 

lib/fluxsource/hardwarefluxsource.cc

@@ -24,6 +24,11 @@ static IntFlag indexMode(
     "index pulse source (0=drive, 1=300 RPM fake source, 2=360 RPM fake source",
     0);
 
+static IntFlag hardSectorCount(
+    { "--hard-sector-count" },
+    "number of hard sectors on the disk (0=soft sectors)",
+    0);
+
 static bool high_density = false;
 
 void setHardwareFluxSourceDensity(bool high_density)
@@ -39,7 +44,11 @@ public:
     {
         usbSetDrive(_drive, high_density, indexMode);
         std::cerr << "Measuring rotational speed... " << std::flush;
-        _oneRevolution = usbGetRotationalPeriod();
+        _oneRevolution = usbGetRotationalPeriod(hardSectorCount);
+	if (hardSectorCount != 0)
+		_hardSectorThreshold = _oneRevolution * 3 / (4 * hardSectorCount);
+	else
+		_hardSectorThreshold = 0;
         std::cerr << fmt::format("{}ms\n", _oneRevolution / 1e6);
     }
 
@@ -52,7 +61,8 @@ public:
     {
         usbSetDrive(_drive, high_density, indexMode);
         usbSeek(track);
-        Bytes data = usbRead(side, synced, revolutions * _oneRevolution);
+        Bytes data = usbRead(
+			side, synced, revolutions * _oneRevolution, _hardSectorThreshold);
         auto fluxmap = std::make_unique<Fluxmap>();
         fluxmap->appendBytes(data);
         return fluxmap;
@@ -72,6 +82,7 @@ private:
     unsigned _drive;
     unsigned _revolutions;
     nanoseconds_t _oneRevolution;
+    nanoseconds_t _hardSectorThreshold;
 };
 
 void setHardwareFluxSourceRevolutions(double revolutions)
@@ -84,6 +95,11 @@ void setHardwareFluxSourceSynced(bool synced)
     ::synced.setDefaultValue(synced);
 }
 
+void setHardwareFluxSourceHardSectorCount(int sectorCount)
+{
+    ::hardSectorCount.setDefaultValue(sectorCount);
+}
+
 std::unique_ptr<FluxSource> FluxSource::createHardwareFluxSource(unsigned drive)
 {
     return std::unique_ptr<FluxSource>(new HardwareFluxSource(drive));

lib/imagereader/diskcopyimagereader.cc

@@ -0,0 +1,128 @@
+#include "globals.h"
+#include "flags.h"
+#include "dataspec.h"
+#include "sector.h"
+#include "sectorset.h"
+#include "imagereader/imagereader.h"
+#include "fmt/format.h"
+#include <algorithm>
+#include <iostream>
+#include <fstream>
+
+class DiskCopyImageReader : public ImageReader
+{
+public:
+	DiskCopyImageReader(const ImageSpec& spec):
+		ImageReader(spec)
+	{}
+
+	SectorSet readImage()
+	{
+        std::ifstream inputFile(spec.filename, std::ios::in | std::ios::binary);
+        if (!inputFile.is_open())
+            Error() << "cannot open input file";
+
+		Bytes data;
+		data.writer() += inputFile;
+		ByteReader br(data);
+
+		br.seek(1);
+		std::string label = br.read(data[0]);
+
+		br.seek(0x40);
+		uint32_t dataSize = br.read_be32();
+
+		br.seek(0x50);
+		uint8_t encoding = br.read_8();
+		uint8_t formatByte = br.read_8();
+
+		unsigned numCylinders = 80;
+		unsigned numHeads = 2;
+		unsigned numSectors = 0;
+		bool mfm = false;
+
+		switch (encoding)
+		{
+			case 0: /* GCR CLV 400kB */
+				numHeads = 1;
+				break;
+
+			case 1: /* GCR CLV 800kB */
+				break;
+
+			case 2: /* MFM CAV 720kB */
+				numSectors = 9;
+				mfm = true;
+				break;
+
+			case 3: /* MFM CAV 1440kB */
+				numSectors = 18;
+				mfm = true;
+				break;
+
+			default:
+				Error() << fmt::format("don't understant DiskCopy disks of type {}", encoding);
+		}
+
+		std::cout << "reading DiskCopy 4.2 image\n"
+		          << fmt::format("{} cylinders, {} heads; {}; {}\n",
+				  		numCylinders, numHeads,
+						mfm ? "MFM" : "GCR",
+						label);
+
+		auto sectorsPerTrack = [&](int track) -> int
+		{
+			if (mfm)
+				return numSectors;
+
+			if (track < 16)
+				return 12;
+			if (track < 32)
+				return 11;
+			if (track < 48)
+				return 10;
+			if (track < 64)
+				return 9;
+			return 8;
+		};
+
+		uint32_t dataPtr = 0x54;
+		uint32_t tagPtr = dataPtr + dataSize;
+
+        SectorSet sectors;
+        for (int track = 0; track < numCylinders; track++)
+        {
+			int numSectors = sectorsPerTrack(track);
+            for (int head = 0; head < numHeads; head++)
+            {
+                for (int sectorId = 0; sectorId < numSectors; sectorId++)
+                {
+					br.seek(dataPtr);
+					Bytes payload = br.read(512);
+					dataPtr += 512;
+
+					br.seek(tagPtr);
+					Bytes tag = br.read(12);
+					tagPtr += 12;
+
+                    std::unique_ptr<Sector>& sector = sectors.get(track, head, sectorId);
+                    sector.reset(new Sector);
+                    sector->status = Sector::OK;
+                    sector->logicalTrack = sector->physicalTrack = track;
+                    sector->logicalSide = sector->physicalSide = head;
+                    sector->logicalSector = sectorId;
+                    sector->data.writer().append(payload).append(tag);
+                }
+            }
+        }
+        return sectors;
+	}
+};
+
+std::unique_ptr<ImageReader> ImageReader::createDiskCopyImageReader(
+	const ImageSpec& spec)
+{
+    return std::unique_ptr<ImageReader>(new DiskCopyImageReader(spec));
+}
+
+

lib/imagereader/imagereader.cc

@@ -12,8 +12,11 @@ std::map<std::string, ImageReader::Constructor> ImageReader::formats =
 {
 	{".adf", ImageReader::createImgImageReader},
 	{".d81", ImageReader::createImgImageReader},
+	{".diskcopy", ImageReader::createDiskCopyImageReader},
 	{".img", ImageReader::createImgImageReader},
 	{".ima", ImageReader::createImgImageReader},
+	{".jv1", ImageReader::createImgImageReader},
+	{".jv3", ImageReader::createJv3ImageReader},
 };
 
 static bool ends_with(const std::string& value, const std::string& ending)
@@ -45,7 +48,7 @@ std::unique_ptr<ImageReader> ImageReader::create(const ImageSpec& spec)
 void ImageReader::verifyImageSpec(const ImageSpec& spec)
 {
     if (!findConstructor(spec))
-        Error() << "unrecognised image filename extension";
+        Error() << "unrecognised input image filename extension";
 }
 
 ImageReader::ImageReader(const ImageSpec& spec):

lib/imagereader/imagereader.h

@@ -23,7 +23,9 @@ private:
 
 	static std::map<std::string, Constructor> formats;
 
+    static std::unique_ptr<ImageReader> createDiskCopyImageReader(const ImageSpec& spec);
     static std::unique_ptr<ImageReader> createImgImageReader(const ImageSpec& spec);
+    static std::unique_ptr<ImageReader> createJv3ImageReader(const ImageSpec& spec);
 
 	static Constructor findConstructor(const ImageSpec& spec);
 

lib/imagereader/jv3imagereader.cc

@@ -0,0 +1,141 @@
+#include "globals.h"
+#include "flags.h"
+#include "dataspec.h"
+#include "sector.h"
+#include "sectorset.h"
+#include "imagereader/imagereader.h"
+#include "fmt/format.h"
+#include <algorithm>
+#include <iostream>
+#include <fstream>
+
+/* JV3 files are kinda weird. There's a fixed layout for up to 2901 sectors, which may appear
+ * in any order, followed by the same again for more sectors. To find the second data block
+ * you need to know the size of the first data block, which requires parsing it.
+ *
+ * https://www.tim-mann.org/trs80/dskspec.html
+ *
+ * typedef struct {
+ *   SectorHeader headers1[2901];
+ *   unsigned char writeprot;
+ *   unsigned char data1[];
+ *   SectorHeader headers2[2901];
+ *   unsigned char padding;
+ *   unsigned char data2[];
+ * } JV3;
+ *
+ * typedef struct {
+ *   unsigned char track;
+ *   unsigned char sector;
+ *   unsigned char flags;
+ * } SectorHeader;
+ */
+
+struct SectorHeader
+{
+	uint8_t track;
+	uint8_t sector;
+	uint8_t flags;
+};
+
+#define JV3_DENSITY     0x80  /* 1=dden, 0=sden */
+#define JV3_DAM         0x60  /* data address mark code; see below */
+#define JV3_SIDE        0x10  /* 0=side 0, 1=side 1 */
+#define JV3_ERROR       0x08  /* 0=ok, 1=CRC error */
+#define JV3_NONIBM      0x04  /* 0=normal, 1=short */
+#define JV3_SIZE        0x03  /* in used sectors: 0=256,1=128,2=1024,3=512
+                                 in free sectors: 0=512,1=1024,2=128,3=256 */
+
+#define JV3_FREE        0xFF  /* in track and sector fields of free sectors */
+#define JV3_FREEF       0xFC  /* in flags field, or'd with size code */
+
+static unsigned getSectorSize(uint8_t flags)
+{
+	if ((flags & JV3_FREEF) == JV3_FREEF)
+	{
+		switch (flags & JV3_SIZE)
+		{
+			case 0: return 512;
+			case 1: return 1024;
+			case 2: return 128;
+			case 3: return 256;
+		}
+	}
+	else
+	{
+		switch (flags & JV3_SIZE)
+		{
+			case 0: return 256;
+			case 1: return 128;
+			case 2: return 1024;
+			case 3: return 512;
+		}
+	}
+	Error() << "not reachable";
+}
+
+class Jv3ImageReader : public ImageReader
+{
+public:
+	Jv3ImageReader(const ImageSpec& spec):
+		ImageReader(spec)
+	{}
+
+	SectorSet readImage()
+	{
+        std::ifstream inputFile(spec.filename, std::ios::in | std::ios::binary);
+        if (!inputFile.is_open())
+            Error() << "cannot open input file";
+
+		inputFile.seekg( 0, std::ios::end);
+		unsigned inputFileSize = inputFile.tellg();
+		unsigned headerPtr = 0;
+		SectorSet sectors;
+		for (;;)
+		{
+			unsigned dataPtr = headerPtr + 2901*3 + 1;
+			if (dataPtr >= inputFileSize)
+				break;
+
+			for (unsigned i=0; i<2901; i++)
+			{
+				SectorHeader header = {0, 0, 0xff};
+				inputFile.seekg(headerPtr);
+				inputFile.read((char*) &header, 3);
+				unsigned sectorSize = getSectorSize(header.flags);
+				if ((header.flags & JV3_FREEF) != JV3_FREEF)
+				{
+					Bytes data(sectorSize);
+					inputFile.seekg(dataPtr);
+					inputFile.read((char*) data.begin(), sectorSize);
+
+					unsigned head = !!(header.flags & JV3_SIDE);
+                    std::unique_ptr<Sector>& sector = sectors.get(header.track, head, header.sector);
+                    sector.reset(new Sector);
+                    sector->status = Sector::OK;
+                    sector->logicalTrack = sector->physicalTrack = header.track;
+                    sector->logicalSide = sector->physicalSide = head;
+                    sector->logicalSector = header.sector;
+                    sector->data = data;
+				}
+
+				headerPtr += 3;
+				dataPtr += sectorSize;
+			}
+
+			/* dataPtr is now pointing at the beginning of the next chunk. */
+
+			headerPtr = dataPtr;
+		}
+
+        return sectors;
+	}
+};
+
+std::unique_ptr<ImageReader> ImageReader::createJv3ImageReader(
+	const ImageSpec& spec)
+{
+    return std::unique_ptr<ImageReader>(new Jv3ImageReader(spec));
+}
+
+

lib/imagewriter/diskcopyimagewriter.cc

@@ -47,7 +47,6 @@ public:
 		else
 			Error() << "this image is not compatible with the DiskCopy 4.2 format";
 
-
 		std::cout << "writing DiskCopy 4.2 image\n"
 		          << fmt::format("{} tracks, {} heads, {} sectors, {} bytes per sector; {}\n",
 				  		spec.cylinders, spec.heads, spec.sectors, spec.bytes,

lib/imagewriter/imagewriter.cc

@@ -47,7 +47,7 @@ std::unique_ptr<ImageWriter> ImageWriter::create(const SectorSet& sectors, const
 void ImageWriter::verifyImageSpec(const ImageSpec& spec)
 {
 	if (!findConstructor(spec))
-		Error() << "unrecognised image filename extension";
+		Error() << "unrecognised output image filename extension";
 }
 
 ImageWriter::ImageWriter(const SectorSet& sectors, const ImageSpec& spec):

lib/reader.cc

@@ -91,6 +91,11 @@ void setReaderRevolutions(int revolutions)
 	setHardwareFluxSourceRevolutions(revolutions);
 }
 
+void setReaderHardSectorCount(int sectorCount)
+{
+    setHardwareFluxSourceHardSectorCount(sectorCount);
+}
+
 static void writeSectorsToFile(const SectorSet& sectors, const ImageSpec& spec)
 {
 	std::unique_ptr<ImageWriter> writer(ImageWriter::create(sectors, spec));

lib/reader.h

@@ -13,6 +13,7 @@ extern FlagGroup readerFlags;
 extern void setReaderDefaultSource(const std::string& source);
 extern void setReaderDefaultOutput(const std::string& output);
 extern void setReaderRevolutions(int revolutions);
+extern void setReaderHardSectorCount(int sectorCount);
 
 extern std::vector<std::unique_ptr<Track>> readTracks();
 

lib/usb/fluxengineusb.cc

@@ -144,9 +144,12 @@ public:
 		await_reply<struct any_frame>(F_FRAME_RECALIBRATE_REPLY);
 	}
 
-	nanoseconds_t getRotationalPeriod(void)
+	nanoseconds_t getRotationalPeriod(int hardSectorCount)
 	{
-		struct any_frame f = { .f = {.type = F_FRAME_MEASURE_SPEED_CMD, .size = sizeof(f)} };
+		struct measurespeed_frame f = {
+			.f = {.type = F_FRAME_MEASURE_SPEED_CMD, .size = sizeof(f)},
+			.hard_sector_count = (uint8_t) hardSectorCount,
+		};
 		usb_cmd_send(&f, f.f.size);
 
 		auto r = await_reply<struct speed_frame>(F_FRAME_MEASURE_SPEED_REPLY);
@@ -227,13 +230,15 @@ public:
 		await_reply<struct any_frame>(F_FRAME_BULK_READ_TEST_REPLY);
 	}
 
-	Bytes read(int side, bool synced, nanoseconds_t readTime)
+	Bytes read(int side, bool synced, nanoseconds_t readTime,
+	           nanoseconds_t hardSectorThreshold)
 	{
 		struct read_frame f = {
 			.f = { .type = F_FRAME_READ_CMD, .size = sizeof(f) },
 			.side = (uint8_t) side,
-			.synced = (uint8_t) synced
+			.synced = (uint8_t) synced,
 		};
+		f.hardsec_threshold_ms = (hardSectorThreshold + 5e5) / 1e6; /* round to nearest ms */
 		uint16_t milliseconds = readTime / 1e6;
 		((uint8_t*)&f.milliseconds)[0] = milliseconds;
 		((uint8_t*)&f.milliseconds)[1] = milliseconds >> 8;
@@ -249,7 +254,7 @@ public:
 		return buffer;
 	}
 
-	void write(int side, const Bytes& bytes)
+	void write(int side, const Bytes& bytes, nanoseconds_t hardSectorThreshold)
 	{
 		unsigned safelen = bytes.size() & ~(FRAME_SIZE-1);
 		Bytes safeBytes = bytes.slice(0, safelen);
@@ -258,6 +263,7 @@ public:
 			.f = { .type = F_FRAME_WRITE_CMD, .size = sizeof(f) },
 			.side = (uint8_t) side,
 		};
+		f.hardsec_threshold_ms = (hardSectorThreshold + 5e5) / 1e6; /* round to nearest ms */
 		((uint8_t*)&f.bytes_to_write)[0] = safelen;
 		((uint8_t*)&f.bytes_to_write)[1] = safelen >> 8;
 		((uint8_t*)&f.bytes_to_write)[2] = safelen >> 16;
@@ -269,12 +275,13 @@ public:
 		await_reply<struct any_frame>(F_FRAME_WRITE_REPLY);
 	}
 
-	void erase(int side)
+	void erase(int side, nanoseconds_t hardSectorThreshold)
 	{
 		struct erase_frame f = {
 			.f = { .type = F_FRAME_ERASE_CMD, .size = sizeof(f) },
 			.side = (uint8_t) side,
 		};
+		f.hardsec_threshold_ms = (hardSectorThreshold + 5e5) / 1e6; /* round to nearest ms */
 		usb_cmd_send(&f, f.f.size);
 
 		await_reply<struct any_frame>(F_FRAME_ERASE_REPLY);

lib/usb/greaseweazle.cc

@@ -0,0 +1,156 @@
+#include "globals.h"
+#include "usb.h"
+#include "protocol.h"
+#include "bytes.h"
+#include "fmt/format.h"
+#include "greaseweazle.h"
+
+Bytes fluxEngineToGreaseWeazle(const Bytes& fldata, nanoseconds_t clock)
+{
+	Bytes gwdata;
+	ByteWriter bw(gwdata);
+	ByteReader br(fldata);
+	uint32_t ticks_fl = 0;
+	uint32_t ticks_gw = 0;
+
+	auto write_28 = [&](uint32_t val) {
+		bw.write_8(1 | (val<<1) & 0xff);
+		bw.write_8(1 | (val>>6) & 0xff);
+		bw.write_8(1 | (val>>13) & 0xff);
+		bw.write_8(1 | (val>>20) & 0xff);
+	};
+
+	while (!br.eof())
+	{
+		uint8_t b = br.read_8();
+		ticks_fl += b & 0x3f;
+		if (b & F_BIT_PULSE)
+		{
+			uint32_t newticks_gw = ticks_fl * NS_PER_TICK / clock;
+			uint32_t delta = newticks_gw - ticks_gw;
+			if (delta < 250)
+				bw.write_8(delta);
+			else
+			{
+				int high = (delta-250) / 255;
+				if (high < 5)
+				{
+					bw.write_8(250 + high);
+					bw.write_8(1 + (delta-250) % 255);
+				}
+				else
+				{
+					bw.write_8(255);
+					bw.write_8(FLUXOP_SPACE);
+					write_28(delta - 249);
+					bw.write_8(249);
+				}
+			}
+			ticks_gw = newticks_gw;
+		}
+	}
+	bw.write_8(0); /* end of stream */
+	return gwdata;
+}
+
+Bytes greaseWeazleToFluxEngine(const Bytes& gwdata, nanoseconds_t clock)
+{
+	Bytes fldata;
+	ByteReader br(gwdata);
+	ByteWriter bw(fldata);
+
+    auto read_28 = [&]() {
+        return ((br.read_8() & 0xfe) >> 1)
+            | ((br.read_8() & 0xfe) << 6)
+            | ((br.read_8() & 0xfe) << 13)
+            | ((br.read_8() & 0xfe) << 20);
+    };
+
+	uint32_t ticks_gw = 0;
+	uint32_t lastevent_fl = 0;
+	uint32_t index_gw = ~0;
+
+	while (!br.eof())
+	{
+		uint8_t b = br.read_8();
+		if (!b)
+			break;
+
+		uint8_t event = 0;
+		if (b == 255)
+		{
+			switch (br.read_8())
+			{
+				case FLUXOP_INDEX:
+					index_gw = ticks_gw + read_28();
+					break;
+
+				case FLUXOP_SPACE:
+					ticks_gw += read_28();
+					break;
+
+				default:
+					Error() << "bad opcode in GreaseWeazle stream";
+			}
+		}
+		else
+		{
+			if (b < 250)
+				ticks_gw += b;
+			else
+			{
+				int delta = 250 + (b-250)*255 + br.read_8() - 1;
+				ticks_gw += delta;
+			}
+			event = F_BIT_PULSE;
+		}
+
+		if (event)
+		{
+			uint32_t index_fl = (index_gw * clock) / NS_PER_TICK;
+			uint32_t ticks_fl = (ticks_gw * clock) / NS_PER_TICK;
+			if (index_gw != ~0)
+			{
+				if (index_fl < ticks_fl)
+				{
+					uint32_t delta_fl = index_fl - lastevent_fl;
+					while (delta_fl > 0x3f)
+					{
+						bw.write_8(0x3f);
+						delta_fl -= 0x3f;
+					}
+					bw.write_8(delta_fl | F_BIT_INDEX);
+					lastevent_fl = index_fl;
+					index_gw = ~0;
+				}
+				else if (index_fl == ticks_fl)
+					event |= F_BIT_INDEX;
+			}
+
+			uint32_t delta_fl = ticks_fl - lastevent_fl;
+			while (delta_fl > 0x3f)
+			{
+				bw.write_8(0x3f);
+				delta_fl -= 0x3f;
+			}
+			bw.write_8(delta_fl | event);
+			lastevent_fl = ticks_fl;
+		}
+	}
+
+	return fldata;
+}
+
+/* Left-truncates at the first index mark, so the resulting data as aligned at
+ * the index. */
+Bytes stripPartialRotation(const Bytes& fldata)
+{
+	for (unsigned i=0; i<fldata.size(); i++)
+	{
+		uint8_t b = fldata[i];
+		if (b & F_BIT_INDEX)
+			return fldata.slice(i);
+	}
+	return fldata;
+}
+

lib/usb/greaseweazle.h

@@ -0,0 +1,203 @@
+#ifndef GREASEWEAZLE_H
+#define GREASEWEAZLE_H
+
+#define GREASEWEAZLE_VID 0x1209
+#define GREASEWEAZLE_PID 0x4d69
+
+#define EP_OUT 0x02
+#define EP_IN 0x83
+
+#define GREASEWEAZLE_VERSION 22
+
+extern Bytes fluxEngineToGreaseWeazle(const Bytes& fldata, nanoseconds_t clock);
+extern Bytes greaseWeazleToFluxEngine(const Bytes& gwdata, nanoseconds_t clock);
+extern Bytes stripPartialRotation(const Bytes& fldata);
+
+/* Copied from https://github.com/keirf/Greaseweazle/blob/master/inc/cdc_acm_protocol.h.
+ *
+ * WANING: these headers were originally defined with 'packed', which is a gccism so it's
+ * been dummied out. Don't use them expecting wire protocol structures. */
+
+#define packed /* */
+
+/*
+ * GREASEWEAZLE COMMAND SET
+ */
+
+/* CMD_GET_INFO, length=3, idx. Returns 32 bytes after ACK. */
+#define CMD_GET_INFO        0
+/* [BOOTLOADER] CMD_UPDATE, length=6, <update_len>. 
+ * Host follows with <update_len> bytes.
+ * Bootloader finally returns a status byte, 0 on success. */
+/* [MAIN FIRMWARE] CMD_UPDATE, length=10, <update_len>, 0xdeafbee3.
+ * Host follows with <update_len> bytes.
+ * Main firmware finally returns a status byte, 0 on success. */
+#define CMD_UPDATE          1
+/* CMD_SEEK, length=3, cyl#. Seek to cyl# on selected drive. */
+#define CMD_SEEK            2
+/* CMD_HEAD, length=3, head# (0=bottom) */
+#define CMD_HEAD            3
+/* CMD_SET_PARAMS, length=3+nr, idx, <nr bytes> */
+#define CMD_SET_PARAMS      4
+/* CMD_GET_PARAMS, length=4, idx, nr_bytes. Returns nr_bytes after ACK. */
+#define CMD_GET_PARAMS      5
+/* CMD_MOTOR, length=4, drive#, on/off. Turn on/off a drive motor. */
+#define CMD_MOTOR           6
+/* CMD_READ_FLUX, length=2-8. Argument is gw_read_flux.
+ * Returns flux readings until EOStream. */
+#define CMD_READ_FLUX       7
+/* CMD_WRITE_FLUX, length=2-4. Argument is gw_write_flux.
+ * Host follows with flux readings until EOStream. */
+#define CMD_WRITE_FLUX      8
+/* CMD_GET_FLUX_STATUS, length=2. Last read/write status returned in ACK. */
+#define CMD_GET_FLUX_STATUS 9
+/* CMD_SWITCH_FW_MODE, length=3, <mode> */
+#define CMD_SWITCH_FW_MODE 11
+/* CMD_SELECT, length=3, drive#. Select drive# as current unit. */
+#define CMD_SELECT         12
+/* CMD_DESELECT, length=2. Deselect current unit (if any). */
+#define CMD_DESELECT       13
+/* CMD_SET_BUS_TYPE, length=3, bus_type. Set the bus type. */
+#define CMD_SET_BUS_TYPE   14
+/* CMD_SET_PIN, length=4, pin#, level. */
+#define CMD_SET_PIN        15
+/* CMD_RESET, length=2. Reset all state to initial (power on) values. */
+#define CMD_RESET          16
+/* CMD_ERASE_FLUX, length=6. Argument is gw_erase_flux. */
+#define CMD_ERASE_FLUX     17
+/* CMD_SOURCE_BYTES, length=6. Argument is gw_sink_source_bytes. */
+#define CMD_SOURCE_BYTES   18
+/* CMD_SINK_BYTES, length=6. Argument is gw_sink_source_bytes. */
+#define CMD_SINK_BYTES     19
+#define CMD_MAX            19
+
+
+/*
+ * CMD_SET_BUS CODES
+ */
+#define BUS_NONE            0
+#define BUS_IBMPC           1
+#define BUS_SHUGART         2
+
+
+/*
+ * ACK RETURN CODES
+ */
+#define ACK_OKAY            0
+#define ACK_BAD_COMMAND     1
+#define ACK_NO_INDEX        2
+#define ACK_NO_TRK0         3
+#define ACK_FLUX_OVERFLOW   4
+#define ACK_FLUX_UNDERFLOW  5
+#define ACK_WRPROT          6
+#define ACK_NO_UNIT         7
+#define ACK_NO_BUS          8
+#define ACK_BAD_UNIT        9
+#define ACK_BAD_PIN        10
+#define ACK_BAD_CYLINDER   11
+
+
+/*
+ * CONTROL-CHANNEL COMMAND SET:
+ * We abuse SET_LINE_CODING requests over endpoint 0, stashing a command
+ * in the baud-rate field.
+ */
+#define BAUD_NORMAL        9600
+#define BAUD_CLEAR_COMMS  10000
+
+/*
+ * Flux stream opcodes. Preceded by 0xFF byte.
+ * 
+ * Argument types:
+ *  N28: 28-bit non-negative integer N, encoded as 4 bytes b0,b1,b2,b3:
+ *   b0 = (uint8_t)(1 | (N <<  1))
+ *   b1 = (uint8_t)(1 | (N >>  6))
+ *   b2 = (uint8_t)(1 | (N >> 13))
+ *   b3 = (uint8_t)(1 | (N >> 20))
+ */
+/* FLUXOP_INDEX [CMD_READ_FLUX]
+ *  Args:
+ *   +4 [N28]: ticks to index, relative to sample cursor.
+ *  Signals an index pulse in the read stream. Sample cursor is unaffected. */
+#define FLUXOP_INDEX      1
+/* FLUXOP_SPACE [CMD_READ_FLUX, CMD_WRITE_FLUX]
+ *  Args:
+ *   +4 [N28]: ticks to increment the sample cursor.
+ *  Increments the sample cursor with no intervening flux transitions. */
+#define FLUXOP_SPACE      2
+/* FLUXOP_ASTABLE [CMD_WRITE_FLUX]
+ *  Args:
+ *   +4 [N28]: astable period.
+ *  Generate regular flux transitions at specified astable period. 
+ *  Duration is specified by immediately preceding FLUXOP_SPACE opcode(s). */
+#define FLUXOP_ASTABLE    3
+
+
+/*
+ * COMMAND PACKETS
+ */
+
+/* CMD_GET_INFO, index 0 */
+#define GETINFO_FIRMWARE 0
+struct packed gw_info {
+    uint8_t fw_major;
+    uint8_t fw_minor;
+    uint8_t is_main_firmware; /* == 0 -> update bootloader */
+    uint8_t max_cmd;
+    uint32_t sample_freq;
+    uint8_t hw_model, hw_submodel;
+    uint8_t usb_speed;
+};
+extern struct gw_info gw_info;
+
+/* CMD_GET_INFO, index 1 */
+#define GETINFO_BW_STATS 1
+struct packed gw_bw_stats {
+    struct packed {
+        uint32_t bytes;
+        uint32_t usecs;
+    } min_bw, max_bw;
+};
+
+/* CMD_READ_FLUX */
+struct packed gw_read_flux {
+    /* Maximum ticks to read for (or 0, for no limit). */
+    uint32_t ticks;
+    /* Maximum index pulses to read (or 0, for no limit). */
+    uint16_t max_index;
+};
+
+/* CMD_WRITE_FLUX */
+struct packed gw_write_flux {
+    /* If non-zero, start the write at the index pulse. */
+    uint8_t cue_at_index;
+    /* If non-zero, terminate the write at the next index pulse. */
+    uint8_t terminate_at_index;
+};
+
+/* CMD_ERASE_FLUX */
+struct packed gw_erase_flux {
+    uint32_t ticks;
+};
+
+/* CMD_SINK_SOURCE_BYTES */
+struct packed gw_sink_source_bytes {
+    uint32_t nr_bytes;
+};
+
+/* CMD_{GET,SET}_PARAMS, index 0 */
+#define PARAMS_DELAYS 0
+struct packed gw_delay {
+    uint16_t select_delay; /* usec */
+    uint16_t step_delay;   /* usec */
+    uint16_t seek_settle;  /* msec */
+    uint16_t motor_delay;  /* msec */
+    uint16_t auto_off;     /* msec */
+};
+
+/* CMD_SWITCH_FW_MODE */
+#define FW_MODE_BOOTLOADER 0
+#define FW_MODE_NORMAL     1
+
+#endif
+

lib/usb/greaseweazleusb.cc

@@ -0,0 +1,390 @@
+#include "globals.h"
+#include "usb.h"
+#include "protocol.h"
+#include "fluxmap.h"
+#include "bytes.h"
+#include <libusb.h>
+#include "fmt/format.h"
+#include "greaseweazle.h"
+
+#define TIMEOUT 5000
+
+static const char* gw_error(int e)
+{
+    switch (e)
+    {
+        case ACK_OKAY:           return "OK";
+        case ACK_BAD_COMMAND:    return "Bad command";
+        case ACK_NO_INDEX:       return "No index";
+        case ACK_NO_TRK0:        return "No track 0";
+        case ACK_FLUX_OVERFLOW:  return "Overflow";
+        case ACK_FLUX_UNDERFLOW: return "Underflow";
+        case ACK_WRPROT:         return "Write protected";
+        case ACK_NO_UNIT:        return "No unit";
+        case ACK_NO_BUS:         return "No bus";
+        case ACK_BAD_UNIT:       return "Invalid unit";
+        case ACK_BAD_PIN:        return "Invalid pin";
+        case ACK_BAD_CYLINDER:   return "Invalid cylinder";
+        default:                 return "Unknown error";
+    }
+}
+
+class GreaseWeazleUsb : public USB
+{
+private:
+    uint8_t _readbuffer[4096];
+    int _readbuffer_ptr = 0;
+    int _readbuffer_fill = 0;
+
+    void read_bytes(uint8_t* buffer, int len)
+    {
+        while (len > 0)
+        {
+            if (_readbuffer_ptr < _readbuffer_fill)
+            {
+                int buffered = std::min(len, _readbuffer_fill - _readbuffer_ptr);
+                memcpy(buffer, _readbuffer + _readbuffer_ptr, buffered);
+                _readbuffer_ptr += buffered;
+                buffer += buffered;
+                len -= buffered;
+            }
+
+            if (len == 0)
+                break;
+
+            int actual;
+            int rc = libusb_bulk_transfer(_device, EP_IN,
+                _readbuffer, sizeof(_readbuffer),
+                &actual, TIMEOUT);
+            if (rc < 0)
+                Error() << "failed to receive command reply: " << usberror(rc);
+
+            _readbuffer_fill = actual;
+            _readbuffer_ptr = 0;
+        }
+    }
+
+    void read_bytes(Bytes& bytes)
+    {
+        read_bytes(bytes.begin(), bytes.size());
+    }
+
+    Bytes read_bytes(unsigned len)
+    {
+        Bytes b(len);
+        read_bytes(b);
+        return b;
+    }
+
+    uint8_t read_byte()
+    {
+        uint8_t b;
+        read_bytes(&b, 1);
+        return b;
+    }
+
+    uint32_t read_28()
+    {
+        return ((read_byte() & 0xfe) >> 1)
+            | ((read_byte() & 0xfe) << 6)
+            | ((read_byte() & 0xfe) << 13)
+            | ((read_byte() & 0xfe) << 20);
+    }
+
+    void write_bytes(const uint8_t* buffer, int len)
+    {
+        while (len > 0)
+        {
+            int actual;
+            int rc = libusb_bulk_transfer(_device, EP_OUT, (uint8_t*)buffer, len, &actual, 0);
+            if (rc < 0)
+                Error() << "failed to send command: " << usberror(rc);
+
+            buffer += actual;
+            len -= actual;
+        }
+    }
+
+    void write_bytes(const Bytes& bytes)
+    {
+        write_bytes(bytes.cbegin(), bytes.size());
+    }
+
+    void do_command(const Bytes& command)
+    {
+        write_bytes(command);
+
+        uint8_t buffer[2];
+        read_bytes(buffer, sizeof(buffer));
+
+        if (buffer[0] != command[0])
+            Error() << fmt::format("command returned garbage (0x{:x} != 0x{:x} with status 0x{:x})",
+                buffer[0], command[0], buffer[1]);
+        if (buffer[1])
+            Error() << fmt::format("GreaseWeazle error: {}", gw_error(buffer[1]));
+    }
+
+public:
+    GreaseWeazleUsb(libusb_device_handle* device)
+    {
+        _device = device;
+
+        /* Configure the device. */
+
+        int i;
+        int cfg = -1;
+        libusb_get_configuration(_device, &cfg);
+        if (cfg != 1)
+        {
+            i = libusb_set_configuration(_device, 1);
+            if (i < 0)
+                Error() << "the GreaseWeazle would not accept configuration: " << usberror(i);
+        }
+
+        /* Detach the existing kernel serial port driver, if there is one, and claim it ourselves. */
+
+        for (int i = 0; i < 2; i++)
+        {
+            if (libusb_kernel_driver_active(_device, i))
+                libusb_detach_kernel_driver(_device, i);
+            int rc = libusb_claim_interface(_device, i);
+            if (rc < 0)
+                Error() << "unable to claim interface: " << libusb_error_name(rc);
+        }
+
+        int version = getVersion();
+        if (version != GREASEWEAZLE_VERSION)
+            Error() << "your GreaseWeazle firmware is at version " << version
+                    << " but the client is for version " << GREASEWEAZLE_VERSION
+                    << "; please upgrade";
+
+        /* Configure the hardware. */
+
+        do_command({ CMD_SET_BUS_TYPE, 3, BUS_IBMPC });
+    }
+
+    int getVersion()
+    {
+        do_command({ CMD_GET_INFO, 3, GETINFO_FIRMWARE });
+
+        Bytes response = read_bytes(32);
+        ByteReader br(response);
+
+        br.seek(4);
+        nanoseconds_t freq = br.read_le32();
+        _clock = 1000000000 / freq;
+
+        br.seek(0);
+        return br.read_be16();
+    }
+
+    void recalibrate()
+    {
+        seek(0);
+    }
+    
+    void seek(int track)
+    {
+        do_command({ CMD_SEEK, 3, (uint8_t)track });
+    }
+    
+    nanoseconds_t getRotationalPeriod(int hardSectorCount)
+    {
+        if (hardSectorCount != 0)
+            Error() << "hard sectors are currently unsupported on the GreaseWeazel";
+
+        /* The GreaseWeazle doesn't have a command to fetch the period directly,
+         * so we have to do a flux read. */
+
+        do_command({ CMD_READ_FLUX, 2 });
+
+        uint32_t ticks_gw = 0;
+        uint32_t firstindex = ~0;
+        uint32_t secondindex = ~0;
+        for (;;)
+        {
+            uint8_t b = read_byte();
+            if (!b)
+                break;
+
+            if (b == 255)
+            {
+                switch (read_byte())
+                {
+                    case FLUXOP_INDEX:
+                    {
+                        uint32_t index = read_28() + ticks_gw;
+                        if (firstindex == ~0)
+                            firstindex = index;
+                        else if (secondindex == ~0)
+                            secondindex = index;
+                        break;
+                    }
+
+                    case FLUXOP_SPACE:
+                        read_bytes(4);
+                        break;
+
+                    default:
+                        Error() << "bad opcode in GreaseWeazle stream";
+                }
+            }
+            else
+            {
+                if (b < 250)
+                    ticks_gw += b;
+                else
+                {
+                    int delta = 250 + (b-250)*255 + read_byte() - 1;
+                    ticks_gw += delta;
+                }
+            }
+        }
+
+        if (secondindex == ~0)
+            Error() << "unable to determine disk rotational period (is a disk in the drive?)";
+        do_command({ CMD_GET_FLUX_STATUS, 2 });
+
+        _revolutions = (nanoseconds_t)(secondindex - firstindex) * _clock;
+        return _revolutions;
+    }
+    
+    void testBulkWrite()
+    {
+        const int LEN = 10*1024*1024;
+        Bytes cmd(6);
+        ByteWriter bw(cmd);
+        bw.write_8(CMD_SINK_BYTES);
+        bw.write_8(cmd.size());
+        bw.write_le32(LEN);
+        do_command(cmd);
+
+        Bytes junk(LEN);
+		double start_time = getCurrentTime();
+        write_bytes(LEN);
+        read_bytes(1);
+		double elapsed_time = getCurrentTime() - start_time;
+
+		std::cout << "Transferred "
+				  << LEN
+				  << " bytes from PC -> GreaseWeazle in "
+				  << int(elapsed_time * 1000.0)
+				  << " ms ("
+				  << int((LEN / 1024.0) / elapsed_time)
+				  << " kB/s)"
+				  << std::endl;
+    }
+    
+    void testBulkRead()
+    {
+        const int LEN = 10*1024*1024;
+        Bytes cmd(6);
+        ByteWriter bw(cmd);
+        bw.write_8(CMD_SOURCE_BYTES);
+        bw.write_8(cmd.size());
+        bw.write_le32(LEN);
+        do_command(cmd);
+
+		double start_time = getCurrentTime();
+        read_bytes(LEN);
+		double elapsed_time = getCurrentTime() - start_time;
+
+		std::cout << "Transferred "
+				  << LEN
+				  << " bytes from GreaseWeazle -> PC in "
+				  << int(elapsed_time * 1000.0)
+				  << " ms ("
+				  << int((LEN / 1024.0) / elapsed_time)
+				  << " kB/s)"
+				  << std::endl;
+    }
+
+    Bytes read(int side, bool synced, nanoseconds_t readTime, nanoseconds_t hardSectorThreshold)
+    {
+        if (hardSectorThreshold != 0)
+            Error() << "hard sectors are currently unsupported on the GreaseWeazel";
+
+        int revolutions = (readTime+_revolutions-1) / _revolutions;
+
+        do_command({ CMD_HEAD, 3, (uint8_t)side });
+
+        {
+            Bytes cmd(4);
+            cmd.writer()
+                .write_8(CMD_READ_FLUX)
+                .write_8(cmd.size())
+                .write_le32(revolutions + (synced ? 1 : 0));
+            do_command(cmd);
+        }
+
+		Bytes buffer;
+        ByteWriter bw(buffer);
+        for (;;)
+        {
+            uint8_t b = read_byte();
+            if (!b)
+                break;
+            bw.write_8(b);
+        }
+
+        do_command({ CMD_GET_FLUX_STATUS, 2 });
+
+        Bytes fldata = greaseWeazleToFluxEngine(buffer, _clock);
+        if (synced)
+            fldata = stripPartialRotation(fldata);
+        return fldata;
+    }
+    
+    void write(int side, const Bytes& fldata, nanoseconds_t hardSectorThreshold)
+    {
+        if (hardSectorThreshold != 0)
+            Error() << "hard sectors are currently unsupported on the GreaseWeazel";
+
+        do_command({ CMD_HEAD, 3, (uint8_t)side });
+        do_command({ CMD_WRITE_FLUX, 3, 1 });
+        write_bytes(fluxEngineToGreaseWeazle(fldata, _clock));
+        read_byte(); /* synchronise */
+
+        do_command({ CMD_GET_FLUX_STATUS, 2 });
+    }
+    
+    void erase(int side, nanoseconds_t hardSectorThreshold)
+    {
+        if (hardSectorThreshold != 0)
+            Error() << "hard sectors are currently unsupported on the GreaseWeazel";
+
+        do_command({ CMD_HEAD, 3, (uint8_t)side });
+
+        Bytes cmd(6);
+        ByteWriter bw(cmd);
+        bw.write_8(CMD_ERASE_FLUX);
+        bw.write_8(cmd.size());
+        bw.write_le32(200e6 / _clock);
+        do_command(cmd);
+        read_byte(); /* synchronise */
+
+        do_command({ CMD_GET_FLUX_STATUS, 2 });
+    }
+    
+    void setDrive(int drive, bool high_density, int index_mode)
+    {
+        do_command({ CMD_SELECT, 3, (uint8_t)drive });
+        do_command({ CMD_MOTOR, 4, (uint8_t)drive, 1 });
+        do_command({ CMD_SET_PIN, 4, 2, (uint8_t)(high_density ? 0 : 1) });
+    }
+
+    void measureVoltages(struct voltages_frame* voltages)
+    { Error() << "unsupported operation on the GreaseWeazle"; }
+
+private:
+    nanoseconds_t _clock;
+    nanoseconds_t _revolutions;
+};
+
+USB* createGreaseWeazleUsb(libusb_device_handle* device)
+{
+    return new GreaseWeazleUsb(device);
+}
+
+// vim: sw=4 ts=4 et
+

lib/usb/usb.cc

@@ -6,6 +6,7 @@
 #include "bytes.h"
 #include <libusb.h>
 #include "fmt/format.h"
+#include "greaseweazle.h"
 
 FlagGroup usbFlags;
 
@@ -19,6 +20,7 @@ static USB* usb = NULL;
 enum
 {
 	DEV_FLUXENGINE,
+	DEV_GREASEWEAZLE,
 };
 
 struct CandidateDevice
@@ -42,8 +44,26 @@ static const char* device_type(int i)
 	switch (i)
 	{
 		case DEV_FLUXENGINE: return "FluxEngine";
+		case DEV_GREASEWEAZLE: return "GreaseWeazle";
 		default: assert(false);
 	}
+	return NULL;
+}
+
+static const std::string get_serial_number(libusb_device* device, libusb_device_descriptor* desc)
+{
+	std::string serial;
+
+	libusb_device_handle* handle;
+	if (libusb_open(device, &handle) == 0)
+	{
+		unsigned char buffer[64];
+		libusb_get_string_descriptor_ascii(handle, desc->iSerialNumber, buffer, sizeof(buffer));
+		serial = (const char*) buffer;
+		libusb_close(handle);
+	}
+
+	return serial;
 }
 
 static std::map<std::string, std::unique_ptr<CandidateDevice>> get_candidates(libusb_device** devices, int numdevices)
@@ -55,22 +75,24 @@ static std::map<std::string, std::unique_ptr<CandidateDevice>> get_candidates(li
 		candidate->device = devices[i];
 		(void) libusb_get_device_descriptor(devices[i], &candidate->desc);
 
-		if ((candidate->desc.idVendor == FLUXENGINE_VID) && (candidate->desc.idProduct == FLUXENGINE_PID))
+		uint32_t id = (candidate->desc.idVendor << 16) | candidate->desc.idProduct;
+		switch (id)
 		{
-			candidate->type = DEV_FLUXENGINE;
-			candidate->serial = "";
-
-			libusb_device_handle* handle;
-			if (libusb_open(candidate->device, &handle) == 0)
+			case (FLUXENGINE_VID<<16) | FLUXENGINE_PID:
 			{
-				unsigned char buffer[64];
-				libusb_get_string_descriptor_ascii(handle,
-					candidate->desc.iSerialNumber, buffer, sizeof(buffer));
-				candidate->serial = (const char*) buffer;
-				libusb_close(handle);
+				candidate->type = DEV_FLUXENGINE;
+				candidate->serial = get_serial_number(candidate->device, &candidate->desc);
+				candidates[candidate->serial] = std::move(candidate);
+				break;
 			}
 
-			candidates[candidate->serial] = std::move(candidate);
+			case (GREASEWEAZLE_VID<<16) | GREASEWEAZLE_PID:
+			{
+				candidate->type = DEV_GREASEWEAZLE;
+				candidate->serial = get_serial_number(candidate->device, &candidate->desc);
+				candidates[candidate->serial] = std::move(candidate);
+				break;
+			}
 		}
 	}
 
@@ -85,7 +107,16 @@ static void open_device(CandidateDevice& candidate)
 		Error() << "cannot open USB device: " << libusb_strerror((libusb_error) i);
 	
 	std::cout << "Using " << device_type(candidate.type) << " with serial number " << candidate.serial << '\n';
-	usb = createFluxengineUsb(handle);
+	switch (candidate.type)
+	{
+		case DEV_FLUXENGINE:
+			usb = createFluxengineUsb(handle);
+			break;
+
+		case DEV_GREASEWEAZLE:
+			usb = createGreaseWeazleUsb(handle);
+			break;
+	}
 }
 
 static CandidateDevice& select_candidate(const std::map<std::string, std::unique_ptr<CandidateDevice>>& devices)

lib/usb/usb.h

@@ -15,12 +15,14 @@ public:
 	virtual int getVersion() = 0;
 	virtual void recalibrate() = 0;
 	virtual void seek(int track) = 0;
-	virtual nanoseconds_t getRotationalPeriod() = 0;
+	virtual nanoseconds_t getRotationalPeriod(int hardSectorCount) = 0;
 	virtual void testBulkWrite() = 0;
 	virtual void testBulkRead() = 0;
-	virtual Bytes read(int side, bool synced, nanoseconds_t readTime) = 0;
-	virtual void write(int side, const Bytes& bytes) = 0;
-	virtual void erase(int side) = 0;
+	virtual Bytes read(int side, bool synced, nanoseconds_t readTime,
+	                   nanoseconds_t hardSectorThreshold) = 0;
+	virtual void write(int side, const Bytes& bytes,
+	                   nanoseconds_t hardSectorThreshold) = 0;
+	virtual void erase(int side, nanoseconds_t hardSectorThreshold) = 0;
 	virtual void setDrive(int drive, bool high_density, int index_mode) = 0;
 	virtual void measureVoltages(struct voltages_frame* voltages) = 0;
 
@@ -34,22 +36,27 @@ extern FlagGroup usbFlags;
 extern USB& getUsb();
 
 extern USB* createFluxengineUsb(libusb_device_handle* device);
+extern USB* createGreaseWeazleUsb(libusb_device_handle* device);
 
 static inline int usbGetVersion()     { return getUsb().getVersion(); }
 static inline void usbRecalibrate()   { getUsb().recalibrate(); }
 static inline void usbSeek(int track) { getUsb().seek(track); }
 static inline void usbTestBulkWrite() { getUsb().testBulkWrite(); }
 static inline void usbTestBulkRead()  { getUsb().testBulkRead(); }
-static inline void usbErase(int side) { getUsb().erase(side); }
 
-static inline nanoseconds_t usbGetRotationalPeriod()
-{ return getUsb().getRotationalPeriod(); }
+static inline void usbErase(int side, nanoseconds_t hardSectorThreshold)
+{ getUsb().erase(side, hardSectorThreshold); }
 
-static inline Bytes usbRead(int side, bool synced, nanoseconds_t readTime)
-{ return getUsb().read(side, synced, readTime); }
+static inline nanoseconds_t usbGetRotationalPeriod(int hardSectorCount)
+{ return getUsb().getRotationalPeriod(hardSectorCount); }
 
-static inline void usbWrite(int side, const Bytes& bytes)
-{ getUsb().write(side, bytes); }
+static inline Bytes usbRead(int side, bool synced, nanoseconds_t readTime,
+                            nanoseconds_t hardSectorThreshold)
+{ return getUsb().read(side, synced, readTime, hardSectorThreshold); }
+
+static inline void usbWrite(int side, const Bytes& bytes,
+                            nanoseconds_t hardSectorThreshold)
+{ getUsb().write(side, bytes, hardSectorThreshold); }
 
 static inline void usbSetDrive(int drive, bool high_density, int index_mode)
 { getUsb().setDrive(drive, high_density, index_mode); }

lib/writer.cc

@@ -43,6 +43,11 @@ void setWriterDefaultInput(const std::string& input)
     ::input.set(input);
 }
 
+void setWriterHardSectorCount(int sectorCount)
+{
+	setHardwareFluxSinkHardSectorCount(sectorCount);
+}
+
 static SectorSet readSectorsFromFile(const ImageSpec& spec)
 {
 	return ImageReader::create(spec)->readImage();

lib/writer.h

@@ -11,6 +11,7 @@ class Geometry;
 
 extern void setWriterDefaultDest(const std::string& dest);
 extern void setWriterDefaultInput(const std::string& input);
+extern void setWriterHardSectorCount(int sectorCount);
 
 extern void writeTracks(const std::function<std::unique_ptr<Fluxmap>(int track, int side)> producer);
 

mkninja.sh

@@ -151,8 +151,10 @@ buildlibrary libfmt.a \
     dep/fmt/posix.cc \
 
 buildlibrary libbackend.a \
+	lib/imagereader/diskcopyimagereader.cc \
 	lib/imagereader/imagereader.cc \
 	lib/imagereader/imgimagereader.cc \
+	lib/imagereader/jv3imagereader.cc \
 	lib/imagewriter/d64imagewriter.cc \
 	lib/imagewriter/diskcopyimagewriter.cc \
 	lib/imagewriter/imagewriter.cc \
@@ -171,6 +173,7 @@ buildlibrary libbackend.a \
     arch/ibm/decoder.cc \
     arch/ibm/encoder.cc \
     arch/macintosh/decoder.cc \
+    arch/macintosh/encoder.cc \
     arch/micropolis/decoder.cc \
     arch/mx/decoder.cc \
 	arch/tids990/decoder.cc \
@@ -196,6 +199,8 @@ buildlibrary libbackend.a \
     lib/fluxsource/streamfluxsource.cc \
     lib/usb/usb.cc \
     lib/usb/fluxengineusb.cc \
+    lib/usb/greaseweazle.cc \
+    lib/usb/greaseweazleusb.cc \
     lib/globals.cc \
     lib/hexdump.cc \
     lib/ldbs.cc \
@@ -207,11 +212,13 @@ buildlibrary libbackend.a \
     lib/writer.cc \
 
 buildlibrary libfrontend.a \
+	src/fe-analysedriveresponse.cc \
     src/fe-cwftoflux.cc \
     src/fe-erase.cc \
     src/fe-fluxtoau.cc \
     src/fe-fluxtoscp.cc \
     src/fe-fluxtovcd.cc \
+    src/fe-image.cc \
     src/fe-inspect.cc \
     src/fe-readadfs.cc \
     src/fe-readaeslanier.cc \
@@ -239,6 +246,7 @@ buildlibrary libfrontend.a \
     src/fe-writeamiga.cc \
     src/fe-writebrother.cc \
     src/fe-writeibm.cc \
+    src/fe-writemac.cc \
     src/fe-writetids990.cc \
     src/fe-writeflux.cc \
     src/fe-writetestpattern.cc \
@@ -266,6 +274,7 @@ buildsimpleprogram brother240tool \
     libemu.a \
     libfmt.a \
 
+runtest amiga-test          tests/amiga.cc
 runtest bitaccumulator-test tests/bitaccumulator.cc
 runtest bytes-test          tests/bytes.cc
 runtest compression-test    tests/compression.cc
@@ -273,6 +282,6 @@ runtest dataspec-test       tests/dataspec.cc
 runtest flags-test          tests/flags.cc
 runtest fluxpattern-test    tests/fluxpattern.cc
 runtest fmmfm-test          tests/fmmfm.cc
+runtest greaseweazle-test   tests/greaseweazle.cc
 runtest kryoflux-test       tests/kryoflux.cc
 runtest ldbs-test           tests/ldbs.cc
-runtest amiga-test          tests/amiga.cc

protocol.h

@@ -3,7 +3,7 @@
 
 enum 
 {
-    FLUXENGINE_VERSION = 14,
+    FLUXENGINE_VERSION = 15,
 
     FLUXENGINE_VID = 0x1209,
     FLUXENGINE_PID = 0x6e00,
@@ -48,7 +48,7 @@ enum
     F_FRAME_GET_VERSION_REPLY,    /* version_frame */
     F_FRAME_SEEK_CMD,             /* seek_frame */
     F_FRAME_SEEK_REPLY,           /* any_frame */
-    F_FRAME_MEASURE_SPEED_CMD,    /* any_frame */
+    F_FRAME_MEASURE_SPEED_CMD,    /* measurespeed_frame */
     F_FRAME_MEASURE_SPEED_REPLY,  /* speed_frame */
     F_FRAME_BULK_WRITE_TEST_CMD,   /* any_frame */
     F_FRAME_BULK_WRITE_TEST_REPLY, /* any_frame */
@@ -125,6 +125,12 @@ struct seek_frame
     uint8_t track;
 };
 
+struct measurespeed_frame 
+{
+    struct frame_header f;
+	uint8_t hard_sector_count;
+};
+
 struct speed_frame
 {
     struct frame_header f;
@@ -137,6 +143,7 @@ struct read_frame
     uint8_t side;
     uint8_t synced;
     uint16_t milliseconds;
+    uint8_t hardsec_threshold_ms;
 };
 
 struct write_frame
@@ -144,12 +151,14 @@ struct write_frame
     struct frame_header f;
     uint8_t side;
     uint32_t bytes_to_write;
+    uint8_t hardsec_threshold_ms;
 };
 
 struct erase_frame
 {
     struct frame_header f;
     uint8_t side;
+    uint8_t hardsec_threshold_ms;
 };
 
 struct set_drive_frame

scripts/analysedriveresponse.py

@@ -0,0 +1,36 @@
+import numpy
+import matplotlib.pyplot as plt
+import matplotlib.animation as animation
+
+TICK_FREQUENCY = 12e6
+TICKS_PER_US = TICK_FREQUENCY / 1e6
+print(TICKS_PER_US)
+
+# Load data.
+data = numpy.loadtxt(open("driveresponse.csv", "rb"), delimiter=",", skiprows=1)
+
+labels = data[:, 0]
+frequencies = data[:, 1:]
+
+# Scale the frequencies.
+def scaled(row):
+    m = row.mean()
+    if m != 0:
+        return row / m
+    else:
+        return row
+
+scaledfreq = numpy.array([scaled(row) for row in frequencies])
+
+# Create new Figure with black background
+fig = plt.figure(figsize=(8, 8), facecolor='#aaa')
+
+plt.imshow(scaledfreq, extent=[0, 512/TICKS_PER_US, labels[0], labels[-1]], cmap='jet',
+           vmin=0, vmax=1, origin='lower', aspect='auto')
+plt.colorbar()
+plt.ylabel("Interval period (us)")
+plt.xlabel("Response (us)")
+plt.grid(True, dashes=(2, 2))
+plt.show()
+
+plt.show()

src/fe-analysedriveresponse.cc

@@ -0,0 +1,135 @@
+#include "globals.h"
+#include "flags.h"
+#include "usb/usb.h"
+#include "dataspec.h"
+#include "fluxmap.h"
+#include "decoders/fluxmapreader.h"
+#include "writer.h"
+#include "protocol.h"
+#include "fmt/format.h"
+#include <fstream>
+
+static FlagGroup flags = {
+	&usbFlags,
+};
+
+static DataSpecFlag dest(
+    { "--dest", "-d" },
+    "destination to analyse",
+    ":d=0:t=0:s=0");
+
+static DoubleFlag minInterval(
+	{ "--min-interval-us" },
+	"Minimum pulse interval",
+	2.0);
+
+static DoubleFlag maxInterval(
+	{ "--max-interval-us" },
+	"Maximum pulse interval",
+	10.0);
+
+static DoubleFlag intervalStep(
+	{ "--interval-step-us" },
+	"Interval step, approximately",
+	0.2);
+
+static StringFlag writeCsv(
+	{ "--write-csv" },
+	"Write detailed CSV data",
+	"driveresponse.csv");
+
+int mainAnalyseDriveResponse(int argc, const char* argv[])
+{
+    flags.parseFlags(argc, argv);
+
+    FluxSpec spec(dest);
+	if (spec.locations.size() != 1)
+		Error() << "the destination dataspec must contain exactly one track (two sides count as two tracks)";
+
+    usbSetDrive(spec.drive, false, F_INDEX_REAL);
+	usbSeek(spec.locations[0].track);
+
+	std::cout << "Measuring rotational speed...\n";
+    nanoseconds_t period = usbGetRotationalPeriod(0);
+	if (period == 0)
+		Error() << "Unable to measure rotational speed (try fluxengine rpm).";
+
+	std::ofstream csv;
+	if (writeCsv.get() != "")
+		csv.open(writeCsv);
+
+	for (double interval = minInterval; interval<maxInterval; interval += intervalStep)
+	{
+		unsigned ticks = (unsigned) (interval * TICKS_PER_US);
+		std::cout << fmt::format("Interval {:.2f}: ", ticks * US_PER_TICK);
+		std::cout << std::flush;
+
+		std::vector<int> frequencies(512);
+
+		if (interval >= 2.0)
+		{
+			/* Write the test pattern. */
+
+			Fluxmap outFluxmap;
+			while (outFluxmap.duration() < period)
+			{
+				outFluxmap.appendInterval(ticks);
+				outFluxmap.appendPulse();
+			}
+			usbWrite(spec.locations[0].side, outFluxmap.rawBytes(), 0);
+
+			/* Read the test pattern in again. */
+
+			Fluxmap inFluxmap;
+			inFluxmap.appendBytes(usbRead(spec.locations[0].side, true, period, 0));
+
+			/* Compute histogram. */
+
+			FluxmapReader fmr(inFluxmap);
+			fmr.seek((double)period*0.1); /* skip first 10% and last 10% as contains junk */
+			fmr.findEvent(F_BIT_PULSE);
+			while (fmr.tell().ns() < ((double)period*0.9))
+			{
+				unsigned ticks = fmr.findEvent(F_BIT_PULSE);
+				if (ticks < frequencies.size())
+					frequencies[ticks]++;
+			}
+		}
+
+		/* Compute standard deviation. */
+
+		int sum = 0;
+		int prod = 0;
+		for (int i=0; i<frequencies.size(); i++)
+		{
+			sum += frequencies[i];
+			prod += i * frequencies[i];
+		}
+		if (sum == 0)
+			std::cout << "failed\n";
+		else
+		{
+			double mean = prod / sum;
+			double sqsum = 0;
+			for (int i=0; i<frequencies.size(); i++)
+			{
+				double dx = (double)i - mean;
+				sqsum += (double)frequencies[i] * dx * dx;
+			}
+			double stdv = sqrt(sqsum / sum);
+			std::cout << fmt::format("{:.4f} {:.4f}\n", stdv, mean/TICKS_PER_US);
+
+		}
+
+		if (writeCsv.get() != "")
+		{
+			csv << interval;
+			for (int i : frequencies)
+				csv << "," << i;
+			csv << '\n';
+		}
+	}
+
+    return 0;
+}
+

src/fe-image.cc

@@ -0,0 +1,38 @@
+#include "globals.h"
+#include "flags.h"
+#include "dataspec.h"
+#include "sector.h"
+#include "sectorset.h"
+#include "imagereader/imagereader.h"
+#include "imagewriter/imagewriter.h"
+#include "fmt/format.h"
+#include <fstream>
+
+static FlagGroup flags { };
+
+static void syntax()
+{
+    std::cout << "Syntax: fluxengine convert image <srcspec> <destspec>\n";
+    exit(0);
+}
+
+int mainConvertImage(int argc, const char* argv[])
+{
+    auto filenames = flags.parseFlagsWithFilenames(argc, argv);
+    if (filenames.size() != 2)
+        syntax();
+
+	DataSpec ids(filenames[0]);
+	ImageSpec iis(ids);
+	SectorSet sectors = ImageReader::create(iis)->readImage();
+
+	DataSpec ods(filenames[1]);
+	ImageSpec ois(ods);
+	auto writer = ImageWriter::create(sectors, ois);
+	writer->adjustGeometry();
+	writer->printMap();
+	writer->writeImage();
+
+    return 0;
+}
+

src/fe-readmicropolis.cc

@@ -16,7 +16,7 @@ int mainReadMicropolis(int argc, const char* argv[])
 {
 	setReaderDefaultSource(":t=0-76");
 	setReaderDefaultOutput("micropolis.img");
-	setReaderRevolutions(21); /* 17 index holes * 1.25 */
+	setReaderHardSectorCount(16);
 	flags.parseFlags(argc, argv);
 
 	MicropolisDecoder decoder;

src/fe-rpm.cc

@@ -13,13 +13,18 @@ static DataSpecFlag source(
     "source for data",
     ":d=0:t=0:s=0");
 
+static IntFlag hardSectorCount(
+    { "--hard-sector-count" },
+    "number of hard sectors on the disk (0=soft sectors)",
+    0);
+
 int mainRpm(int argc, const char* argv[])
 {
     flags.parseFlags(argc, argv);
 
     FluxSpec spec(source);
     usbSetDrive(spec.drive, false, F_INDEX_REAL);
-    nanoseconds_t period = usbGetRotationalPeriod();
+    nanoseconds_t period = usbGetRotationalPeriod(hardSectorCount);
     if (period != 0)
         std::cout << "Rotational period is " << period/1000000 << " ms (" << 60e9/period << " rpm)" << std::endl;
     else

src/fe-writemac.cc

@@ -0,0 +1,24 @@
+#include "globals.h"
+#include "flags.h"
+#include "decoders/decoders.h"
+#include "encoders/encoders.h"
+#include "macintosh/macintosh.h"
+#include "writer.h"
+#include "fmt/format.h"
+#include <fstream>
+
+static FlagGroup flags { &writerFlags, &macintoshEncoderFlags };
+
+int mainWriteMac(int argc, const char* argv[])
+{
+    setWriterDefaultInput(":c=80:h=2:s=12:b=524");
+	setWriterDefaultDest(":d=0:t=0-79:s=0-1");
+    flags.parseFlags(argc, argv);
+
+	MacintoshEncoder encoder;
+	writeDiskCommand(encoder);
+
+    return 0;
+}
+
+

src/fluxengine.cc

@@ -2,11 +2,13 @@
 
 typedef int command_cb(int agrc, const char* argv[]);
 
+extern command_cb mainAnalyseDriveResponse;
 extern command_cb mainErase;
 extern command_cb mainConvertCwfToFlux;
 extern command_cb mainConvertFluxToAu;
 extern command_cb mainConvertFluxToScp;
 extern command_cb mainConvertFluxToVcd;
+extern command_cb mainConvertImage;
 extern command_cb mainConvertScpToFlux;
 extern command_cb mainInspect;
 extern command_cb mainReadADFS;
@@ -34,6 +36,7 @@ extern command_cb mainUpgradeFluxFile;
 extern command_cb mainWriteAmiga;
 extern command_cb mainWriteBrother;
 extern command_cb mainWriteIbm;
+extern command_cb mainWriteMac;
 extern command_cb mainWriteTiDs990;
 extern command_cb mainWriteFlux;
 extern command_cb mainWriteTestPattern;
@@ -48,6 +51,7 @@ struct Command
 static command_cb mainRead;
 static command_cb mainWrite;
 static command_cb mainConvert;
+static command_cb mainAnalyse;
 static command_cb mainTest;
 
 static std::vector<Command> commands =
@@ -55,6 +59,7 @@ static std::vector<Command> commands =
     { "erase",             mainErase,             "Permanently but rapidly erases some or all of a disk." },
     { "convert",           mainConvert,           "Converts various types of data file.", },
     { "inspect",           mainInspect,           "Low-level analysis and inspection of a disk." },
+	{ "analyse",           mainAnalyse,           "Disk and drive analysis tools." },
     { "read",              mainRead,              "Reads a disk, producing a sector image.", },
     { "rpm",               mainRpm,               "Measures the disk rotational speed.", },
     { "seek",              mainSeek,              "Moves the disk head.", },
@@ -91,6 +96,7 @@ static std::vector<Command> writeables =
     { "amiga",         mainWriteAmiga,    "Writes Amiga disks.", },
     { "brother",       mainWriteBrother,  "Writes 120kB and 240kB Brother word processor disks.", },
     { "ibm",           mainWriteIbm,      "Writes the ubiquitous IBM format disks.", },
+	{ "mac", 		   mainWriteMac,      "Writes Apple Macintosh disks.", },
 	{ "tids990",       mainWriteTiDs990,  "Writes Texas Instruments DS990 disks.", },
 };
 
@@ -101,6 +107,12 @@ static std::vector<Command> convertables =
     { "fluxtoau",      mainConvertFluxToAu,  "Converts (one track of a) flux file to an .au audio file.", },
     { "fluxtoscp",     mainConvertFluxToScp, "Converrt a flux file to a Supercard Pro file.", },
     { "fluxtovcd",     mainConvertFluxToVcd, "Converts (one track of a) flux file to a VCD file.", },
+	{ "image",         mainConvertImage,     "Converts one disk image to another.", },
+};
+
+static std::vector<Command> analysables =
+{
+	{ "driveresponse", mainAnalyseDriveResponse, "Measures the drive's ability to read and write pulses.", }
 };
 
 static std::vector<Command> testables =
@@ -149,6 +161,9 @@ static int mainWrite(int argc, const char* argv[])
 static int mainConvert(int argc, const char* argv[])
 { return mainExtended(convertables, "convert", argc, argv); }
 
+static int mainAnalyse(int argc, const char* argv[])
+{ return mainExtended(analysables, "analyse", argc, argv); }
+
 static int mainTest(int argc, const char* argv[])
 { return mainExtended(testables, "test", argc, argv); }
 

tests/bytes.cc

@@ -124,6 +124,13 @@ static void test_tobits()
 	}));
 }
 
+static void test_tostring()
+{
+	std::string s = "Hello, world";
+	Bytes b(s);
+	assert(b == s);
+}
+
 int main(int argc, const char* argv[])
 {
     test_bounds();
@@ -133,5 +140,6 @@ int main(int argc, const char* argv[])
     test_writes();
     test_slice();
 	test_tobits();
+	test_tostring();
     return 0;
 }

tests/greaseweazle.cc

@@ -0,0 +1,109 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include "globals.h"
+#include "fluxmap.h"
+#include "lib/usb/greaseweazle.h"
+
+static Bytes operator + (const Bytes& left, const Bytes& right)
+{
+    Bytes output;
+    ByteWriter bw(output);
+    bw += left;
+    bw += right;
+    return output;
+}
+
+static Bytes operator * (const Bytes& left, size_t count)
+{
+    Bytes output;
+    ByteWriter bw(output);
+    while (count--)
+        bw += left;
+    return output;
+}
+
+#define E28(val) \
+	(1 | (val<<1) & 0xff), \
+	(1 | (val>>6) & 0xff), \
+	(1 | (val>>13) & 0xff), \
+	(1 | (val>>20) & 0xff)
+
+
+static void test_convert(const Bytes& gwbytes, const Bytes& flbytes)
+{
+	Bytes gwtoflbytes = greaseWeazleToFluxEngine(gwbytes, 2*NS_PER_TICK);
+	Bytes fltogwbytes = fluxEngineToGreaseWeazle(flbytes, 2*NS_PER_TICK);
+
+    if (gwtoflbytes != flbytes)
+    {
+		std::cout << "GreaseWeazle to FluxEngine conversion failed.\n";
+        std::cout << "GreaseWeazle bytes:" << std::endl;
+        hexdump(std::cout, gwbytes);
+        std::cout << std::endl << "Produced this:" << std::endl;
+        hexdump(std::cout, gwtoflbytes);
+        std::cout << std::endl << "Expected this:" << std::endl;
+        hexdump(std::cout, flbytes);
+        abort();
+    }
+
+    if (fltogwbytes != gwbytes)
+    {
+		std::cout << "FluxEngine to GreaseWeazle conversion failed.\n";
+        std::cout << "FluxEngine bytes:" << std::endl;
+        hexdump(std::cout, flbytes);
+        std::cout << std::endl << "Produced this:" << std::endl;
+        hexdump(std::cout, fltogwbytes);
+        std::cout << std::endl << "Expected this:" << std::endl;
+        hexdump(std::cout, gwbytes);
+        abort();
+    }
+}
+
+static void test_conversions()
+{
+	/* Simple one-byte intervals. */
+
+	test_convert(
+		Bytes{ 1, 1, 1, 1, 0 },
+		Bytes{ 0x82, 0x82, 0x82, 0x82 }
+	);
+
+	/* Larger one-byte intervals. */
+
+	test_convert(
+		Bytes{ 32, 0 },
+		Bytes{ 0x3f, 0x81 }
+	);
+
+	test_convert(
+		Bytes{ 64, 0 },
+		Bytes{ 0x3f, 0x3f, 0x82 }
+	);
+
+	test_convert(
+		Bytes{ 128, 0 },
+		Bytes{ 0x3f, 0x3f, 0x3f, 0x3f, 0x84 }
+	);
+
+	/* Two-byte intervals. */
+
+	test_convert(
+		Bytes{ 250, 1, 0 },
+		Bytes{ 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xbb }
+	);
+
+	/* Very long intervals. */
+
+	test_convert(
+		Bytes{ 255, FLUXOP_SPACE, E28(2048 - 249), 249, 0 },
+		Bytes{ 0x3f }*0x41 + Bytes{ 0x81 }
+	);
+}
+
+int main(int argc, const char* argv[])
+{
+	test_conversions();
+    return 0;
+}
+