Merge pull request #163 from davidgiven/brother120

Untested Brother 120kB write support.
Merge from trunk.
2025-10-31 11:17:01 -07:00 · 2020-05-24 01:32:28 +02:00 · 2020-05-24 00:56:17 +02:00 · 2020-05-24 00:47:12 +02:00 · 2020-05-22 20:46:48 +02:00 · 2020-05-16 10:38:17 +02:00
96 changed files with 2476 additions and 1434 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,7 +15,7 @@ install:

 build_script:
  - make
-  - zip -9 fluxengine.zip fluxengine.exe brother120tool.exe FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
+  - zip -9 fluxengine.zip fluxengine.exe brother120tool.exe brother240tool.exe FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex

 artifacts:
  - path: fluxengine.zip
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -7,8 +7,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
    - name: apt
-      run: sudo apt install libusb-1.0-0-dev libsqlite3-dev ninja-build
+      run: sudo apt update && sudo apt install libusb-1.0-0-dev libsqlite3-dev ninja-build
    - name: make
      run: make

@@ -16,6 +18,8 @@ jobs:
    runs-on: macos-latest
    steps:
    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
    - name: brew
      run: brew install sqlite pkg-config libusb ninja
    - name: make
@@ -26,9 +30,12 @@ jobs:
 #    steps:
 #    - uses: numworks/setup-msys2@v1
 #      with:
-#        msystem: MSYS
+#        path-type: inherit
 #    - uses: actions/checkout@v1
 #    - name: pacman
-#      run: msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip
-#    - name: make
-#      run: msys2do make
+#      run: |
+#        msys2do pacman -S --noconfirm --needed make ninja mingw-w64-i686-libusb mingw-w64-i686-sqlite3 mingw-w64-i686-zlib mingw-w64-i686-gcc zip
+#    - name: build
+#      run: |
+#        msys2do make
+
--- a/FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
+++ b/FluxEngine.cydsn/CortexM3/ARM_GCC_541/Release/FluxEngine.hex
@@ -1,245 +1,245 @@
-:4000000000800020110000007910000079100000064A08B5136843F020031360044B1A6803F53F5302331A6001F044F8E8460040FA46004010B5054C237833B9044B13B1D7
-:400040000448AFF300800123237010BD6881FF1F00000000F8380000084B10B51BB108490848AFF300800848036803B910BD074B002BFBD0BDE81040184700BF0000000011
-:400080006C81FF1FF8380000C880FF1F000000000A4A0B4B116801310B40002BBEBF03F1FF3363F00F030133136011685368994202BF024B01221A72704700BF8881FF1FBC
-:4000C0000F0000800A4A0B4B516801310B40002BBEBF03F1FF3363F00F030133536051681368994202BF024B01221A72704700BF8881FF1F0F000080024B012200205A7223
-:4001000002F07EB98881FF1F10B5C4B2204601F093F90128FAD110BD08B572B60F4B0F49DA680132DA601A690132C82A08BF00221A615A6918690132A72A08BF00224A6162
-:400140005B69002B0CBF02230023002814BF184643F0010002F0BCFE62B608BD8881FF1F10B504460D4B8278997E91421CBF00225A7702689A610279094B1A718378002B42
-:4001800014BF0220012002F067FEE07802F05EFE2079BDE8104002F095BE00BF8881FF1FA081FF1F70B5C4B220460E4601F04CF9314605460246204601F008FA204601F0EF
-:4001C0003BF90128FAD0284670BD000038B50B4CA57F5DB904F11800FFF7C2FF012002F0A5F84FF47A7002F0B7FA6577E36823620123A377BDE8384002F0ECBA8881FF1FB5
-:4002000038B50446C5B2284602F09CF8062002F0B9FA44F00200C0B202F094F8062002F0B1FA284602F08EF8BDE83840062002F093BA10B5642402F07FF820B10120BDE8B3
-:400240001040FFF7DDBF0120FFF7DAFF013CF2D1F4E7000038B5044D0024285D013402F041FA102CF9D138BDAC81FF1F08B502F05BFC002002F064FC02F076FC02F080FCF8
-:4002800080B208BD10B50446012002F073F8642002F062FAFFF7EAFF2080002002F06AF8642002F059FAFFF7E1FF608010BD08B502F066FD002002F06FFD02F081FD02F0B7
-:4002C0008BFD80B208BD10B50446FFF7B2FF322002F042FAFFF7EBFF20800020FFF790FF322002F039FAFFF7E2FF608010BD0FB400B593B014AB53F8042B402102A8019396
-:4003000002F0E2FE02A802F082F802F08CF813B05DF804EB04B0704710B5044601780648FFF7E5FF0420FFF7EFFE62782146BDE81040042001F0D8B80A39000007B5002339
-:40034000ADF804308DF80600032301A88DF80530FFF7E2FF03B05DF804FB0000F8B51D4C0646FFF733FF637F03B156B91A48FFF7BEFFFFF75EFF012000236077636302F048
-:4003800001FA3246616B1548FFF7B1FF114D0027636B9E4216D001F0CFFF00B16F63636B9E4205DD0020FFF72BFF6B6B013305E005DA0120FFF724FF6B6B013B6B6302F0F6
-:4003C00009FAE5E7322002F0C7F9BDE8F8400448FFF78DBF8881FF1F173900001E3900003B3900002DE9F04F9BB062B602F05CFAAF49042002F080FAAE4801F0A9FFAE4870
-:4004000002F04CFDAD4801F0DDFF02F02DFC02F0FFFA002002F020FD01F0F8FF0221002000F0C0FFA64D0321084602F0B3F92E462C4602F0CFF9AB7F73B12A6AEB689B1A23
-:4004400041F28832934207D9002001F06FFF002002F002FD0023AB7700F0DCFF18B99948FFF745FF04E000F0DBFF0028F7D109E000F0D0FF0028FBD09348FFF738FF0320EA
-:4004800001F0F8F8032000F0D7FF0128D1D18F48FFF766FE8E490320FFF784FE94F838108C48FFF724FF94F83830023B122B00F2EE83DFE813F01300EC031C00EC03220079
-:4004C000EC034400EC036800EC039F01EC032E03EC034D03EC035303EC035E0303238DF828308DF829300A238DF82A303DE394F83A00FFF733FF784B34E3FFF767FE00239C
-:400500006372E068627A02F0FF0132B9EB681B1AB3F57A7FF6DD0B4608E03BB100227272F168627A12B9EB685B1AFAE707228DF8282004228DF82920ADF82A3015E3022012
-:40054000FFF7E2FD4FF000090DF1280A4FF480780027C8EB0903DA1907F80A200137402FF9D10220FFF7D0FD3A465146022000F0BBFFB8F10108EBD109F10109B9F1400F4D
-:40058000E4D1564BC0E294F83A0001F0F3FE606BFFF7E4FE02F004FD514BDFF848811A78002742F004021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A70E1
-:4005C00002F0F2FC0220FFF79FFD41F6FF734FF480420121022002F045FC84F8780002F067F808F807000137102FF8D1DFF8F8A000270AF15D081FFA88F90137102F14BFDC
-:400600003A4600221AF8010F2244062392F82420402102F081F84A4646F24F419AF8000002F08CF809F14009102F1FFA89F9E4D100237372637A002BFCD0002714223946E3
-:400640000AA8777202F00CFD40230D934FF0FF333760736037723368DFF89090334493F8241096F87800CDF8309001F0D9FF96F8780001F097FF012196F8780001F06AFF32
-:40068000236813B96B7A002BFAD0002794F83BA0676094F808B0BBF1000F6AD102F09AF86B7A43B3BAF1010A85F809B023D160E019010000F900000091000000C500000092
-:4006C0008881FF1F493900005C390000A081FF1FC081FF1F66390000FC380000FE3800009F640040AC81FF1FAB81FF1F0886FF1F2B7A002B3DD1626823689A42F8D04FF07B
-:40070000000B63680AA808EB83135B440A93CBF140030B9300F0DCFA0B9B0137C3F140039B440D9B5FFA8BFB9BB9022000F084FE012805D0637AE3B92B7A002BF5D018E0E2
-:400740004022BA49022000F0CFFE4023CDF830900D93BBF13F0FD4D96268B54B01321340002BBEBF03F1FF3363F00F03013363608FE7042194F8780001F05EFF94F878009B
-:4007800001F06AFF0028F9D10AA800F0D5FA0220FFF7BAFC337A63B90D9A402A06D0C2F1400292B2A149022000F09EFE0220FFF7ABFC0D9A32F0400203D11146022000F026
-:4007C00093FEFFF747FD237A33B19A48FFF78FFD0220FFF7B3FD06E0974B09A81B88ADF82430FFF799FD627A3946237A9348FFF77EFD4FE29248FFF77AFDE76B17F03F0785
-:4008000001D0032044E2012001F0BAFD95F83A0001F0B0FD02F0C4FB8A4BDFF82C821A7802F0FB021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A7002F0FB
-:40084000B3FB686BFFF78AFD01214FF4804341F6FF72084601F09AFD85F8780001F028FF08F807000137102FF8D1DFF8E091002709F15D031FFA83F807930137102F14BF3F
-:400880003A46002219F8010F2244052392F82420402101F041FF414646F2445299F8000001F04CFF08F14008102F1FFA88F8E4D10027BB46B946BA46F36B4FF0FF389B09F8
-:4008C000142239460AA837600593C6F80480377202F0C6FB402301200D9300F0CBFECDF8188001F077FF2268514B01321340002BBCBF03F1FF3363F00F036168B8BF0133D2
-:400900008B4200F0A580BAF1000F07D0237A002B40F0B1806B7A002B40F0AD800B9B002B34D1B9F1000F0BD07F2240495A540133402BFAD10A910B9328E0BAF1000F06D130
-:40094000012000F079FD01288046F6D107E0237A002B40F090806B7A002BF1D08BE03349FFF720FC8146314B0B9040460A9300F081FEB9F13F0F07F1010706DD059BDB1BA0
-:40098000D3F1000949EB030900E0C1460B9BDBB12368079A0AA802EB83120D9BC3F1400313440C9300F0D7F90D9B6BB92A68204B01321340002BBEBF03F1FF3363F00F03DA
-:4009C0000133236040230D936368013340D12B680F2B3DD14FF00008C5F8048001F004FD85F808806B6895F878002B4493F8241001F016FE95F8780001F0D4FD012195F852
-:400A0000780001F0A7FD85F80980637A002BFCD04FF00008012086F8098001F0F1FC404601F0AEFCCDF8188015E000BF0886FF1F0F00008075390000003900008F39000066
-:400A4000A239000094650040AC81FF1FAB81FF1FBAF1000F05D0237A6BB96B7A5BB94FF0010A6368069A93423FF43BAF6B680BF1010B069335E701F0BDFC012001F080FC15
-:400A8000002001F0BDFC042194F8780001F0D4FD94F8780001F0E0FD0028F9D196F8780001F06EFD737A327A0293012303920193CDF800905B463A4605997A48FFF717FC01
-:400AC000B9F1000F16D1059BBB420ADD012000F0B3FC01288046F6D17349FFF763FB3F2803DC012000F0DAFD04E0404600F0C2FD0137E8E7FFF7AEFB6C48FFF7F8FB237A25
-:400B00000BB10220C4E06A4B1B8809A8ADF824302CE094F83A0001F02DFC606BFFF71EFC6448FFF7E4FB00236372637A002BFCD0012001F065FC00237372637A002BFCD0CE
-:400B4000002001F05DFC5C48FFF7D1FB5B4B09E000206077FFF702FC594B03E05948FFF7FFFA594B1B88ADF828300AA8FFF7D4FB90E0A37F3BB1002001F0D8FB002002F0E5
-:400B80006BF90023AB7702F0EDF8002002F090F82A2701F0BBFF002001F05EFF3A4600210AA802F05DFA15238DF828308DF8297001F010FE002001F0B9FB002002F04CF9C7
-:400BC000C82001F0C9FD0DEB0700FFF75BFB0DF13E00FFF778FB01F0FDFD012002F03CF9322001F0B9FD0DF12E00FFF74BFB0DF14200FFF768FB012001F098FB4FF496704B
-:400C000001F0AAFD01F0E6FD0DF13600FFF73AFB0DF14A00FFF757FB002001F087FB4FF4967001F099FD01F0D5FD022002F014F9322001F091FD0DF13200FFF723FB0DF1FF
-:400C40004600FFF740FB012001F070FB4FF4967001F082FD01F0BEFD0DF13A00FFF712FB0DF14E00FFF72FFB002001F05FFB4FF4967001F071FD01F0ADFD002002F0ECF8D0
-:400C80000023637701F0F0FF01F0C2FE6DE70120FFF754FB032000F0EDFC0C48FFF727FBFFF7C7BBAC3900000886FF1FDC39000002390000EB390000F93900000439000098
-:400CC00006390000C081FF1F08390000063A000010B54268002A2ED0C368002B2BD00368048A591C01601B78013A13F0800F817C42601DBF03F0010242EA8403023108312E
-:400D000014BF43F0020343EA0423817414BF03820382837C072BDCD9028A083B42FA03F38268511C81601370C368013BC360837C083B8374CDE710BD07B5827C42B102AA43
-:400D4000002102F8011D026001224260FFF7C0FF03B05DF804FB30B543686BB3C2685AB3827C072A0CD8046890F91050611C01602178013B41EA05210832018243608274B0
-:400D8000827C018AA2F108042141CBB2090608D5C3F3801363F07F03023A03F08103827402E08474002BD7D08268511C81601370C368013BC360CFE730BD00002DE9F0419E
-:400DC00072B6884B61221A70A3F5F06301221A801924854A9C7092E803008033062283F8002283E80300522203F580731A707F4B7F4A1B787F4EDBB2137040F618027E4BC3
-:400E000000251A8041F2512223F8022C33784FF4F07003F0010343EA450502F0B9F8013C05F003052ED0032DF0D1744B4FF480721A8007221A70724A00254821157091706B
-:400E400002221D705D7103F8032C0422DA716D4A6D4C13786D4E43F00103137012F8013C062743F0030302F8013C2378012243F0800323705B4B1A70654A137843F020033D
-:400E8000137000E0FEE707FB056300219A881868013502F0E5F8072DF5D15E485E4E002550F8041F05F1105303F1560221F0FF075733C9B20B4452005B0002329A4206D039
-:400EC00012F802EC12F801CC0EF807C0F5E7B0420D44E5D1514A002313609360136193614F4B504F1A68504BDFF888811A604F4B1A684F4B1A604F4A137843F00203137036
-:400F0000137C43F0020313742378A2F5863243F040032370413A137843F010031370464A464B07CA03C31A80454A2833106843F8250C127903F8212C424A07CA03C31A80F1
-:400F4000414AE83B07CA03C31A80404A083307CA03C31A803E4A3F4BA2F5616203CBC2F8100EC2F8141E1378042043F008031370394B02F5AA521B783D78DBB298F80060F2
-:400F8000EDB203F007010C321B091170F6B2537045F003033B7046F0030388F800302F4B48221A702E4A402313702E49937013729372082382F81F3220220A7048710A72C0
-:400FC000294A0A20137001F0DDFB284B88F8006044223D70264D1A7094E80F0007C52B80BDE8F08100480040F01000480F010049A14600402542004022420040044000406E
-:4010000006400040A2430040A04300400B3A0000E8460040FCFFFF47A800004800760040F8100048F846004020760040FC1000482876004003500140B0100048C051004085
-:40104000BC100048C4100048D0100048DC10004832510040E8100048CF0100491D51004001590040235B0040585B004076580040B0430040F946004008B501F0C5FF036832
-:401080000C2B00D1FEE7FEE7084908B50B68084A1844821A802A01DC086005E001F0B4FF0C2303604FF0FF33184608BDCC80FF1F5887FF1F80B51148114B0025C0B1A3F17A
-:4010C000100192C922460439161BB74204D051F8046F42F8046BF7E7114653F8046C8C1AA64202D041F8045BF9E701381033E5E701F090FFFFF776F9FEE700BF01000000E2
-:40110000DC3B0000124A134B10B51A60124A134C1368134843F4007313600023032B98BF54F823204FEA830188BF0E4A0133302B4250F3D10C4B1A780C4B1A700C4B084A06
-:401140001A60FFF73BFEBDE8104001F0EDB900BF0004FA050CED00E014ED00E0000000000080FF1F79100000BC760040C080FF1F08ED00E0F8B501F013FF4B4A01271378FA
-:40118000022643F001031370137C484C43F001031374474B02F5E3521F700B3203F8946C1378054603F07F031370002001F0EAFA2378404A03F0F90323701378384603F081
-:4011C000DF03137023783B43237001F0DBFA282001F0D8FA384B30461A7802F07F021A701A7802F0BF021A7023783343237001F0C9FA2378314A43F00403237000231370D5
-:4012000053702F4AFF2199540133092BFBD1284601F0CAFE0721172001F0FCFA2949172001F0EAFA0721182001F0F4FA2649182001F0E2FA0721152001F0ECFA23491520BE
-:4012400001F0DAFA0721052001F0E4FA2049052001F0D2FA0721062001F0DCFA1D49062001F0CAFA0721084601F0D4FA1A49072001F0C2FA0721082001F0CCFA17490820F1
-:4012800001F0BAFA0021162001F0C4FA1449162001F0B2FA07210C2001F0BCFABDE8F84010490C2001F0A8BAA5430040944300409D60004012600040F851004084600040C8
-:4012C0007D86FF1F431B00007D190000411B0000751A0000A11A0000D11A0000091B0000491B0000BD1B0000214B224A10B5187000231370204A40201370204A0F241370B0
-:401300001F4A13701F4A13701F4A13701F4A13701F4B4FF400021A604FF080721A604FF400121A6020221A601860802018604FF480701860174804704FF480001860164BF4
-:401340001A70933B19B91A7802F0FE0202E01A7842F001021A70114B03221A70802203F8202C012001F014FE0D4B04221A7010BD9886FF1F9E86FF1F9C86FF1F9D86FF1FA0
-:401380009986FF1F8886FF1F9B86FF1F1087FF1F00E100E09E6000409C600040286000401260004070B5074C054623780E461BB9FFF7E0FE0123237031462846BDE87040D0
-:4013C000FFF792BF4886FF1F0A4A002313700A4A13700A4A13700A4A13700A4A13700A4A13700A4A13700A4B03221A70802203F8202C70479E86FF1F9C86FF1F9D86FF1F4F
-:401400009986FF1F8886FF1F9B86FF1F1087FF1F28600040014B1878704700BF9D86FF1F044B1A7802F0FF001AB118780022C0B21A7070479C86FF1F024A0C2303FB002019
-:4014400040787047A486FF1F431E072B0CD8074A064B00010344805C5B7800F00F0043EA0020023880B2704700207047FC5F00401A4A38B50C2303FB00231B79090C13F077
-:40148000800F00F1FF35044619BF8AB24FF480438BB24FF48042032D18D8DFE805F002070C110021084601F01BF80DE00021084600F0FAFF08E00021084600F0D9FF03E016
-:4014C0000021084600F0B8FF054B1855EDB2072D03D801F0EDF8034B185538BDA486FF1F7486FF1F7D86FF1F431E072B2DE9F0470446894615465CD82F4F0C2202FB0072C1
-:40150000D388DFF8B8A09BB2C3F500739D424FF00C0303FB007388BFD588DB7884BFC5F50075ADB2254A43EA15230601B354B244EBB28AF80130224B1A5C9846FF2A01D15F
-:40154000FFF796FF0C2303FB047200215170B9F1000F28D03DB31B4F385D01F011F811232946FE2218F8040001F0D6F806F5C04278321FFA89F118F8040001F0DFF8124DB6
-:4015800018F80410385D01F04BF80121385D00F0E1FF735D43F002037355735D03F0FD037355BDE8F08703FB04746379DBB28AF80230BDE8F08700BFA486FF1FFC5F0040EF
-:4015C0007D86FF1F7486FF1F706000402DE9F047044615468846002940D0431E072B3FD8FFF732FFA84203D22046FFF72DFF05461D4E335DFF2B03D141462046FFF738FF33
-:40160000DFF868A027011AF8040000F0B9FF1223FE222946305D01F07FF807F5C0411FFA88F27831305D01F089F8DFF84490315D1AF8040000F0F4FF01211AF8040000F09A
-:4016400089FF17F8093043F0020307F8093017F8093003F0FD0307F8093002E00D4600E000252846BDE8F0877D86FF1F7486FF1F70600040431E072B0AD8064A0C2303FBB8
-:40168000002300225A705A79034BD2B200011A54704700BFA486FF1FFE5F0040431E072B9FBF024B000108221A547047FE5F004030B51A4A1A491B4D0878138803449BB2BE
-:4016C0001380194A00231488D8B2A4B27CB1082B0CD050680078C0B2E85450680133013050601088013880B21080ECE718460B780E4C082B0E4A00D040B10E4D2B7883F010
-:4017000080032B700F232370022301E0022323701370094B1870087030BD00BF1487FF1F1087FF1F006000408C86FF1F8986FF1F9E86FF1F9A86FF1F1187FF1F074B02226E
-:401740001A70074B80221A70064B0F221A70064A00231370054A0120137070479E86FF1F9A86FF1F8986FF1F1087FF1F1187FF1F30B5164B16491B780A8803F00F03023B91
-:40178000DBB21A4492B20A80124C134A0020118889B279B173B15568215C013BC9B229705168DBB20131516011880130013989B21180ECE7094A1370094A137883F0800373
-:4017C0001370084B0B221A7030BD00BF296000401487FF1F006000408C86FF1F1187FF1F9A86FF1F8986FF1F064A06231370064A01201370054B80221A70054B00221A70D5
-:40180000704700BF9E86FF1F8986FF1F9A86FF1F1187FF1F054B9A683AB19A68044910709A680988518000229A6070478C86FF1F1487FF1F08B5124B1A78D2B21A701B7856
-:40184000DBB21A0602D50F4A137008BD0220FFF7E1FF0D4B1B7803F06003202B05D0402B06D043B900F012FC04E001F0A1FB01E000F046FD10B9034B03221A7008BD00BFE0
-:40188000286000408986FF1F0060004008B5084A084B0120197813880B449BB21380064B00221A70FFF7B6FF044B03221A7008BD1487FF1F1087FF1F9E86FF1F8986FF1F6D
-:4018C00008B50C4B1B78DBB2042B07D0062B09D0022B0DD1BDE80840FFF7D8BFBDE80840FFF746BF0320FFF795FF034B03221A7008BD00BF9E86FF1F8986FF1F08B5054B8D
-:40190000002201201A70FFF785FF034B03221A7008BD00BF9E86FF1F8986FF1F08B50A4B1A7832B11A78094942F080020A7000221A70074B002201201A70FFF76BFF054B5C
-:4019400003221A7008BD00BF8886FF1F086000409E86FF1F8986FF1F074B1B78DBB2042B05D0062B05D0022B05D1FFF7A1BEFFF7C5BFFFF7D3BF70479E86FF1F38B51D4CCC
-:401980002378DBB2DD0634D518060AD503F00F03012B2ED1FFF74EFF174B1B78190609D538BD5A0602D5FFF7D7FF03E09D0620D5FFF786FF23781B061BD4104B1A78104BD0
-:4019C0001B7813430F4A13701278934211D10A4A0849154613782078DBB2000605D41378DBB20B700B7803F00F0328788342F1D138BD38BD286000408986FF1F9A86FF1FF3
-:401A00001187FF1F29600040054A00231380054A916819B191680B7092685380704700BF1487FF1F8C86FF1F0E4808B503889BB213B9FFF783FE13E00B4B02221A700B4BF5
-:401A400000221A70FFF7E0FF094AD1799379028843EA012392B2934238BF0380FFF728FE012008BD8C86FF1F9E86FF1F9A86FF1F00600040084B01221A700F3B9B7C074BC9
-:401A80001A7B02F00302012A1EBFDA7B82F08002DA7301225A7370470B600040A486FF1F094B02221A700F3B93F82230074B1A7E02F00302012A1EBFDA7E82F08002DA76B4
-:401AC00001225A76704700BF0B600040A486FF1F0B4B04221A700F3B93F83230094B93F8242002F00302012A1EBF93F8272082F0800283F82720012283F82520704700BF4A
-:401B00000B600040A486FF1F0B4B08221A700F3B93F84230094B93F8302002F00302012A1EBF93F8332082F0800283F83320012283F83120704700BF0B600040A486FF1F3B
-:401B40007047FFF741BC0000F0B5184B184E19780C27C9B201234FF0000C31B3CA0720D5144A4FEA031E7244947850782040C5070DD507FB03652C79240608D5147804F00F
-:401B8000FE0414706D790C4CEDB204F80E50840706D507FB036425792D0658BF84F801C090700133DBB24908D7E7F0BD9F600040A486FF1F70600040FE5F004000F0ACBC6B
-:401BC00070B50446184B88B003AA03F11006154618685968083303C5B3422A46F7D11B782B70FCB12223237001AD03232846637000F08AFE002220461146AB5C08AC04EB8F
-:401C0000131414F8144C03F00F03847008AC234413F8143C0132082AC1700371417100F10400EAD108B070BD353A00002DE9F0431C4D01222E460C201F274FF0800E4FF01B
-:401C4000080C194B00FB02581401234418705F70164998F805902144B9F1000F07D098F8044024064CBF887081F802C001E081F802E000FB0261CC880132E4B29C71CC88F7
-:401C8000092AC4F30724DC71CC88E4B21C71C988C1F307215971D4D1054BFF221A70BDE8F08300BFA486FF1F70600040FC5F00400A600040064B074A1B7802EBC30253689E
-:401CC0001A7C824286BF03EBC0035869002070479886FF1F983A00002DE9F84F424B1A78002A7ED01878414D0138C0B2FFF7E2FFA8463F4AC3681478007ADFF800C1E4B284
-:401D000003EBC0000C2600274FF0010E834268D01A78A24263D11CF80420597891425ED19A7893F8039002F07F0206FB02FA05EB0A01CF7093F802B009F0030981F804B053
-:401D400093F803B005F80AB0B3F804A0A1F808A093F902A0BAF1000F0BDAB9F1010F0CBF4FF007094FF00D0981F8059081F801E009E0B9F1010F0CBF4FF005094FF0090974
-:401D800081F805904F704FEA02191A4906FB0282494481F802E0B2F808A0CAF3072A81F800A0B2F808A05FFA8AFA81F801A0B2F806A011495FFA8AFA494481F806A0B2F8B3
-:401DC0000690C9F3072981F80790B2F806905FFA89F981F80490D288C2F307224A71083394E7BDE8F88F00BF9D86FF1FA486FF1F9986FF1FFC5F0040706000408A86FF1FF6
-:401E000008B5064B18780138C0B2FFF753FF20B143681B7900EBC300406908BD9D86FF1F00212DE9F84F0B464E4E0C2707FB01F401313219092933554FF000059370494CFC
-:401E4000D3701381937253705371EFD118B1464B1D70464B1D70464B1A78002A7FD0187801250138C0B2FFF725FFA8464368DFF8F8E0DB790C2713F0400F3E4B4FF0000C2E
-:401E80001A7814BF42F0010202F0FE021A70027AD20007FB0541C36803EB02094B4531D093F802A00AF07F06AE4229D10E89B3F804B0B6B25E4538BFA1F808B01E7893F8C1
-:401EC00001B01EF80660B3451AD181F804A0DE780E7093F902A0DE78BAF1000F06F0030607DA012E0CBF07260D264E7181F8018006E0012E0CBF052609264E7181F801C07D
-:401F00000833CBE70135092DC3D1C1680A328B1C0A440C200833934209D013F8081C13F80A5C01F07F0100FB01418D72F2E7FFF767FF114B0121186000230C2000FB014240
-:401F4000D3801289013113449BB203F00102134409299BB2F2D1BDE8F84FFFF767BEBDE8F88F00BFA486FF1F8A86FF1F1287FF1F9D86FF1F9B86FF1FA086FF1F114B1B793B
-:401F800003F07F035A1E072A19D80F490C2202FB031291781B0141F0010191700021D170517841F002015170127912F0800F074A1A4414BF8D2389239370FFF715BC00201D
-:401FC000704700BF00600040A486FF1FFC5F004030B4194B1A7902F07F02531E072B27D8164B0C2404FB02339978154D01F0FE0199700021D97029461201505D114400F0E9
-:402000007F0050555A7802F0FD025A701A795B78120605D5012B01D18C7006E00D2303E0012B0CBF082309238B7030BCFFF7DCBB002030BC704700BF00600040A486FF1F78
-:40204000FC5F004010B50D4B0D4C21791878C9B20138C0B2FFF72EFE43681B798B4201D2012909D8074A0848535CDBB24354A3780120DBB2535410BD002010BD9D86FF1F14
-:40208000006000408A86FF1F1287FF1F38B58A4A8A4C13780021DBB221801806517840F18D800A2900F20581DFE811F05D00030103010301030103010B0003017E00030190
-:4020C0008200D3787C49012B09D17D4B1A787D4B03EBC2035B685B686360122310E0CB78022B12D18878FFF7E5FD002800F0E180436863606368DA7863689B7843EA0223A6
-:402100002380BDE83840FFF78FBCCB78032B26D16D4B00228878D5B2854209D3664A91786A4AEE2908BF1346634A917881B106E0187801320028F1D018780344EAE76449BF
-:402140009278097C914203D16248FFF739FD614B1A78002A00F0AD801A78228018E0BDE8384000F025BF13F0030313D0022B40F0A0802380504B0C211B7903F07F02564B34
-:4021800001FB02339A78554BD2B21A7000225A706360B6E702222280514A11784F4AC9B2117053706260ACE7012323804D4BEFE70123238013794C4A1344E9E701390A2999
-:4021C00077D8DFE801F037764F76067676760A7620009378454ADBB25AE0937803F0FF0153B9404B1A7891425FD01970404B01201870FFF715FE58E0481EC0B2FFF75AFDB1
-:402200000028EED155E0FFF71DFF002851D02A4A384913791279DBB2D2B20A70364A3249D25CCB5C9A4240D0314B01221A70FFF753FD3AE003F00303012B2BD009D3022BA2
-:4022400037D11D4B9B78002B33D1BDE83840FFF7BFBE194B9B78012B2BD1214A137803F0FD0315E003F00303012B13D008D3022B1FD1114B9B78E3B9BDE83840FFF77EBE45
-:402280000D4B9B78012B14D1154A137843F0020313700AE0084B1A795AB998781B791749DBB2CA5C22EA0002CA54BDE83840FFF79BBA002038BD00BF006000408C86FF1F2B
-:4022C0009886FF1F983A0000FC3A0000843A00006F3B00003087FF1FA486FF1F4986FF1F9B86FF1F9D86FF1F8A86FF1F8886FF1F9C86FF1F9986FF1F1287FF1F9F86FF1FD7
-:40230000074B1A78120609D55B78012B06D1054B054A5A6012781A80FFF786BB00207047006000408C86FF1F5C3A0000014B1870704700BF77650040014B1878704700BF44
-:4023400068650040014B1870704700BF7A650040064A0123136002F688321268E0211064034A1170A2F540721360704780E100E000E400E0014B1870704700BF79650040B1
-:40238000014B1870704700BF7565004073B515461E460B4C05230022019200920A4601461846237000F064F932462946207800F01FF90221207800F009F9207802B070BD8C
-:4023C000D080FF1F064A0423136002F688321268E0219064034A1170A2F202321360704780E100E002E400E0014B04221A60704700E100E0014B04221A60704780E100E055
-:40240000014B1870704700BF7B650040704738B505460078012428B100F062FD285D0134E4B2F8E738BD08B50D2000F059FDBDE808400A2000F054BDF7B516461F460B4C4E
-:4024400000230325019300930A4601462846257000F00EF93A463146207800F0C9F80221207800F0B3F8207803B0F0BDE080FF1FF7B516461F460B4C002302250193009318
-:402480000A4601462846257000F0F2F83A463146207800F0ADF82946207800F097F8207803B0F0BDE180FF1FF7B516461F460B4C00230125019300930A46014628462570B9
-:4024C00000F0D6F83A463146207800F091F80221207800F07BF8207803B0F0BDE280FF1F73B515461E460B4C0023019300930A4601461846237000F0BBF83246294620784E
-:4025000000F076F80221207800F060F8207802B070BD00BFE380FF1F024B1878C0F38010704700BF8F450040074A7F23802113705170064A013BDBB202F80839002BF9D1B8
-:40254000034A1370704700BFE480FF1FF87B00400078004017280FD8084B0001C25C11B142F0200201E002F0DF02C254C25C42F00102C254002070470120704710700040D8
-:4025800017280BD8064B0001C25C02F0FE02C254C25C02F0DF02C25400207047012070471070004017280DD8074900010B4603441A7942F004021A71435C43F0010343543B
-:4025C00000207047012070471070004017280BD8064A0001835C490003F0F10301F00E011943815400207047012070471070004041F6FF73994208BF4FF400519A4208BFC8
-:402600004FF4005217289FBFC00000F1804000F5EC4081809ABFC280002001207047000017289FBF034B00011954002088BF0120704700BF1970004017289FBF054B000134
-:402640001A5C01F007019DBF1143195400200120704700BF1470004017289FBF034B0001185C00F0070088BFFF20704714700040172810B51AD8C00001F07F0100F180443F
-:4026800041EAC21204F5EC44D2B222709DF8082003F00F0343EA0213DBB263709DF80C30002003F00F03A370E07010BD012010BD10B500F075FC0A4A5378182B0AD914786D
-:4026C000013B5370E30003F1804303F5F0431B78137000E0FF2400F067FC204610BD00BFE480FF1F030610B5044611D400F058FC084AE300117803F1804303F5F0431970CC
-:402700005378147001335370BDE8104000F04CBC10BD00BFE480FF1F30B504060CD411F4704509D1C40004F1804404F5F0442180A270E370284630BD012030BD03065FBFB5
-:40274000C00000F1804000F5F04081805ABFC280002001207047000038B50446084DB4F5004F05D9286800F013FCA4F50044F6E7034B58686043BDE8384000F009BC00BF82
-:40278000EC80FF1F024B1B7A584300F001BC00BFEC80FF1F0E4B00F003001A78490102F0FC02104318701A7801F0600142F080021A701A7802F07F021A701A7802F09F0253
-:4027C0000A431A701A7842F010021A70704700BF83430040014B01221A70704784430040044B00F00F021B6853F8220043F82210704700BF08ED00E0054A00F01F0012689F
-:4028000000F1100352F8230042F82310704700BF08ED00E000F01F0000F16040490100F56440C9B2017070470F4B10B50F4900240F205C609C60DC601C615C61FFF7D0FF8C
-:402840000B4A136843F0040313600A4B4FF47A72DB68B3FBF2F3084A1360084B4FF400421C60C3F8E82010BD4C86FF1FD528000010E000E0EC80FF1F14E000E018E000E0E5
-:40288000024A136843F002031360704710E000E008B5FFF7F5FF034A136843F00103136008BD00BF10E000E010B5054CA3691BB9FFF7BAFF0123A361BDE81040FFF7E8BF53
-:4028C0004C86FF1F024B1868C0F30040704700BF10E000E038B5FFF7F5FF012808D1054D002455F8243003B198470134052CF8D138BD00BF5086FF1F024B03EB800358680A
-:40290000596070474C86FF1F134B144A1B78DBB20360127843EA0223114A0360127843EA0243104A0360127843EA026303600E4B0E4A1B78DBB24360127843EA02230C4A80
-:402940004360127843EA02430A4A4360127843EA02634360704700BF0301004904010049EC460040020100490101004900010049050100490601004910B500F011FB204AD4
-:40298000044613780A2043F002031370137C43F00203137412F80A3C43F0010302F80A3C937943F00103937102F5AB52137843F003031370134B18221A7013F8012C42F03A
-:4029C000400203F8012C13F8012C02F0FC0203F8012CCE2203F8062CA3F597530222183B1A70094A137843F008031370FFF7CAFE064B10222046BDE810401A6000F0D4BA4A
-:402A0000AB4300400E5900402F5B004080E200E008B500F0C5FA0F4A137803F0FE031370A2F5AA521D3A137803F0FD031370137C03F0FD03137412F80A3C03F0FE0302F8BC
-:402A40000A3C937903F0FE039371BDE8084000F0ABBA00BF08590040044A137803F03F0343EA8010C0B21070704700BF08590040082804D00A280CBF8223C22300E04223C6
-:402A800008380E4AC0B20428137098BF0C4B4FF0000298BF33F910100A4B88BF11461A8042F210734B4341F2883103F6C41393FBF1F305490B60054B1A8070470A590040CE
-:402AC000463A00001A87FF1F1C87FF1F2087FF1F08B5102000F0A6F907210420FFF79AFE07490420FFF788FE064A0C20137843F006031370FFF7BCFF034B00221A8008BD85
-:402B0000C92B0000095900401887FF1F10B5054C23781BB9FFF7DCFF01232370BDE81040FFF72ABF6886FF1F044B1A7802F0FB021A701A7842F001021A7070470859004052
-:402B400010B5084B1C7814F0010403D10028F9D0002404E02046FFF715FE024B1B78204610BD00BF09590040034A044B1B881088181A00B2704700BF2087FF1FA25B0040BD
-:402B80000E4A13881BB223B111880A2309B2594301E00B4B19680B4B1B88C01A42F2107300B203FB00F2022391FBF3F30028D8BF5B42134493FBF1F000B270471A87FF1F9F
-:402BC0001C87FF1F1887FF1F7047000010B500F0E7F9214A044613780A2043F001031370137C43F00103137412F80A3C43F0020302F80A3C937943F00203937102F5AA5297
-:402C00001832137843F003031370144B18221A7013F8012C42F0400203F8012C13F8012C02F0FC0203F8012CCE2203F8062CA3F597530222123B1A70094A137843F0080306
-:402C40001370FFF79FFD074B08222046BDE810401A6000F0A9B900BFAB43004006590040275B004080E200E008B500F099F90F4A137803F0FE031370A2F5AA52153A137805
-:402C800003F0FE031370137C03F0FE03137412F80A3C03F0FD0302F80A3C937903F0FD039371BDE8084000F07FB900BF00590040044A137803F03F0343EA8010C0B21070E3
-:402CC000704700BF00590040082804D00A280CBF8223C22300E0422308380E4AC0B20428137098BF0C4B4FF0000298BF33F910100A4B88BF11461A8042F210734B4341F2A5
-:402D0000883103F6C41393FBF1F305490B60054B1A80704702590040503A00002687FF1F2C87FF1F2487FF1F08B5102000F084F807210320FFF76EFD07490320FFF75CFDED
-:402D4000064A0C20137843F006031370FFF7BCFF034B00221A8008BD212E0000015900402887FF1F10B5054C23781BB9FFF7DCFF01232370BDE81040FFF728BF6986FF1F6B
-:402D8000044B1A7802F0FB021A701A7842F001021A7070470059004010B5084B1C7814F0010403D10028F9D0002404E02046FFF7E9FC024B1B78204610BD00BF01590040E9
-:402DC000034A044B1B881088181A00B2704700BF2487FF1FA05B00400E4A13881BB223B111880A2309B2594301E00B4B19680B4B1B88C01A42F2107300B203FB00F20223E4
-:402E000091FBF3F30028D8BF5B42134493FBF1F000B270472687FF1F2C87FF1F2887FF1F70470000034A00F0F800137803431370704700BF02410040034A00F0F800137833
-:402E400003431370704700BF06410040014B1870704700BF79640040014B1870704700BF7665004073B515461E460B4C04230022019200920A46014618462370FFF7F8FBA3
-:402E8000324629462078FFF7B3FB02212078FFF79DFB207802B070BDFC80FF1F074A0223136002F688321268E0215064044A11706FF440710A441360704700BF80E100E070
-:402EC00001E400E0014B1870704700BF72640040014B1870704700BF7064004000000000FEB5494652465B460EB40746244909688A46244A12682448022100F071F8030044
-:402F000020480068C018204900F06AF8143883460121C9430C460125002600F041F8814651460B7823400B705846013000F030F83800F04028400B78234003430B70584669
-:402F400000F026F80136072EF2D9002001300138013001200B78234003430B705846043000F016F8484600F01FF800BF00BF00BF0EBC894692469B46FEBD00BFAFF30080F9
-:402F8000D480FF1FF880FF1F00C20100000000000230800803D000BF01380046FCD17047EFF3108072B6704780F31088704700BF094A137803F00303012B0AD0022B09D141
-:402FC00013790C2103F07F02044B01FB02339B7A00E013790020704700600040A486FF1F002902D0B0FBF1F0704708B14FF0FF3000F008B80029F8D00246B0FBF1F000FB0F
-:4030000011217047704700BF014B1868704700BF6081FF1F0E4B70B51E460E4C0025E41AA410A54204D056F8253098470135F8E700F0BAFD084B094C1E46E41AA410002501
-:40304000A54204D056F8253098470135F8E770BDB43B0000B43B0000B43B0000BC3B000003460244934202D003F8011BFAE7704730B5141E05469BB0184604DA8B232B6006
-:403080004FF0FF301DE04FF40273ADF80C300CBF234604F1FF33029305934FF6FF7300910491ADF80E3002461E9B6946284600F073F8431CBCBF8B232B6014B1009B0022B6
-:4030C0001A701BB030BD000007B5009313460A46014603480068FFF7CBFF03B05DF804FB6081FF1F2DE9F0478E6882469E420C46914698463ED88A8912F4906F3AD025681F
-:40310000096902236F1A656905EB450595FBF3F57B1C43449D4238BF1D4653050FD5294600F04AFB064698B13A46216900F0D2FAA38923F4906343F08003A38113E02A46EA
-:4031400000F098FB064670B92169504600F0E8FA0C23CAF80030A3894FF0FF3043F04003A381BDE8F08726613E44266046466561ED1BA560464528BF464649463246206879
-:4031800000F0B3FAA36800209B1BA36023681E442660BDE8F08700002DE9F04F9DB003938B8980461C060D4616460DD50B695BB9402100F001FB2860286118B90C23C8F894
-:4031C0000030CDE040236B610023099320238DF82930DFF89CB130238DF82A3037463C4614F8013B1BB9B7EB060910D003E0252BF9D02746F3E74B46324629464046FFF7AA
-:4032000071FF013000F0A780099B4B4409933B78002B00F0A08000234FF0FF3204930793059206938DF853301A930126052221784E4800F041FA671C049B38B14B4A3C46A6
-:40324000801A06FA00F018430490EFE7D90644BF20228DF853201A0744BF2B228DF8532022782A2A03D0079A00210A200BE0039A111D12680391002A10DA524243F002002C
-:40328000079204900BE027463B780134303B092B03D800FB02320121F5E701B107923B782E2B1ED17B782A2B0AD1039B02371A1D1B680392002BB8BF4FF0FF33059310E0D0
-:4032C000002319460593781C0A2407463A780130303A092A03D804FB01210123F5E703B1059103223978224800F0E6F940B14023CBEB000003FA00F0049B01371843049013
-:40330000397806221B487E1C8DF8281000F0D4F988B1194B33B9039B073323F007030833039314E003AB00932A46144B04A94046AFF3008007E003AB00932A460F4B04A9F6
-:40334000404600F093F8B0F1FF3F824603D0099B5344099342E7AB895B0601D4099801E04FF0FF301DB0BDE8F08F00BF833B0000893B00008D3B000000000000E530000069
-:403380002DE9F04791461F460A698B6806469342B8BF1346C9F8003091F843200C46DDF8208012B10133C9F800302368990642BFD9F800300233C9F80030256815F00605B2
-:4033C00010D104F1190A07E00123524639463046C04701301AD00135E368D9F800209B1A9D42F1DB94F843302268003318BF012392060FD5E118302081F843005A1C94F80E
-:4034000045102244023382F8431003E04FF0FF30BDE8F08704F1430239463046C0470130F4D02268D9F80050E36802F00602042A08BF5D1B2269A3680CBF25EAE5750025EB
-:403440009342C4BF9B1AED184FF000091A344D4509D00123224639463046C0470130D5D009F10109F3E70020BDE8F0872DE9F04317460A7E85B06E2A984606460C460C9BA3
-:4034800001F1430E00F0AE8011D8632A22D009D8002A00F0BB80582A40F0CA8081F84520834955E0642A1ED0692A1CD0C0E0732A00F0B08009D86F2A2ED0702A40F0B88060
-:4034C0000A6842F020020A603EE0752A24D0782A3AD0ADE01A6801F14205111D1960136884F84230A8E021681A6811F0800F02D0111D196008E011F0400F02F104011960A2
-:4035000002D0B2F9003000E01368002B3CDA2D225B4284F8432037E021681A6811F0800F02D0111D196007E011F0400F02F10401196001D0138800E01368227E5C496F2AFF
-:4035400014BF0A2208221BE078225A4984F845202268186812F0800F00F104051D6003D1550601D5038800E00368D00744BF42F0200222601BB9226822F020022260102226
-:40358000002084F8430001E049490A226568002DA56008DB206820F0040020602BB9002D7DD175460CE0002B79D07546B3FBF2F002FB1033CB5C05F8013D03460028F5D1F1
-:4035C000082A0BD12368DA0708D5236962689A42DEBF302305F8013C05F1FF35C5EB0E0323612EE008681A6810F0800F496903D0101D1860136808E010F0400F02F1040047
-:403600001860136801D0198000E0196000232361754616E01A68111D1960156800216268284600F049F808B1401B6060636804E004F1420584F8422001232361002384F868
-:403640004330CDF800803B4603AA21463046FFF797FE013002D14FF0FF3026E023692A4639463046C0470130F5D023689B0710D5002504F1190907E001234A4639463046B8
-:40368000C0470130E7D00135E368039A9B1A9D42F2DBE068039B9842B8BF184605E00B7804F1420584F842308AE705B0BDE8F083353A0000943B000010B5C9B202449042A1
-:4036C000034605D01C7801308C42F8D1184610BD002010BD10B5431E0A44914204D011F8014B03F8014FF8E710BD884210B501EB020301D8421E0BE09842FBD28118D21A01
-:40370000D34204D013F8014D01F8014DF8E710BD994204D011F8014B02F8014FF8E710BD38B50546002944D051F8043C0C1F002BB8BFE41800F0D4F81E4A1368114613B9D1
-:403740006360146030E0A3420DD92268A018834201BF18685B681218226063600C6023E0A24203D813465A68002AF9D118681918A1420BD12168014458188242196013D1B2
-:4037800010685268014419605A600DE002D90C232B6009E021686018824201BF106852680918216062605C602846BDE8384000F098B838BD7086FF1F70B5CD1C25F003051E
-:4037C00008350C2D38BF0C25002D064601DBA94202D90C23336046E000F082F8234B1C681A462146A1B10B685B1B0ED40B2B03D90B60CC18CD501EE08C420BBF63684B6856
-:403800001360636018BF0C4615E00C464968E9E7174C23681BB9304600F052F820602946304600F04DF8431C18D0C41C24F00304A0420DD12560304600F053F804F10B001D
-:40384000231D20F00700C31A0ED05A42E25070BD211A304600F034F80130EBD10C233360304600F03EF8002070BD00BF7086FF1F6C86FF1FF8B5074615460E4621B9114619
-:40388000BDE8F840FFF798BF1AB9FFF749FF2846F8BD00F027F885420ED929463846FFF78BFF044650B131462A46FFF713FF31463846FFF735FF01E03046F8BD2046F8BD00
-:4038C00038B5064C0023054608462360FDF7DCFB431C02D1236803B12B6038BD5487FF1F7047704751F8040C0028BEBF091851F8043CC018043870470000000005020902A2
-:403900000B020D020F02110213027265706C792030782530327800686F6D696E6700626567696E6E696E67207365656B2066726F6D20256420746F2025640066696E697302
-:40394000686564207365656B0057616974696E6720666F72205553422E2E2E0055534220726561647900636F6D6D616E642030782530327800756E64657272756E20616661
-:40398000746572202564207061636B65747300636F756E743D256420693D256420643D256400636D645F777269746500703D25642063723D25642063773D256420663D2529
-:4039C0006420773D256420696E6465783D256420756E64657272756E3D25640077726974652066696E69736865640073746172742065726173696E670073746F7020657226
-:403A00006173696E670069646C650000510040100040510040300000000140001000140140000800400140000A004C0140000200500140200030313233343536373839416D
-:403A40004243444546000001000000040000001000010000000400000010000028000000000104000100000000000000000157494E555342000030303030310000000000D0
-:403A80000000000012034D005300460054003100300030000100000001000000A03A0000010000006F3B0000000000000000000001000000B83A000001000000413B00002F
-:403AC00004000000DA3A0000000000000000000000000000D83A0000FF00000001024000FF00000082024000FF00000003034000FF00000084034000FF0002030403090474
-:403B0000160346006C007500780045006E00670069006E0065002A0343006F0077006C00610072006B00200054006500630068006E006F006C006F00670069006500730073
-:403B40000009022E0001010080320904000004FF00000107050102400000070582024000000705030340000A0705840340000A12010002FF0001080912006E0100020180C5
-:403B8000014300232D302B2000686C4C00656667454647003031323334353637383961626364656600000000F8B500BFF8BC08BC9E4670475900000005110000F8B500BF16
-:403BC000F8BC08BC9E46704735000000E03B0000C880FF1FA0000000F005000000000000000000005887FF1FFF000000675000400C00000007000000FFFFFFFF7F80000066
-:403C00003F0000000000007D00FA0000400000000090D003FF0000000000000000000000000000000000000000000000000000000000000000000000813B00000000000070
-:403C400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000081FF1F00000000A5
+: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
+:4007400001F04AFF08F807000137402FF8D1DFF894A200270AF199091FFA89F80137402F14BF3A4600221AF8010F22440623127E402101F065FF424646F244519AF8000063
+:4007800001F070FF08F14008402F1FFA88F8E5D196F86D3033B100237372637A002BFCD00023737200234FF0FF32236062602372236894F8AA002344197E01F0C5FE94F87B
+:4007C000AA0001F083FE012194F8AA0001F056FE2368002BFCD0002398467360D6F80CA0012701F08BFFE368B4F86E20CAEB030393420DD367B1042195F8AA0001F0B0FEC5
+:4008000094F8AA0001F0BCFE0028F9D107463072237AFBB96A682B689A4202D1002FE0D118E00220FFF770FC6968402209EB8111022000F0EDFD6A68634B01321340002B4F
+:40084000BEBF03F1FF3363F03F03013308F101086360C6E70220277AFFF756FC00221146022000F0D5FDFFB20220FFF74DFCFFF7BDFC37B15548FFF706FD0220FFF72AFDB4
+:4008800006E0534B08A81B88ADF82030FFF710FD627A4146237A4F48FFF7F5FC01E24E48FFF7F1FCD4F86E7017F03F0701D00320F5E1012001F0F8FC95F86C0001F0EEFCF4
+:4008C00002F002FB454BDFF818811A7842F004021A701A7842F001021A701A7802F0FE021A701A7802F0FE021A7002F0F1FA686EFFF756FD01214FF4804341F6FF7208462E
+:4009000001F0D8FC85F8AA0001F066FE08F807000137402FF8D1DFF8CC90002709F199031FFA83F804930137402F14BF3A46002219F8010F22440523127E402101F080FEB9
+:40094000414646F24B4299F8000001F08BFE08F14008402F1FFA88F8E5D100274FF0FF33376098467360BB463B46D6F86E9037725FEA99190CBF4FF0010A4FF0000A216868
+:40098000114A01310A40002ABCBF02F1FF3262F03F026068B8BF013282426BD02BB1227A002A76D16A7A002A73D12068049A059302EB8010BAF1000F16D040223F2102F0C9
+:4009C000E3FA1CE0946500403F000080E43800002A380000FE380000113900009B640040A081FF1F9F81FF1F014601370120FFF7DEFBC7EB0903D3F1000A4AEB030A2168A6
+:400A0000AB4A01310A40002ABEBF02F1FF3262F03F02013222606268059B01322AD12A683F2A27D14FF00008C5F8048001F070FC85F808806B6895F8AA002B44197E01F0BC
+:400A400083FD95F8AA0001F041FD012195F8AA0001F014FD85F80980637A002BFCD04FF00008012086F8098001F05EFC404601F01BFC00E023B1237A5BB96B7A4BB90123A1
+:400A8000626842453FF47BAF0BF1010BD5F8048075E701F043FC012001F006FC002001F043FC042194F8AA0001F05AFD94F8AA0001F066FD0028F9D196F8AA0001F0F4FC07
+:400AC000737A327A0293012303920193CDF800A05B463A4649467748FFF7D5FBBAF1000F08D0FFF783FB237A63B17348FFF7CBFB0220D4E0B945F4D070490120FFF757FBF9
+:400B00000137F7E76E48FFF7BEFB6E4B38E094F86C0001F0C3FB606EFFF742FC6A48FFF7B2FB00236372637A002BFCD0012001F0FBFB00237372637A002BFCD0002001F0AA
+:400B4000F3FB6248FFF79FFB614B19E0002084F85E00FFF725FC5F4B12E094F8683023B195F869200AB985F86C2094F869201AB113B9012385F86C305748FFF7CDFB574B39
+:400B80001B88ADF8203008A8FFF792FB89E0FFF7B1FB02F07BF8002002F01EF82A2701F049FF002001F0ECFE3A46002108A802F0EBF917238DF820308DF8217001F09EFD75
+:400BC000002001F047FB002002F0DAF8C82001F057FD0DF12200FFF721FB0DF13600FFF73EFB01F08BFD012002F0CAF8322001F047FD0DF12600FFF711FB0DF13A00FFF7D3
+:400C00002EFB012001F026FB4FF4967001F038FD01F074FD0DF12E00FFF700FB0DF14200FFF71DFB002001F015FB4FF4967001F027FD01F063FD022002F0A2F8322001F05B
+:400C40001FFD0DEB0700FFF7E9FA0DF13E00FFF706FB012001F0FEFA4FF4967001F010FD01F04CFD0DF13200FFF7D8FA0DF14600FFF7F5FA002001F0EDFA4FF4967001F06F
+:400C8000FFFC01F03BFD002002F07AF8002384F85E3001F07DFF01F04FFE74E70120FFF719FB032000F07AFC0D48FFF7ECFA0DE43F0000801B3900004B3900003892FF1F04
+:400CC000553900002C3800005D3900006B3900002E38000030380000F281FF1F32380000783900002DE9F04172B6884B61221A70A3F5F06301221A801924854A9C7092E8C5
+:400D000003008033062283F8002283E80300522203F580731A707F4B7F4A1B787F4EDBB2137040F618027E4B00251A8041F2512223F8022C33784FF4F07003F0010343EAA5
+:400D4000450502F0B9F8013C05F003052ED0032DF0D1744B4FF480721A8007221A70724A002548211570917002221D705D7103F8032C0422DA716D4A6D4C13786D4E43F049
+:400D80000103137012F8013C062743F0030302F8013C2378012243F0800323705B4B1A70654A137843F02003137000E0FEE707FB056300219A881868013502F0E5F8072D53
+:400DC000F5D15E485E4E002550F8041F05F1105303F14A0221F0FF074B33C9B20B4452005B0002329A4206D012F802EC12F801CC0EF807C0F5E7B0420D44E5D1514A002391
+:400E000013609360136193614F4B504F1A68504BDFF888811A604F4B1A684F4B1A604F4A137843F002031370137C43F0020313742378A2F5863243F040032370413A1378DE
+:400E400043F010031370464A464B07CA03C31A80454A2833106843F8250C127903F8212C424A07CA03C31A80414AE83B07CA03C31A80404A083307CA03C31A803E4A3F4B12
+:400E8000A2F5616203CBC2F8100EC2F8141E1378042043F008031370394B02F5AA521B783D78DBB298F80060EDB203F007010C321B091170F6B2537045F003033B7046F096
+:400EC000030388F800302F4B48221A702E4A402313702E49937013729372082382F81F3220220A7048710A72294A0A20137001F0DDFB284B88F8006044223D70264D1A7039
+:400F000094E80F0007C52B80BDE8F08100480040140C00480F010049A146004025420040224200400440004006400040A2430040A04300407D390000E8460040FCFFFF4727
+:400F400090000048007600401C0C0048F846004020760040200C00482876004003500140D40B0048C0510040E00B0048E80B0048F40B0048000C0048325100400C0C004895
+: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
+:40224000FFF786BB0020704700600040BC92FF1FCC390000014B1870704700BF78650040014B1878704700BF68650040014B1870704700BF76640040064A0123136002F636
+:4022800088321268E0211064034A1170A2F540721360704780E100E000E400E0014B1870704700BF77640040014B1870704700BF7A64004073B515461E460B4C05230022DA
+:4022C000019200920A4601461846237000F064F932462946207800F01FF90221207800F009F9207802B070BDD080FF1F064A0423136002F688321268E0219064034A1170F2
+:40230000A2F202321360704780E100E002E400E0014B04221A60704700E100E0014B04221A60704780E100E0014B1870704700BF74650040704738B505460078012428B194
+: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
+:402D40005C93FF1F5893FF1F70470000034A00F0F800137803431370704700BF02410040034A00F0F800137803431370704700BF06410040014B1870704700BF7F64004011
+:402D8000014B1870704700BF7B65004073B515461E460B4C04230022019200920A46014618462370FFF7F8FB324629462078FFF7B3FB02212078FFF79DFB207802B070BDA9
+:402DC000FC80FF1F074A0223136002F688321268E0215064044A11706FF440710A441360704700BF80E100E001E400E0014B1870704700BF7A650040014B1870704700BF9C
+:402E00007965004000000000FEB5494652465B460EB40746244909688A46244A12682448022100F071F8030020480068C018204900F06AF8143883460121C9430C4601254B
+: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
 :403CC00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C4
 :403D00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083
@@ -4098,74 +4098,74 @@
 :40FF80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041
 :40FFC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
 :0200000480007A
-:400000000145004008520040015B00400164004001650040450001403A01014048020140530301404504014057050140500601404E070140460801405B0901404C0A014076
-:400040005F0B0140570C0140550D0140460E01403C0F0140441401405B1501404716014054170140541801405C190140461A0140601B01400E4001400E410140094201406E
-:400080000C430140054401400445014007460140114701400A48014010490140174C0140084D014008500140045101407E02080209441080180219016013611A7C40272152
-:4000C0003C01290A0207030507400804090F0A100F0A141815031601171019401A201C041D0C1E081F032018232024022618270F281F29032B1C2D802E18303F33C0353FA3
-:400100003B20580459045B045C995F0180208108840188108C0190109302950A96019704980C9A029B019C08A101A202A40AA604AA10AB04AD0CAE04AF02B430B50FB60F0E
-:40014000D608D80BD904DB04DC99DD90DF01012204080550064009940B010D020E240F021098120217A519021D701F80210422282320261028102A422B182E902F803088C8
-:4001800031103610370538A039083B013F025E406640680269206A106B017F40821083808502864289808B01C0FAC2F7C4FFCABFCCEECE8FD610D810DE80E009E206E408D2
-:4001C000E60401080401050C07020A0112021401150A17041A011B011C01210F26012A042B042C012F0232073407350F3A285804590B5B045C995F0180068318860287203B
-:4002000088068A018B078C068D048F08911F920694079540980699029B189C039D189E08A140A201A401A504A60CA710A918AA01AB01AC01AD40AE06B00FB140B33FB54083
-:40024000BB33BE01D608D804D904DB04DC90DD90DF0100100110028103200414080D09400B090C040F851101120A13081548172019011C041E081F0820A0231824082520DD
-:4002800029092B062C022D082E102F9030A031063610370439803A063B103E043F02598063026F057F4080408202868487018F0C9120921094889644978099809D209E80F6
-:4002C0009F04A002A210A380A488A590A711A810A906AE02B120B220B308B608C06FC2FFC4EFCABFCC6FCECFD608D808DE80E002E201E606EA05EE0802020408050A0705B7
-:40030000080309020A0C0E010F02120814081502170419011A0F1B081C08200824082703280429012B022C0F2D03320F350737083B203E043F40580459045C905F018210A4
-:400340008308862087208A3F8B028D018E089001913F9602973F9A049B109C3F9F04A03FA33FA53FA63FAA3FAB3FAC3FAD3FB23FB33FBE04BF04D608D804D904DB04DD9016
-:40038000DF01000801100291055106100A040B590E030F541181120813041551170819081D04200621C02720281429802B102C402D402E082F08300831203540360937109D
-:4003C000380439803B203C083D013F5049104A085F80668082408380848488018A048D908E049120932095D99640978C99229B0D9C099D049E059F20A042A120A204A309CE
-:40040000A408A5D2A68AA772A820A902AC80AF01B050B120B310B704C0FFC2FFC4FFCAFECCF6CEFED610D810E24DEA09EC08EE0401010407050109010A070C060D010E01E6
-:400440000F02120113011407150119011A021C041F01200721012405250126022A082B012D012F02300F3303340F3A223F04580459045C095F0182C984098540880989C0D4
-:400480008A808C098D048F0890FC920293079408951F964398C999029B189CCD9D189E10A0C9A318A4C9A720A8CDA904AA30AB10AC04AD18AEE1AF01B0C0B13FB23CB34013
-:4004C000B403B580BE15BF04D804D904DC90DF0100810328051407010A650B020C020D100E200F02115812821440172418201B121D101F11200421042209272029A22A04C0
-:400500002D112E082F013098320135043752381439803C083E403F117C087F108002838086108A1A8E0891A09204955996039755981099A29A849B059C499D419E099F10E7
-:40054000A0CBA204A309A404A540A68AA762AB10AC08AD0AAF40B201C0EFC2FFC47FCAFFCCFFCEFEE60AEA0FEC08EE01000701080501060809010A420C070D011101121082
-:400580001501162118C61A211B011C071F0420A522422302248425012B012C072D0130E03108321F34E0370739803E013F015608580459045B045C995D905F0180028218D2
-:4005C000830586078A208D08901892019504961898049A109C1F9D02A004A208A418B104B23FB301B502B708BF51D608D804D904DB04DC99DD90DF01010803440502060402
-:400600000712081009400A400B100D080E020F84128013081420168219081A101E201F25208621032207244027032D802E042F483244340835603702380139803D183F41BF
-:4006400048044A0858405C80600362406701698080048502872088018A018B018C808E018F84901A912C92409334948095419633978A983199419A849B0C9C029E519F4169
-:40068000A148A280A454A624A780AB40AD40AE40AF01B302C0FEC2FFC4BCCAF0CCFACEF9D618D818E004E4C0E622E820EA05000201030402050308020B080D030E0210020D
-:4006C000130314021503180819031A011C101F03201C22032302240326042701280229032C022F04310F330F350F361F3E40580459045C905F0180F282048301840A860528
-:40070000870188138AE08B018D018ED390139101922095019A129B019F01A001A208A301A412A680A701A812AA40AB01AF01B0F0B207B408B501BA08BE10BF10D804D904F6
-:40074000DB04DC09DF0100800120021003A004820504070808010A210B080E44104411401220132014101518164019401C401D051E44201021102202232024082704288493
-:400780002B212C822E2430403211330835113748382039023B883DA63F10444047016C016D806F02840485018708880889108AA28B088D018F059020910C932494C0957116
-:4007C0009636970898A199309AA49B089C4A9D019E019F46A082A119A414A540A624A702A840AB80AC20AF08B005B340B440C0FFC25FC47FCAFFCCFFCEFFE080E245E67024
-:40080000EA60ECA000040203060108010A040C030E0411011202130E150E16011701190C1A011D031E011F08220126012A012E0134073508370739803E103F50402149FFC2
-:400840004AFF4BFF50045601580459045A045B045D095F0160806240644065648101820183088406853187C2887F8D0A8E018F0592049406972298569A219C409D809E0606
-:400880009F33A011A133A226A340A407A608A806AA78AB10ADF2AE02AF04B108B27FB308B5F0B707BB80BE04BF05D804D904DC90DF010028010102010448074808010A2285
-:4008C0000B080C880E040F4010401140122013101504160A170118201F10200421442206234825A0280829012B0232043340350136103748380639A03B103D023E0245A070
-:400900006C066D266F817488751076288110820287048C808D208E8090029488951C961497409A049C0E9D019E0A9F4FA108A210A488A540A604A801A921AF20B080B101A6
-:40094000B340B620C0FFC2FFC4FFCA0DCCFACE0BD030E010E410E602E820ECC00002023803070504071009040A400B080D020E070F181034111F12081404163017201838E7
-:400980001A011C3F1F18211822282301240826102918367F373F580459045C995F0180058102820A8601880B8A048B018C0C8E03920196019A019E01A103A201A601AA0119
-:4009C000AE01B202B401B60CB703BE50C201C60EC804C9FFCAFFCBFFCF83D804D90BDA04DB04DC99DD09DF0101800344048805110708080809600A020B400C880D010E0490
-:400A00001040130814401504160A170119801D801E201F202301240329112F40308032013304388039183B013E21458057405D805E185F026484650867017C0282048340AD
-:400A40008408850886018908C0FBC2FFC4FCCA85CC0BCEAFD010D6F0D8F0DE80E420E684013F0208063F07020A3F0B100C3F0D01103F13081602173F1A101B201D3F1E3FE1
-:400A8000203F233F253F26042A202B3F2C012F04323F373F3E043F404003450E47C0482149FF4AFF4BFF50045601580459045A045B045D095F0162C082028A048E0190010F
-:400AC00095019601970298019C01AA01AC01AD02AF01B102B407B501B922BA20BF11D804D904DB04DC09DF010101020A032004200542084009080A880D840E48100813455F
-:400B00001510160118201D101E081F2021402488284829442C0231803259370439203A093B404010411043104A2051016203681C69016A2A6B126D806E406F027001714CBB
-:400B40007208735580418302840485408A818B068D198E208F10901091189408958396409755984899029B049D419E089F12A002A180A20AA414A540A680A722A914AA01A0
-:400B8000B109B340B404B604C0DFC2FFC4CFCA1FCC4FCE0FD002E214E40FEA05EE020102050209020E030F06100211021201150117041902200421022401250226022B0300
-:400BC0002D033104320434023503360138A03E543F11580459045B045F018037814883208430860C87018A628B018C378F04901391019248954896119710983799019C374E
-:400C00009D409F30A037A349A637A702A837A949AD49AE37B00FB340B507B670B738BB20BE41D804D904DB04DC90DF010080028003280701080809800A640B020C0210600B
-:400C4000112012021680170419021B401D181F802010211022542404274028412A102B102D112E082F023254330236083712398A3B103C083F51640167026B016C026F040C
-:400C80008110881089108C04911892049302941095019660975598409A909D419E099F52A060A20EA318A404A544A680A7E0A821A904AC41AD10B001B110B310B410C08F69
-:400CC000C21FC43FCAFFCCEFCEFFE080E210E404EA03EE290008030106020A080C080F021101120F1403160C18081C0F1F0120012408270428082C04300F310739023E0196
-:400D0000580459045B045C905F0182028303848F850386108A088B088D108E0192049304940E9503982E9AC19B019C7F9D03A021A103A2CEA601A702A80EA903AA70AE0E87
-:400D4000AF03B10FB27FB30FB480B510BE14BF10C026C602C804C9FFCAFFCBFFCD20CEF0D110D804D904DA04DB04DC90DD09DF01E108E240E340E480E640E7400010022159
-:400D8000038005AE08010A210B080D020E271090124A130314081502162518241F022008210A22082480274028202A422B042F1030203184330235013740382039823B08AE
-:400DC0003D803F024004480451405C406A807A087B04886089018A108D518F10905A912E93289480955196A497C0980199019A019B0A9C489DA09E109F40A040A1C0A2329F
-:400E0000A301A410A504A60DA74CA902AB02AD02AE12B180B220B301B710C0FFC2FFC4FFCA4FCC9FCE9FD004D204D610E080E4A4E8A0EC40013D03C0050C074009800D80F7
-:400E400011801580180219801C021F0321302580280129A92D563202340135FF3A083E103F105608580459045B045C095D905F01803E8113832085058640883089058C0426
-:400E80008D108E30900191059408952C9620970299059A0E9C089D089E109F02A10FA310A630A705A830A905AA02AD05B001B47EB73FBE01BF40D804D904DB04DC09DF0169
-:400EC000048A070809600C020D040E080F0210081504171019181A201B041E081F0121202540282029802A012B042C802D202E802F20302131883410350A374039603B09B6
-:400F00003C803E2758805E805F20600268086A406C0278027A4082408368841085128740881089A88A058B408C808D448EA48F80908A912C93099550962597C298219A019D
-:400F40009B389C109D1A9E26A0E0A188A301A410A504A604A788A908AA08AB01B1A0B320B420B740C0F0C2F3C462CAFFCCFFCEFFD638D808E060E280E4F0E860ECE4EE029E
-:400F80001B011F0831103308350836803B4081088340C630CCF0CE10E220E6203010320137143A083F80860197409D10A340AE80AF01CCF0CE60E640518057208D109740C9
-:400FC0009C109D109E089F14D46082408320841097409C109E08A580A720AB14E220E660EAA0150880408904C404E6015D0284809440D60118408140824094409C809D02DB
-:40100000C60808800B200F818201871089028C109580964097019C809D02A740AB41C20FE001E20826808A808D80924097409A109E08A580B210C82056105A4079807F02B2
-:40104000814083028E0892409A109E08AF40D4C0DC80DE20E2A0EE40041008020D400E401F10538056805820620181028E808F809410958096409A01C001C20DC601D4077D
-:40108000D802E002E40875028C0298029902A820AF10DE04E208010109010B010D010F0111011B011D0100FF01AB020211050000BF0000A09F001F00000000000000000097
-:4010C000100000004000000000000000C0000000FF0000B8470047000001000080000000800080000000000000030300030000002700180127001801000400000005000088
+:400000000145004008520040015B0040016400400103014008050140440601404807014051080140520901404B0A01404E0B0140650C0140450D0140580E0140350F0140DA
+:40004000471401405B150140221701403F18014056190140481A0140561B01400A4001400E4101400E420140084301400244014009450140064601400B4701400F48014016
+:4000800011490140174C0140094D014007500140045101407E0208020901100211821902601661157C4027212D0AE21029022B4088408CA88E808F05E628EA08003F032039
+:4000C0000538062007010A380B200E070F3811041220131016201707183819021A011B381C041D041E101F082220232024042608272028022A382B202D3F2E20353F363F03
+:40010000580459045B045C995F01822086208A078C3F910292209438950196019A209C049E10A220A404A608A802AA38AE38B102B301B43FBF05D608D804D904DB04DC0965
+:40014000DD90DF01012A030205490604082009080A010B800C100D040E010F801210136114021690172019301D402040220427042C042D082F4232083301358036023724A4
+:400180003D043E203F815A605B08600862486A806C046D8085108728880689018B408C0891089301960898A099029AA0A008A344A440A540AB40AD04AE20B140B204C0FFAF
+:4001C000C2FFC4FFCAF0CCF3CEF0D60ED80EE20BEA0CEE20020206040760080C09070A200B100C800D770E0C10FF112013101403152016FC1A081B071C0C1E101F08200CD3
+:40020000210122402306240125012602270229012A022B042C0C2D012EF1310F334036FF37303B803E40580459045B045C905F0181108204860489148A078B218C078D7F65
+:40024000920495099604981899019A029B0E9D089E109F01A008A604A750A909AA01AD01AE04AF22B21FB330B50FB740BE04D804D904DC90DF01009001010310040A052049
+:400280000701081009100A820B200E420F141190120A13091404150A174019041D402019211822102308250126842741280829082A802C882E042F02325033043540360469
+:4002C0003721381139403E403F186C026D40850888048B088D088E048F04908A910A9244933494309531980499309A049B309C109E80A088A203A302A446A509A680A70142
+:40030000AB10AD20B020C0FFC2FFC4FFCAFECCFECE7DE040E229E680E88000010104033909051120160119341B0A1D0528022904311033203401350C360237033E503F047C
+:40034000580459045B045C905F018077831186E4871188168A218B778D778E1490119288930E96779A149BE19E14A214A410A511A642A744A911AA14AB22AC01AD11AE0EF7
+:40038000AF88B10FB20FB3F0B4F0BA28BB0AC006C60EC70CC814C9FFCAFFCBFFD004D601D804D904DA04DB04DC99DD09DF01E2C0000104A406800A200C020D180F02120442
+:4003C00014121501171019401B101C041D341F1020012104221923202480260227102B042C122D1032513602371038013B103C983F024F2057845C205D806AC06B016C893C
+:400400006D806E046F027649878088848C028D148E0290089102931494029508964499A09A049D409E499F21A201A488A541A688A702AE40C0F8C2F4C4F2CA74CCADCEF509
+:40044000D220D630E250E610EA08EE02004001120220047E0512083E09080A400B130D121112120114401610184019111A081C401E041F02230424802710288029122A7E0E
+:400480002C402D182E0231083310350736FF39203E403F05580459045C905F01808081248204852486048804891A8A208BE48E0290FF916C93809404950A9610971098035A
+:4004C00099249AFC9D409E029F84A004A208A301A404A524A6F9A801A924AA02AC04AE40AF10B1F9B2FFB307B90ABE04C035C702C810C9FFCAFFCBFFCD20CEF0D110D80495
+:40050000D904DA04DC90DD09DF01E108E240E340E480E640E74000040120028103400402062809480A680C880E440F801102120813441603173819081F802101220623502F
+:40054000249C26102708281029202B422D202E402FA0329A3410369139013B143D033E203F5440104940520483018C4093069408950A9644975099A09D089E429F59A108DA
+:40058000A201A320A488A501A6CAA702C07FC2FFC4EFCAFFCCBFCEF7D002D208E210E404004001010280030E04020501060C07040872090F0A800C080E041080122014047E
+:4005C0001608170F18101C101D011F022010210F24102710280E29012AF02B082D012E0134FF351F3820580459045C995F018201831086108708881089078BF88C1F8DFF45
+:4006000090409118934094099612970799189A069B209C109D809E089F18A010A118A3E0A40CA501A601A706A901AA20AB02AD01AE10AF04B040B238B3FFB407B638BE018F
+:40064000BF04D608D804D904DB04DC09DD90DF010120028003120408052006410701080409800B440C020E0A0F10110212011318150A176019201D881E0A1FA12304272093
+:40068000280429082A012B022C0C2D042E042F82308032083520368A39043A023B103D023E403F145E8065806C02C0FFC2FFC4FFCAFFCCFACEF7D610D810000A080D0F01A1
+:4006C00012051C011D04201029012D02301031033403360C37043E013F40420345E0480249FF4AFF4BFF4F83580A59045A045B045C995D095F01801182888320840185381E
+:40070000860E870188108A228B208E148F20913F921495049614970899029A049B389EE49F07A214A338A477A720AA77AB20AC16AD04AE41AF10B13FB20FB4F0B6F0BAA8F4
+:40074000D804D904DC99DF010120024005050602070809020A020C080E010F8811021525160119201A021B021D041E011F60204021022280274029202A442B202C0A2E028D
+:400780002F2032403501376838403D053E203F804108484059125B44608061646B017808810186018810892C8B208D0291219280950496029780988899519A639B2C9C104A
+:4007C0009E049F01A00AA344A440A508A680A702A802AA01AD88AE02AF08B201B440B640C0FAC2F9C4F8CAFCCCF8CEF8D002D60FD80FDE02E008E212E609EA0CEE0A8202FC
+:40080000869087028A01904091219280950496419780988899519A609B249C109D889E149F01A008A344A440A508A602A901AB02B404B610E008E243E408E614E840EA0CDF
+:40084000EE08021006040A040E041007150216071A021E041F0120082104260428182A012D072E0433043502361F37013E40580459045B045C905F018101822085F1862038
+:4008800088048A018B448C018E028F22900191CC923E932295AA962097449A109E20A240A311A620AA08AC7FAD88B03FB50FB640B7F0D608D804D909DB04DC99DD90DF01DE
+:4008C00000900101031004820510071009500A800B200D290F221002120813091488160217281A821B011F802305242225302608272429012A402C022F80300833013480CD
+:40090000350439503B0558405D80624069506A106E807B04815085808720884089208B408E108F20909091209320942095019682970199149B189C089E809F04A002A1482A
+:40094000A30CA440A510A608A701A802B708C0FFC2FFC4FFCA99CC53CE0FD618D808DE04E240E408E690E810EA08EE0802010320070708100B200E020F20100C11FF1202C4
+:400980001504160417901B201D041F48200821F823012401250227F8280A2A042B382F20300F31E03210333F340E3E14580459045B045C995F0182078404860889068A20DB
+:4009C0008B098D098E388F06903F940296389A209E209F0CA220A404A610AA20AC38AE01B104B308B501B63FB702B9AABF55D608D804D904DB04DC09DD90DF01014203085E
+:400A00000481051007200A900C020D100F2210081240130415011794190B1B201C011F8020A021052380240825042682288029102B11308233143640388039293D904080E9
+:400A4000410142805F40640268086A806B016D90800285018682885089018A028C048D048F809080916092109344950399109A409B349D099E829F01A082A240A319A44806
+:400A8000A720A920AC80AE08AF01B080B108C0FBC2FCC4FECA0FCC1FCE3FD610D810E080E270E6A0E860EE421B011F0831103308368037023B40C630CCF0CE103002338003
+:400AC000358037043B083D808F0297409D109F02AE80AF01CCF0CE60500857108704894097489D109F04A402A540A780AD80D460E610EA10830497409D109F04A402A790B8
+:400B0000B008E2801420C4045F80630883048F889820D604D802E208E4081B0898209C06A708AC06C608080809200C040F01830186018D0898209C06C20FE4082680838010
+:400B40008D108E0297409D10A680A710AC02AF80B680C820E620EA10EE105202538078407D80844085408F10A202A380A710AF40D4A0DC80DE20E240E610EE40052008023A
+:400B80000E411F105280550858406302870188208920960198209C02A108AC08AD20C001C20DC601D407D602E20577108F10AF10B040B6C0DE04E402E803EE0201010B01AE
+:400BC0000D010F0111011B011D0100FF01AB020211050000BF0000A09F001F000000000000000000100000004000000000000000C0000000FF0000B8470047000001000053
+:400C0000800000028200820000000000000303000300000027001801270018010004000000050000000000000000000000000000000000000000000000000000000000009C
+:400C40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000074
+:400C80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000034
+:400CC00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F4
+:400D000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B3
+:400D40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000073
+:400D80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000033
+:400DC00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F3
+:400E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B2
+:400E40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000072
+:400E80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000032
+:400EC00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F2
+:400F000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B1
+:400F40000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000071
+:400F80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031
+:400FC00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F1
+:4010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B0
+:401040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000070
+:401080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030
+:4010C00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F0
 :4011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AF
 :40114000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F
 :40118000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002F
@@ -4615,12 +4615,12 @@
 :0200000490105A
 :04000000BC90ACAF55
 :0200000490303A
-:02000000C51623
+:020000004415A5
 :0200000490402A
 :4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C0
 :400040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080
 :400080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040
 :4000C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 :0200000490501A
-:0C00000000012E16106900002E31D57F83
+:0C00000000012E16106900002E30547E06
 :00000001FF
--- a/FluxEngine.cydsn/FIFOout/FIFOout.v
+++ b/FluxEngine.cydsn/FIFOout/FIFOout.v
@@ -20,33 +20,34 @@ module FIFOout (
 wire [7:0] po;
 assign d = po;

-localparam STATE_WAIT = 1'b0;
-localparam STATE_READ = 1'b1;
+localparam STATE_WAITFORREQ = 0;
+localparam STATE_READFROMFIFO = 1;
+localparam STATE_WAITFORNREQ = 2;

-reg state;
-reg oldreq;
+reg [1:0] state;
+wire readfromfifo;

-assign ack = (state != STATE_READ);
+assign ack = (state == STATE_WAITFORNREQ);
+assign readfromfifo = (state == STATE_READFROMFIFO);

 always @(posedge clk)
 begin
    case (state)
-        STATE_WAIT:
+        /* opcode is not valid; req is low; wait for req to go high. */
+        STATE_WAITFORREQ:
        begin
-            if (!empty)
-            begin
-                if (req && !oldreq)
-                begin
-                    state <= STATE_READ;
-                end
-                oldreq <= req;
-            end
+            if (!empty && req)
+                state <= STATE_READFROMFIFO;
        end
        
-        STATE_READ:
-        begin
-            state <= STATE_WAIT;
-        end
+        /* Fetch a single value from the FIFO. */
+        STATE_READFROMFIFO:
+            state <= STATE_WAITFORNREQ;
+            
+        /* opcode is valid; ack is high. Wait for req to go low. */
+        STATE_WAITFORNREQ:
+            if (!req)
+                state <= STATE_WAITFORREQ;
    endcase
 end
            
@@ -55,11 +56,11 @@ cy_psoc3_dp #(.cy_dpconfig(
    `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0,
    `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE,
    `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA,
-    `CS_CMP_SEL_CFGA, /*CFGRAM0: STATE_WAITFORREQ*/
+    `CS_CMP_SEL_CFGA, /*CFGRAM0: idle */
    `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0,
    `CS_SHFT_OP_PASS, `CS_A0_SRC___F0, `CS_A1_SRC_NONE,
    `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA,
-    `CS_CMP_SEL_CFGA, /*CFGRAM1: STATE_LOAD*/
+    `CS_CMP_SEL_CFGA, /*CFGRAM1: read from fifo */
    `CS_ALU_OP_PASS, `CS_SRCA_A0, `CS_SRCB_D0,
    `CS_SHFT_OP_PASS, `CS_A0_SRC_NONE, `CS_A1_SRC_NONE,
    `CS_FEEDBACK_DSBL, `CS_CI_SEL_CFGA, `CS_SI_SEL_CFGA,
@@ -102,7 +103,7 @@ cy_psoc3_dp #(.cy_dpconfig(
 )) dp(
        /*  input                   */  .reset(1'b0),
        /*  input                   */  .clk(clk),
-        /*  input   [02:00]         */  .cs_addr({2'b0, state}),
+        /*  input   [02:00]         */  .cs_addr({2'b0, readfromfifo}),
        /*  input                   */  .route_si(1'b0),
        /*  input                   */  .route_ci(1'b0),
        /*  input                   */  .f0_load(1'b0),
--- a/FluxEngine.cydsn/FluxEngine.cydwr
+++ b/FluxEngine.cydsn/FluxEngine.cydwr
@@ -848,15 +848,18 @@
      <Data key="efd5f185-0c32-4824-ba72-3ceb5356f5a7" value="Clock_1" />
    </Group>
    <Group key="Pin">
+      <Data key="3e1862bb-be82-47b0-9549-7ebfe76b6f7b" value="Pin_2" />
      <Data key="4a398466-709f-4228-9500-96178658e13e" value="RDATA" />
      <Data key="5a3407c1-b434-4438-a7b4-b9dfd2280495" value="MOTEA" />
      <Data key="8d318d8b-cf7b-4b6b-b02c-ab1c5c49d0ba" value="SW1" />
+      <Data key="8fc20a4f-e4d1-44b3-a5d4-546e8628d61e" value="LED" />
      <Data key="12e00eac-69b5-4717-85c8-25ef6b224d4c" value="DEBUG_PINS" />
      <Data key="41e2d8ed-5494-4d8c-8ff7-f4f789cece51" value="REDWC" />
      <Data key="264be2d3-9481-494b-8d9c-c1905a45e9cc" value="FDD" />
      <Data key="472f8fdb-f772-44fb-8897-cc690694237b" value="WDATA" />
      <Data key="736cb12b-c863-43d4-a8f0-42f06023f8b5" value="SIDE1" />
      <Data key="4249c923-fcff-453b-8629-bec6fddd00c1" value="STEP" />
+      <Data key="27315b0e-6a8c-4b7f-be77-73ab434fa803" value="Pin_1" />
      <Data key="1425177d-0d0e-4468-8bcc-e638e5509a9b" value="UartRx" />
      <Data key="a5d987c6-e45b-45b9-ad93-656fab06d720" value="TRK00" />
      <Data key="a93ef5b3-00f4-42c0-8fad-0e275a7e2537" value="MOTEB" />
@@ -3962,6 +3965,11 @@
    </Group>
  </Group>
  <Group key="Pin2">
+    <Group key="3e1862bb-be82-47b0-9549-7ebfe76b6f7b">
+      <Group key="0">
+        <Data key="Port Format" value="0,6" />
+      </Group>
+    </Group>
    <Group key="4a398466-709f-4228-9500-96178658e13e">
      <Group key="0">
        <Data key="Port Format" value="1,5" />
@@ -3977,6 +3985,11 @@
        <Data key="Port Format" value="2,2" />
      </Group>
    </Group>
+    <Group key="8fc20a4f-e4d1-44b3-a5d4-546e8628d61e">
+      <Group key="0">
+        <Data key="Port Format" value="2,1" />
+      </Group>
+    </Group>
    <Group key="12e00eac-69b5-4717-85c8-25ef6b224d4c">
      <Group key="0">
        <Data key="Port Format" value="2,2" />
@@ -4058,6 +4071,11 @@
        <Data key="Port Format" value="1,0" />
      </Group>
    </Group>
+    <Group key="27315b0e-6a8c-4b7f-be77-73ab434fa803">
+      <Group key="0">
+        <Data key="Port Format" value="0,7" />
+      </Group>
+    </Group>
    <Group key="1425177d-0d0e-4468-8bcc-e638e5509a9b">
      <Group key="0">
        <Data key="Port Format" value="12,6" />
--- a/FluxEngine.cydsn/FluxEngine.cyprj
+++ b/FluxEngine.cydsn/FluxEngine.cyprj
@@ -39,20 +39,6 @@
 <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="crunch.c" persistent="..\lib\common\crunch.c">
-<Hidden v="False" />
-</CyGuid_31768f72-0253-412b-af77-e7dba74d1330>
-<build_action v="SOURCE_C;;;;" />
-<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="crunch.h" persistent="..\lib\common\crunch.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>
@@ -2762,6 +2748,105 @@
 </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="LED" 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="LED_aliases.h" persistent="Generated_Source\PSoC5\LED_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="LED.c" persistent="Generated_Source\PSoC5\LED.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="LED.h" persistent="Generated_Source\PSoC5\LED.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>
+<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="Pin_2" persistent="">
+<Hidden v="True" />
+</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="Pin_2_aliases.h" persistent="Generated_Source\PSoC5\Pin_2_aliases.h">
+<Hidden v="True" />
+</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="Pin_2.c" persistent="Generated_Source\PSoC5\Pin_2.c">
+<Hidden v="True" />
+</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="Pin_2.h" persistent="Generated_Source\PSoC5\Pin_2.h">
+<Hidden v="True" />
+</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>
+<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="Pin_1" persistent="">
+<Hidden v="True" />
+</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="Pin_1_aliases.h" persistent="Generated_Source\PSoC5\Pin_1_aliases.h">
+<Hidden v="True" />
+</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="Pin_1.c" persistent="Generated_Source\PSoC5\Pin_1.c">
+<Hidden v="True" />
+</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="Pin_1.h" persistent="Generated_Source\PSoC5\Pin_1.h">
+<Hidden v="True" />
+</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>
@@ -3347,6 +3432,6 @@
 </ignored_deps>
 </CyGuid_495451fe-d201-4d01-b22d-5d3f5609ac37>
 <boot_component v="" />
-<current_generation v="84" />
+<current_generation v="150" />
 </CyGuid_fec8f9e8-2365-4bdb-96d3-a4380222e01b>
 </CyXmlSerializer>
--- a/FluxEngine.cydsn/Sampler/Sampler.v
+++ b/FluxEngine.cydsn/Sampler/Sampler.v
@@ -19,113 +19,78 @@ module Sampler (

 //`#start body` -- edit after this line, do not edit this line

-localparam STATE_RESET = 0;
-localparam STATE_WAITING = 1;
-localparam STATE_INTERVAL = 2;
-localparam STATE_DISPATCH = 3;
-localparam STATE_OPCODE = 4;
-localparam STATE_COUNTING = 5;
+localparam STATE_WAITING = 0;
+localparam STATE_OPCODE = 1;

-reg [2:0] state;
-wire [6:0] counter;
-
-wire countnow;
-assign countnow = (state == STATE_COUNTING);
-
-wire counterreset;
-assign counterreset = (state == STATE_INTERVAL) || (state == STATE_OPCODE);
-
-SuperCounter #(.Delta(1), .ResetValue(0)) Counter
-(
-    /* input */ .clk(clock),
-    /* input */ .reset(counterreset),
-    /* input */ .count(countnow),
-    /* output */ .d(counter)
-);
+reg [0:0] state;
+reg [5:0] counter;

 reg oldsampleclock;
-wire sampleclocked;
-assign sampleclocked = !oldsampleclock && sampleclock;
-
 reg oldindex;
-wire indexed;
-assign indexed = !oldindex && index;
-
-wire rdataed;
 reg oldrdata;
-assign rdataed = !oldrdata && rdata;

-assign req = (state == STATE_INTERVAL) || (state == STATE_OPCODE);
+reg sampleclocked;
+reg indexed;
+reg rdataed;
+
+assign req = (state == STATE_OPCODE);

 always @(posedge clock)
 begin
    if (reset)
    begin
-        state <= STATE_RESET;
+        state <= STATE_WAITING;
        opcode <= 0;
+        sampleclocked <= 0;
+        indexed <= 0;
+        rdataed <= 0;
        oldsampleclock <= 0;
        oldindex <= 0;
        oldrdata <= 0;
+        counter <= 0;
    end
    else
+    begin
+        /* Remember positive egdes for sampleclock, index and rdata. */
+        
+        if (sampleclock && !oldsampleclock)
+            sampleclocked <= 1;
+        oldsampleclock <= sampleclock;
+        
+        if (index && !oldindex)
+            indexed <= 1;
+        oldindex <= index;
+        
+        if (rdata && !oldrdata)
+            rdataed <= 1;
+        oldrdata <= rdata;
+        
        case (state)
-            STATE_RESET:
-                state <= STATE_WAITING;
-            
            STATE_WAITING:
            begin
-                if (rdataed || indexed)
+                if (sampleclocked)
                begin
-                    opcode <= {0, counter};
-                    state <= STATE_INTERVAL;
-                end
-                else if (sampleclocked)
-                begin
-                    oldsampleclock <= 1;
-                    if (counter == 7'h7f)
+                    if (rdataed || indexed || (counter == 6'h3f))
                    begin
-                        opcode <= {0, counter};
+                        opcode <= {rdataed, indexed, counter};
+                        rdataed <= 0;
+                        indexed <= 0;
+                        counter <= 1; /* remember to count this tick */
                        state <= STATE_OPCODE;
                    end
                    else
-                        state <= STATE_COUNTING;
+                        counter <= counter + 1;
+                        
+                    sampleclocked <= 0;
                end
-                
-                if (oldrdata && !rdata)
-                    oldrdata <= 0;
-                if (oldindex && !index)
-                    oldindex <= 0;
-                if (oldsampleclock && !sampleclock)
-                    oldsampleclock <= 0;
            end
            
-            STATE_INTERVAL: /* interval byte sent here; counter reset */
-                state <= STATE_DISPATCH;
-                
-            STATE_DISPATCH: /* relax after interval byte, dispatch for opcode */
+            STATE_OPCODE: /* opcode sent here */
            begin
-                if (rdataed)
-                begin
-                    oldrdata <= 1;
-                    opcode <= 8'h80;
-                    state <= STATE_OPCODE;
-                end
-                else if (indexed)
-                begin
-                    oldindex <= 1;
-                    opcode <= 8'h81;
-                    state <= STATE_OPCODE;
-                end
-                else
-                    state <= STATE_WAITING;
+                state <= STATE_WAITING;
            end
-            
-            STATE_OPCODE: /* opcode byte sent here */
-                state <= STATE_WAITING;
-                            
-            STATE_COUNTING:
-                state <= STATE_WAITING;
        endcase
+    end
 end

 //`#end` -- edit above this line, do not edit this line
--- a/FluxEngine.cydsn/Sequencer/Sequencer.v
+++ b/FluxEngine.cydsn/Sequencer/Sequencer.v
@@ -18,21 +18,16 @@ module Sequencer (

 //`#start body` -- edit after this line, do not edit this line

-localparam STATE_IDLE = 0;
-localparam STATE_LOAD = 1;
-localparam STATE_WAITING = 2;
-localparam STATE_PULSING = 3;
-localparam STATE_INDEXING = 4;
+localparam STATE_LOAD = 0;
+localparam STATE_WRITING = 1;

-localparam OPCODE_PULSE = 8'h80;
-localparam OPCODE_INDEX = 8'h81;
+reg state;
+reg [5:0] countdown;
+reg pulsepending;

-reg [2:0] state;
-reg [6:0] countdown;
-
-assign req = (state == STATE_LOAD);
-assign wdata = (state == STATE_PULSING);
-assign debug_state = state;
+assign req = (!reset && (state == STATE_LOAD));
+assign wdata = (!reset && (state == STATE_WRITING) && (countdown == 0) && pulsepending);
+assign debug_state = 0;

 reg olddataclock;
 wire dataclocked;
@@ -40,9 +35,7 @@ always @(posedge clock) olddataclock <= dataclock;
 assign dataclocked = !olddataclock && dataclock;

 reg oldsampleclock;
-wire sampleclocked;
-always @(posedge clock) oldsampleclock <= sampleclock;
-assign sampleclocked = !oldsampleclock && sampleclock;
+reg sampleclocked;

 reg oldindex;
 wire indexed;
@@ -53,48 +46,43 @@ always @(posedge clock)
 begin
    if (reset)
    begin
-        state <= STATE_IDLE;
+        state <= STATE_LOAD;
        countdown <= 0;
+        pulsepending <= 0;
+        oldsampleclock <= 0;
    end
    else
+    begin
+        if (!oldsampleclock && sampleclock)
+            sampleclocked <= 1;
+        oldsampleclock <= sampleclock;
+            
        case (state)
-            STATE_IDLE:
-                state <= STATE_LOAD;
-            
            STATE_LOAD:
+            begin
+                /* A posedge on dataclocked indicates that another opcode has
+                 * arrived. */
                if (dataclocked)
-                    case (opcode)
-                        OPCODE_PULSE:
-                            state <= STATE_PULSING;
-                        
-                        OPCODE_INDEX:
-                            state <= STATE_INDEXING;
-                        
-                        default:
-                        begin
-                            countdown <= opcode[6:0];
-                            state <= STATE_WAITING;
-                        end
-                    endcase
+                begin
+                    pulsepending <= opcode[7];
+                    countdown <= opcode[5:0] - 1; /* compensate for delay in last tick */
+                    state <= STATE_WRITING;
+                end
+            end
            
-            STATE_WAITING:
+            STATE_WRITING:
+            begin
                if (sampleclocked)
                begin
                    if (countdown == 0)
                        state <= STATE_LOAD;
                    else
                        countdown <= countdown - 1;
+                    sampleclocked <= 0;
                end
-            
-            STATE_PULSING:
-                state <= STATE_LOAD;
-            
-            STATE_INDEXING:
-                if (indexed)
-                    state <= STATE_LOAD;
-                else
-                    state <= STATE_INDEXING;
+            end
        endcase
+    end
 end

 //`#end` -- edit above this line, do not edit this line
--- a/FluxEngine.cydsn/TopDesign/TopDesign.cysch
+++ b/FluxEngine.cydsn/TopDesign/TopDesign.cysch
--- a/FluxEngine.cydsn/main.c
+++ b/FluxEngine.cydsn/main.c
@@ -5,7 +5,6 @@
 #include <setjmp.h>
 #include "project.h"
 #include "../protocol.h"
-#include "../lib/common/crunch.h"

 #define MOTOR_ON_TIME 5000 /* milliseconds */
 #define STEP_INTERVAL_TIME 6 /* ms */
@@ -17,6 +16,9 @@
 #define STEP_TOWARDS0 1
 #define STEP_AWAYFROM0 0

+static bool drive0_present;
+static bool drive1_present;
+
 static volatile uint32_t clock = 0; /* ms */
 static volatile bool index_irq = false;

@@ -26,7 +28,7 @@ static bool homed = false;
 static int current_track = 0;
 static struct set_drive_frame current_drive_flags;

-#define BUFFER_COUNT 16
+#define BUFFER_COUNT 64 /* the maximum */
 #define BUFFER_SIZE 64
 static uint8_t td[BUFFER_COUNT];
 static uint8_t dma_buffer[BUFFER_COUNT][BUFFER_SIZE] __attribute__((aligned()));
@@ -41,6 +43,8 @@ static volatile bool dma_underrun = false;
 #define DECLARE_REPLY_FRAME(STRUCT, TYPE) \
    STRUCT r = {.f = { .type = TYPE, .size = sizeof(STRUCT) }}

+static void stop_motor(void);
+
 static void system_timer_cb(void)
 {
    CyGlobalIntDisable;
@@ -103,7 +107,10 @@ static void print(const char* msg, ...)
 static void set_drive_flags(struct set_drive_frame* flags)
 {
    if (current_drive_flags.drive != flags->drive)
+    {
+        stop_motor();
        homed = false;
+    }
    
    current_drive_flags = *flags;
    DRIVESELECT_REG_Write(flags->drive ? 2 : 1); /* select drive 1 or 0 */
@@ -142,6 +149,12 @@ static void wait_until_writeable(int ep)
        ;
 }

+static void wait_until_readable(int ep)
+{
+    while (USBFS_GetEPState(ep) != USBFS_OUT_BUFFER_FULL)
+        ;
+}
+
 static void send_reply(struct any_frame* f)
 {
    print("reply 0x%02x", f->f.type);
@@ -159,9 +172,15 @@ static void send_error(int code)
 /* buffer must be big enough for a frame */
 static int usb_read(int ep, uint8_t buffer[FRAME_SIZE])
 {
+    if (USBFS_GetEPState(ep) != USBFS_OUT_BUFFER_FULL)
+    {
+        USBFS_EnableOutEP(ep);
+        wait_until_readable(ep);
+    }
+
    int length = USBFS_GetEPCount(ep);
    USBFS_ReadOutEP(ep, buffer, length);
-    while (USBFS_GetEPState(ep) == USBFS_OUT_BUFFER_FULL)
+    while (USBFS_GetEPState(ep) != USBFS_OUT_BUFFER_EMPTY)
        ;
    return length;
 }
@@ -183,19 +202,19 @@ static void step(int dir)
    CyDelay(STEP_INTERVAL_TIME);
 }

-static void home(void)
+/* returns true if it looks like a drive is attached */
+static bool home(void)
 {
    for (int i=0; i<100; i++)
    {
        /* Don't keep stepping forever, because if a drive's
         * not connected bad things happen. */
        if (TRACK0_REG_Read())
-            break;
+            return true;
        step(STEP_TOWARDS0);
    }
    
-    /* Step to -1, which should be a nop, to reset the disk on disk change. */
-    step(STEP_TOWARDS0);
+    return false;
 }

 static void seek_to(int track)
@@ -278,12 +297,14 @@ static void cmd_measure_speed(struct any_frame* f)
    send_reply((struct any_frame*) &r);    
 }

-static void cmd_bulk_test(struct any_frame* f)
+static void cmd_bulk_write_test(struct any_frame* f)
 {
    uint8_t buffer[64];
    
    wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
    for (int x=0; x<64; x++)
+    {
+        CyWdtClear();
        for (int y=0; y<256; y++)
        {
            for (unsigned z=0; z<sizeof(buffer); z++)
@@ -292,11 +313,44 @@ static void cmd_bulk_test(struct any_frame* f)
            wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
            USBFS_LoadInEP(FLUXENGINE_DATA_IN_EP_NUM, buffer, sizeof(buffer));
        }
+    }
    
-    DECLARE_REPLY_FRAME(struct any_frame, F_FRAME_BULK_TEST_REPLY);
+    DECLARE_REPLY_FRAME(struct any_frame, F_FRAME_BULK_WRITE_TEST_REPLY);
    send_reply(&r);
 }

+static void cmd_bulk_read_test(struct any_frame* f)
+{
+    uint8_t buffer[64];
+    
+    bool passed = true;
+    for (int x=0; x<64; x++)
+    {
+        CyWdtClear();
+        for (int y=0; y<256; y++)
+        {
+            usb_read(FLUXENGINE_DATA_OUT_EP_NUM, buffer);
+            for (unsigned z=0; z<sizeof(buffer); z++)
+            {
+                if (buffer[z] != (uint8)(x+y+z))
+                {
+                    print("fail %d+%d+%d == %d, not %d", x, y, z, buffer[z], (uint8)(x+y+z));
+                    passed = false;
+                }
+            }
+        }
+    }
+
+    print("passed=%d", passed);
+    if (passed)
+    {
+        DECLARE_REPLY_FRAME(struct any_frame, F_FRAME_BULK_READ_TEST_REPLY);
+        send_reply(&r);
+    }
+    else
+        send_error(F_ERROR_INVALID_VALUE);
+}
+
 static void deinit_dma(void)
 {
    for (int i=0; i<BUFFER_COUNT; i++)
@@ -306,7 +360,7 @@ static void deinit_dma(void)
 static void init_capture_dma(void)
 {
    dma_channel = SAMPLER_DMA_DmaInitialize(
-        2 /* bytes */,
+        1 /* bytes */,
        true /* request per burst */, 
        HI16(CYDEV_PERIPH_BASE),
        HI16(CYDEV_SRAM_BASE));
@@ -334,7 +388,7 @@ static void cmd_read(struct read_frame* f)
    
    {
        uint8_t i = CyEnterCriticalSection();
-        SAMPLER_FIFO_SET_LEVEL_MID;
+        SAMPLER_FIFO_SET_LEVEL_NORMAL;
        SAMPLER_FIFO_CLEAR;
        SAMPLER_FIFO_SINGLE_BUFFER_UNSET;
        CyExitCriticalSection(i);
@@ -343,16 +397,15 @@ static void cmd_read(struct read_frame* f)
    wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
    init_capture_dma();

-    /* Wait for the beginning of a rotation. */
+    /* Wait for the beginning of a rotation, if requested. */
        
-    index_irq = false;
-    while (!index_irq)
-        ;
-    index_irq = false;
-    
-    crunch_state_t cs = {};
-    cs.outputptr = usb_buffer;
-    cs.outputlen = BUFFER_SIZE;
+    if (f->synced)
+    {
+        index_irq = false;
+        while (!index_irq)
+            ;
+        index_irq = false;
+    }
    
    dma_writing_to_td = 0;
    dma_reading_from_td = -1;
@@ -365,75 +418,67 @@ static void cmd_read(struct read_frame* f)
    /* Wait for the first DMA transfer to complete, after which we can start the
     * USB transfer. */

-    while ((dma_writing_to_td == 0) && !index_irq)
+    while (dma_writing_to_td == 0)
        ;
    dma_reading_from_td = 0;
+    bool dma_running = true;
    
    /* Start transferring. */

-    int revolutions = f->revolutions;
-    while (!dma_underrun)
+    uint32_t start_time = clock;
+    for (;;)
    {
        CyWdtClear();

-        /* Have we reached the index pulse? */
-        if (index_irq)
-        {
-            index_irq = false;
-            revolutions--;
-            if (revolutions == 0)
-                break;
-        }
+        /* If the sample session is over, stop reading but continue processing until
+         * the DMA chain is empty. */
        
-        /* Wait for the next block to be read. */
-        while (dma_reading_from_td == dma_writing_to_td)
+        if ((clock - start_time) >= f->milliseconds)
        {
-            /* On an underrun, give up immediately. */
-            if (dma_underrun)
-                goto abort;
-        }
-
-        uint8_t dma_buffer_usage = 0;
-        while (dma_buffer_usage < BUFFER_SIZE)
-        {
-            cs.inputptr = dma_buffer[dma_reading_from_td] + dma_buffer_usage;
-            cs.inputlen = BUFFER_SIZE - dma_buffer_usage;
-            crunch(&cs);
-            dma_buffer_usage += BUFFER_SIZE - cs.inputlen;
-            count++;
-            if (cs.outputlen == 0)
+            if (dma_running)
            {
-                while (USBFS_GetEPState(FLUXENGINE_DATA_IN_EP_NUM) != USBFS_IN_BUFFER_EMPTY)
-                {
-                    if (index_irq || dma_underrun)
-                        goto abort;
-                }
-
-                USBFS_LoadInEP(FLUXENGINE_DATA_IN_EP_NUM, usb_buffer, BUFFER_SIZE);
-                cs.outputptr = usb_buffer;
-                cs.outputlen = BUFFER_SIZE;
+                CyDmaChSetRequest(dma_channel, CY_DMA_CPU_TERM_CHAIN);
+                while (CyDmaChGetRequest(dma_channel))
+                    ;
+                dma_running = false;
+                dma_underrun = false;
            }
        }
-        dma_reading_from_td = NEXT_BUFFER(dma_reading_from_td);
+        
+        /* If there's an underrun event, stop immediately. */
+        
+        if (dma_underrun)
+            goto abort;
+        
+        /* If there are no more blocks to be read, check to see if we've finished. */
+        
+        if (dma_reading_from_td == dma_writing_to_td)
+        {
+            /* Also if we've run out of blocks to send. */
+            
+            if (!dma_running)
+                goto abort;
+        }
+        else
+        {
+            /* Otherwise, there's a block waiting, so attempt to send it. */
+            
+            wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
+            USBFS_LoadInEP(FLUXENGINE_DATA_IN_EP_NUM, dma_buffer[dma_reading_from_td], BUFFER_SIZE);
+            count++;
+            dma_reading_from_td = NEXT_BUFFER(dma_reading_from_td);
+        }
    }
 abort:;
-    CyDmaChSetRequest(dma_channel, CY_DMA_CPU_TERM_CHAIN);
-    while (CyDmaChGetRequest(dma_channel))
-        ;
+    bool saved_dma_underrun = dma_underrun;

-    donecrunch(&cs);
+    /* Terminate the transfer (all transfers are an exact number of fragments). */
+    wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
+    USBFS_LoadInEP(FLUXENGINE_DATA_IN_EP_NUM, NULL, 0);
    wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
-    if (!dma_underrun)
-    {
-        if (cs.outputlen != BUFFER_SIZE)
-            USBFS_LoadInEP(FLUXENGINE_DATA_IN_EP_NUM, usb_buffer, BUFFER_SIZE-cs.outputlen);
-        wait_until_writeable(FLUXENGINE_DATA_IN_EP_NUM);
-    }
-    if ((cs.outputlen == BUFFER_SIZE) || (cs.outputlen == 0))
-        USBFS_LoadInEP(FLUXENGINE_DATA_IN_EP_NUM, NULL, 0);
    deinit_dma();

-    if (dma_underrun)
+    if (saved_dma_underrun)
    {
        print("underrun after %d packets");
        send_error(F_ERROR_UNDERRUN);
@@ -483,7 +528,7 @@ static void cmd_write(struct write_frame* f)
    SIDE_REG_Write(f->side);
    {
        uint8_t i = CyEnterCriticalSection();        
-        REPLAY_FIFO_SET_LEVEL_NORMAL;
+        REPLAY_FIFO_SET_LEVEL_MID;
        REPLAY_FIFO_CLEAR;
        REPLAY_FIFO_SINGLE_BUFFER_UNSET;
        CyExitCriticalSection(i);
@@ -492,22 +537,18 @@ static void cmd_write(struct write_frame* f)

    init_replay_dma();
    bool writing = false; /* to the disk */
-    bool finished = false;
    int packets = f->bytes_to_write / FRAME_SIZE;
+    bool finished = (packets == 0);
    int count_written = 0;
    int count_read = 0;
    dma_writing_to_td = 0;
    dma_reading_from_td = -1;
    dma_underrun = false;
-
-    crunch_state_t cs = {};
-    cs.outputlen = BUFFER_SIZE;
-    USBFS_EnableOutEP(FLUXENGINE_DATA_OUT_EP_NUM);
    
    int old_reading_from_td = -1;
    for (;;)
    {
-        CyWdtClear();
+        //CyWdtClear();

        /* Read data from USB into the buffers. */
        
@@ -516,54 +557,25 @@ static void cmd_write(struct write_frame* f)
            if (writing && (dma_underrun || index_irq))
                goto abort;
            
-            /* Read crunched data, if necessary. */
-            
-            if (cs.inputlen == 0)
+            uint8_t* buffer = dma_buffer[dma_writing_to_td];
+            if (finished)
            {
-                if (finished)
-                {
-                    /* There's no more data to read, so fake some. */
-                    
-                    for (int i=0; i<BUFFER_SIZE; i++)
-                        usb_buffer[i+0] = 0x7f;
-                    cs.inputptr = usb_buffer;
-                    cs.inputlen = BUFFER_SIZE;
-                }
-                else
-                {
-                    while (USBFS_GetEPState(FLUXENGINE_DATA_OUT_EP_NUM) != USBFS_OUT_BUFFER_FULL)
-                    {
-                        if (writing && (dma_underrun || index_irq))
-                            goto abort;
-                    }
-
-                    int length = usb_read(FLUXENGINE_DATA_OUT_EP_NUM, usb_buffer);
-                    cs.inputptr = usb_buffer;
-                    cs.inputlen = length;
-                    USBFS_EnableOutEP(FLUXENGINE_DATA_OUT_EP_NUM);
-
-                    count_read++;
-                    if ((length < FRAME_SIZE) || (count_read == packets))
-                        finished = true;
-                }
+                /* There's no more data to read, so fake some. */
+                
+                memset(buffer, 0x3f, BUFFER_SIZE);
            }
-            
-            /* If there *is* data waiting in the buffer, uncrunch it. */
-            
-            if (cs.inputlen != 0)
+            else
            {
-                cs.outputptr = dma_buffer[dma_writing_to_td] + BUFFER_SIZE - cs.outputlen;
-                uncrunch(&cs);
-                if (cs.outputlen == 0)
-                {
-                    /* Completed a DMA buffer; queue it for writing. */
-                    
-                    dma_writing_to_td = NEXT_BUFFER(dma_writing_to_td);
-                    cs.outputlen = BUFFER_SIZE;
-                }
+                (void) usb_read(FLUXENGINE_DATA_OUT_EP_NUM, buffer);
+                count_read++;
+                
+                if (count_read == packets)
+                    finished = true;
            }
+            dma_writing_to_td = NEXT_BUFFER(dma_writing_to_td);
+            
+            /* Once all the buffers are full, start writing. */
            
-            /* If we have a full buffer, start writing. */
            if ((dma_reading_from_td == -1) && (dma_writing_to_td == BUFFER_COUNT-1))
            {
                dma_reading_from_td = old_reading_from_td = 0;
@@ -578,7 +590,7 @@ static void cmd_write(struct write_frame* f)

                /* Wait for the index marker. While this happens, the DMA engine
                 * will prime the FIFO. */
-                
+
                index_irq = false;
                while (!index_irq)
                    ;
@@ -589,7 +601,7 @@ static void cmd_write(struct write_frame* f)
                SEQUENCER_CONTROL_Write(0); /* start writing! */
            }
        }
-        
+
        if (writing && (dma_underrun || index_irq))
            goto abort;

@@ -615,29 +627,25 @@ 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);
    if (!finished)
    {
-        while (count_read < packets)
+        /* There's still some data to read, so just read and blackhole it ---
+         * easier than trying to terminate the connection. */
+        while (count_read != packets)
        {
-            if (USBFS_GetEPState(FLUXENGINE_DATA_OUT_EP_NUM) == USBFS_OUT_BUFFER_FULL)
-            {
-                int length = usb_read(FLUXENGINE_DATA_OUT_EP_NUM, usb_buffer);
-                if (length < FRAME_SIZE)
-                    break;
-                USBFS_EnableOutEP(FLUXENGINE_DATA_OUT_EP_NUM);
-                count_read++;
-            }
+            (void) usb_read(FLUXENGINE_DATA_OUT_EP_NUM, usb_buffer);
+            count_read++;
        }
-        USBFS_DisableOutEP(FLUXENGINE_DATA_OUT_EP_NUM);
    }
    
    deinit_dma();
-    print("write finished");
    
    if (dma_underrun)
    {
+        print("underrun!");
        send_error(F_ERROR_UNDERRUN);
        return;
    }

+    print("success");
    DECLARE_REPLY_FRAME(struct any_frame, F_FRAME_WRITE_REPLY);
    send_reply((struct any_frame*) &r);
 }
@@ -665,6 +673,10 @@ static void cmd_erase(struct erase_frame* f)

 static void cmd_set_drive(struct set_drive_frame* f)
 {
+    if (drive0_present && !drive1_present)
+        f->drive = 0;
+    if (drive1_present && !drive0_present)
+        f->drive = 1;
    set_drive_flags(f);
    
    DECLARE_REPLY_FRAME(struct any_frame, F_FRAME_SET_DRIVE_REPLY);
@@ -781,8 +793,12 @@ static void handle_command(void)
            cmd_measure_speed(f);
            break;
            
-        case F_FRAME_BULK_TEST_CMD:
-            cmd_bulk_test(f);
+        case F_FRAME_BULK_WRITE_TEST_CMD:
+            cmd_bulk_write_test(f);
+            break;
+            
+        case F_FRAME_BULK_READ_TEST_CMD:
+            cmd_bulk_read_test(f);
            break;
            
        case F_FRAME_READ_CMD:
@@ -814,6 +830,21 @@ static void handle_command(void)
    }
 }

+static void detect_drives(void)
+{
+    current_drive_flags.drive = 0;
+    start_motor();
+    drive0_present = home();
+    stop_motor();
+    
+    current_drive_flags.drive = 1;
+    start_motor();
+    drive1_present = home();
+    stop_motor();
+    
+    print("drive 0: %s drive 1: %s", drive0_present ? "yes" : "no", drive1_present ? "yes" : "no");
+}
+
 int main(void)
 {
    CyGlobalIntEnable;
@@ -827,11 +858,11 @@ int main(void)
    DRIVESELECT_REG_Write(0);
    UART_Start();
    USBFS_Start(0, USBFS_DWR_VDDD_OPERATION);
+    USBFS_DisableOutEP(FLUXENGINE_DATA_OUT_EP_NUM);
    
+    detect_drives();
    CyWdtStart(CYWDT_1024_TICKS, CYWDT_LPMODE_DISABLED);
    
-    /* UART_PutString("GO\r"); */
-
    for (;;)
    {
        CyWdtClear();
@@ -847,7 +878,7 @@ int main(void)
        {
            print("Waiting for USB...");
            while (!USBFS_GetConfiguration())
-                ;
+                CyWdtClear();
            print("USB ready");
            USBFS_EnableOutEP(FLUXENGINE_CMD_OUT_EP_NUM);
        }
--- a/13
+++ b/13
@@ -1,8 +1,13 @@
 PACKAGES = zlib sqlite3 libusb-1.0

-export CFLAGS = -Os -g --std=c++14 \
-	-ffunction-sections -fdata-sections
-export LDFLAGS = -Os
+export CFLAGS = --std=c++14 -ffunction-sections -fdata-sections
+export LDFLAGS =
+
+export COPTFLAGS = -Os
+export LDOPTFLAGS = -Os -s
+
+export CDBGFLAGS = -O0 -g
+export LDDBGFLAGS = -O0 -g

 ifeq ($(OS), Windows_NT)
 export CXX = /mingw32/bin/g++
@@ -34,7 +39,7 @@ CFLAGS += -Ilib -Idep/fmt -Iarch
 export OBJDIR = .obj

 all: .obj/build.ninja
-	@ninja -f .obj/build.ninja -v
+	@ninja -f .obj/build.ninja

 clean:
 	@echo CLEAN
--- a/README.md
+++ b/README.md
@@ -24,17 +24,10 @@ 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>

-**Important note.** On 2019-02-09 I did a hardware redesign and moved the pins on
-the board. Sorry for the inconvenience, but it means you don't have to modify
-the board any more to make it work. If you built the hardware prior to then,
-you'll need to adjust it.
-
-**Another important note.** On 2019-07-03 I've revamped the build process and
-the (command line) user interface. It should be much nicer now, not least in
-that there's a single client binary with all the functionality in it. The
-interface is a little different, but not much. The build process is now
-better (simpler). See [the building](doc/building.md) and
-[using](doc/using.md) pages for more details.
+**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
+inconvenience.

 Where?
 ------
@@ -79,10 +72,10 @@ people who've had it work).

 | Format                                   | Read? | Write? | Notes |
 |:-----------------------------------------|:-----:|:------:|-------|
-| IBM PC compatible                        |  🦄   |        | and compatibles (like the Atari ST) |
-| [Acorn ADFS](doc/disk-acornadfs.md)      |  🦄   |        | single- and double- sided           |
-| [Acorn DFS](doc/disk-acorndfs.md)        |  🦄   |        |                                     |
-| [Ampro Little Board](doc/disk-ampro.md)  |  🦖   |        |                                     |
+| [IBM PC compatible](doc/disk-ibm.md)     |  🦄   |   🦄   | and compatibles (like the Atari ST) |
+| [Acorn ADFS](doc/disk-acornadfs.md)      |  🦄   |   🦖*  | single- and double- sided           |
+| [Acorn DFS](doc/disk-acorndfs.md)        |  🦄   |   🦖*  |                                     |
+| [Ampro Little Board](doc/disk-ampro.md)  |  🦖   |   🦖*   |                                     |
 | [Apple II DOS 3.3](doc/disk-apple2.md)   |  🦄   |        | doesn't do logical sector remapping |
 | [Amiga](doc/disk-amiga.md)               |  🦄   |        |                                     |
 | [Commodore 64 1541](doc/disk-c64.md)     |  🦖   |        | and probably the other GCR formats  |
@@ -90,9 +83,13 @@ people who've had it work).
 | [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          |
-| [TRS-80](doc/disk-trs80.md)              |  🦖   |        | a minor variation of the IBM scheme |
+| [TRS-80](doc/disk-trs80.md)              |  🦖   |   🦖*  | a minor variation of the IBM scheme |
 {: .datatable }

+`*`: these formats are variations of the generic IBM format, and since the
+IBM writer is completely generic, it should be configurable for these
+formats... theoretically. I don't have the hardware to try it.
+
 ### Even older disk formats

 These formats are for particularly old, weird architectures, even by the
--- a/arch/amiga/amiga.h
+++ b/arch/amiga/amiga.h
@@ -20,6 +20,8 @@ public:

    RecordType advanceToNextRecord();
    void decodeSectorRecord();
+
+	std::set<unsigned> requiredSectors(Track& track) const;
 };

 class AmigaEncoder : public AbstractEncoder
--- a/arch/amiga/decoder.cc
+++ b/arch/amiga/decoder.cc
@@ -32,6 +32,8 @@ AbstractDecoder::RecordType AmigaDecoder::advanceToNextRecord()
 void AmigaDecoder::decodeSectorRecord()
 {
    const auto& rawbits = readRawBits(AMIGA_RECORD_SIZE*16);
+	if (rawbits.size() < (AMIGA_RECORD_SIZE*16))
+		return;
    const auto& rawbytes = toBytes(rawbits).slice(0, AMIGA_RECORD_SIZE*2);
    const auto& bytes = decodeFmMfm(rawbits).slice(0, AMIGA_RECORD_SIZE);

@@ -56,3 +58,10 @@ void AmigaDecoder::decodeSectorRecord()
    _sector->data.writer().append(amigaDeinterleave(ptr, 512)).append(recoveryinfo);
    _sector->status = (gotdatachecksum == wanteddatachecksum) ? Sector::OK : Sector::BAD_CHECKSUM;
 }
+
+std::set<unsigned> AmigaDecoder::requiredSectors(Track& track) const
+{
+	static std::set<unsigned> sectors = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+	return sectors;
+}
+
--- a/arch/amiga/encoder.cc
+++ b/arch/amiga/encoder.cc
@@ -19,6 +19,8 @@ static DoubleFlag postIndexGapMs(
 	"Post-index gap before first sector header (milliseconds).",
 	0.5);

+static bool lastBit;
+
 static int charToInt(char c)
 {
 	if (isdigit(c))
@@ -51,7 +53,7 @@ static void write_interleaved_bytes(std::vector<bool>& bits, unsigned& cursor, c
 {
 	assert(!(bytes.size() & 3));
 	Bytes interleaved = amigaInterleave(bytes);
-	encodeMfm(bits, cursor, interleaved);
+	encodeMfm(bits, cursor, interleaved, lastBit);
 }

 static void write_interleaved_bytes(std::vector<bool>& bits, unsigned& cursor, uint32_t data)
@@ -108,6 +110,7 @@ std::unique_ptr<Fluxmap> AmigaEncoder::encode(
 	unsigned cursor = 0;

    fillBitmapTo(bits, cursor, postIndexGapMs * 1000 / clockRateUs, { true, false });
+	lastBit = false;

 	for (int sectorId=0; sectorId<AMIGA_SECTORS_PER_TRACK; sectorId++)
 	{
--- a/arch/brother/brother.h
+++ b/arch/brother/brother.h
@@ -9,7 +9,8 @@
 #define BROTHER_DATA_RECORD_CHECKSUM     3
 #define BROTHER_DATA_RECORD_ENCODED_SIZE 415

-#define BROTHER_TRACKS_PER_DISK          78
+#define BROTHER_TRACKS_PER_240KB_DISK    78
+#define BROTHER_TRACKS_PER_120KB_DISK    39
 #define BROTHER_SECTORS_PER_TRACK        12

 class Sector;
@@ -28,8 +29,16 @@ public:
 class BrotherEncoder : public AbstractEncoder
 {
 public:
+	BrotherEncoder(int format, int bias):
+		_format(format),
+		_bias(bias)
+	{}
+
 	virtual ~BrotherEncoder() {}

+private:
+	int _format;
+	int _bias;
 public:
    std::unique_ptr<Fluxmap> encode(int physicalTrack, int physicalSide, const SectorSet& allSectors);
 };
--- a/arch/brother/encoder.cc
+++ b/arch/brother/encoder.cc
@@ -129,9 +129,25 @@ static int charToInt(char c)
 std::unique_ptr<Fluxmap> BrotherEncoder::encode(
 	int physicalTrack, int physicalSide, const SectorSet& allSectors)
 {
-	if ((physicalTrack < 0) || (physicalTrack >= BROTHER_TRACKS_PER_DISK)
-        || (physicalSide != 0))
+	int logicalTrack;
+	if (physicalSide != 0)
 		return std::unique_ptr<Fluxmap>();
+	physicalTrack -= _bias;
+	switch (_format)
+	{
+		case 120:
+			if ((physicalTrack < 0) || (physicalTrack >= (BROTHER_TRACKS_PER_120KB_DISK*2))
+					|| (physicalTrack & 1))
+				return std::unique_ptr<Fluxmap>();
+			logicalTrack = physicalTrack/2;
+			break;
+
+		case 240:
+			if ((physicalTrack < 0) || (physicalTrack >= BROTHER_TRACKS_PER_240KB_DISK))
+				return std::unique_ptr<Fluxmap>();
+			logicalTrack = physicalTrack;
+			break;
+	}

 	int bitsPerRevolution = 200000.0 / clockRateUs;
 	const std::string& skew = sectorSkew.get();
@@ -146,10 +162,10 @@ std::unique_ptr<Fluxmap> BrotherEncoder::encode(
 		double dataMs = headerMs + postHeaderSpacingMs;
 		unsigned dataCursor = dataMs*1e3 / clockRateUs;

-		const auto& sectorData = allSectors.get(physicalTrack, 0, sectorId);
+		const auto& sectorData = allSectors.get(logicalTrack, 0, sectorId);

 		fillBitmapTo(bits, cursor, headerCursor, { true, false });
-		write_sector_header(bits, cursor, physicalTrack, sectorId);
+		write_sector_header(bits, cursor, logicalTrack, sectorId);
 		fillBitmapTo(bits, cursor, dataCursor, { true, false });
 		write_sector_data(bits, cursor, sectorData->data);
 	}
--- a/arch/ibm/decoder.cc
+++ b/arch/ibm/decoder.cc
@@ -57,11 +57,11 @@ const FluxPattern FM_TRS80DAM1_PATTERN(16, 0xf56b);

 /* 
 * TRS80DAM2 record:
- * flux:   XXXX-X-X-XX-XXX- = 0xf56c
+ * flux:   XXXX-X-X-XX-XXX- = 0xf56e
 * clock:  X X - - - X X X  = 0xc7
 * data:    X X X X X - X - = 0xfa
 */
-const FluxPattern FM_TRS80DAM2_PATTERN(16, 0xf56c);
+const FluxPattern FM_TRS80DAM2_PATTERN(16, 0xf56e);

 /* MFM record separator:
 * 0xA1 is:
@@ -73,8 +73,10 @@ const FluxPattern FM_TRS80DAM2_PATTERN(16, 0xf56c);
 * encoding (you can't do 10 00). So this can't be spoofed by user data.
 * 
 * shifted: 10 00 10 01 00 01 00 1
+ * 
+ * It's repeated three times.
 */
-const FluxPattern MFM_PATTERN(16, 0x4489);
+const FluxPattern MFM_PATTERN(48, 0x448944894489LL);

 const FluxMatchers ANY_RECORD_PATTERN(
    {
@@ -100,7 +102,8 @@ AbstractDecoder::RecordType IbmDecoder::advanceToNextRecord()
    if (_currentHeaderLength > 0)
        readRawBits(_currentHeaderLength*16);
    auto idbits = readRawBits(16);
-    uint8_t id = decodeFmMfm(idbits).slice(0, 1)[0];
+    const Bytes idbytes = decodeFmMfm(idbits);
+    uint8_t id = idbytes.slice(0, 1)[0];
    seek(here);
    
    switch (id)
--- a/arch/ibm/encoder.cc
+++ b/arch/ibm/encoder.cc
@@ -0,0 +1,236 @@
+#include "globals.h"
+#include "record.h"
+#include "decoders/decoders.h"
+#include "encoders/encoders.h"
+#include "ibm.h"
+#include "crc.h"
+#include "sectorset.h"
+#include "writer.h"
+#include "fmt/format.h"
+#include <ctype.h>
+
+/* IAM record separator:
+ * 0xC2 is:
+ * data:    1  1  0  0  0  0  1  0  = 0xc2
+ * mfm:     01 01 00 10 10 10 01 00 = 0x5254
+ * special: 01 01 00 10 00 10 01 00 = 0x5224
+ */
+#define MFM_IAM_SEPARATOR 0x5224
+
+/* FM IAM record:
+ * flux:   XXXX-XXX-XXXX-X- = 0xf77a
+ * clock:  X X - X - X X X  = 0xd7
+ * data:    X X X X X X - - = 0xfc
+ */
+#define FM_IAM_RECORD 0xf77a
+
+/* MFM IAM record:
+ * data:   1  1  1  1  1  1  0  0  = 0xfc
+ * flux:   01 01 01 01 01 01 00 10 = 0x5552
+ */
+#define MFM_IAM_RECORD 0x5552
+
+/* MFM record separator:
+ * 0xA1 is:
+ * data:    1  0  1  0  0  0  0  1  = 0xa1
+ * mfm:     01 00 01 00 10 10 10 01 = 0x44a9
+ * special: 01 00 01 00 10 00 10 01 = 0x4489
+ *                       ^^^^^
+ * When shifted out of phase, the special 0xa1 byte becomes an illegal
+ * encoding (you can't do 10 00). So this can't be spoofed by user data.
+ * 
+ * shifted: 10 00 10 01 00 01 00 1
+ * 
+ * It's repeated three times.
+ */
+#define MFM_RECORD_SEPARATOR 0x4489
+#define MFM_RECORD_SEPARATOR_BYTE 0xa1
+
+/* MFM IDAM byte:
+ * data:    1  1  1  1  1  1  1  0  = 0xfe
+ * mfm:     01 01 01 01 01 01 01 00 = 0x5554
+ */
+
+/* MFM DAM byte:
+ * data:    1  1  1  1  1  0  1  1  = 0xfb
+ * mfm:     01 01 01 01 01 00 01 01 = 0x5545
+ */
+
+static int charToInt(char c)
+{
+	if (isdigit(c))
+		return c - '0';
+	return 10 + tolower(c) - 'a';
+}
+
+void IbmEncoder::writeRawBits(uint32_t data, int width)
+{
+	_cursor += width;
+	_lastBit = data & 1;
+	for (int i=0; i<width; i++)
+	{
+		unsigned pos = _cursor - i - 1;
+		if (pos < _bits.size())
+			_bits[pos] = data & 1;
+		data >>= 1;
+	}
+}
+
+void IbmEncoder::writeBytes(const Bytes& bytes)
+{
+	if (_parameters.useFm)
+		encodeFm(_bits, _cursor, bytes);
+	else
+		encodeMfm(_bits, _cursor, bytes, _lastBit);
+}
+
+void IbmEncoder::writeBytes(int count, uint8_t byte)
+{
+	Bytes bytes = { byte };
+	for (int i=0; i<count; i++)
+		writeBytes(bytes);
+}
+
+static uint8_t decodeUint16(uint16_t raw)
+{
+	Bytes b;
+	ByteWriter bw(b);
+	bw.write_be16(raw);
+	return decodeFmMfm(b.toBits())[0];
+}
+
+std::unique_ptr<Fluxmap> IbmEncoder::encode(
+	int physicalTrack, int physicalSide, const SectorSet& allSectors)
+{
+	double clockRateUs = 1e3 / _parameters.clockRateKhz;
+	if (!_parameters.useFm)
+		clockRateUs /= 2.0;
+	int bitsPerRevolution = (_parameters.trackLengthMs * 1000.0) / clockRateUs;
+	_bits.resize(bitsPerRevolution);
+	_cursor = 0;
+
+	uint8_t idamUnencoded = decodeUint16(_parameters.idamByte);
+	uint8_t damUnencoded = decodeUint16(_parameters.damByte);
+
+	uint8_t sectorSize = 0;
+	{
+		int s = _parameters.sectorSize >> 7;
+		while (s > 1)
+		{
+			s >>= 1;
+			sectorSize += 1;
+		}
+	}
+
+	uint8_t gapFill = _parameters.useFm ? 0x00 : 0x4e;
+
+	writeBytes(_parameters.gap0, gapFill);
+	if (_parameters.emitIam)
+	{
+		writeBytes(_parameters.useFm ? 6 : 12, 0x00);
+		if (!_parameters.useFm)
+		{
+			for (int i=0; i<3; i++)
+				writeRawBits(MFM_IAM_SEPARATOR, 16);
+		}
+		writeRawBits(_parameters.useFm ? FM_IAM_RECORD : MFM_IAM_RECORD, 16);
+		writeBytes(_parameters.gap1, gapFill);
+	}
+
+	bool first = true;
+	for (char sectorChar : _parameters.sectorSkew)
+	{
+		int sectorId = charToInt(sectorChar);
+		if (!first)
+			writeBytes(_parameters.gap3, gapFill);
+		first = false;
+
+		const auto& sectorData = allSectors.get(physicalTrack, physicalSide, sectorId);
+		if (!sectorData)
+			Error() << fmt::format("format tried to find sector {} which wasn't in the input file", sectorId);
+
+		/* Writing the sector and data records are fantastically annoying.
+		 * The CRC is calculated from the *very start* of the record, and
+		 * include the malformed marker bytes. Our encoder doesn't know
+		 * about this, of course, with the result that we have to construct
+		 * the unencoded header, calculate the checksum, and then use the
+		 * same logic to emit the bytes which require special encoding
+		 * before encoding the rest of the header normally. */
+
+		{
+			Bytes header;
+			ByteWriter bw(header);
+
+			writeBytes(_parameters.useFm ? 6 : 12, 0x00);
+			if (!_parameters.useFm)
+			{
+				for (int i=0; i<3; i++)
+					bw.write_8(MFM_RECORD_SEPARATOR_BYTE);
+			}
+			bw.write_8(idamUnencoded);
+			bw.write_8(sectorData->logicalTrack);
+			bw.write_8(sectorData->logicalSide);
+			bw.write_8(sectorData->logicalSector + _parameters.startSectorId);
+			bw.write_8(sectorSize);
+			uint16_t crc = crc16(CCITT_POLY, header);
+			bw.write_be16(crc);
+
+			int conventionalHeaderStart = 0;
+			if (!_parameters.useFm)
+			{
+				for (int i=0; i<3; i++)
+					writeRawBits(MFM_RECORD_SEPARATOR, 16);
+				conventionalHeaderStart += 3;
+
+			}
+			writeRawBits(_parameters.idamByte, 16);
+			conventionalHeaderStart += 1;
+
+			writeBytes(header.slice(conventionalHeaderStart));
+		}
+
+		writeBytes(_parameters.gap2, gapFill);
+
+		{
+			Bytes data;
+			ByteWriter bw(data);
+
+			writeBytes(_parameters.useFm ? 6 : 12, 0x00);
+			if (!_parameters.useFm)
+			{
+				for (int i=0; i<3; i++)
+					bw.write_8(MFM_RECORD_SEPARATOR_BYTE);
+			}
+			bw.write_8(damUnencoded);
+
+			Bytes truncatedData = sectorData->data.slice(0, _parameters.sectorSize);
+			bw += truncatedData;
+			hexdump(std::cout, data.slice(0, 64));
+			uint16_t crc = crc16(CCITT_POLY, data);
+			bw.write_be16(crc);
+
+			int conventionalHeaderStart = 0;
+			if (!_parameters.useFm)
+			{
+				for (int i=0; i<3; i++)
+					writeRawBits(MFM_RECORD_SEPARATOR, 16);
+				conventionalHeaderStart += 3;
+
+			}
+			writeRawBits(_parameters.damByte, 16);
+			conventionalHeaderStart += 1;
+
+			writeBytes(data.slice(conventionalHeaderStart));
+		}
+    }
+
+	if (_cursor >= _bits.size())
+		Error() << "track data overrun";
+	while (_cursor < _bits.size())
+		writeBytes(1, gapFill);
+
+	std::unique_ptr<Fluxmap> fluxmap(new Fluxmap);
+	fluxmap->appendBits(_bits, clockRateUs*1e3);
+	return fluxmap;
+}
+
--- a/arch/ibm/ibm.h
+++ b/arch/ibm/ibm.h
@@ -2,6 +2,7 @@
 #define IBM_H

 #include "decoders/decoders.h"
+#include "encoders/encoders.h"

 /* IBM format (i.e. ordinary PC floppies). */

@@ -31,68 +32,68 @@ struct IbmIdam
 class IbmDecoder : public AbstractDecoder
 {
 public:
-    IbmDecoder(unsigned sectorBase, bool ignoreSideByte=false):
+    IbmDecoder(unsigned sectorBase, bool ignoreSideByte=false,
+			const std::set<unsigned> requiredSectors=std::set<unsigned>()):
        _sectorBase(sectorBase),
-        _ignoreSideByte(ignoreSideByte)
+        _ignoreSideByte(ignoreSideByte),
+		_requiredSectors(requiredSectors)
    {}

    RecordType advanceToNextRecord();
    void decodeSectorRecord();
    void decodeDataRecord();

+	std::set<unsigned> requiredSectors(Track& track) const
+	{ return _requiredSectors; }
+
 private:
    unsigned _sectorBase;
    bool _ignoreSideByte;
+	std::set<unsigned> _requiredSectors;
    unsigned _currentSectorSize;
    unsigned _currentHeaderLength;
 };

-#if 0
-class AbstractIbmDecoder : public AbstractSoftSectorDecoder
+struct IbmParameters
+{
+	int trackLengthMs;
+	int sectorSize;
+	bool emitIam;
+	int startSectorId;
+	int clockRateKhz;
+	bool useFm;
+	uint16_t idamByte;
+	uint16_t damByte;
+	int gap0;
+	int gap1;
+	int gap2;
+	int gap3;
+	std::string sectorSkew;
+};
+
+class IbmEncoder : public AbstractEncoder
 {
 public:
-    AbstractIbmDecoder(unsigned sectorIdBase):
-        _sectorIdBase(sectorIdBase)
-    {}
-    virtual ~AbstractIbmDecoder() {}
+	IbmEncoder(const IbmParameters& parameters):
+		_parameters(parameters)
+	{}

-    SectorVector decodeToSectors(const RawRecordVector& rawRecords, unsigned physicalTrack, unsigned physicalSide);
+	virtual ~IbmEncoder() {}

-protected:
-    virtual int skipHeaderBytes() const = 0;
+public:
+    std::unique_ptr<Fluxmap> encode(int physicalTrack, int physicalSide, const SectorSet& allSectors);

 private:
-    unsigned _sectorIdBase;
+	void writeRawBits(uint32_t data, int width);
+	void writeBytes(const Bytes& bytes);
+	void writeBytes(int count, uint8_t value);
+	void writeSync();
+	
+private:
+	IbmParameters _parameters;
+	std::vector<bool> _bits;
+	unsigned _cursor;
+	bool _lastBit;
 };

-class IbmFmDecoder : public AbstractIbmDecoder
-{
-public:
-    IbmFmDecoder(unsigned sectorIdBase):
-        AbstractIbmDecoder(sectorIdBase)
-    {}
-
-    int recordMatcher(uint64_t fifo) const;
-
-protected:
-    int skipHeaderBytes() const
-    { return 0; }
-};
-
-class IbmMfmDecoder : public AbstractIbmDecoder
-{
-public:
-    IbmMfmDecoder(unsigned sectorIdBase):
-        AbstractIbmDecoder(sectorIdBase)
-    {}
-
-    nanoseconds_t guessClock(Fluxmap& fluxmap) const;
-    int recordMatcher(uint64_t fifo) const;
-
-protected:
-    int skipHeaderBytes() const
-    { return 3; }
-};
-#endif
-
 #endif
--- a/arch/macintosh/decoder.cc
+++ b/arch/macintosh/decoder.cc
@@ -184,3 +184,25 @@ void MacintoshDecoder::decodeDataRecord()
    _sector->data.clear();
    _sector->data.writer().append(userData.slice(12, 512)).append(userData.slice(0, 12));
 }
+
+std::set<unsigned> MacintoshDecoder::requiredSectors(Track& track) const
+{
+	int count;
+	if (track.physicalTrack < 16)
+		count = 12;
+	else if (track.physicalTrack < 32)
+		count = 11;
+	else if (track.physicalTrack < 48)
+		count = 10;
+	else if (track.physicalTrack < 64)
+		count = 9;
+	else
+		count = 8;
+
+	std::set<unsigned> sectors;
+	while (count--)
+		sectors.insert(count);
+	return sectors;
+}
+
+
--- a/arch/macintosh/macintosh.h
+++ b/arch/macintosh/macintosh.h
@@ -18,6 +18,8 @@ public:
    RecordType advanceToNextRecord();
    void decodeSectorRecord();
    void decodeDataRecord();
+
+	std::set<unsigned> requiredSectors(Track& track) const;
 };

 #endif
--- a/doc/building.md
+++ b/doc/building.md
@@ -25,6 +25,8 @@ This is the physical stuff you'll need.
    connector](https://eu.mouser.com/ProductDetail/Amphenol-FCI/86130342114345E1LF?qs=%2Fha2pyFadug%252BpMTyxmFhglPPVKuWXYuFpPNgq%252BsrzhDnXxo8B28k7UCGc7F%2FXjsi)
    (or one of the other myriad compatible connectors; there's a billion).

+  - A floppy drive cable, preferably one with two connectors and a twist.
+
  - A suitable power supply. 3.5" floppy drives use 5V at about an amp
    (usually less) --- sadly, too much to power from USB. 5.25" floppy drives
    also require 12V. An old but decent quality PC power supply is ideal, as
@@ -48,7 +50,7 @@ All you need to do is attach your chosen connector to the board. You'll need
 to make sure that pin 2 on the cable is connected to pin 2.7 on the board,
 and pin 34 to pin 1.7 on the board (and of course all the ones in between).
 Apart from grounding the board (see below), this is literally all there is to
-it.
+it. The actual pinout is described in detail below.

 The pads are small, but soldering them isn't too bad with a needle-nosed
 soldering iron tip.
@@ -173,6 +175,7 @@ pattern. Press and hold the little button near the light for five seconds
 until the light stays solidly on. Now you should be able to acquire
 the port and proceed normally.

+
 ## Building the client

 The client software is where the intelligence, such as it is, is. It's pretty
@@ -181,12 +184,12 @@ well, although on Windows it'll need MSYS2 and mingw32. You'll need to
 install some support packages.

  - For Linux (this is Ubuntu, but this should apply to Debian too):
-  `ninja-build`, `libusb-1.0-0-dev`, `libsqlite3-dev`.
+	`ninja-build`, `libusb-1.0-0-dev`, `libsqlite3-dev`.
  - For OSX with Homebrew: `ninja`, `libusb`, `pkg-config`, `sqlite`.
  - For Windows with MSYS2: `make`, `ninja`, `mingw-w64-i686-libusb`,
-  `mingw-w64-i686-sqlite3`, `mingw-w64-i686-zlib`, `mingw-w64-i686-gcc`.
+	`mingw-w64-i686-sqlite3`, `mingw-w64-i686-zlib`, `mingw-w64-i686-gcc`.

-These lists are not necessarily exhaustive --- plaese [get in
+These lists are not necessarily exhaustive --- please [get in
 touch](https://github.com/davidgiven/fluxengine/issues/new) if I've missed
 anything.

@@ -197,11 +200,176 @@ dependencies and you should be able to put it anywhere.
 If it doesn't build, please [get in
 touch](https://github.com/davidgiven/fluxengine/issues/new).

+
+## Connecting it up
+
+You should now have a working board, so it's time to test it.
+
+  1. Plug the motherboard end of your floppy disk cable into the FluxEngine.
+     
+     The **red stripe goes on the right**. The **lower set of
+     holes connect to the board**. See the pinout below.
+
+     If you're using header pins, the upper row of holes in the connector
+     should overhang the edge of the board. If you're using a floppy drive
+     motherboard connector, you're golden, of course (unless you have one of
+     those annoying unkeyed cables, or have accidentally soldered the
+     connector on in the wrong place --- don't laugh, I've done it.)
+
+  2. Plug the drive end of your floppy disk cable into the drive (or drives).
+
+     Floppy disk cables typically have [two pairs of floppy disk drive
+     connectors with a twist between
+     them](http://www.nullmodem.com/Floppy.htm). (Each pair has one connector
+     for a 3.5" drive and a different one for a 5.25" drive.) (Some cables
+     are cheap and just have the 3.5" connectors. Some are _very_ cheap and
+     have a single 3.5" connector, after the twist.)
+     
+     If you have **two** drives, plug them into both connectors. FluxEngine,
+     sadly, non-standard disk numbering (there are reasons). Drive 0 is the
+     one nearest the motherboard; that is, before the twist. Drive 1 is the
+     one at the end of the cable; that is, after the twist. Drive 0 is the
+     default. You can tell the client to select drive 1 by using `-s :d=1`.
+
+     If you have **one** drive, you may plug it into _either_ connector.
+     FluxEngine will autodetect it and treat it as drive 0. However, you'll
+     get the most reliable electrical signal if you plug it in at the end of
+     the cable.
+
+     **A note on termination:** some 5.25" drives require jumper configuration
+     to tell them whether they're at the end of the cable or in the middle of
+     the cable. 3.5" drives don't, and my 5.25" drives don't, so I can't
+     advise there. Consult your drive datasheet for details.
+
+  3. **Important.** Make sure that no disk you care about is in the drive.
+	 (Because if your wiring is wrong and a disk is inserted, you'll corrupt
+	 it.)
+
+  4. Connect the floppy drive to power. Nothing should happen. If you've
+	 connected something in backwards, you'll see the drive light up, the motor
+	 start, and if you didn't take the disk out, one track has just been wiped.
+	 If this happens, check your wiring.
+
+  5. Strip off the little piece of protective plastic on the USB socket on the
+	 board --- the little socket at the end, not the big programmer plug.
+
+  6. Connect the FluxEngine to your PC via USB.
+
+  7. Insert a scratch disk and do `fluxengine rpm` from the shell. The motor
+     should work and it'll tell you that the disk is spinning at about 300
+     rpm for a 3.5" disk, or 360 rpm for a 5.25" disk. If it doesn't, please
+     [get in touch](https://github.com/davidgiven/fluxengine/issues/new).
+
+  8. Do `fluxengine test bandwidth` from the shell. It'll measure your USB
+	 bandwidth. Ideally you should be getting above 800kB/s in both directions.
+	 FluxEngine needs about 300kB/s for a DD disk and about 600kB/s for a HD
+	 disk, so if you're getting less than this, try a different USB port.
+
+  9. Insert a standard PC formatted floppy disk into the drive (probably a good
+     idea to remove the old disk first). Then do `fluxengine read ibm`. It
+     should read the disk, emitting copious diagnostics, and spit out an
+     `ibm.img` file containing the decoded disk image (either 1440kB or 720kB
+     depending).
+
+ 10. Profit!
+
+## Technical details
+
+The board pinout and the way it's connected to the floppy bus is described
+below.
+
+```ditaa
+:-E -s 0.75
+                 +-----+
+                 |||||||
+            +----+-----+----+
+            +cAAA           +
+            +  Debug board  +
+            +----+-----+----+
+            + GND|cDDD | VDD+  
+            +----+     +----+
+INDEX300 ---+ 3.0|     | GND+--------------------------+
+            +----+     +----+                 +--+--+  |
+INDEX360 ---+ 3.1|     | 1.7+------ DISKCHG --+34+33+--+
+            +----+     +----+                 +--+--+
+            + 3.2|     | 1.6+------- SIDE1 ---+32+31+
+            +----+     +----+                 +--+--+
+            + 3.3|     | 1.5+------- RDATA ---+30+29+
+            +----+     +----+                 +--+--+
+            + 3.4|     | 1.4+-------- WPT ----+28+27+
+            +----+     +----+                 +--+--+
+            + 3.5|     | 1.3+------- TRK00 ---+26+25+
+            +----+     +----+                 +--+--+
+            + 3.6|     | 1.2+------- WGATE ---+24+23+
+            +----+     +----+                 +--+--+
+            + 3.7|     | 1.1+------- WDATA ---+22+21+
+            +----+     +----+                 +--+--+
+            +15.0|     | 1.0+------- STEP ----+20+19+
+            +----+     +----+                 +--+--+
+            +15.1|     |12.0+-------- DIR ----+18+17+
+            +----+     +----+                 +--+--+
+            +15.2|     |12.1+------- MOTEB ---+16+15+
+            +----+     +----+                 +--+--+
+            +15.3|     |12.2+------- DRVSA ---+14+13+
+            +----+     +----+                 +--+--+
+            +15.4|     |12.3+------- DRVSB ---+12+11+
+            +----+     +----+                 +--+--+
+            +15.5|     |12.4+------- MOTEA ---+10+9 +
+            +----+     +----+                 +--+--+
+            + 0.0|     |12.5+------- INDEX ---+8 +7 +
+            +----+     +----+                 +--+--+
+            + 0.1|     |12.6+-------- n/c ----+6 +5 +
+            +----+     +----+                 +--+--+
+            + 0.2|     |12.7+- TX --- n/c ----+4 +3 +
+            +----+     +----+                 +--+--+
+            + 0.3|     | 2.7+------- REDWC ---+2 +1 +
+            +----+     +----+                 +--+--+
+            + 0.4|     | 2.6+  
+            +----+     +----+                FDD socket
+            + 0.5|     | 2.5+  
+            +----+     +----+
+            + 0.6|     | 2.4+    TX: debug UART from board
+            +----+     +----+
+            + 0.7|     | 2.3+
+            +----+     +----+
+            + RST|     | 2.2+  
+            +----+     +----+
+            + GND|     | 2.1+  
+            +----+ USB +----+
+            + VDD+-----+ 2.0+  
+            +----+-----+----+
+               PSoC5 board
+```
+
+Notes:
+
+  - `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
+  and using a serial terminal at 115200 baud. If you solder a floppy drive
+  connector on, then it'll end up connected to pin 4 of the floppy drive bus,
+  which is usually not connected. It's possible that some floppy drives do,
+  in fact, use this pin. You may wish to remove pin 4 from the floppy drive
+  socket before attaching it to the FluxEngine to make sure that this pin is
+  not connected; however, so far I have not found any drives for which this
+  is necessary. If you do find one, _please_ [get in
+  touch](https://github.com/davidgiven/fluxengine/issues/new) so I can
+  document it.
+
+  - The `GND` pin only really needs to be connected to one of the floppy bus
+  ground pins; pin 33 is the closest. For extra safety, you can bridge all
+  the odd numbered pins together and ground them all if you like.
+
+  - `INDEX300` and `INDEX360` are optional output pins which generate fake
+  timing pulses for 300 and 360 RPM drives. These are useful for certain
+  rather exotic things. See the section on flippy disks [in the FAQ](faq.md)
+  for more details; you can normally ignore these.
+
 ## Next steps

-The board's now assembled and programmed. Plug it into your drive, strip the
-plastic off the little USB connector and plug that into your computer, and
-you're ready to start using it.
+You should now be ready to go. You'll want to read [the client
+documentation](using.md) for information about how to actually do interesting
+things.

 I _do_ make updates to the firmware whenever necessary, so you may need to
 reprogram it at intervals; you may want to take this into account if you
--- a/doc/disk-brother.md
+++ b/doc/disk-brother.md
@@ -14,10 +14,12 @@ Apparently about 20% of Brother word processors have alignment issues which
 means that the disks can't be read by FluxEngine (because the tracks on the
 disk don't line up with the position of the head in a PC drive). The word
 processors themselves solved this by microstepping until they found where the
-real track is, but normal PC drives aren't capable of doing this.
-Particularly with the 120kB disks, you might want to fiddle with the start
-track (e.g. `:t=0-79x2`) to get a clean read. Keep an eye on the bad sector
-map that's dumped at the end of a read.
+real track is, but normal PC drives aren't capable of doing this.  Particularly
+with the 120kB disks, you might want to fiddle with the start track (e.g.
+`:t=0-79x2`) to get a clean read. Keep an eye on the bad sector map that's
+dumped at the end of a read. My word processor likes to put logical track 0 on
+physical track 3, which means that logical track 77 is on physical track 80;
+luckily my PC drive can access track 80.

 Using FluxEngine to *write* disks isn't a problem, so the
 simplest solution is to use FluxEngine to create a new disk, with the tracks
@@ -30,7 +32,7 @@ If you find one of these misaligned disks then *please* [get in
 touch](https://github.com/davidgiven/fluxengine/issues/new); I want to
 investigate.

-Reading discs
+Reading disks
 -------------

 Just do:
@@ -41,7 +43,7 @@ fluxengine read brother

 You should end up with a `brother.img` which is 239616 bytes long.

-Writing discs
+Writing disks
 -------------

 Just do:
@@ -53,6 +55,27 @@ fluxengine write brother
 ...and it'll write a `brother.img` file which is 239616 bytes long to the
 disk. (Use `-i` to specify a different input filename.)

+Dealing with misaligned disks
+-----------------------------
+
+While FluxEngine can't read misaligned disks directly, Brother word processors
+_can_. If you have access to a compatible word processor, there's a fairly
+simple workaround to allow you to extract the data:
+
+  1. Format a disk using FluxEngine (by simply writing a blank filesystem image
+	 to a disk). This will have the correct alignment to work on a PC drive.
+
+  2. Use a word processor to copy the misaligned disk to the newly formatted
+	 disk. The machine will happily adjust itself to both sets of alignments.
+
+  3. Use FluxEngine to read the data off the correctly aligned disk.
+
+I realise this is rather unsatisfactory, as the Brother hardware is becoming
+rarer and they cope rather badly with damaged disks, but this is a limitation
+of the hardware of normal PC drives. (It _is_ possible to deliberately misalign
+a drive to make it match up with a bad disk, but this is for experts only --- I
+wouldn't dare.)
+
 Low level format
 ----------------

@@ -60,14 +83,6 @@ The drive is a single-sided 3.5" drive spinning at not 300 rpm (I don't know
 the precise speed yet but FluxEngine doesn't care). The 240kB disks have 78
 tracks and the 120kB disks have 39.

-The Brother drive alignment is kinda variable; when you put the disk in the
-drive it seeks all the way to physical track 0 and then starts searching for
-something which looks like data. My machine likes to put logical track 0 on
-physical track 3. FluxEngine puts logical track 0 on physical track 0 for
-simplicity, which works fine (at least on my machine). If this doesn't work
-for you, [get in touch](https://github.com/davidgiven/fluxengine/issues/new);
-there are potential workarounds.
-
 Each track has 12 256-byte sectors. The drive ignores the index hole so they're
 lined up all anyhow. As FluxEngine can only read from index to index, it
 actually reads two complete revolutions and reassembles the sectors from that.
@@ -138,7 +153,8 @@ mcopy -i brother.img ::brother.doc linux.doc
 ```

 The word processor checks the media byte, unfortunately, so you'll need to
-change it back to 0x58 before writing an image to disk.
+change it back to 0x58 before writing an image to disk. Just run
+`brother240tool` on the image again and it will flip it back.

 The file format is not WP-1, and currently remains completely unknown,
 although it's probably related. If anyone knows anything about this, please
--- a/doc/disk-ibm.md
+++ b/doc/disk-ibm.md
@@ -0,0 +1,152 @@
+Disk: Generic IBM
+=================
+
+IBM scheme disks are _the_ most common disk format, ever. They're used by a
+huge variety of different systems, and they come in a huge variety of different
+forms, but they're all fundamentally the same: either FM or MFM, either single
+or double sided, with distinct sector header and data records and no sector
+metadata. Systems which use IBM scheme disks include but are not limited to:
+
+  - IBM PCs (naturally)
+  - Atari ST
+  - late era Apple machines
+  - Acorn machines
+  - the TRS-80
+  - late era Commodore machines (the 1571 and so on)
+  - most CP/M machines
+  - etc
+
+FluxEngine supports reading these. However, some variants are more peculiar
+than others, and as a result there are specific decoders which set the defaults
+correctly for certain formats (for example: on PC disks the sector numbers
+start from 1, but on [Acorn](disk-acorndfs.md) disks they start from 0). The
+IBM decoder described here is the generic one, and is suited for 'conventional'
+PC disks. While you can read all the variant formats with it if you use the
+right set of arguments, it's easier to use the specific decoder.
+
+The generic decoder is mostly self-configuring, and will detect the format of
+your disk for you.
+
+
+Reading disks
+-------------
+
+Just do:
+
+    fluxengine read ibm
+
+...and you'll end up with an `ibm.img` file. This should work on most PC disks
+(including FM 360kB disks, 3.5" 1440kB disks, 5.25" 1200kB disks, etc.) The size
+of the disk image will vary depending on the format.
+
+Configuration options you'll want include:
+
+  - `--ibm-sector-id-base=N`: specifies the ID of the first sector; this defaults
+	to 1. Some formats (like the Acorn ones) start at 0. This can't be
+	autodetected because FluxEngine can't distinguish between a disk which
+	starts at sector 1 and a disk which starts at sector 0 but all the sector
+	0s are missing.
+
+  - `--ibm-ignore-side-byte=true|false`: each sector header describes the location of the
+	sector: sector ID, track and side. Some formats use the wrong side ID, so
+	the sectors on side 1 are labelled as belonging to side 0. This causes
+	FluxEngine to see duplicate sectors (as it can't distinguish between the
+	two sides). This option tells FluxEngine to ignore the side byte completely
+	and use the physical side instead.
+
+  - `--ibm-required-sectors=range`: if you know how many sectors to expect per
+	track, you can improve reads by telling FluxEngine what to expect here. If
+	a track is read and a sector on this list is _not_ present, then FluxEngine
+	assumes the read failed and will retry. This avoids the situation where
+	FluxEngine can't tell the difference between a sector missing because it's
+	bad or a sector missing because it was never written in the first place. If
+	sectors are seen outside the range here, it will still be read. You can use
+	the same syntax as for track specifiers: e.g. `0-9`, `0,1,2,3`, etc.
+
+
+Writing disks
+-------------
+
+FluxEngine can also write IBM scheme disks. Unfortunately the format is
+incredibly flexible and you need to specify every single parameter, which
+makes things slightly awkward.
+
+The syntax is:
+
+    fluxengine write ibm -i input.img <options>
+
+The format of `input.img` will vary depending on the kind of disk you're
+writing, which is configured by the options. There are some presets, which
+you will almost certainly want to use if possible:
+
+  - `--ibm-preset-720`: a standard 720kB DS DD 3.5" disk, with 80 cylinders,
+  2 sides, and 9 sectors per track.
+  - `--ibm-preset-1440`: a standard 1440kB DS HD 3.5" disk, with 80
+  cylinders, 2 sides, and 18 sectors per track.
+
+These options simply preset the following, lower-level options. Note that
+options are processed left to right, so it's possible to use a preset and
+then change some settings. To see the values for a preset, simply append
+`--help`.
+
+  - `--ibm-track-length-ms=N`: one disk rotation, in milliseconds. This is used
+  to determine whether all the data will fit on a track or not. `fluxengine
+  rpm` will tell you this; it'll be 200 for a normal 3.5" drive and 166 for a
+  normal 5.25" drive.
+  - `--ibm-sector-size=N`: the size of a sector, in bytes. Must be a power of
+  two.
+  - `--ibm-emit-iam=true|false`: whether to emit the IAM record at the top of
+  the track. The standard format requires it, but it's ignored by absolutely
+  everyone and you can fit a bit more data on the disk without it.
+  - `--ibm-start-sector-id=N`: the sector ID of the first sector. Normally 1,
+  except for non-standard formats like Acorn's, which use 0.
+  - `--ibm-use-fm=true|false`: uses FM rather than MFM.
+  - `--ibm-idam-byte=N`: the sixteen-bit raw bit pattern used for the IDAM ID
+  byte. Big-endian, clock bit first.
+  - `--ibm-dam-byte-N`: the sixteen-bit raw bit pattern used for the DAM ID
+  byte. Big-endian, clock bit first.
+  - `--ibm-gap0-bytes=N`: the size of gap 0 in bytes (between the start of
+  the track and the IAM record).
+  - `--ibm-gap1-bytes=N`: the size of gap 1 in bytes (between the IAM record
+  and the first sector record).
+  - `--ibm-gap2-bytes=N`: the size of gap 2 in bytes (between each sector
+  record and the data record).
+  - `--ibm-gap3-bytes=N`: the size of gap 3 in bytes (between the data record
+  and the next sector record).
+  - `--ibm-sector-skew=0123...`: a string representing the order in which to
+  write sectors: each character represents on sector, with `0` being the
+  first (always, regardless of `--ibm-start-sector-id` above). Sectors 10 and
+  above are represented as latters from `A` up.
+
+Mixed-format disks
+------------------
+
+Some disks, usually those belonging to early CP/M machines, have more than one
+format on the disk at once. Typically, the first few tracks will be low-density
+FM encoded and will be read by the machine's ROM; those tracks contain new
+floppy drive handling code capable of coping with MFM data, and so the rest of
+the disk will use that, allowing them to store more data.
+
+FluxEngine copes with these fine, but the disk images are a bit weird. If track
+0 is FM and contains five sectors, but track 1 is MFM with nine sectors (MFM is
+more efficient and the sectors are physically smaller, allowing you to get more
+on), then the resulting image will have nine sectors per track... but track 0
+will only contain data in the first five.
+
+This is typically what you want as it makes locating the sectors in the image
+easier, but emulators will typically require a different format. Please [get
+in touch](https://github.com/davidgiven/fluxengine/issues/new) if you have
+specific requirements (nothing's come up yet). Alternatively, you can tell
+FluxEngine to write a [`.ldbs`
+file](http://www.seasip.info/Unix/LibDsk/ldbs.html) and then use
+[libdsk](http://www.seasip.info/Unix/LibDsk/) to convert it to something
+useful.
+
+One easy option when reading these is to simply read the two sections of the
+disk into two different image files.
+
+FluxEngine can write these too, but in two different passes with different
+options. It's possible to assemble a flux file by judicious use of `-D
+something.flux --merge`, which can then be written in a single pass with
+`fluxengine writeflux`, but it's usually not worth the bother: just write the
+boot tracks, then write the data tracks, possibly with a script for automation.
--- a/doc/technical.md
+++ b/doc/technical.md
@@ -22,19 +22,17 @@ FluxEngine, where a different datapath state machine thingy (the PSoC5LP has
 24, all independently programmable) to interpret the bytecodes, generate a
 stream of pulses to the disk.

-The bytecode format represents an interval between pulses as a byte, a pulse
-as a byte, and the index hole as a byte. Timer overflows are handled by
-sending multiple intervals in a row. However, the USB transport applies a
-simple compression system to this in order to get the USB bandwidth down to
-something manageable.
+The bytecode format is very simple with a six-bit interval since the previous
+event in the lower six bits and the top two bits are set of a pulse or an index
+hole (or both, or neither).

 An HD floppy has a nominal pulse frequency of 500kHz, and we use a sample
 clock of 12MHz (every 83ns). This means that our 500kHz pulses will have an
 average interval of 24. This gives us more than enough resolution. At this
 speed, in the 200ms that a 3.5" disk takes to rotate, we will see about
-100,000 pulses. Each one is encoded as two bytes, one for the interval and
-one to generate the pulse; so that revolution generates 200kB of data.
-(Extremely approximately. The actual figure is less.)
+100,000 pulses. Each one is encoded as a single byte; so that revolution
+generates 100kB of data.  (Extremely approximately. The actual figure varies
+depending on what data is stored on the disk.)

 (The clock needs to be absolutely rock solid or we get jitter which makes the
 data difficult to analyse, so 12 was chosen to be derivable from the
@@ -59,53 +57,42 @@ Some useful and/or interesting numbers:

 ## Why don't I use an Arduino / STM32 / ESP32 / Raspberry Pi / etc?

-I've got a _lot_ of questions on this, and multiple Github issues of people
+-I've got a _lot_ of questions on this, and multiple Github issues of people
 debating it. It's complicated, but it's essentially a tradeoff between speed
-and complexity.
+and complexity.-

-FluxEngine's read process involves generating a lot of data using a fairly
-brute force sampling approach --- about 150kB per disk revolution, and
-sometimes it needs to record multiple revolutions. Most microcontrollers
-don't have enough RAM to buffer this, so instead I have to stream it over USB
-back to the host PC in real time. The disk won't wait, so I need to stream data faster
-than the disk is producing it: the total is about 800kB/s.
+**Update as of 2020-01-08:**

-Handling USB is pretty CPU-hungry, so my candidate microntroller has to be
-able to cope with the ruinously strict real-time requirements of the
-sampler's 12MHz clock as well as keeping up with 13,000 USB interrupts a
-second (one for each 64-byte frame) in order to transfer the data.
+Right. Well.

-The Atmels and STM32s I found were perfectly capable of doing the real-time
-sampling, using hand-tool assembly, but I very much doubt whether they could
-do the USB streaming as well (although I want to move away from the Cypress
-onto something less proprietary and easier to source, so I'd like to be
-proven wrong here).
+This section used to have a long explanation as to why these other platforms
+were unsuitable --- essentially, they're generally missing out on either the
+realtimeness to sample the data correctly (Raspberry Pi) or enough CPU to
+stream the data over USB while also sampling it (Arduino).

-The Raspberry Pi easily has enough processing power and memory, but it's also
-got terrible GPIO pin read performance --- [about
-1kHz](https://raspberrypi.stackexchange.com/questions/9646/how-fast-is-gpiodma-multi-i2s-input/10197#10197).
-That's a long way from the 12MHz I need.
+This is correct, but it turns out that the STM32 has some built-in features
+which support the FluxEngine's use case almost exactly: you can configure the
+DMA engine to sample the interval between pulses and write them directly into
+memory, and you can configure the PWM engine the read samples from memory and
+use them to time pulses to the output. There's a bit less functionality, so you
+can't do things like measure the signal voltages, and they're less convenient
+as you need an adapter cable or board, but this will allow you to replicate the
+FluxEngine hardware on a $2 Blue Pill.

-The PSoC5LP part I'm using has enough CPU to handle the USB side of things,
-and it _also_ has a whole set of FPGA-like soft programmable features,
-including 24 mini-ALU systems that are ideally suited to exactly this kind of
-sampling. I can read the disk and generate the byte stream describing the
-flux pattern entirely in 'hardware', without involving the main CPU at all.
-This is then DMAed directly into a set of ring buffers read for the USB
-system to pick up and relay back to the PC. It's incredibly simple and works
-well. (The same applies to writing flux back onto the disk.)
+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).

-The development board I'm using, the
-[CY8CKIT-059](https://www.cypress.com/documentation/development-kitsboards/cy8ckit-059-psoc-5lp-prototyping-kit-onboard-programmer-and),
-also has another big advantage: it's the right shape. It's got 17 holes in a
-row connected to GPIO pins, and it's a native 5V part, which means I can just
-connect a floppy drive connector directly to the board without needing to
-build any hardware. No adapter board, no level shifting, no special cable,
-nothing. This makes the FluxEngine hardware incredibly easy to assemble,
-which therefore means cheap.
+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.

-Speaking of which, the CY8CKIT-059 is $10. (Before shipping, which is
-admittedly expensive.)

 ### Some useful links

--- a/doc/using.md
+++ b/doc/using.md
@@ -1,78 +1,8 @@
 Using a FluxEngine
 ==================

-So you've [built the hardware](building.md)! What now?
-
-## Connecting it up
-
-In order to do anything useful, you have to plug it in to a floppy disk drive (or two).
-
-  1. Plug the motherboard end of your floppy disk cable into the FluxEngine.
-     
-     The **red stripe goes on the right**. The **lower set of
-     holes connect to the board**. (Pin 2 of the connector needs to connect
-     to pin 2.7 on the board.)
-
-     If you're using header pins, the upper row of holes in the connector
-     should overhang the edge of the board. If you're using a floppy drive
-     motherboard connector, you're golden, of course (unless you have one of
-     those annoying unkeyed cables, or have accidentally soldered the
-     connector on in the wrong place --- don't laugh, I've done it.)
-
-  2. Plug the drive end of your floppy disk cable into the drive (or drives).
-
-     Floppy disk cables typically have [two pairs of floppy disk drive
-     connectors with a twist between
-     them](http://www.nullmodem.com/Floppy.htm). (Each pair has one connector
-     for a 3.5" drive and a different one for a 5.25" drive.) (Some cables
-     are cheap and just have the 3.5" connectors. Some are _very_ cheap and
-     have a single 3.5" connector, after the twist.)
-     
-     FluxEngine uses, sadly, non-standard disk numbering (there are reasons).
-     Drive 0 is the one nearest the motherboard; that is, before the twist.
-     Drive 1 is the one at the end of the cable; that is, after the twist.
-     Drive 0 is the default. If you only have one drive, remember to plug the
-     drive into the connector _before_ the twist. (Or use `-s :d=1` to select
-     drive 1 when working with disks.)
-
-  3. **Important.** Make sure that no disk you care about is in the drive.
-     (Because if your wiring is wrong and a disk is inserted, you'll corrupt it.)
-
-  4. Connect the floppy drive to power. Nothing should happen. If you've
-     connected something in backwards, you'll see the drive light up, the
-     motor start, and if you didn't take the disk out, one track has just
-     been wiped. If this happens, check your wiring.
-
-  5. Connect the FluxEngine to your PC via USB --- using the little socket on
-     the board, not the big programmer plug.
-
-  6. Insert a scratch disk and do `fluxengine rpm` from the shell. The motor
-     should work and it'll tell you that the disk is spinning at about 300
-     rpm for a 3.5" disk, or 360 rpm for a 5.25" disk. If it doesn't, please
-     [get in touch](https://github.com/davidgiven/fluxengine/issues/new).
-
-  7. Do `fluxengine test bulktransport` from the shell. It'll measure your USB
-     bandwidth. Ideally you should be getting above 900kB/s. FluxEngine needs
-     about 850kB/s, so if you're getting less than this, try a different USB
-     port.
-
-  8. Insert a standard PC formatted floppy disk into the drive (probably a good
-     idea to remove the old disk first). Then do `fluxengine read ibm`. It
-     should read the disk, emitting copious diagnostics, and spit out an
-     `ibm.img` file containing the decoded disk image (either 1440kB or 720kB
-     depending).
-
-  9. Profit!
-
-## Bonus hardware features
-
-For advanced users, the board has a few extra signals which are useful for special purposes.
-
-  - Pin 3[0] produces short pulses every 200ms. This is useful for spoofing
-    index signals to 300 RPM drives; for example, to read flippy disks.
-
-  - Pin 3[1] is the same, but produces the pulses every 166ms; this works with
-    360 RPM drives.
+So you've [built the hardware](building.md), programmed and tested it! What
+now?

 ## The programs

@@ -81,10 +11,33 @@ moving too quickly for the documentation to keep up. It does respond to
 `--help` or `help` depending on context. There are some common properties,
 described below.

+### Core concepts
+
+FluxEngine fundamentally takes file system images and puts them on disk; or
+reads the disk and produces a file system image.
+
+A file system image typically has the extension `.img`. It contains a
+sector-by-sector record of the _decoded_ data on the disk. For example, on a
+disk with 512 byte sectors, one sector will occupy 512 bytes. These are
+typically what you want in everyday life.
+
+FluxEngine can also record the raw magnetic data on the disk into a file, which
+we call a _flux file_. This contains all the low-level data which the drive
+produced as the disk rotated. These are continuous streams of samples from the
+disk and are completely useless in day-to-day life. FluxEngine uses its own
+format for this, `.flux`, although it's capable of limited interchange with
+Kryoflux, Supercard Pro and Catweasel files. A flux file will typically contain
+from 80 to 150 kilobytes of data per track.
+
+In general, FluxEngine can use either a real disk or a flux file
+interchangeably: you can specify either at (very nearly) any time. A very
+common workflow is to read a disk to a flux file, and then reread from the flux
+file while changing the decoder options, to save disk wear. It's also much faster.
+
 ### Source and destination specifiers

-When reading from or writing to _a disk_ (or a file pretending to be a disk),
-use the `--source` (`-s`) and `--dest` (`-d`) options to tell FluxEngine
+When reading from or writing _flux_ (either from or to a real disk, or a flux
+file), use the `--source` (`-s`) and `--dest` (`-d`) options to tell FluxEngine
 which bits of the disk you want to access. These use a common syntax:

 ```
@@ -94,7 +47,7 @@ fluxengine read ibm -s fakedisk.flux:t=0-79:s=0
  - To access a real disk, leave out the filename (so `:t=0-79:s=0`).

  - To access only some tracks, use the `t=` modifier. To access only some
-    sides, use the `s=` modifier. To change drives, use `d=`.
+    sides, use the `s=` modifier.

  - Inside a modifier, you can use a comma separated list of ranges. So
    `:t=0-3` and `:t=0,1,2,3` are equivalent.
@@ -120,18 +73,15 @@ If you _don't_ specify a modifier, you'll get the default, which should be
 sensible for the command you're using.

 **Important note:** FluxEngine _always_ uses zero-based units (even if the
-*disk format says otherwise).
+disk format says otherwise).

 ### Input and output specifiers

-These use a very similar syntax to the source and destination specifiers
-(because they're based on the same microformat library!) but are used for
-input and output _images_: i.e. nicely lined up arrays of sectors which you
-can actually do something with.
-
-Use `--input` (`-i`) or `--output` (`-o`) as appropriate to tell FluxEngine
-where you want to read from or write to. The actual format is autodetected
-based on the extension:
+When reading or writing _file system images_, use the `--input` (`-i`) and
+`--output` (`-o`) options to specify the file and file format. These use a very
+similar syntax to the source and destination specifiers (because they're based
+on the same microformat library!) but with different specifiers. Also, the
+exact format varies according to the extension:

  - `.img` or `.adf`: raw sector images in CHS order. Append
    `:c=80:h=2:s=9:b=512` to set the geometry; that specifies 80 cylinders, 2
@@ -191,17 +141,23 @@ here.](http://www.retrotechnology.com/herbs_stuff/guzis.html)
 These flags apply to many operations and are useful for modifying the overall
 behaviour.

-  - `--revolutions=X`: when reading, spin the disk X times. Many formats
-  require `--revolutions=2` (which should happen automatically); or you can
-  increase the number to sample more data.
+  - `--revolutions=X`: when reading, spin the disk X times. X can be a floating
+	point number. The default is usually 1.25. Some formats default to 1.
+	Increasing the number will sample more data, and can be useful on dubious
+	disks to try and get a better read.
+
+  - `--sync-with-index=true|false`: wait for an index pulse before starting to
+	read the disk. (Ignored for write operations.) By default FluxEngine
+	doesn't, as it makes reads faster, but when diagnosing disk problems it's
+	helpful to have all your data start at the same place each time.

  - `--index-source=X`, `--write-index-source=X`: set the source of index
-  pulses when reading or writing respectively. This is for use with drives
-  which don't produce index pulse data. Use 0 to get index pulses from the
-  drive, 1 to fake 300RPM pulses, or 2 to fake 360RPM pulses. Note this has
-  no effect on the _drive_, so it doesn't help with flippy disks, but is
-  useful for using very old drives with FluxEngine itself. If you use this
-  option, then any index marks in the sampled flux are, of course, garbage.
+	pulses when reading or writing respectively. This is for use with drives
+	which don't produce index pulse data. Use 0 to get index pulses from the
+	drive, 1 to fake 300RPM pulses, or 2 to fake 360RPM pulses. Note this has
+	no effect on the _drive_, so it doesn't help with flippy disks, but is
+	useful for using very old drives with FluxEngine itself. If you use this
+	option, then any index marks in the sampled flux are, of course, garbage.

 ### The commands

@@ -211,59 +167,62 @@ installed anywhere and after building you'll find them in the `.obj`
 directory.

  - `fluxengine erase`: wipes (all or part of) a disk --- erases it without
-  writing a pulsetrain.
+	writing a pulsetrain.

  - `fluxengine inspect`: dumps the raw pulsetrain / bitstream to stdout.
-  Mainly useful for debugging.
+	Mainly useful for debugging.

-  - `fluxengine read*`: reads various formats of disk. See the per-format
-  documentation linked from the table above. These all take an optional
-  `--write-flux` option which will cause the raw flux to be written to the
-  specified file.
+  - `fluxengine read *`: reads various formats of disk. See the per-format
+	documentation linked from the table [in the index page](../README.md).
+	These all take an optional `--write-flux` option which will cause the raw
+	flux to be written to the specified file as well as the normal decode.
+	There are various `--dump` options for showing raw data during the decode
+	process, and `--write-csv` will write a copious CSV report of the state of
+	every sector in the file in machine-readable format.

-  - `fluxengine write*`: writes various formats of disk. Again, see the
-  per-format documentation above.
+  - `fluxengine write *`: writes various formats of disk. Again, see the
+	per-format documentation [in the index page](../README.md).

  - `fluxengine writeflux`: writes raw flux files. This is much less useful
-  than you might think: you can't write flux files read from a disk to
-  another disk. (See the [FAQ](faq.md) for more information.) It's mainly
-  useful for flux files synthesised by the other `fluxengine write` commands.
+	than you might think: you can't reliably write flux files read from a disk
+	to another disk. (See the [FAQ](faq.md) for more information.) It's mainly
+	useful for flux files synthesised by the other `fluxengine write` commands.

  - `fluxengine writetestpattern`: writes regular pulses (at a configurable
-  interval) to the disk. Useful for testing drive jitter, erasing disks in a
-  more secure fashion, or simply debugging. Goes well with `fluxengine
-  inspect`.
+	interval) to the disk. Useful for testing drive jitter, erasing disks in a
+	more secure fashion, or simply debugging. Goes well with `fluxengine
+	inspect`.

  - `fluxengine rpm`: measures the RPM of the drive (requires a disk in the
-  drive). Mainly useful for testing.
+	drive). Mainly useful for testing.

  - `fluxengine seek`: moves the head. Mainly useful for finding out whether
-  your drive can seek to track 82. (Mine can't.)
+	your drive can seek to track 82. (Mine can't.)

-  - `fluxengine test bulktransport`: measures your USB throughput. You need
-  about 600kB/s for FluxEngine to work. You don't need a disk in the drive
-  for this one.
+  - `fluxengine test bandwidth`: measures your USB throughput.  You don't need
+	a disk in the drive for this one.

-  - `fluxengine test voltages`: measures your FDD bus signal voltages, which
-  is useful for testing for termination issues.
+  - `fluxengine test voltages`: measures your FDD bus signal voltages, which is
+	useful for testing for termination issues.

-  - `fluxengine upgradefluxfile`: occasionally I need to upgrade the flux
-  file format in a non-backwards-compatible way; this tool will upgrade flux
-  files to the new format.
+  - `fluxengine upgradefluxfile`: occasionally I need to upgrade the flux file
+	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'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.
+	other formats. You can use this to convert 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.
+	**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
@@ -289,8 +248,10 @@ disk). For a 5.25" disk, use `--visualiser-period=166`.
 Supplied with FluxEngine, but not part of FluxEngine, are some little tools I
 wrote to do useful things. These are built alongside FluxEngine.

-  - `brother120tool`: extracts files from a 120kB Brother filesystem image.
-
+  - `brother120tool`, `brother240tool`: does things to Brother word processor
+	disks. These are [documented on the Brother disk format
+	page](disk-brother.md).
+  
 ## The recommended workflow

 So you've just received, say, a huge pile of old Brother word processor disks
@@ -299,13 +260,13 @@ containing valuable historical data, and you want to read them.
 Typically I do this:

 ```
-$ fluxengine read brother -s :d=0 -o brother.img --write-flux=brother.flux --write-svg=brother.svg
+$ fluxengine read brother -s :d=0 -o brother.img --write-flux=brother.flux --overwrite --write-svg=brother.svg
 ```

-This will read the disk in drive 0 and write out a filesystem image. It'll
-also copy the flux to brother.flux and write out an SVG visualisation. If I
-then need to tweak the settings, I can rerun the decode without having to
-physically touch the disk like this:
+This will read the disk in drive 0 and write out a filesystem image. It'll also
+copy the flux to `brother.flux` (replacing any old one) and write out an SVG
+visualisation. If I then need to tweak the settings, I can rerun the decode
+without having to physically touch the disk like this:

 ```
 $ fluxengine read brother -s brother.flux -o brother.img --write-svg=brother.svg
--- a/lib/bytes.cc
+++ b/lib/bytes.cc
@@ -1,7 +1,6 @@
 #include "globals.h"
 #include "bytes.h"
 #include "fmt/format.h"
-#include "common/crunch.h"
 #include <fstream>
 #include <zlib.h>

@@ -147,6 +146,28 @@ Bytes Bytes::slice(unsigned start, unsigned len) const
    }
 }

+Bytes Bytes::slice(unsigned start) const
+{
+	int len = 0;
+	if (start < size())
+		len = size() - start;
+	return slice(start, len);
+}
+
+std::vector<bool> Bytes::toBits() const
+{
+	std::vector<bool> bits;
+	for (uint8_t byte : *this)
+	{
+		for (int i=0; i<8; i++)
+		{
+			bits.push_back(byte & 0x80);
+			byte <<= 1;
+		}
+	}
+	return bits;
+}
+
 uint8_t toByte(
    std::vector<bool>::const_iterator start,
    std::vector<bool>::const_iterator end)
@@ -227,60 +248,6 @@ Bytes Bytes::decompress() const
    return output;
 }

-Bytes Bytes::crunch() const
-{
-    Bytes output;
-    ByteWriter bw(output);
-    Bytes outputBuffer(1024*1024);
-
-    crunch_state_t cs = {};
-    cs.inputptr = begin();
-    cs.inputlen = size();
-
-    do
-    {
-        cs.outputptr = outputBuffer.begin();
-        cs.outputlen = outputBuffer.size();
-
-        ::crunch(&cs);
-        bw += outputBuffer.slice(0, outputBuffer.size() - cs.outputlen);
-    }
-    while (cs.inputlen != 0);
-    cs.outputptr = outputBuffer.begin();
-    cs.outputlen = outputBuffer.size();
-    donecrunch(&cs);
-    bw += outputBuffer.slice(0, outputBuffer.size() - cs.outputlen);
-
-    return output;
-}
-
-Bytes Bytes::uncrunch() const
-{
-    Bytes output;
-    ByteWriter bw(output);
-    Bytes outputBuffer(1024*1024);
-
-    crunch_state_t cs = {};
-    cs.inputptr = begin();
-    cs.inputlen = size();
-
-    do
-    {
-        cs.outputptr = outputBuffer.begin();
-        cs.outputlen = outputBuffer.size();
-
-        ::uncrunch(&cs);
-        bw += outputBuffer.slice(0, outputBuffer.size() - cs.outputlen);
-    }
-    while (cs.inputlen != 0);
-    cs.outputptr = outputBuffer.begin();
-    cs.outputlen = outputBuffer.size();
-    doneuncrunch(&cs);
-    bw += outputBuffer.slice(0, outputBuffer.size() - cs.outputlen);
-
-    return output;
-}
-
 void Bytes::writeToFile(const std::string& filename) const
 {
    std::ofstream f(filename, std::ios::out | std::ios::binary);
@@ -291,6 +258,11 @@ void Bytes::writeToFile(const std::string& filename) const
    f.close();
 }

+void Bytes::writeTo(std::ostream& stream) const
+{
+	stream.write((const char*) cbegin(), size());
+}
+
 ByteReader Bytes::reader() const
 {
    return ByteReader(*this);
--- a/lib/bytes.h
+++ b/lib/bytes.h
@@ -47,16 +47,17 @@ public:
    { resize(0); return *this; }

    Bytes slice(unsigned start, unsigned len) const;
+    Bytes slice(unsigned start) const;
    Bytes swab() const;
    Bytes compress() const;
    Bytes decompress() const;
-    Bytes crunch() const;
-    Bytes uncrunch() const;
+	std::vector<bool> toBits() const;

    ByteReader reader() const;
    ByteWriter writer();

    void writeToFile(const std::string& filename) const;
+	void writeTo(std::ostream& stream) const;

 private:
    std::shared_ptr<std::vector<uint8_t>> _data;
--- a/lib/common/crunch.c
+++ b/lib/common/crunch.c
@@ -1,86 +0,0 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include "crunch.h"
-
-void crunch(crunch_state_t* state)
-{
-    while (state->inputlen && state->outputlen)
-    {
-        uint8_t data = *state->inputptr++;
-        state->inputlen--;
-
-        if (data & 0x80)
-        {
-            state->fifo = (state->fifo << 2) | 2 | (data & 1);
-            state->fifolen += 2;
-        }
-        else
-        {
-            state->fifo = (state->fifo << 8) | data;
-            state->fifolen += 8;
-        }
-
-        if (state->fifolen >= 8)
-        {
-            data = state->fifo >> (state->fifolen - 8);
-            *state->outputptr++ = data;
-            state->outputlen--;
-            state->fifolen -= 8;
-        }
-    }
-}
-
-void donecrunch(crunch_state_t* state)
-{
-    if (state->fifolen > 0)
-    {
-        uint8_t b = 0;
-        state->inputptr = &b;
-        state->inputlen = 1;
-        crunch(state);
-    }
-}
-
-void uncrunch(crunch_state_t* state)
-{
-    while (state->inputlen && state->outputlen)
-    {
-        if (state->fifolen < 8)
-        {
-            if (state->inputlen)
-            {
-                state->fifo = (state->fifo << 8) | *state->inputptr++;
-                state->inputlen--;
-                state->fifolen += 8;
-            }
-            else
-                state->fifo <<= 8;
-        }
-
-        uint8_t data = state->fifo >> (state->fifolen - 8);
-        if (data & 0x80)
-        {
-            data = ((data >> 6) & 0x01) | 0x80;
-            state->fifolen -= 2;
-        }
-        else
-            state->fifolen -= 8;
-
-        if (data)
-        {
-            *state->outputptr++ = data;
-            state->outputlen--;
-        }
-    }
-}
-
-void doneuncrunch(crunch_state_t* state)
-{
-    if (state->fifolen > 0)
-    {
-        uint8_t b = 0;
-        state->inputptr = &b;
-        state->inputlen = 1;
-        uncrunch(state);
-    }
-}
--- a/lib/common/crunch.h
+++ b/lib/common/crunch.h
@@ -1,45 +0,0 @@
-#ifndef CRUNCH_H
-#define CRUNCH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/* To save bandwidth, we compress the byte stream from the sampler when
- * sending it over USB. The encoding used is:
- * 
- * 0nnn.nnnn: value 0x00..0x7f
- * 1n       : value 0x80|n
- *
- * The end of the buffer is terminated with zeroes, which are ignored
- * (not written to the output).
- * 
- * This saves ~40%, which gets us in under the bandwidth cap.
- */
-    
-typedef struct crunch_state_t
-{
-    const uint8_t* inputptr;
-    uint32_t inputlen;
-    uint8_t* outputptr;
-    uint32_t outputlen;
-    uint16_t fifo;
-    uint8_t fifolen;
-}
-crunch_state_t;
-
-/* Crunches as much as possible and then stops. */
-extern void crunch(crunch_state_t* state);
-extern void donecrunch(crunch_state_t* state);
-
-/* Uncrunches as much as possible and then stops. */
-extern void uncrunch(crunch_state_t* state);
-extern void doneuncrunch(crunch_state_t* state);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
--- a/lib/dataspec.cc
+++ b/lib/dataspec.cc
@@ -15,34 +15,31 @@ std::vector<std::string> DataSpec::split(
 {
    std::vector<std::string> ret;

-    size_t start = 0;
-    size_t end = 0;
-    size_t len = 0;
-    do
-    {
-        end = s.find(delimiter,start); 
-        len = end - start;
-        std::string token = s.substr(start, len);
-        ret.emplace_back( token );
-        start += len + delimiter.length();
-    }
-    while (end != std::string::npos);
+	if (!s.empty())
+	{
+		size_t start = 0;
+		size_t end = 0;
+		size_t len = 0;
+		do
+		{
+			end = s.find(delimiter,start); 
+			len = end - start;
+			std::string token = s.substr(start, len);
+			ret.emplace_back( token );
+			start += len + delimiter.length();
+		}
+		while (end != std::string::npos);
+	}
+
    return ret;
 }

-DataSpec::Modifier DataSpec::parseMod(const std::string& spec)
+std::set<unsigned> DataSpec::parseRange(const std::string& data)
 {
-    static const std::regex MOD_REGEX("([a-z]*)=([-x+0-9,]*)");
-    static const std::regex DATA_REGEX("([0-9]+)(?:(?:-([0-9]+))|(?:\\+([0-9]+)))?(?:x([0-9]+))?");
+	static const std::regex DATA_REGEX("([0-9]+)(?:(?:-([0-9]+))|(?:\\+([0-9]+)))?(?:x([0-9]+))?");

-    std::smatch match;
-    if (!std::regex_match(spec, match, MOD_REGEX))
-        Error() << "invalid data modifier syntax '" << spec << "'";
-    
-    Modifier m;
-    m.name = match[1];
-    m.source = spec;
-    for (auto& data : split(match[2], ","))
+	std::set<unsigned> result;
+    for (auto& data : split(data, ","))
    {
        int start = 0;
        int count = 1;
@@ -64,9 +61,24 @@ DataSpec::Modifier DataSpec::parseMod(const std::string& spec)
            Error() << "mod '" << data << "' specifies an illegal quantity";

        for (int i = start; i < (start+count); i += step)
-            m.data.insert(i);
+            result.insert(i);
    }

+    return result;
+}
+
+DataSpec::Modifier DataSpec::parseMod(const std::string& spec)
+{
+	static const std::regex MOD_REGEX("([a-z]*)=([-x+0-9,]*)");
+
+    std::smatch match;
+    if (!std::regex_match(spec, match, MOD_REGEX))
+        Error() << "invalid data modifier syntax '" << spec << "'";
+    
+    Modifier m;
+    m.name = match[1];
+    m.source = spec;
+	m.data = parseRange(match[2]);
    return m;
 }

@@ -74,7 +86,7 @@ void DataSpec::set(const std::string& spec)
 {
    std::vector<std::string> words = split(spec, ":");
    if (words.size() == 0)
-        Error() << "empty data specification (you have to specify *something*)";
+		return;

    filename = words[0];
    if (words.size() > 1)
--- a/lib/dataspec.h
+++ b/lib/dataspec.h
@@ -34,6 +34,8 @@ public:
 public:
    static std::vector<std::string> split(
        const std::string& s, const std::string& delimiter);
+	static std::set<unsigned> parseRange(const std::string& spec);
+
    static Modifier parseMod(const std::string& spec);

 public:
@@ -117,4 +119,34 @@ private:
    DataSpec _value;
 };

+class RangeFlag : public Flag
+{
+public:
+    RangeFlag(const std::vector<std::string>& names, const std::string helptext,
+            const std::string& defaultValue):
+        Flag(names, helptext),
+		_stringValue(defaultValue),
+        _value(DataSpec::parseRange(defaultValue))
+    {}
+
+    const std::set<unsigned>& get() const
+    { checkInitialised(); return _value; }
+
+    operator const std::set<unsigned>& () const
+    { return get(); }
+
+    bool hasArgument() const { return true; }
+    const std::string defaultValueAsString() const { return _stringValue; }
+
+    void set(const std::string& value)
+	{
+		_stringValue = value;
+		_value = DataSpec::parseRange(value);
+	}
+
+private:
+	std::string _stringValue;
+    std::set<unsigned> _value;
+};
+
 #endif
--- a/lib/decoders/decoders.cc
+++ b/lib/decoders/decoders.cc
@@ -25,7 +25,7 @@ void AbstractDecoder::decodeToSectors(Track& track)
    beginTrack();
    for (;;)
    {
-        Fluxmap::Position recordStart = sector.position = fmr.tell();
+        Fluxmap::Position recordStart = fmr.tell();
        sector.clock = 0;
        sector.status = Sector::MISSING;
        sector.data.clear();
@@ -35,13 +35,13 @@ void AbstractDecoder::decodeToSectors(Track& track)
            return;
        if ((r == UNKNOWN_RECORD) || (r == DATA_RECORD))
        {
-            fmr.readNextMatchingOpcode(F_OP_PULSE);
+            fmr.findEvent(F_BIT_PULSE);
            continue;
        }

        /* Read the sector record. */

-        recordStart = fmr.tell();
+        sector.position = recordStart = fmr.tell();
        decodeSectorRecord();
        Fluxmap::Position recordEnd = fmr.tell();
        pushRecord(recordStart, recordEnd);
@@ -51,14 +51,19 @@ void AbstractDecoder::decodeToSectors(Track& track)

            sector.headerStartTime = recordStart.ns();
            sector.headerEndTime = recordEnd.ns();
-            r = advanceToNextRecord();
+			for (;;)
+			{
+				r = advanceToNextRecord();
+				if (r != UNKNOWN_RECORD)
+					break;
+				if (fmr.findEvent(F_BIT_PULSE) == 0)
+                    break;
+			}
+            recordStart = fmr.tell();
            if (r == DATA_RECORD)
-            {
-                recordStart = fmr.tell();
                decodeDataRecord();
-                recordEnd = fmr.tell();
-                pushRecord(recordStart, recordEnd);
-            }
+            recordEnd = fmr.tell();
+            pushRecord(recordStart, recordEnd);
        }
        sector.dataStartTime = recordStart.ns();
        sector.dataEndTime = recordEnd.ns();
@@ -83,3 +88,10 @@ void AbstractDecoder::pushRecord(const Fluxmap::Position& start, const Fluxmap::
    _track->rawrecords.push_back(record);
    _fmr->seek(here);
 }
+
+std::set<unsigned> AbstractDecoder::requiredSectors(Track& track) const
+{
+	static std::set<unsigned> empty;
+	return empty;
+}
+
--- a/lib/decoders/decoders.h
+++ b/lib/decoders/decoders.h
@@ -20,7 +20,8 @@ extern void setDecoderManualClockRate(double clockrate_us);

 extern Bytes decodeFmMfm(std::vector<bool>::const_iterator start,
    std::vector<bool>::const_iterator end);
-extern void encodeMfm(std::vector<bool>& bits, unsigned& cursor, const Bytes& input);
+extern void encodeMfm(std::vector<bool>& bits, unsigned& cursor, const Bytes& input, bool& lastBit);
+extern void encodeFm(std::vector<bool>& bits, unsigned& cursor, const Bytes& input);

 static inline Bytes decodeFmMfm(const std::vector<bool> bits)
 { return decodeFmMfm(bits.begin(), bits.end()); }
@@ -51,6 +52,11 @@ public:
    void seek(const Fluxmap::Position& pos)
    { return _fmr->seek(pos); } 

+	/* Returns a set of sectors required to exist on this track. If the reader
+	 * sees any missing, it will consider this to be an error and will retry
+	 * the read. */
+	virtual std::set<unsigned> requiredSectors(Track& track) const;
+
 protected:
    virtual void beginTrack() {};
    virtual RecordType advanceToNextRecord() = 0;
--- a/lib/decoders/fluxmapreader.cc
+++ b/lib/decoders/fluxmapreader.cc
@@ -25,16 +25,20 @@ static DoubleFlag clockIntervalBias(
    "Adjust intervals between pulses by this many clocks before decoding.",
    -0.02);

-int FluxmapReader::readOpcode(unsigned& ticks)
+static DoubleFlag minimumClockUs(
+    { "--minimum-clock-us" },
+    "Refuse to detect clocks shorter than this, to avoid false positives.",
+    0.75);
+
+uint8_t FluxmapReader::getNextEvent(unsigned& ticks)
 {
    ticks = 0;

    while (!eof())
    {
        uint8_t b = _bytes[_pos.bytes++];
-        if (b < 0x80)
-            ticks += b;
-        else
+		ticks += b & 0x3f;
+		if (b & (F_BIT_PULSE|F_BIT_INDEX))
        {
            _pos.ticks += ticks;
            return b;
@@ -42,21 +46,21 @@ int FluxmapReader::readOpcode(unsigned& ticks)
    }

    _pos.ticks += ticks;
-    return -1;
+    return 0;
 }

-unsigned FluxmapReader::readNextMatchingOpcode(uint8_t opcode)
+unsigned FluxmapReader::findEvent(uint8_t target)
 {
    unsigned ticks = 0;

    for (;;)
    {
        unsigned thisTicks;
-        int op = readOpcode(thisTicks);
+        uint8_t bits = getNextEvent(thisTicks);
        ticks += thisTicks;
-        if (op == -1)
+        if (eof())
            return 0;
-        if (op == opcode)
+        if (bits & target)
            return ticks;
    }
 }
@@ -68,7 +72,7 @@ unsigned FluxmapReader::readInterval(nanoseconds_t clock)

    while (ticks < thresholdTicks)
    {
-        unsigned thisTicks = readNextMatchingOpcode(F_OP_PULSE);
+        unsigned thisTicks = findEvent(F_BIT_PULSE);
        if (!thisTicks)
            break;
        ticks += thisTicks;
@@ -191,7 +195,7 @@ void FluxmapReader::seek(nanoseconds_t ns)
    while (!eof() && (_pos.ticks < ticks))
    {
        unsigned t;
-        readOpcode(t);
+        getNextEvent(t);
    }
    _pos.zeroes = 0;
 }
@@ -222,7 +226,9 @@ nanoseconds_t FluxmapReader::seekToPattern(const FluxMatcher& pattern, const Flu
            seek(positions[intervalCount-match.intervals]);
            _pos.zeroes = match.zeroes;
            matching = match.matcher;
-            return match.clock * NS_PER_TICK;
+            nanoseconds_t detectedClock = match.clock * NS_PER_TICK;
+            if (detectedClock > (minimumClockUs*1000))
+                return match.clock * NS_PER_TICK;
        }

        for (unsigned i=0; i<intervalCount; i++)
@@ -230,7 +236,7 @@ nanoseconds_t FluxmapReader::seekToPattern(const FluxMatcher& pattern, const Flu
            positions[i] = positions[i+1];
            candidates[i] = candidates[i+1];
        }
-        candidates[intervalCount] = readNextMatchingOpcode(F_OP_PULSE);
+        candidates[intervalCount] = findEvent(F_BIT_PULSE);
        positions[intervalCount] = tell();

    }
@@ -241,7 +247,7 @@ nanoseconds_t FluxmapReader::seekToPattern(const FluxMatcher& pattern, const Flu

 void FluxmapReader::seekToIndexMark()
 {
-    readNextMatchingOpcode(F_OP_INDEX);
+    findEvent(F_BIT_INDEX);
    _pos.zeroes = 0;
 }

--- a/lib/decoders/fluxmapreader.h
+++ b/lib/decoders/fluxmapreader.h
@@ -96,8 +96,8 @@ public:
        _pos = pos;
    }

-    int readOpcode(unsigned& ticks);
-    unsigned readNextMatchingOpcode(uint8_t opcode);
+    uint8_t getNextEvent(unsigned& ticks);
+    unsigned findEvent(uint8_t bits);
    unsigned readInterval(nanoseconds_t clock); /* with debounce support */

    /* Important! You can only reliably seek to 1 bits. */
--- a/lib/decoders/fmmfm.cc
+++ b/lib/decoders/fmmfm.cc
@@ -52,9 +52,32 @@ Bytes decodeFmMfm(
    return bytes;
 }

-void encodeMfm(std::vector<bool>& bits, unsigned& cursor, const Bytes& input)
+void encodeFm(std::vector<bool>& bits, unsigned& cursor, const Bytes& input)
 {
-    bool lastBit = false;
+	if (bits.size() == 0)
+		return;
+    unsigned len = bits.size()-1;
+
+    for (uint8_t b : input)
+    {
+        for (int i=0; i<8; i++)
+        {
+            bool bit = b & 0x80;
+            b <<= 1;
+
+            if (cursor >= len)
+                return;
+            
+            bits[cursor++] = true;
+            bits[cursor++] = bit;
+        }
+    }
+}
+
+void encodeMfm(std::vector<bool>& bits, unsigned& cursor, const Bytes& input, bool& lastBit)
+{
+	if (bits.size() == 0)
+		return;
    unsigned len = bits.size()-1;

    for (uint8_t b : input)
--- a/lib/flags.cc
+++ b/lib/flags.cc
@@ -1,5 +1,6 @@
 #include "globals.h"
 #include "flags.h"
+#include "fmt/format.h"

 static FlagGroup* currentFlagGroup;
 static std::vector<Flag*> all_flags;
@@ -172,6 +173,11 @@ void BoolFlag::set(const std::string& value)
 		Error() << "can't parse '" << value << "'; try 'true' or 'false'";
 }

+const std::string HexIntFlag::defaultValueAsString() const
+{
+	return fmt::format("0x{:x}", _defaultValue);
+}
+
 static void doHelp()
 {
    std::cout << "FluxEngine options:" << std::endl;
--- a/lib/flags.h
+++ b/lib/flags.h
@@ -135,6 +135,17 @@ public:
    void set(const std::string& value) { _value = std::stoi(value); }
 };

+class HexIntFlag : public IntFlag
+{
+public:
+    HexIntFlag(const std::vector<std::string>& names, const std::string helptext,
+            int defaultValue = 0):
+        IntFlag(names, helptext, defaultValue)
+    {}
+
+    const std::string defaultValueAsString() const;
+};
+
 class DoubleFlag : public ValueFlag<double>
 {
 public:
@@ -147,7 +158,7 @@ public:
    void set(const std::string& value) { _value = std::stod(value); }
 };

-class BoolFlag : public ValueFlag<double>
+class BoolFlag : public ValueFlag<bool>
 {
 public:
    BoolFlag(const std::vector<std::string>& names, const std::string helptext,
--- a/lib/fluxmap.cc
+++ b/lib/fluxmap.cc
@@ -4,6 +4,9 @@

 Fluxmap& Fluxmap::appendBytes(const Bytes& bytes)
 {
+	if (bytes.size() == 0)
+		return *this;
+
    return appendBytes(&bytes[0], bytes.size());
 }

@@ -15,8 +18,7 @@ Fluxmap& Fluxmap::appendBytes(const uint8_t* ptr, size_t len)
    while (len--)
    {
        uint8_t byte = *ptr++;
-        if (byte < 0x80)
-            _ticks += byte;
+		_ticks += byte & 0x3f;
        bw.write_8(byte);
    }

@@ -24,12 +26,19 @@ Fluxmap& Fluxmap::appendBytes(const uint8_t* ptr, size_t len)
    return *this;
 }

+uint8_t& Fluxmap::findLastByte()
+{
+	if (_bytes.empty())
+		appendByte(0x00);
+	return *(_bytes.end() - 1);
+}
+
 Fluxmap& Fluxmap::appendInterval(uint32_t ticks)
 {
-    while (ticks >= 0x7f)
+    while (ticks >= 0x3f)
    {
-        appendByte(0x7f);
-        ticks -= 0x7f;
+        appendByte(0x3f);
+        ticks -= 0x3f;
    }
    appendByte((uint8_t)ticks);
    return *this;
@@ -37,13 +46,13 @@ Fluxmap& Fluxmap::appendInterval(uint32_t ticks)

 Fluxmap& Fluxmap::appendPulse()
 {
-    appendByte(0x80);
+	findLastByte() |= 0x80;
    return *this;
 }

 Fluxmap& Fluxmap::appendIndex()
 {
-    appendByte(0x81);
+	findLastByte() |= 0x40;
    return *this;
 }

@@ -54,25 +63,26 @@ void Fluxmap::precompensate(int threshold_ticks, int amount_ticks)
    for (unsigned i=0; i<_bytes.size(); i++)
    {
        uint8_t& prev = (i == 0) ? junk : _bytes[i-1];
-        uint8_t curr = _bytes[i];
+		uint8_t prevticks = prev & 0x3f;
+        uint8_t currticks = _bytes[i] & 0x3f;

-        if (curr < (3*threshold_ticks))
+        if (currticks < (3*threshold_ticks))
        {
-            if ((prev <= threshold_ticks) && (curr > threshold_ticks))
+            if ((prevticks <= threshold_ticks) && (currticks > threshold_ticks))
            {
                /* 01001; move the previous bit backwards. */
-                if (prev >= (1+amount_ticks))
+                if (prevticks >= (1+amount_ticks))
                    prev -= amount_ticks;
-                if (curr <= (0x7f-amount_ticks))
-                    curr += amount_ticks;
+                if (currticks <= (0x7f-amount_ticks))
+                    currticks += amount_ticks;
            }
-            else if ((prev > threshold_ticks) && (curr <= threshold_ticks))
+            else if ((prevticks > threshold_ticks) && (currticks <= threshold_ticks))
            {
                /* 00101; move the current bit forwards. */
-                if (prev <= (0x7f-amount_ticks))
+                if (prevticks <= (0x7f-amount_ticks))
                    prev += amount_ticks;
-                if (curr >= (1+amount_ticks))
-                    curr -= amount_ticks;
+                if (currticks >= (1+amount_ticks))
+                    currticks -= amount_ticks;
            }
        }
    }
--- a/lib/fluxmap.h
+++ b/lib/fluxmap.h
@@ -48,6 +48,9 @@ public:

 	void precompensate(int threshold_ticks, int amount_ticks);

+private:
+	uint8_t& findLastByte();
+
 private:
    nanoseconds_t _duration = 0;
    int _ticks = 0;
--- a/lib/fluxsink/fluxsink.h
+++ b/lib/fluxsink/fluxsink.h
@@ -4,6 +4,7 @@
 #include "flags.h"

 extern FlagGroup hardwareFluxSinkFlags;
+extern FlagGroup sqliteFluxSinkFlags;

 class Fluxmap;
 class FluxSpec;
@@ -13,11 +14,9 @@ class FluxSink
 public:
    virtual ~FluxSink() {}

-private:
    static std::unique_ptr<FluxSink> createSqliteFluxSink(const std::string& filename);
    static std::unique_ptr<FluxSink> createHardwareFluxSink(unsigned drive);

-public:
    static std::unique_ptr<FluxSink> create(const FluxSpec& spec);

 public:
--- a/lib/fluxsink/hardwarefluxsink.cc
+++ b/lib/fluxsink/hardwarefluxsink.cc
@@ -36,8 +36,7 @@ public:
        usbSetDrive(_drive, high_density, indexMode);
        usbSeek(track);

-        Bytes crunched = fluxmap.rawBytes().crunch();
-        return usbWrite(side, crunched);
+        return usbWrite(side, fluxmap.rawBytes());
    }

 private:
--- a/lib/fluxsink/sqlitefluxsink.cc
+++ b/lib/fluxsink/sqlitefluxsink.cc
@@ -2,14 +2,37 @@
 #include "fluxmap.h"
 #include "sql.h"
 #include "fluxsink/fluxsink.h"
+#include "flags.h"
 #include "fmt/format.h"
+#include <unistd.h>
+
+FlagGroup sqliteFluxSinkFlags;
+
+static SettableFlag mergeFlag(
+	{ "--merge" },
+	"merge new data into existing flux file");
+
+static SettableFlag overwriteFlag(
+	{ "--overwrite" },
+	"overwrite existing flux file");

 class SqliteFluxSink : public FluxSink
 {
 public:
    SqliteFluxSink(const std::string& filename)
    {
+		if (mergeFlag && overwriteFlag)
+			Error() << "you can't specify --merge and --overwrite";
+
+		if (!mergeFlag)
+		{
+			if (!overwriteFlag && (access(filename.c_str(), F_OK) == 0))
+				Error() << "cowardly refusing to overwrite flux file without --merge or --overwrite specified";
+			if ((access(filename.c_str(), F_OK) == 0) && (remove(filename.c_str()) != 0))
+				Error() << fmt::format("failed to overwrite flux file");
+		}
 		_outdb = sqlOpen(filename, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
+
 		int oldVersion = sqlReadIntProperty(_outdb, "version");
 		if ((oldVersion != 0) && (oldVersion != FLUX_VERSION_CURRENT))
            Error() << fmt::format("that flux file is version {}, but this client is for version {}",
--- a/lib/fluxsource/fluxsource.h
+++ b/lib/fluxsource/fluxsource.h
@@ -27,8 +27,9 @@ public:
    virtual bool retryable() { return false; }
 };

-extern void setHardwareFluxSourceRevolutions(int revolutions);
+extern void setHardwareFluxSourceRevolutions(double revolutions);
 extern void setHardwareFluxSourceDensity(bool high_density);
+extern void setHardwareFluxSourceSynced(bool synced);

 #endif

--- a/lib/fluxsource/hardwarefluxsource.cc
+++ b/lib/fluxsource/hardwarefluxsource.cc
@@ -3,13 +3,19 @@
 #include "fluxmap.h"
 #include "usb.h"
 #include "fluxsource/fluxsource.h"
+#include "fmt/format.h"

 FlagGroup hardwareFluxSourceFlags;

-static IntFlag revolutions(
+static DoubleFlag revolutions(
    { "--revolutions" },
    "read this many revolutions of the disk",
-    1);
+    1.25);
+
+static BoolFlag synced(
+    { "--sync-with-index" },
+    "whether to wait for an index pulse before started to read",
+    false);

 static IntFlag indexMode(
    { "--index-mode" },
@@ -29,6 +35,10 @@ public:
    HardwareFluxSource(unsigned drive):
        _drive(drive)
    {
+        usbSetDrive(_drive, high_density, indexMode);
+        std::cerr << "Measuring rotational speed... " << std::flush;
+        _oneRevolution = usbGetRotationalPeriod();
+        std::cerr << fmt::format("{}ms\n", _oneRevolution / 1e6);
    }

    ~HardwareFluxSource()
@@ -40,9 +50,9 @@ public:
    {
        usbSetDrive(_drive, high_density, indexMode);
        usbSeek(track);
-        Bytes crunched = usbRead(side, revolutions);
+        Bytes data = usbRead(side, synced, revolutions * _oneRevolution);
        auto fluxmap = std::make_unique<Fluxmap>();
-        fluxmap->appendBytes(crunched.uncrunch());
+        fluxmap->appendBytes(data);
        return fluxmap;
    }

@@ -59,13 +69,19 @@ public:
 private:
    unsigned _drive;
    unsigned _revolutions;
+    nanoseconds_t _oneRevolution;
 };

-void setHardwareFluxSourceRevolutions(int revolutions)
+void setHardwareFluxSourceRevolutions(double revolutions)
 {
    ::revolutions.setDefaultValue(revolutions);
 }

+void setHardwareFluxSourceSynced(bool synced)
+{
+    ::synced.setDefaultValue(synced);
+}
+
 std::unique_ptr<FluxSource> FluxSource::createHardwareFluxSource(unsigned drive)
 {
    return std::unique_ptr<FluxSource>(new HardwareFluxSource(drive));
--- a/lib/image.cc
+++ b/lib/image.cc
@@ -1,25 +0,0 @@
-#include "globals.h"
-#include "image.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 <algorithm>
-#include <iostream>
-#include <fstream>
-
-SectorSet readSectorsFromFile(const ImageSpec& spec)
-{
-	return ImageReader::create(spec)->readImage();
-}
-
-void writeSectorsToFile(const SectorSet& sectors, const ImageSpec& spec)
-{
-	std::unique_ptr<ImageWriter> writer(ImageWriter::create(sectors, spec));
-	writer->adjustGeometry();
-	writer->printMap();
-	writer->writeImage();
-}
--- a/lib/image.h
+++ b/lib/image.h
@@ -1,14 +0,0 @@
-#ifndef IMAGE_H
-#define IMAGE_H
-
-class SectorSet;
-class ImageSpec;
-
-extern SectorSet readSectorsFromFile(
-	const ImageSpec& filename);
-
-extern void writeSectorsToFile(
-	const SectorSet& sectors,
-	const ImageSpec& filename);
-
-#endif
--- a/lib/imagereader/imagereader.cc
+++ b/lib/imagereader/imagereader.cc
@@ -1,17 +1,19 @@
 #include "globals.h"
-#include "image.h"
 #include "flags.h"
 #include "dataspec.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "imagereader/imagereader.h"
 #include "fmt/format.h"
+#include <algorithm>
+#include <ctype.h>

 std::map<std::string, ImageReader::Constructor> ImageReader::formats =
 {
 	{".adf", ImageReader::createImgImageReader},
 	{".d81", ImageReader::createImgImageReader},
 	{".img", ImageReader::createImgImageReader},
+	{".ima", ImageReader::createImgImageReader},
 };

 static bool ends_with(const std::string& value, const std::string& ending)
--- a/lib/imagereader/imgimagereader.cc
+++ b/lib/imagereader/imgimagereader.cc
@@ -1,5 +1,4 @@
 #include "globals.h"
-#include "image.h"
 #include "flags.h"
 #include "dataspec.h"
 #include "sector.h"
--- a/lib/imagewriter/d64imagewriter.cc
+++ b/lib/imagewriter/d64imagewriter.cc
@@ -1,5 +1,4 @@
 #include "globals.h"
-#include "image.h"
 #include "flags.h"
 #include "dataspec.h"
 #include "sector.h"
--- a/lib/imagewriter/imagewriter.cc
+++ b/lib/imagewriter/imagewriter.cc
@@ -1,11 +1,12 @@
 #include "globals.h"
-#include "image.h"
 #include "flags.h"
 #include "dataspec.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "imagewriter/imagewriter.h"
 #include "fmt/format.h"
+#include <iostream>
+#include <fstream>

 std::map<std::string, ImageWriter::Constructor> ImageWriter::formats =
 {
@@ -63,6 +64,56 @@ void ImageWriter::adjustGeometry()
 	}
 }

+void ImageWriter::writeCsv(const std::string& filename)
+{
+	std::ofstream f(filename, std::ios::out);
+	if (!f.is_open())
+		Error() << "cannot open CSV report file";
+
+	f << "\"Physical track\","
+		"\"Physical side\","
+		"\"Logical track\","
+		"\"Logical side\","
+		"\"Logical sector\","
+		"\"Clock (ns)\","
+		"\"Header start (ns)\","
+		"\"Header end (ns)\","
+		"\"Data start (ns)\","
+		"\"Data end (ns)\","
+		"\"Raw data address (bytes)\","
+		"\"User payload length (bytes)\","
+		"\"Status\""
+		"\n";
+
+	for (int track = 0; track < spec.cylinders; track++)
+	{
+		for (int head = 0; head < spec.heads; head++)
+		{
+			for (int sectorId = 0; sectorId < spec.sectors; sectorId++)
+			{
+				f << fmt::format("{},{},", track, head);
+				const auto& sector = sectors.get(track, head, sectorId);
+				if (!sector)
+					f << fmt::format(",,{},,,,,,,,MISSING\n", sectorId);
+				else
+					f << fmt::format("{},{},{},{},{},{},{},{},{},{},{}\n",
+						sector->logicalTrack,
+						sector->logicalSide,
+						sector->logicalSector,
+						sector->clock,
+						sector->headerStartTime,
+						sector->headerEndTime,
+						sector->dataStartTime,
+						sector->dataEndTime,
+						sector->position.bytes,
+						sector->data.size(),
+						Sector::statusToString(sector->status)
+					);
+			}
+		}
+	}
+}
+
 void ImageWriter::printMap()
 {
 	int badSectors = 0;
--- a/lib/imagewriter/imagewriter.h
+++ b/lib/imagewriter/imagewriter.h
@@ -35,6 +35,7 @@ private:
 public:
 	virtual void adjustGeometry();
 	void printMap();
+	void writeCsv(const std::string& filename);
 	virtual void writeImage() = 0;

 protected:
--- a/lib/imagewriter/imgimagewriter.cc
+++ b/lib/imagewriter/imgimagewriter.cc
@@ -1,5 +1,4 @@
 #include "globals.h"
-#include "image.h"
 #include "flags.h"
 #include "dataspec.h"
 #include "sector.h"
@@ -47,7 +46,7 @@ public:
 					if (sector)
 					{
 						outputFile.seekp(sector->logicalTrack*trackSize + sector->logicalSide*headSize + sector->logicalSector*numBytes, std::ios::beg);
-						outputFile.write((const char*) sector->data.cbegin(), sector->data.size());
+						sector->data.slice(0, numBytes).writeTo(outputFile);
 					}
 				}
 			}
--- a/lib/imagewriter/ldbsimagewriter.cc
+++ b/lib/imagewriter/ldbsimagewriter.cc
@@ -1,5 +1,4 @@
 #include "globals.h"
-#include "image.h"
 #include "flags.h"
 #include "dataspec.h"
 #include "sector.h"
--- a/lib/reader.cc
+++ b/lib/reader.cc
@@ -2,6 +2,7 @@
 #include "flags.h"
 #include "usb.h"
 #include "fluxsource/fluxsource.h"
+#include "fluxsink/fluxsink.h"
 #include "reader.h"
 #include "fluxmap.h"
 #include "sql.h"
@@ -11,14 +12,21 @@
 #include "sectorset.h"
 #include "visualiser.h"
 #include "record.h"
-#include "image.h"
 #include "bytes.h"
 #include "decoders/rawbits.h"
 #include "track.h"
 #include "imagewriter/imagewriter.h"
 #include "fmt/format.h"
+#include <iostream>
+#include <fstream>

-FlagGroup readerFlags { &hardwareFluxSourceFlags, &fluxmapReaderFlags, &visualiserFlags };
+FlagGroup readerFlags
+{
+	&hardwareFluxSourceFlags,
+	&sqliteFluxSinkFlags,
+	&fluxmapReaderFlags,
+	&visualiserFlags
+};

 static DataSpecFlag source(
    { "--source", "-s" },
@@ -46,7 +54,11 @@ static SettableFlag justRead(

 static SettableFlag dumpRecords(
 	{ "--dump-records" },
-	"Dump the parsed records.");
+	"Dump the parsed but undecoded records.");
+
+static SettableFlag dumpSectors(
+	{ "--dump-sectors" },
+	"Dump the decoded sectors.");

 static IntFlag retries(
 	{ "--retries" },
@@ -57,7 +69,12 @@ static SettableFlag highDensityFlag(
 	{ "--high-density", "--hd" },
 	"set the drive to high density mode");

-static sqlite3* outdb;
+static StringFlag csvFile(
+	{ "--write-csv" },
+	"write a CSV report of the disk state",
+	"");
+
+static std::unique_ptr<FluxSink> outputFluxSink;

 void setReaderDefaultSource(const std::string& source)
 {
@@ -74,6 +91,16 @@ void setReaderRevolutions(int revolutions)
 	setHardwareFluxSourceRevolutions(revolutions);
 }

+static void writeSectorsToFile(const SectorSet& sectors, const ImageSpec& spec)
+{
+	std::unique_ptr<ImageWriter> writer(ImageWriter::create(sectors, spec));
+	writer->adjustGeometry();
+	writer->printMap();
+	if (!csvFile.get().empty())
+		writer->writeCsv(csvFile.get());
+	writer->writeImage();
+}
+
 void Track::readFluxmap()
 {
 	std::cout << fmt::format("{0:>3}.{1}: ", physicalTrack, physicalSide) << std::flush;
@@ -82,8 +109,8 @@ void Track::readFluxmap()
 		"{0} ms in {1} bytes\n",
            int(fluxmap->duration()/1e6),
            fluxmap->bytes());
-	if (outdb)
-		sqlWriteFlux(outdb, physicalTrack, physicalSide, *fluxmap);
+	if (outputFluxSink)
+		outputFluxSink->writeFlux(physicalTrack, physicalSide, *fluxmap);
 }

 std::vector<std::unique_ptr<Track>> readTracks()
@@ -96,17 +123,8 @@ std::vector<std::unique_ptr<Track>> readTracks()

 	if (!destination.get().empty())
 	{
-		outdb = sqlOpen(destination, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
 		std::cout << "Writing a copy of the flux to " << destination.get() << std::endl;
-		sqlPrepareFlux(outdb);
-		sqlStmt(outdb, "BEGIN;");
-        sqlWriteIntProperty(outdb, "version", FLUX_VERSION_CURRENT);
-		atexit([]()
-			{
-				sqlStmt(outdb, "COMMIT;");
-				sqlClose(outdb);
-			}
-		);
+		outputFluxSink = FluxSink::createSqliteFluxSink(destination.get());
 	}

 	std::shared_ptr<FluxSource> fluxSource = FluxSource::create(spec);
@@ -174,8 +192,6 @@ void readDiskCommand(AbstractDecoder& decoder)
 			decoder.decodeToSectors(*track);

 			std::cout << "       ";
-			if (!track->sectors.empty())
-			{
 				std::cout << fmt::format("{} records, {} sectors; ",
 					track->rawrecords.size(),
 					track->sectors.size());
@@ -191,9 +207,12 @@ void readDiskCommand(AbstractDecoder& decoder)
 				}

 				bool hasBadSectors = false;
+				std::set<unsigned> requiredSectors = decoder.requiredSectors(*track);
 				for (const auto& i : readSectors)
 				{
 					const auto& sector = i.second;
+					requiredSectors.erase(sector->logicalSector);
+
 					if (sector->status != Sector::OK)
 					{
 						std::cout << std::endl
@@ -202,6 +221,12 @@ void readDiskCommand(AbstractDecoder& decoder)
 						hasBadSectors = true;
 					}
 				}
+				for (unsigned logicalSector : requiredSectors)
+				{
+					std::cout << "\n"
+					          << "       Required sector " << logicalSector << " missing; ";
+					hasBadSectors = true;
+				}

 				if (hasBadSectors)
 					failures = false;
@@ -211,7 +236,6 @@ void readDiskCommand(AbstractDecoder& decoder)

 				if (!hasBadSectors)
 					break;
-			}

 			if (!track->fluxsource->retryable())
 				break;
@@ -227,13 +251,27 @@ void readDiskCommand(AbstractDecoder& decoder)
 			std::cout << "\nRaw (undecoded) records follow:\n\n";
 			for (auto& record : track->rawrecords)
 			{
-				std::cout << fmt::format("I+{:.2f}us", record.position.ns() / 1000.0)
-						<< std::endl;
+				std::cout << fmt::format("I+{:.2f}us with {:.2f}us clock\n",
+                            record.position.ns() / 1000.0, record.clock / 1000.0);
 				hexdump(std::cout, record.data);
 				std::cout << std::endl;
 			}
 		}

+        if (dumpSectors)
+        {
+            std::cout << "\nDecoded sectors follow:\n\n";
+            for (auto& sector : track->sectors)
+            {
+				std::cout << fmt::format("{}.{:02}.{:02}: I+{:.2f}us with {:.2f}us clock: status {}\n",
+                            sector.logicalTrack, sector.logicalSide, sector.logicalSector,
+                            sector.position.ns() / 1000.0, sector.clock / 1000.0,
+							sector.status);
+				hexdump(std::cout, sector.data);
+				std::cout << std::endl;
+            }
+        }
+
        int size = 0;
 		bool printedTrack = false;
        for (auto& i : readSectors)
@@ -258,7 +296,7 @@ void readDiskCommand(AbstractDecoder& decoder)

 	if (!visualise.get().empty())
 		visualiseSectorsToFile(allSectors, visualise.get());
-
+	
    writeSectorsToFile(allSectors, outputSpec);
 	if (failures)
 		std::cerr << "Warning: some sectors could not be decoded." << std::endl;
--- a/lib/sectorset.cc
+++ b/lib/sectorset.cc
@@ -1,5 +1,4 @@
 #include "globals.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"

--- a/lib/sql.h
+++ b/lib/sql.h
@@ -10,8 +10,9 @@ enum
    FLUX_VERSION_0, /* without properties table */
    FLUX_VERSION_1,
    FLUX_VERSION_2, /* new bytecode with index marks */
+	FLUX_VERSION_3, /* simplified bytecode with six-bit timer */

-    FLUX_VERSION_CURRENT = 2,
+    FLUX_VERSION_CURRENT = FLUX_VERSION_3,
 };

 extern void sqlCheck(sqlite3* db, int i);
--- a/lib/usb.cc
+++ b/lib/usb.cc
@@ -3,7 +3,6 @@
 #include "protocol.h"
 #include "fluxmap.h"
 #include "bytes.h"
-#include "common/crunch.h"
 #include <libusb.h>
 #include "fmt/format.h"

@@ -149,23 +148,26 @@ nanoseconds_t usbGetRotationalPeriod(void)
    usb_cmd_send(&f, f.f.size);

    auto r = await_reply<struct speed_frame>(F_FRAME_MEASURE_SPEED_REPLY);
-    return r->period_ms * 1000;
+    return r->period_ms * 1000000;
 }

 static int large_bulk_transfer(int ep, Bytes& bytes)
 {
+    if (bytes.size() == 0)
+        return 0;
+
    int len;
    int i = libusb_bulk_transfer(device, ep, bytes.begin(), bytes.size(), &len, TIMEOUT);
    if (i < 0)
-        Error() << "data transfer failed: " << usberror(i);
+        Error() << fmt::format("data transfer failed at {} bytes: {}", len, usberror(i));
    return len;
 }

-void usbTestBulkTransport()
+void usbTestBulkWrite()
 {
    usb_init();

-    struct any_frame f = { .f = {.type = F_FRAME_BULK_TEST_CMD, .size = sizeof(f)} };
+    struct any_frame f = { .f = {.type = F_FRAME_BULK_WRITE_TEST_CMD, .size = sizeof(f)} };
    usb_cmd_send(&f, f.f.size);

    /* These must match the device. */
@@ -180,9 +182,9 @@ void usbTestBulkTransport()

    std::cout << "Transferred "
              << bulk_buffer.size()
-              << " bytes in "
+              << " bytes from FluxEngine -> PC in "
              << int(elapsed_time * 1000.0)
-              << " ("
+              << " ms ("
              << int((bulk_buffer.size() / 1024.0) / elapsed_time)
              << " kB/s)"
              << std::endl;
@@ -199,16 +201,56 @@ void usbTestBulkTransport()
                            << x << '.' << y << '.' << z << '.';
            }

-    await_reply<struct any_frame>(F_FRAME_BULK_TEST_REPLY);
+    await_reply<struct any_frame>(F_FRAME_BULK_WRITE_TEST_REPLY);
 }

-Bytes usbRead(int side, int revolutions)
+void usbTestBulkRead()
+{
+    usb_init();
+
+    struct any_frame f = { .f = {.type = F_FRAME_BULK_READ_TEST_CMD, .size = sizeof(f)} };
+    usb_cmd_send(&f, f.f.size);
+
+    /* These must match the device. */
+    const int XSIZE = 64;
+    const int YSIZE = 256;
+    const int ZSIZE = 64;
+
+    Bytes bulk_buffer(XSIZE*YSIZE*ZSIZE);
+    for (int x=0; x<XSIZE; x++)
+        for (int y=0; y<YSIZE; y++)
+            for (int z=0; z<ZSIZE; z++)
+            {
+                int offset = x*XSIZE*YSIZE + y*ZSIZE + z;
+                bulk_buffer[offset] = uint8_t(x+y+z);
+            }
+
+    double start_time = getCurrentTime();
+    large_bulk_transfer(FLUXENGINE_DATA_OUT_EP, bulk_buffer);
+    double elapsed_time = getCurrentTime() - start_time;
+
+    std::cout << "Transferred "
+              << bulk_buffer.size()
+              << " bytes from PC -> FluxEngine in "
+              << int(elapsed_time * 1000.0)
+              << " ms ("
+              << int((bulk_buffer.size() / 1024.0) / elapsed_time)
+              << " kB/s)"
+              << std::endl;
+
+    await_reply<struct any_frame>(F_FRAME_BULK_READ_TEST_REPLY);
+}
+
+Bytes usbRead(int side, bool synced, nanoseconds_t readTime)
 {
    struct read_frame f = {
        .f = { .type = F_FRAME_READ_CMD, .size = sizeof(f) },
        .side = (uint8_t) side,
-        .revolutions = (uint8_t) revolutions
+        .synced = (uint8_t) synced
    };
+    uint16_t milliseconds = readTime / 1e6;
+    ((uint8_t*)&f.milliseconds)[0] = milliseconds;
+    ((uint8_t*)&f.milliseconds)[1] = milliseconds >> 8;
    usb_cmd_send(&f, f.f.size);

    auto fluxmap = std::unique_ptr<Fluxmap>(new Fluxmap);
@@ -236,7 +278,6 @@ void usbWrite(int side, const Bytes& bytes)
    ((uint8_t*)&f.bytes_to_write)[3] = safelen >> 24;

    usb_cmd_send(&f, f.f.size);
-
    large_bulk_transfer(FLUXENGINE_DATA_OUT_EP, safeBytes);
    
    await_reply<struct any_frame>(F_FRAME_WRITE_REPLY);
--- a/lib/usb.h
+++ b/lib/usb.h
@@ -8,8 +8,9 @@ extern int usbGetVersion();
 extern void usbRecalibrate();
 extern void usbSeek(int track);
 extern nanoseconds_t usbGetRotationalPeriod();
-extern void usbTestBulkTransport();
-extern Bytes usbRead(int side, int revolutions);
+extern void usbTestBulkWrite();
+extern void usbTestBulkRead();
+extern Bytes usbRead(int side, bool synced, nanoseconds_t readTime);
 extern void usbWrite(int side, const Bytes& bytes);
 extern void usbErase(int side);
 extern void usbSetDrive(int drive, bool high_density, int index_mode);
--- a/lib/visualiser.cc
+++ b/lib/visualiser.cc
@@ -1,6 +1,5 @@
 #define _USE_MATH_DEFINES
 #include "globals.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "visualiser.h"
--- a/lib/writer.cc
+++ b/lib/writer.cc
@@ -9,13 +9,13 @@
 #include "encoders/encoders.h"
 #include "fluxsource/fluxsource.h"
 #include "fluxsink/fluxsink.h"
+#include "imagereader/imagereader.h"
 #include "fmt/format.h"
 #include "record.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"

-FlagGroup writerFlags { &hardwareFluxSourceFlags, &hardwareFluxSinkFlags };
+FlagGroup writerFlags { &hardwareFluxSourceFlags, &sqliteFluxSinkFlags, &hardwareFluxSinkFlags };

 static DataSpecFlag dest(
    { "--dest", "-d" },
@@ -43,6 +43,11 @@ void setWriterDefaultInput(const std::string& input)
    ::input.set(input);
 }

+static SectorSet readSectorsFromFile(const ImageSpec& spec)
+{
+	return ImageReader::create(spec)->readImage();
+}
+
 void writeTracks(
 	const std::function<std::unique_ptr<Fluxmap>(int track, int side)> producer)
 {
@@ -53,19 +58,7 @@ void writeTracks(
 	setHardwareFluxSourceDensity(highDensityFlag);
 	setHardwareFluxSinkDensity(highDensityFlag);

-	if (!spec.filename.empty())
-	{
-		outdb = sqlOpen(spec.filename, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
-		sqlPrepareFlux(outdb);
-		sqlStmt(outdb, "BEGIN;");
-        sqlWriteIntProperty(outdb, "version", FLUX_VERSION_CURRENT);
-		atexit([]()
-			{
-				sqlStmt(outdb, "COMMIT;");
-				sqlClose(outdb);
-			}
-		);
-	}
+	std::shared_ptr<FluxSink> fluxSink = FluxSink::create(spec);

    for (const auto& location : spec.locations)
    {
@@ -73,29 +66,16 @@ void writeTracks(
        std::unique_ptr<Fluxmap> fluxmap = producer(location.track, location.side);
        if (!fluxmap)
        {
-            if (!outdb)
-            {
-                std::cout << "erasing\n";
-                usbSeek(location.track);
-                usbErase(location.side);
-            }
-            else
-                std::cout << "skipping\n";
-        }
-        else
-        {
-            fluxmap->precompensate(PRECOMPENSATION_THRESHOLD_TICKS, 2);
-            if (outdb)
-                sqlWriteFlux(outdb, location.track, location.side, *fluxmap);
-            else
-            {
-                Bytes crunched = fluxmap->rawBytes().crunch();
-                usbSeek(location.track);
-                usbWrite(location.side, crunched);
-            }
-            std::cout << fmt::format(
-                "{0} ms in {1} bytes", int(fluxmap->duration()/1e6), fluxmap->bytes()) << std::endl;
+            /* Create an empty fluxmap for writing. */
+            fluxmap.reset(new Fluxmap());
        }
+
+        /* Precompensation actually seems to make things worse, so let's leave
+            * it disabled for now. */
+        //fluxmap->precompensate(PRECOMPENSATION_THRESHOLD_TICKS, 2);
+        fluxSink->writeFlux(location.track, location.side, *fluxmap);
+        std::cout << fmt::format(
+            "{0} ms in {1} bytes", int(fluxmap->duration()/1e6), fluxmap->bytes()) << std::endl;
    }
 }

--- a/mkninja.sh
+++ b/mkninja.sh
@@ -44,18 +44,27 @@ buildlibrary() {
        esac
    done

-    local objs
-    objs=
+    local oobjs
+	local dobjs
+    oobjs=
+	dobjs=
    for src in "$@"; do
        local obj
-        obj="$OBJDIR/${src%%.c*}.o"
-        objs="$objs $obj"
+        obj="$OBJDIR/opt/${src%%.c*}.o"
+        oobjs="$oobjs $obj"

        echo build $obj : cxx $src
-        echo "    flags=$flags"
+        echo "    flags=$flags $COPTFLAGS"
+
+        obj="$OBJDIR/dbg/${src%%.c*}.o"
+        dobjs="$dobjs $obj"
+
+        echo build $obj : cxx $src
+        echo "    flags=$flags $CDBGFLAGS"
    done

-    echo build $OBJDIR/$lib : library $objs
+    echo build $OBJDIR/opt/$lib : library $oobjs
+    echo build $OBJDIR/dbg/$lib : library $dobjs
 }

 buildprogram() {
@@ -77,16 +86,21 @@ buildprogram() {
        esac
    done

-    local objs
-    objs=
+    local oobjs
+	local dobjs
+    oobjs=
+	dobjs=
    for src in "$@"; do
-        objs="$objs $OBJDIR/$src"
+        oobjs="$oobjs $OBJDIR/opt/$src"
+        dobjs="$dobjs $OBJDIR/dbg/$src"
    done

-    echo build $prog-debug$EXTENSION : link $objs
-    echo "    flags=$flags"
+    echo build $prog-debug$EXTENSION : link $dobjs
+    echo "    flags=$flags $LDDBGFLAGS"
+
+    echo build $prog$EXTENSION : link $oobjs
+    echo "    flags=$flags $LDOPTFLAGS"

-    echo build $prog$EXTENSION : strip $prog-debug$EXTENSION
 }

 buildsimpleprogram() {
@@ -154,12 +168,12 @@ buildlibrary libbackend.a \
    arch/f85/decoder.cc \
    arch/fb100/decoder.cc \
    arch/ibm/decoder.cc \
+    arch/ibm/encoder.cc \
    arch/macintosh/decoder.cc \
    arch/mx/decoder.cc \
    arch/victor9k/decoder.cc \
    arch/zilogmcz/decoder.cc \
    lib/bytes.cc \
-    lib/common/crunch.c \
    lib/crc.cc \
    lib/dataspec.cc \
    lib/decoders/decoders.cc \
@@ -178,7 +192,6 @@ buildlibrary libbackend.a \
    lib/fluxsource/streamfluxsource.cc \
    lib/globals.cc \
    lib/hexdump.cc \
-    lib/image.cc \
    lib/ldbs.cc \
    lib/reader.cc \
    lib/sector.cc \
@@ -213,11 +226,12 @@ buildlibrary libfrontend.a \
    src/fe-rpm.cc \
    src/fe-scptoflux.cc \
    src/fe-seek.cc \
-    src/fe-testbulktransport.cc \
+    src/fe-testbandwidth.cc \
    src/fe-testvoltages.cc \
    src/fe-upgradefluxfile.cc \
    src/fe-writeamiga.cc \
    src/fe-writebrother.cc \
+    src/fe-writeibm.cc \
    src/fe-writeflux.cc \
    src/fe-writetestpattern.cc \
    src/fluxengine.cc \
@@ -247,7 +261,6 @@ buildsimpleprogram brother240tool \
 runtest bitaccumulator-test tests/bitaccumulator.cc
 runtest bytes-test          tests/bytes.cc
 runtest compression-test    tests/compression.cc
-runtest crunch-test         tests/crunch.cc
 runtest dataspec-test       tests/dataspec.cc
 runtest flags-test          tests/flags.cc
 runtest fluxpattern-test    tests/fluxpattern.cc
--- a/protocol.h
+++ b/protocol.h
@@ -3,7 +3,7 @@

 enum 
 {
-    FLUXENGINE_VERSION = 10,
+    FLUXENGINE_VERSION = 14,

    FLUXENGINE_VID = 0x1209,
    FLUXENGINE_PID = 0x6e00,
@@ -50,8 +50,10 @@ enum
    F_FRAME_SEEK_REPLY,           /* any_frame */
    F_FRAME_MEASURE_SPEED_CMD,    /* any_frame */
    F_FRAME_MEASURE_SPEED_REPLY,  /* speed_frame */
-    F_FRAME_BULK_TEST_CMD,        /* any_frame */
-    F_FRAME_BULK_TEST_REPLY,      /* any_frame */
+    F_FRAME_BULK_WRITE_TEST_CMD,   /* any_frame */
+    F_FRAME_BULK_WRITE_TEST_REPLY, /* any_frame */
+    F_FRAME_BULK_READ_TEST_CMD,   /* any_frame */
+    F_FRAME_BULK_READ_TEST_REPLY, /* any_frame */
    F_FRAME_READ_CMD,             /* read_frame */
    F_FRAME_READ_REPLY,           /* any_frame */
    F_FRAME_WRITE_CMD,            /* write_frame */
@@ -84,8 +86,8 @@ enum

 enum
 {
-    F_OP_PULSE = 0x80,
-    F_OP_INDEX = 0x81
+    F_BIT_PULSE = 0x80,
+    F_BIT_INDEX = 0x40
 };

 struct frame_header
@@ -133,7 +135,8 @@ struct read_frame
 {
    struct frame_header f;
    uint8_t side;
-    uint8_t revolutions;
+    uint8_t synced;
+    uint16_t milliseconds;
 };

 struct write_frame
--- a/src/fe-fluxtoau.cc
+++ b/src/fe-fluxtoau.cc
@@ -81,14 +81,14 @@ int mainConvertFluxToAu(int argc, const char* argv[])
        while (!fmr.eof())
        {
            unsigned ticks;
-            int op = fmr.readOpcode(ticks);
-            if (op == -1)
+            uint8_t bits = fmr.getNextEvent(ticks);
+            if (fmr.eof())
                break;
            timestamp += ticks;

-            if (op == F_OP_PULSE)
+            if (bits & F_BIT_PULSE)
                data[timestamp*channels + 0] = 0x7f;
-            if (withIndex && (op == F_OP_INDEX))
+            if (withIndex && (bits & F_BIT_INDEX))
                data[timestamp*channels + 1] = 0x7f;
        }

--- a/src/fe-fluxtoscp.cc
+++ b/src/fe-fluxtoscp.cc
@@ -125,43 +125,34 @@ int mainConvertFluxToScp(int argc, const char* argv[])
            while (revolution < 5)
            {
                unsigned ticks;
-                int opcode = fmr.readOpcode(ticks);
-                if (ticks)
-                {
-                    ticksSinceLastPulse += ticks;
-                    totalTicks += ticks;
-                    revTicks += ticks;
-                }
+                uint8_t bits = fmr.getNextEvent(ticks);
+				ticksSinceLastPulse += ticks;
+				totalTicks += ticks;
+				revTicks += ticks;

-                switch (opcode)
-                {
-                    case -1: /* end of flux, treat like an index marker */
-                    case F_OP_INDEX:
-                    {
-                        auto* revheader = &trackheader.revolution[revolution];
-                        write_le32(revheader->offset, startOffset + sizeof(ScpTrack));
-                        write_le32(revheader->length, (fluxdataWriter.pos - startOffset) / 2);
-                        write_le32(revheader->index, revTicks * NS_PER_TICK / 25);
-                        revolution++;
-                        revheader++;
-                        revTicks = 0;
-                        startOffset = fluxdataWriter.pos;
-                        break;
-                    }
+				if (fmr.eof() || (bits & F_BIT_INDEX))
+				{
+					auto* revheader = &trackheader.revolution[revolution];
+					write_le32(revheader->offset, startOffset + sizeof(ScpTrack));
+					write_le32(revheader->length, (fluxdataWriter.pos - startOffset) / 2);
+					write_le32(revheader->index, revTicks * NS_PER_TICK / 25);
+					revolution++;
+					revheader++;
+					revTicks = 0;
+					startOffset = fluxdataWriter.pos;
+				}

-                    case F_OP_PULSE:
-                    {
-                        unsigned t = ticksSinceLastPulse * NS_PER_TICK / 25;
-                        while (t >= 0x10000)
-                        {
-                            fluxdataWriter.write_be16(0);
-                            t -= 0x10000;
-                        }
-                        fluxdataWriter.write_be16(t);
-                        ticksSinceLastPulse = 0;
-                        break;
-                    }
-                }
+				if (bits & F_BIT_PULSE)
+				{
+					unsigned t = ticksSinceLastPulse * NS_PER_TICK / 25;
+					while (t >= 0x10000)
+					{
+						fluxdataWriter.write_be16(0);
+						t -= 0x10000;
+					}
+					fluxdataWriter.write_be16(t);
+					ticksSinceLastPulse = 0;
+				}
            }

            write_le32(fileheader.track[strack], trackdataWriter.pos + sizeof(ScpHeader));
--- a/src/fe-fluxtovcd.cc
+++ b/src/fe-fluxtovcd.cc
@@ -59,8 +59,8 @@ int mainConvertFluxToVcd(int argc, const char* argv[])
    while (!fmr.eof())
    {
        unsigned ticks;
-        int op = fmr.readOpcode(ticks);
-        if (op == -1)
+        uint8_t bits = fmr.getNextEvent(ticks);
+        if (fmr.eof())
            break;

        unsigned newtimestamp = timestamp + ticks;
@@ -71,9 +71,9 @@ int mainConvertFluxToVcd(int argc, const char* argv[])
            of << fmt::format("#{} ", (uint64_t)(timestamp * NS_PER_TICK));
        }

-        if (op == F_OP_PULSE)
+        if (bits & F_BIT_PULSE)
            of << "1p ";
-        if (op == F_OP_INDEX)
+        if (bits & F_BIT_INDEX)
            of << "1i ";

        lasttimestamp = timestamp;
--- a/src/fe-inspect.cc
+++ b/src/fe-inspect.cc
@@ -4,7 +4,6 @@
 #include "fluxmap.h"
 #include "decoders/fluxmapreader.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "protocol.h"
 #include "decoders/rawbits.h"
 #include "record.h"
@@ -73,7 +72,7 @@ static nanoseconds_t guessClock(const Fluxmap& fluxmap)

    while (!fr.eof())
    {
-        unsigned interval = fr.readNextMatchingOpcode(F_OP_PULSE);
+        unsigned interval = fr.findEvent(F_BIT_PULSE);
        if (interval > 0xff)
            continue;
        buckets[interval]++;
@@ -156,7 +155,11 @@ static nanoseconds_t guessClock(const Fluxmap& fluxmap)
 				s += BLOCK_ELEMENTS[8];
 			s += BLOCK_ELEMENTS[bar & 7];

-			std::cout << fmt::format("{:.2f} {:6} {}", (double)i * US_PER_TICK, value, s);
+			std::cout << fmt::format("{: 3} {:.2f} {:6} {}",
+					i,
+					(double)i * US_PER_TICK,
+					value,
+					s);
 			std::cout << std::endl;
 		}
 	}
@@ -186,6 +189,12 @@ int mainInspect(int argc, const char* argv[])
 	auto& track = *tracks.begin();
 	track->readFluxmap();

+	std::cout << fmt::format("0x{:x} bytes of data in {:.3f}ms\n",
+			track->fluxmap->bytes(),
+			track->fluxmap->duration() / 1e6);
+	std::cout << fmt::format("Required USB bandwidth: {}kB/s\n",
+			track->fluxmap->bytes()/1024.0 / (track->fluxmap->duration() / 1e9));
+
 	nanoseconds_t clockPeriod = guessClock(*track->fluxmap);
 	std::cout << fmt::format("{:.2f} us clock detected.", (double)clockPeriod/1000.0) << std::flush;

@@ -209,7 +218,7 @@ int mainInspect(int argc, const char* argv[])
 		nanoseconds_t lasttransition = 0;
 		while (!fmr.eof())
 		{
-			ticks += fmr.readNextMatchingOpcode(F_OP_PULSE);
+			ticks += fmr.findEvent(F_BIT_PULSE);

 			nanoseconds_t transition = ticks*NS_PER_TICK;
 			nanoseconds_t next;
--- a/src/fe-readadfs.cc
+++ b/src/fe-readadfs.cc
@@ -3,7 +3,6 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
--- a/src/fe-readaeslanier.cc
+++ b/src/fe-readaeslanier.cc
@@ -3,7 +3,6 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
@@ -12,11 +11,6 @@

 static FlagGroup flags { &readerFlags };

-static StringFlag outputFilename(
-    { "--output", "-o" },
-    "The output image file to write to.",
-    "aeslanier.img");
-
 int mainReadAESLanier(int argc, const char* argv[])
 {
 	setReaderDefaultSource(":t=0-79:s=0");
--- a/src/fe-readamiga.cc
+++ b/src/fe-readamiga.cc
@@ -6,7 +6,6 @@
 #include "amiga/amiga.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readampro.cc
+++ b/src/fe-readampro.cc
@@ -3,7 +3,6 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
--- a/src/fe-readapple2.cc
+++ b/src/fe-readapple2.cc
@@ -6,7 +6,6 @@
 #include "apple2/apple2.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readbrother.cc
+++ b/src/fe-readbrother.cc
@@ -7,7 +7,6 @@
 #include "brother/brother.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readc64.cc
+++ b/src/fe-readc64.cc
@@ -6,7 +6,6 @@
 #include "c64/c64.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readdfs.cc
+++ b/src/fe-readdfs.cc
@@ -3,7 +3,6 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
--- a/src/fe-readf85.cc
+++ b/src/fe-readf85.cc
@@ -6,7 +6,6 @@
 #include "f85/f85.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readfb100.cc
+++ b/src/fe-readfb100.cc
@@ -3,7 +3,6 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
--- a/src/fe-readibm.cc
+++ b/src/fe-readibm.cc
@@ -3,32 +3,37 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
+#include "dataspec.h"
 #include "ibm/ibm.h"
 #include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

 static IntFlag sectorIdBase(
-	{ "--sector-id-base" },
+	{ "--ibm-sector-id-base" },
 	"Sector ID of the first sector.",
 	1);

 static BoolFlag ignoreSideByte(
-	{ "--ignore-side-byte" },
+	{ "--ibm-ignore-side-byte" },
 	"Ignore the side byte in the sector ID, and use the physical side instead.",
 	false);

+static RangeFlag requiredSectors(
+	{ "--ibm-required-sectors" },
+	"A comma seperated list or range of sectors which must be on each track.",
+	"");
+
 int mainReadIBM(int argc, const char* argv[])
 {
 	setReaderDefaultSource(":t=0-79:s=0-1");
 	setReaderDefaultOutput("ibm.img");
    flags.parseFlags(argc, argv);

-	IbmDecoder decoder(sectorIdBase, ignoreSideByte);
+	IbmDecoder decoder(sectorIdBase, ignoreSideByte, requiredSectors);
 	readDiskCommand(decoder);
    return 0;
 }
--- a/src/fe-readmac.cc
+++ b/src/fe-readmac.cc
@@ -6,7 +6,6 @@
 #include "macintosh/macintosh.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readmx.cc
+++ b/src/fe-readmx.cc
@@ -4,7 +4,6 @@
 #include "fluxmap.h"
 #include "decoders/decoders.h"
 #include "mx/mx.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
--- a/src/fe-readvictor9k.cc
+++ b/src/fe-readvictor9k.cc
@@ -6,7 +6,6 @@
 #include "victor9k/victor9k.h"
 #include "sector.h"
 #include "sectorset.h"
-#include "image.h"
 #include "record.h"
 #include "fmt/format.h"
 #include <fstream>
--- a/src/fe-readzilogmcz.cc
+++ b/src/fe-readzilogmcz.cc
@@ -3,7 +3,6 @@
 #include "reader.h"
 #include "fluxmap.h"
 #include "decoders/decoders.h"
-#include "image.h"
 #include "sector.h"
 #include "sectorset.h"
 #include "record.h"
--- a/src/fe-rpm.cc
+++ b/src/fe-rpm.cc
@@ -19,7 +19,7 @@ int mainRpm(int argc, const char* argv[])
    usbSetDrive(spec.drive, false, F_INDEX_REAL);
    nanoseconds_t period = usbGetRotationalPeriod();
    if (period != 0)
-        std::cout << "Rotational period is " << period/1000 << " ms (" << 60e6/period << " rpm)" << std::endl;
+        std::cout << "Rotational period is " << period/1000000 << " ms (" << 60e9/period << " rpm)" << std::endl;
    else
    {
        std::cout << "No index pulses detected from the disk. Common causes of this are:\n"
--- a/src/fe-testbulktransport.cc
+++ b/src/fe-testbulktransport.cc
@@ -4,9 +4,10 @@

 static FlagGroup flags;

-int mainTestBulkTransport(int argc, const char* argv[])
+int mainTestBandwidth(int argc, const char* argv[])
 {
    flags.parseFlags(argc, argv);
-    usbTestBulkTransport();
+    usbTestBulkWrite();
+    usbTestBulkRead();
    return 0;
 }
--- a/src/fe-upgradefluxfile.cc
+++ b/src/fe-upgradefluxfile.cc
@@ -6,7 +6,7 @@

 static sqlite3* db;

-static void update_version_1_to_2()
+static void update_version_1_to_3()
 {
    for (const auto i : sqlFindFlux(db))
    {
@@ -33,6 +33,44 @@ static void update_version_1_to_2()
    std::cout << std::endl;
 }

+static void update_version_2_to_3()
+{
+	for (const auto i : sqlFindFlux(db))
+	{
+		Fluxmap after;
+        const auto before = sqlReadFlux(db, i.first, i.second);
+
+        /* Remember, before does not contain valid opcodes! */
+        unsigned pending = 0;
+        for (uint8_t b : before->rawBytes())
+        {
+			switch (b)
+			{
+				case 0x80: /* pulse */
+					after.appendInterval(pending);
+					after.appendPulse();
+					pending = 0;
+					break;
+
+				case 0x81: /* index */
+					after.appendInterval(pending);
+					after.appendIndex();
+					pending = 0;
+					break;
+
+				default:
+					pending += b;
+					break;
+			}
+        }
+		after.appendInterval(pending);
+
+        sqlWriteFlux(db, i.first, i.second, after);
+        std::cout << '.' << std::flush;
+    }
+    std::cout << std::endl;
+}
+
 int mainUpgradeFluxFile(int argc, const char* argv[])
 {
    if (argc != 2)
@@ -71,14 +109,24 @@ int mainUpgradeFluxFile(int argc, const char* argv[])

    if (version == FLUX_VERSION_1)
    {
-        std::cout << "Upgrading to version 2\n";
+        std::cout << "Upgrading to version 3\n";
        sqlStmt(db, "BEGIN;");
-        update_version_1_to_2();
-        version = FLUX_VERSION_2;
+        update_version_1_to_3();
+        version = FLUX_VERSION_3;
        sqlWriteIntProperty(db, "version", version);
        sqlStmt(db, "COMMIT;");
    }

+	if (version == FLUX_VERSION_2)
+	{
+        std::cout << "Upgrading to version 3\n";
+        sqlStmt(db, "BEGIN;");
+        update_version_2_to_3();
+        version = FLUX_VERSION_3;
+        sqlWriteIntProperty(db, "version", version);
+        sqlStmt(db, "COMMIT;");
+	}
+
    std::cout << "Vacuuming\n";
    sqlStmt(db, "VACUUM;");
    std::cout << "Upgrade done\n";
--- a/src/fe-writeamiga.cc
+++ b/src/fe-writeamiga.cc
@@ -4,7 +4,6 @@
 #include "amiga/amiga.h"
 #include "writer.h"
 #include "fmt/format.h"
-#include "image.h"
 #include <fstream>

 static FlagGroup flags { &writerFlags, &amigaEncoderFlags };
--- a/src/fe-writebrother.cc
+++ b/src/fe-writebrother.cc
@@ -5,18 +5,31 @@
 #include "brother/brother.h"
 #include "writer.h"
 #include "fmt/format.h"
-#include "image.h"
 #include <fstream>

 static FlagGroup flags { &writerFlags, &brotherEncoderFlags };

+static int brotherFormat = 240;
+static ActionFlag preset120(
+	{ "--brother-preset-120" },
+	"Write the Brother 120kB format instead of the 240kB one.",
+	[] {
+		setWriterDefaultInput(":c=39:h=1:s=12:b=256");
+		brotherFormat = 120;
+	});
+
+static IntFlag bias(
+	{ "--brother-track-bias" },
+	"Shift the entire format this many tracks on the disk.",
+	0);
+
 int mainWriteBrother(int argc, const char* argv[])
 {
    setWriterDefaultInput(":c=78:h=1:s=12:b=256");
 	setWriterDefaultDest(":d=0:t=0-77:s=0");
    flags.parseFlags(argc, argv);

-	BrotherEncoder encoder;
+	BrotherEncoder encoder(brotherFormat, bias);
 	writeDiskCommand(encoder);

    return 0;
--- a/src/fe-writeibm.cc
+++ b/src/fe-writeibm.cc
@@ -0,0 +1,138 @@
+#include "globals.h"
+#include "flags.h"
+#include "decoders/decoders.h"
+#include "encoders/encoders.h"
+#include "ibm/ibm.h"
+#include "writer.h"
+#include "fmt/format.h"
+#include <fstream>
+
+static FlagGroup flags { &writerFlags };
+
+static IntFlag trackLengthMs(
+	{ "--ibm-track-length-ms" },
+	"Length of a track in milliseconds.",
+	0);
+
+static IntFlag sectorSize(
+	{ "--ibm-sector-size" },
+	"Size of the sectors to write (bytes).",
+	0);
+
+static BoolFlag emitIam(
+	{ "--ibm-emit-iam" },
+	"Whether to emit an IAM record at the start of the track.",
+	false);
+
+static IntFlag startSectorId(
+	{ "--ibm-start-sector-id" },
+	"Sector ID of first sector.",
+	1);
+
+static IntFlag clockRateKhz(
+	{ "--ibm-clock-rate-khz" },
+	"Clock rate of data to write.",
+	0);
+
+static BoolFlag useFm(
+	{ "--ibm-use-fm" },
+	"Write in FM mode, rather than MFM.",
+	false);
+
+static HexIntFlag idamByte(
+	{ "--ibm-idam-byte" },
+	"16-bit RAW bit pattern to use for the IDAM ID byte",
+	0);
+
+static HexIntFlag damByte(
+	{ "--ibm-dam-byte" },
+	"16-bit RAW bit pattern to use for the DAM ID byte",
+	0);
+
+static IntFlag gap0(
+	{ "--ibm-gap0-bytes" },
+	"Size of gap 0 (the pre-index gap)",
+	0);
+
+static IntFlag gap1(
+	{ "--ibm-gap1-bytes" },
+	"Size of gap 1 (the post-index gap).",
+	0);
+
+static IntFlag gap2(
+	{ "--ibm-gap2-bytes" },
+	"Size of gap 2 (the post-ID gap).",
+	0);
+
+static IntFlag gap3(
+	{ "--ibm-gap3-bytes" },
+	"Size of gap 3 (the post-data or format gap).",
+	0);
+
+static StringFlag sectorSkew(
+	{ "--ibm-sector-skew" },
+	"Order to emit sectors.",
+	"");
+
+static ActionFlag preset1440(
+	{ "--ibm-preset-1440" },
+	"Preset parameters to a 3.5\" 1440kB disk.",
+	[] {
+		setWriterDefaultInput(":c=80:h=2:s=18:b=512");
+		trackLengthMs.setDefaultValue(200);
+		sectorSize.setDefaultValue(512);
+		emitIam.setDefaultValue(true);
+		clockRateKhz.setDefaultValue(500);
+		idamByte.setDefaultValue(0x5554);
+		damByte.setDefaultValue(0x5545);
+		gap0.setDefaultValue(80);
+		gap1.setDefaultValue(50);
+		gap2.setDefaultValue(22);
+		gap3.setDefaultValue(108);
+		sectorSkew.setDefaultValue("0123456789abcdefgh");
+	});
+
+static ActionFlag preset720(
+	{ "--ibm-preset-720" },
+	"Preset parameters to a 3.5\" 720kB disk.",
+	[] {
+		setWriterDefaultInput(":c=80:h=2:s=9:b=512");
+		trackLengthMs.setDefaultValue(200);
+		sectorSize.setDefaultValue(512);
+		emitIam.setDefaultValue(true);
+		clockRateKhz.setDefaultValue(250);
+		idamByte.setDefaultValue(0x5554);
+		damByte.setDefaultValue(0x5545);
+		gap0.setDefaultValue(80);
+		gap1.setDefaultValue(50);
+		gap2.setDefaultValue(22);
+		gap3.setDefaultValue(80);
+		sectorSkew.setDefaultValue("012345678");
+	});
+
+int mainWriteIbm(int argc, const char* argv[])
+{
+	setWriterDefaultDest(":d=0:t=0-79:s=0-1");
+    flags.parseFlags(argc, argv);
+
+	IbmParameters parameters;
+	parameters.trackLengthMs = trackLengthMs;
+	parameters.sectorSize = sectorSize;
+	parameters.emitIam = emitIam;
+	parameters.startSectorId = startSectorId;
+	parameters.clockRateKhz = clockRateKhz;
+	parameters.useFm = useFm;
+	parameters.idamByte = idamByte;
+	parameters.damByte = damByte;
+	parameters.gap0 = gap0;
+	parameters.gap1 = gap1;
+	parameters.gap2 = gap2;
+	parameters.gap3 = gap3;
+	parameters.sectorSkew = sectorSkew;
+
+	IbmEncoder encoder(parameters);
+	writeDiskCommand(encoder);
+
+    return 0;
+}
+
--- a/src/fluxengine.cc
+++ b/src/fluxengine.cc
@@ -26,11 +26,12 @@ extern command_cb mainReadVictor9K;
 extern command_cb mainReadZilogMCZ;
 extern command_cb mainRpm;
 extern command_cb mainSeek;
-extern command_cb mainTestBulkTransport;
+extern command_cb mainTestBandwidth;
 extern command_cb mainTestVoltages;
 extern command_cb mainUpgradeFluxFile;
 extern command_cb mainWriteAmiga;
 extern command_cb mainWriteBrother;
+extern command_cb mainWriteIbm;
 extern command_cb mainWriteFlux;
 extern command_cb mainWriteTestPattern;

@@ -84,6 +85,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.", },
 };

 static std::vector<Command> convertables =
@@ -97,8 +99,8 @@ static std::vector<Command> convertables =

 static std::vector<Command> testables =
 {
-    { "bulktransport", mainTestBulkTransport, "Measures your USB bandwidth.", },
-    { "voltages",      mainTestVoltages,      "Measures the FDD bus voltages.", },
+    { "bandwidth",     mainTestBandwidth, "Measures your USB bandwidth.", },
+    { "voltages",      mainTestVoltages,  "Measures the FDD bus voltages.", },
 };

 static void extendedHelp(std::vector<Command>& subcommands, const std::string& command)
--- a/tests/bytes.cc
+++ b/tests/bytes.cc
@@ -115,6 +115,15 @@ static void test_slice()
    assert((bs == Bytes{ 0, 0 }));
 }

+static void test_tobits()
+{
+	Bytes b = {1, 2};
+	assert(b.toBits() == (std::vector<bool>{
+		false, false, false, false, false, false, false, true,
+		false, false, false, false, false, false, true, false
+	}));
+}
+
 int main(int argc, const char* argv[])
 {
    test_bounds();
@@ -123,5 +132,6 @@ int main(int argc, const char* argv[])
    test_reads();
    test_writes();
    test_slice();
+	test_tobits();
    return 0;
 }
--- a/tests/crunch.cc
+++ b/tests/crunch.cc
@@ -1,43 +0,0 @@
-#include "globals.h"
-#include "bytes.h"
-#include "common/crunch.h"
-
-static uint8_t outputbuffer[64];
-
-static void test_crunch()
-{
-    crunch_state_t cs = {};
-    Bytes inputdata = { 0x01, 0x7f, 0x80, 0x81, 0x01 };
-    cs.inputptr = inputdata.begin();
-    cs.inputlen = inputdata.size();
-    cs.outputptr = outputbuffer;
-    cs.outputlen = 64;
-    crunch(&cs);
-    donecrunch(&cs);
-    Bytes outputdata(outputbuffer, cs.outputptr - outputbuffer);
-
-    assert((outputdata == Bytes{ 0x01, 0x7f, 0xb0, 0x10 }));
-}
-
-static void test_uncrunch()
-{
-    crunch_state_t cs = {};
-    Bytes inputdata = { 0x01, 0x7f, 0xb0, 0x10 };
-    cs.inputptr = inputdata.begin();
-    cs.inputlen = inputdata.size();
-    cs.outputptr = outputbuffer;
-    cs.outputlen = 64;
-    uncrunch(&cs);
-    doneuncrunch(&cs);
-    Bytes outputdata(outputbuffer, cs.outputptr - outputbuffer);
-
-    assert((outputdata == Bytes { 0x01, 0x7f, 0x80, 0x81, 0x01 }));
-}
-
-int main(int argc, const char* argv[])
-{
-    test_crunch();
-    test_uncrunch();
-    return 0;
-}
-
--- a/tests/dataspec.cc
+++ b/tests/dataspec.cc
@@ -13,6 +13,28 @@ static void test_split(void)
        == std::vector<std::string>{"", "2", ""}));
    assert((DataSpec::split("2", ",")
        == std::vector<std::string>{"2"}));
+    assert((DataSpec::split("", ",")
+        == std::vector<std::string>()));
+}
+
+static void test_parserange(void)
+{
+    assert(DataSpec::parseRange("")
+        == std::set<unsigned>());
+    assert(DataSpec::parseRange("1")
+        == std::set<unsigned>({1}));
+    assert(DataSpec::parseRange("1,3,5")
+        == std::set<unsigned>({1, 3, 5}));
+    assert(DataSpec::parseRange("1,1,1")
+        == std::set<unsigned>({1}));
+    assert(DataSpec::parseRange("2-3")
+        == std::set<unsigned>({2, 3}));
+    assert(DataSpec::parseRange("2+3")
+        == std::set<unsigned>({2, 3, 4}));
+    assert(DataSpec::parseRange("2+3x2")
+        == std::set<unsigned>({2, 4}));
+    assert(DataSpec::parseRange("9,2+3x2")
+        == std::set<unsigned>({2, 4, 9}));
 }

 static void test_parsemod(void)
@@ -104,6 +126,7 @@ static void test_imagespec(void)
 int main(int argc, const char* argv[])
 {
    test_split();
+	test_parserange();
    test_parsemod();
    test_fluxspec();
    test_imagespec();
--- a/tests/fmmfm.cc
+++ b/tests/fmmfm.cc
@@ -2,7 +2,7 @@
 #include "decoders/decoders.h"
 #include <assert.h>

-int main(int argc, const char* argv[])
+static void testDecode(void)
 {
    assert(decodeFmMfm(
        std::vector<bool>{
@@ -36,6 +36,100 @@ int main(int argc, const char* argv[])
            true, false,
        }
    ) == Bytes{ 0x80 });
+}

+static std::vector<bool> wrappedEncodeMfm(const Bytes& bytes)
+{
+	std::vector<bool> bits(16);
+	unsigned cursor = 0;
+	bool lastBit = false;
+	encodeMfm(bits, cursor, bytes, lastBit);
+	return bits;
+}
+
+static std::vector<bool> wrappedEncodeFm(const Bytes& bytes)
+{
+	std::vector<bool> bits(16);
+	unsigned cursor = 0;
+	encodeFm(bits, cursor, bytes);
+	return bits;
+}
+
+static void testEncodeMfm(void)
+{
+	assert(wrappedEncodeMfm(Bytes{ 0xa1 })
+		== (std::vector<bool>{
+			false, true,
+			false, false,
+			false, true,
+			false, false,
+			true, false,
+			true, false,
+			true, false,
+			false, true
+		})
+	);
+
+	assert(wrappedEncodeMfm(Bytes{ 0xc2 })
+		== (std::vector<bool>{
+			false, true,
+			false, true,
+			false, false,
+			true, false,
+			true, false,
+			true, false,
+			false, true,
+			false, false
+		})
+	);
+
+	assert(wrappedEncodeMfm(Bytes{ 0xb0 })
+		== (std::vector<bool>{
+			false, true,
+			false, false,
+			false, true,
+			false, true,
+			false, false,
+			true, false,
+			true, false,
+			true, false,
+		})
+	);
+}
+
+static void testEncodeFm(void)
+{
+	assert(wrappedEncodeFm(Bytes{ 0x00 })
+		== (std::vector<bool>{
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, false
+		})
+	);
+
+	assert(wrappedEncodeFm(Bytes{ 0x81 })
+		== (std::vector<bool>{
+            true, true,
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, false,
+            true, true
+		})
+	);
+}
+
+int main(int argc, const char* argv[])
+{
+	testDecode();
+	testEncodeMfm();
+	testEncodeFm();
    return 0;
 }
--- a/tests/kryoflux.cc
+++ b/tests/kryoflux.cc
@@ -49,43 +49,43 @@ static void test_stream_reader()
    /* Simple one-byte intervals */
    test_convert(
        Bytes{ 0x20, 0x20, 0x20, 0x20 },
-        Bytes{ 0x0f, 0x80, 0x0f, 0x80, 0x0f, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x8f, 0x8f, 0x8f }
    );

    /* One-and-a-half-byte intervals */
    test_convert(
        Bytes{ 0x20, 0x00, 0x10, 0x20, 0x01, 0x10, 0x20 },
-        Bytes{ 0x0f, 0x80, 0x07, 0x80, 0x0f, 0x80, 0x7f, 0x08, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x87, 0x8f, 0x3f, 0x3f, 0x89, 0x8f }
    );

    /* Two-byte intervals */
    test_convert(
        Bytes{ 0x20, 0x0c, 0x00, 0x10, 0x20, 0x0c, 0x01, 0x10, 0x20 },
-        Bytes{ 0x0f, 0x80, 0x07, 0x80, 0x0f, 0x80, 0x7f, 0x08, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x87, 0x8f, 0x3f, 0x3f, 0x89, 0x8f }
    );

    /* Overflow */
    test_convert(
        Bytes{ 0x20, 0x0b, 0x10, 0x20 },
-        Bytes{ 0x0f, 0x80 } + (Bytes{ 0x7f } * 0x101) + Bytes{ 0x63, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f } + (Bytes{ 0x3f } * 0x207) + Bytes{ 0xa9, 0x8f }
    );

    /* Single-byte nop */
    test_convert(
        Bytes{ 0x20, 0x08, 0x20 },
-        Bytes{ 0x0f, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x8f }
    );

    /* Double-byte nop */
    test_convert(
        Bytes{ 0x20, 0x09, 0xde, 0x20 },
-        Bytes{ 0x0f, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x8f }
    );

    /* Triple-byte nop */
    test_convert(
        Bytes{ 0x20, 0x0a, 0xde, 0xad, 0x20 },
-        Bytes{ 0x0f, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x8f }
    );

    /* OOB block */
@@ -98,7 +98,7 @@ static void test_stream_reader()
            0x55, /* payload */
            0x20 /* data continues */
        },
-        Bytes{ 0x0f, 0x80, 0x0f, 0x80 }
+        Bytes{ 0x8f, 0x8f }
    );
 }
Author	SHA1	Message	Date
David Given	adba93ae0a	Merge pull request #163 from davidgiven/brother120 Untested Brother 120kB write support.	2020-05-24 01:32:28 +02:00
David Given	98587d04a7	Merge from trunk.	2020-05-24 00:56:17 +02:00
David Given	0051b64648	Merge pull request #167 from vanbogaertetienne/trs80fix Typo fix in FM_TRS80DAM2_PATTERN	2020-05-24 00:47:12 +02:00
vanbogaertetienne	603009ba15	Typo fix in FM_TRS80DAM2_PATTERN	2020-05-22 20:46:48 +02:00
David Given	06eb10d2a0	Merge.	2020-05-16 10:38:17 +02:00
David Given	2244299bd9	Add a bias parameter to allow the entire Brother format to be moved around on the disk.	2020-05-16 10:37:48 +02:00
David Given	6ca06ecafb	Fix several embarassingly stupid bugs in the brother 120kB encoder code path.	2020-05-14 10:41:25 +02:00
David Given	9a5958f80b	Prevent OOB when appending no bytes to a fluxmap.	2020-05-14 10:40:49 +02:00
David Given	2b53ac057c	Fix some bugs which allow erasing tracks with F_FRAME_WRITE_CMD to work again. (F_FRAME_ERASE_CMD always worked.)	2020-05-13 23:45:58 +02:00
David Given	5deba8af41	Untested Brother 120kB write support.	2020-05-13 14:49:06 +02:00
David Given	3c54a663b8	Merge pull request #157 from davidgiven/amigacorruption Fix some issues causing corruption when reading Amiga disks	2020-04-09 00:16:38 +02:00
David Given	1fd65452c4	Typo fix.	2020-04-08 23:37:08 +02:00
David Given	30646ccb07	Fix an Amiga decoder bug where truncated sectors would be considered valid (the Amiga checksum algorithm is weak and zero bytes don't contribute to the checksum).	2020-04-08 23:35:55 +02:00
David Given	5be7249a30	Merge pull request #155 from davidgiven/amigawriter Fix stray bytes at the end of images	2020-04-07 23:13:23 +02:00
David Given	067af18103	When writing images, use the sector size in the spec rather than the actual data size, to avoid problems with multipart formats like the Amiga.	2020-04-07 23:02:47 +02:00
David Given	8dbd2a72a7	Merge pull request #150 from davidgiven/sixbit Fix the new sampler and sequencer	2020-04-03 23:54:29 +02:00
David Given	c29e131a3b	Convert the IBM format back into a unicorn now I've fixed it.	2020-04-03 23:49:01 +02:00
David Given	a9e30c1e49	Fix an off-by-one error in the sequencer that should have it generating correct sequences.	2020-04-03 22:58:51 +02:00
David Given	972c8c6b61	Fix off-by-one sampler error, so now the clock rates are right again.	2020-04-03 22:27:33 +02:00
David Given	2007ff7546	Fix merge wibble.	2020-04-03 21:49:26 +02:00
David Given	64694580cd	Remember to bump the protocol number after the bytecode change.	2020-04-03 21:46:51 +02:00
David Given	deaab94494	Merge pull request #146 from davidgiven/sixbit Switch to a simplified encoding with a six-bit timer.	2020-04-03 00:45:21 +02:00
David Given	1509e1f89d	Document the new bytecode format.	2020-04-03 00:38:20 +02:00
David Given	29e1ddc2ff	Bytecode upgrades always produce the latest version; we don't want to upgrade 1->2->3 (although that specific case is harmless, by accident).	2020-04-03 00:36:55 +02:00
David Given	1fe6434563	Something is wrong with the IBM PC writer, I don't know what. Mark it as a dinosaur again.	2020-04-03 00:27:12 +02:00
David Given	0367b7e77d	Merge from trunk.	2020-04-01 00:06:35 +02:00
David Given	e6da85bf64	Merge pull request #145 from davidgiven/writereport Add a machine readable read report.	2020-04-01 00:04:54 +02:00
David Given	cd19fcdadd	The CSV report now writes records for every sector in the output map, even the missing ones.	2020-03-31 00:14:23 +02:00
David Given	1954f02cfb	Don't reset the device on startup because it confuses Linux.	2020-03-30 22:23:18 +01:00
David Given	39b23200b0	Fix missing flag dependency.	2020-03-29 23:12:12 +02:00
David Given	0644d6d965	Remove some stray tracing (which was causing problems). Fix a potential problem where sampleclock posedges could be lost in the sequencer.	2020-03-29 23:11:53 +02:00
David Given	a075694d8e	Rewrite the sequencer to work with the new six bit bytecode. Fiddle with the USB stuff a lot in an attempt to resolve the weird packet loss issue.	2020-03-29 15:10:35 +02:00
David Given	b1ea5a9a35	Rework the writer to use a fluxsink rather than just writing stuff directly.	2020-03-29 15:08:45 +02:00
David Given	00087cbb6b	Fix a catastrophic DMA setup bug which was causing (probably) every other byte of data to be mixed up with every other byte... but as every other byte was a 0x80 we never noticed up until now.	2020-03-20 00:06:58 +01:00
David Given	1b48ea20c4	Remove the cruncher.	2020-03-20 00:06:07 +01:00
David Given	3d0f019fc4	Replace the sampler with one using the new simplified bytecode.	2020-03-19 23:39:23 +01:00
David Given	a08bfc183f	Display the tick value along with each interval in the histogram.	2020-03-19 22:16:07 +01:00
David Given	c5aef9b051	Annotate inspect to display USB bandwidth.	2020-03-15 13:47:17 +00:00
David Given	fc2655ecd6	Rework the bytecode format to use a much simplified setup: a six-bit timer with the top two bits reserved for pulse and index state. This is actually smaller, bandwidth-wise, than the old version, and may be smaller than the crunched version.	2020-03-14 18:58:43 +00:00
David Given	a737c723d3	Make sure to update before installing packages.	2020-03-14 14:47:04 +00:00
David Given	37aa8b62b0	Add a --write-csv=X option to the reader to dump the sector status map as a machine-readable file.	2020-03-14 14:35:19 +00:00
David Given	a401173f6d	Teach the Amiga decoder how many sectors to expect on each track.	2020-03-09 12:54:29 +00:00
David Given	ce76dc4279	Merge pull request #140 from davidgiven/sectors Fix a couple of annoying but minor issues	2020-02-28 00:08:11 +01:00
David Given	1025bd857b	Don't crashloop if the USB's not connected, as it causes the drives to be constantly reprobed (which runs the motor).	2020-02-27 22:32:27 +01:00
David Given	025802b2d0	Count required sectors correctly on mac disks.	2020-02-27 22:30:05 +01:00
David Given	adbcb2cd31	Merge pull request #139 from davidgiven/sectors Add support for required sectors, drive autodetection and fix homing on 8" drives.	2020-02-24 21:55:27 +01:00
David Given	c47a563790	Don't seek to track -1 on homing (it appears to upset 8" drives). Detect which drives are present, so that if only a single drive is attached then it's always track 0, regardless of which connector it's on.	2020-02-24 21:47:40 +01:00
David Given	04c09d1a5b	Hopefully, fix the problem where ^Cing a job gets the board in a confused state.	2020-02-21 22:16:20 +01:00
David Given	323da8272a	Hopefully add support for giving the reader a set of required sectors, so if one is missing then we can tell and the track can be reread.	2020-02-21 22:14:44 +01:00
David Given	38700c79fc	Merge pull request #137 from davidgiven/docs Update documentation.	2020-02-20 00:32:19 +01:00
David Given	d504d1890a	Remember to document that you need a FDD cable.	2020-02-20 00:30:17 +01:00
David Given	d53e757cfb	Rework some of the Brother documentation.	2020-02-20 00:25:55 +01:00
David Given	4983239458	Rework the hardware and software documentation.	2020-02-20 00:17:16 +01:00
David Given	376985828a	Add the ditaa pinout table.	2020-02-19 23:49:43 +01:00
David Given	dce0a26820	Merge pull request #136 from davidgiven/ibm Finally add write support for IBM disks.	2020-02-18 23:20:57 +01:00
David Given	14e0a67e7d	IBM write support gets the much vaunted unicorn.	2020-02-18 23:10:09 +01:00
David Given	1656947764	Disable write precompensation, as it actually seems to make things worse.	2020-02-18 22:49:12 +01:00
David Given	647862cdbd	Update the firmware for the new cruncher.	2020-02-18 22:13:41 +01:00
David Given	4a8d83838c	Add IBM write support documentation.	2020-02-18 22:12:56 +01:00
David Given	8acf8e181d	Rework the crunch encoding to be, hopefully, smaller and use less bandwidth for HD disks.	2020-02-18 21:37:32 +01:00
David Given	2df9920209	Rename test bulktransport to test bandwidth; avoid watchdog failures while the bandwidth test is running.	2020-02-18 19:12:52 +01:00
David Given	1a6c6b5420	The bandwidth tester now tests bandwidth in both directions. It looks like my default USB port only gets about 500kB/s write bandwidth. However, when plugged into a port with 850kB/s, I still get underrun errors...	2020-02-17 23:58:40 +01:00
David Given	edc56d44d6	Non-functioning archive checkin: You can only have 120-odd DMA buffers, so my last 'fix' was in fact non-functional.	2020-02-17 23:28:40 +01:00
David Given	ef4eff0195	So writing now works, but only if USB DMA is enabled. But that breaks reading. I've worked round this in a simple but brute force manner and it now looks as if reading and writing work, more or less. There does still seem to be the odd bad sector when writing 1440kB disks.	2020-02-17 21:41:01 +01:00
David Given	df8d45bf66	Rework the output fifo to be a bit more correct about the sync signals, which in turn allows the sequencer to lose less time --- this gets the effective clock rate down to about 1.01us. However we still seem to lose the last sector on 18-sector disks and there are some disk reads so something is still wrong.	2020-02-17 00:13:13 +01:00
David Given	89a27619ff	Correctly propagate MFM encoding state.	2020-02-15 21:47:01 +01:00
David Given	387a86969a	Some verilog optimisations which shave off a few p-terms.	2020-02-15 12:15:51 +01:00
David Given	acb5059d17	Rewrite the sampler again to, hopefully, be more stable and not lose ticks. Luckily, we have just enough space in the FPGA to use an actual logic counter, which simplifies things hugely.	2020-02-15 12:09:19 +01:00
David Given	a4002d2617	Fix a few encoder issues; but while 720kB disks work fine in a real machine, 1440kB disks don't.	2020-02-14 22:47:15 +01:00
David Given	a63a90bbd0	Only attempt to remove the old file on overwrite if it actually exists.	2020-02-14 22:30:46 +01:00
David Given	d25f96dd24	The IBM encoder now works well enough that my USB floppy drive thinks the disk is formatted... but has trouble reading sectors above about 1000. Also remember that encoding MFM needs to keep one bit of state at all times.	2020-02-14 00:06:51 +01:00
David Given	e8febe6508	Allow converting Bytes to bits, and slicing until the end of an object.	2020-02-14 00:04:31 +01:00
David Given	ad3a930c6a	Do the boilerplate of the IBM encoder.	2020-02-09 23:56:20 +01:00
David Given	be41c1de76	You now need to explicitly specify whether flux files get merged or overwritten, because the old behaviour was weird. Reader uses SqliteFluxSink to write flux files, rather than raw database accesses.	2020-02-08 12:41:50 +01:00
David Given	d528978667	Merge pull request #135 from davidgiven/docs Update docs.	2020-02-08 11:53:31 +01:00
David Given	827fcf69d2	Another typo fix.	2020-02-08 11:52:39 +01:00
David Given	711ff545e0	Typo fix.	2020-02-08 11:51:19 +01:00
David Given	5befa31050	Document the GreaseWeazle.	2020-02-08 11:50:09 +01:00
David Given	8e5c2d0ebb	Merge from trunk.	2020-02-08 11:35:31 +01:00
David Given	f95fceeb3d	Finally document IBM disks.	2020-02-08 11:34:57 +01:00
David Given	003b20dbf0	Merge pull request #133 from davidgiven/fixing Display RPM values correctly	2020-01-29 00:52:04 +01:00
David Given	cd9bbaa4b6	Merge from trunk.	2020-01-29 00:42:06 +01:00
David Given	71e622bf72	Fix the fe-rpm RPM display, which didn't get updated when we switched to nanoseconds internally. Fixes #132	2020-01-29 00:41:58 +01:00
David Given	2a065a08df	Remember to ship brother240tool with Windows.	2020-01-28 00:45:04 +01:00
David Given	6087228378	Merge pull request #131 from davidgiven/fixing Debug builds are now debuggable.	2020-01-28 00:40:39 +01:00
David Given	efd74e0d7b	Stop trying to make Github CI on Windows work. It just doesn't seem to be running mingw via ninja.	2020-01-28 00:33:30 +01:00
David Given	b68a9dcc4f	Looks like there is no pacman.exe in the image, so we have to go with the additional download.	2020-01-28 00:30:48 +01:00
David Given	008855daa9	...more...	2020-01-28 00:27:21 +01:00
David Given	7a9d36de2a	...	2020-01-28 00:23:59 +01:00
David Given	c56e982c9a	...	2020-01-28 00:22:18 +01:00
David Given	002cc171a2	More sigh.	2020-01-28 00:19:39 +01:00
David Given	32e721b47a	Sigh.	2020-01-28 00:15:31 +01:00
David Given	1e82f697a9	Temporarily disable AppVeyor to prevent spurious builds.	2020-01-28 00:14:45 +01:00
David Given	fa09631e32	More exploration.	2020-01-28 00:13:38 +01:00
David Given	e06436ce1e	Okay, that's not working. What's available?	2020-01-28 00:05:23 +01:00
David Given	b2f443e1ad	Let's try this, but with the right path.	2020-01-27 23:57:48 +01:00
David Given	2e07be0cf7	Let's try this instead.	2020-01-27 23:56:55 +01:00
David Given	bf0b14d094	Okay, changing the path didn't help.	2020-01-27 23:51:22 +01:00
David Given	c9f5803194	The system is installing, but it's not finding mingw32.	2020-01-27 23:47:30 +01:00
David Given	5293560c02	Try enabling the windows CI build again.	2020-01-27 23:41:03 +01:00
David Given	c49823aa9d	Now the optimised binaries are optimised and the debug binaries aren't.	2020-01-27 23:36:33 +01:00
David Given	c4ef4882ae	Merge pull request #130 from davidgiven/fixing Fix a nasty firmware memory corruption bug	2020-01-27 23:15:20 +01:00
David Given	a8eca06cf0	Don't hang if we hit the end of stream while waiting for a data record.	2020-01-27 23:09:29 +01:00
David Given	065257b5aa	Remove stray tracing.	2020-01-27 23:09:07 +01:00
David Given	29bdfc043a	Allow fractional revolutions and non-synced reading. Find more things which need fixing in the firmware sampler.	2020-01-27 22:52:25 +01:00
David Given	933ffe7ab4	Find and attempt to fix a memory corruption error when sampling --- if the next fragment arrives from the sampler before usbbuffer has finished being transmitted via USB, it'll get overwritten. I've disabled DMA USB to make the code easier to understand and made sure that we flush things more rigorously. This may help the weird pipe errors, too.	2020-01-27 21:40:27 +01:00
David Given	e517f28563	Merge pull request #129 from davidgiven/fixing Make decoding more robust	2020-01-27 01:21:40 +01:00
David Given	91ffcf59c3	When reading data records, retry if we get an UNKNOWN record to work the occasional false positive (which happens now and again with MFM).	2020-01-27 01:15:14 +01:00
David Given	51c618f325	Merge from trunk.	2020-01-26 23:53:29 +01:00
David Given	9dc1067032	Add --dump-sectors. Sector positions are recorded correctly.	2020-01-26 18:30:35 +01:00
David Given	9e75dc3af1	Merge pull request #127 from davidgiven/fixing Fix an issue where HD IBM disks can't be read	2020-01-26 18:06:15 +01:00
David Given	efa4c933b3	Made the MFM marker byte detection a lot more robust --- prevents false positives; it looks like the new sampler is producing a little bit of wobble which randomly spoofs a marker byte now and again. This prevents this from happening (so far).	2020-01-26 17:58:08 +01:00
David Given	6af80d1e5e	Improve some messaging. A data record is always pushed, even if it's empty (to help debugging).	2020-01-26 17:49:12 +01:00
David Given	0c48897814	Add a minimum clock threshold.	2020-01-26 17:48:33 +01:00
David Given	549f12a2ab	Merge from master.	2019-12-01 08:36:44 +01:00
David Given	aea254fbe7	Made the AES Lanier reader work again.	2019-12-01 08:35:25 +01:00