diff --git a/board-package-source/boards.txt b/board-package-source/boards.txt
index 1af1880..47cc889 100644
--- a/board-package-source/boards.txt
+++ b/board-package-source/boards.txt
@@ -59,7 +59,7 @@ arduboy-homemade.bootloader.lock_bits=0x3F
arduboy-homemade.build.mcu=atmega32u4
arduboy-homemade.build.f_cpu=16000000L
arduboy-homemade.build.board=AVR_ARDUBOY_HOMEMADE
-arduboy-homemade.build.core=arduboy
+arduboy-homemade.build.core=arduino:arduino
## Arduboy homemade based on boards ###########################################
@@ -71,8 +71,8 @@ arduboy-homemade.menu.based_on.leonardo.build.pid=0x8036
arduboy-homemade.menu.based_on.leonardo.build.variant=arduboy-leonardo
arduboy-homemade.menu.based_on.leonardo.build.usb_product="ABL{usb_product_postfix}"
arduboy-homemade.menu.based_on.leonardo.org_bootloader_file=caterina/Caterina-Leonardo.hex
-arduboy-homemade.menu.based_on.leonardo.c3k_bootloader_file=cathy3k/arduboy3k-bootloader{bootloader_display}{bootloader_flashselect}.hex
-arduboy-homemade.menu.based_on.leonardo.c2k_bootloader_file=cathy2k/arduboy2k-bootloader.hex
+arduboy-homemade.menu.based_on.leonardo.c3k_bootloader_file=cathy3k/arduboy3k-bootloader-menu{bootloader_display}{bootloader_flashselect}.hex
+arduboy-homemade.menu.based_on.leonardo.c3kg_bootloader_file=cathy3k/arduboy3k-bootloader-game{bootloader_display}{bootloader_flashselect}.hex
# micro #
arduboy-homemade.menu.based_on.micro=Arduino/Genuino Micro
@@ -82,8 +82,8 @@ arduboy-homemade.menu.based_on.micro.build.pid=0x8037
arduboy-homemade.menu.based_on.micro.build.variant=arduboy-micro
arduboy-homemade.menu.based_on.micro.build.usb_product="ABM{usb_product_postfix}"
arduboy-homemade.menu.based_on.micro.org_bootloader_file=caterina/Caterina-Micro.hex
-arduboy-homemade.menu.based_on.micro.c3k_bootloader_file=cathy3k/arduboy3k-bootloader-micro{bootloader_display}{bootloader_flashselect}.hex
-arduboy-homemade.menu.based_on.micro.c2k_bootloader_file=cathy2k/arduboy2k-bootloader-micro.hex
+arduboy-homemade.menu.based_on.micro.c3k_bootloader_file=cathy3k/arduboy3k-bootloader-menu-micro{bootloader_display}{bootloader_flashselect}.hex
+arduboy-homemade.menu.based_on.micro.c3kg_bootloader_file=cathy3k/arduboy3k-bootloader-game-micro{bootloader_display}{bootloader_flashselect}.hex
# SparkFun Pro Micro 5V #
arduboy-homemade.menu.based_on.promicro=SparkFun Pro Micro 5V - Standard wiring
@@ -96,8 +96,8 @@ arduboy-homemade.menu.based_on.promicro.build.variant=arduboy-promicro
arduboy-homemade.menu.based_on.promicro.build.usb_product="ABP{usb_product_postfix}"
arduboy-homemade.menu.based_on.promicro.build.board=AVR_PROMICRO
arduboy-homemade.menu.based_on.promicro.org_bootloader_file=caterina/Caterina-promicro16.hex
-arduboy-homemade.menu.based_on.promicro.c3k_bootloader_file=cathy3k/arduboy3k-bootloader{bootloader_display}{bootloader_flashselect}.hex
-arduboy-homemade.menu.based_on.promicro.c2k_bootloader_file=cathy2k/arduboy2k-bootloader.hex
+arduboy-homemade.menu.based_on.promicro.c3k_bootloader_file=cathy3k/arduboy3k-bootloader-menu{bootloader_display}{bootloader_flashselect}.hex
+arduboy-homemade.menu.based_on.promicro.c3kg_bootloader_file=cathy3k/arduboy3k-bootloader-game{bootloader_display}{bootloader_flashselect}.hex
arduboy-homemade.menu.based_on.promicro_alt=SparkFun Pro Micro 5V - Alternate wiring
#arduboy-homemade.menu.based_on.promicro_alt.build.vid=0x1b4f
@@ -109,8 +109,8 @@ arduboy-homemade.menu.based_on.promicro_alt.build.variant=arduboy-promicro-alt
arduboy-homemade.menu.based_on.promicro_alt.build.usb_product="ABA{usb_product_postfix}"
arduboy-homemade.menu.based_on.promicro_alt.build.board=AVR_PROMICRO -DAB_ALTERNATE_WIRING
arduboy-homemade.menu.based_on.promicro_alt.org_bootloader_file=caterina/Caterina-promicro16.hex
-arduboy-homemade.menu.based_on.promicro_alt.c3k_bootloader_file=cathy3k/arduboy3k-bootloader-promicro{bootloader_display}{bootloader_flashselect}.hex
-arduboy-homemade.menu.based_on.promicro_alt.c2k_bootloader_file=cathy2k/arduboy-bootloader-promicro.hex
+arduboy-homemade.menu.based_on.promicro_alt.c3k_bootloader_file=cathy3k/arduboy3k-bootloader-menu-promicro{bootloader_display}{bootloader_flashselect}.hex
+arduboy-homemade.menu.based_on.promicro_alt.c3kg_bootloader_file=cathy3k/arduboy3k-bootloader-game-promicro{bootloader_display}{bootloader_flashselect}.hex
# bootloader #
arduboy-homemade.menu.boot.org=original (Caterina)
@@ -118,22 +118,23 @@ arduboy-homemade.menu.boot.org.upload.maximum_size=28672
arduboy-homemade.menu.boot.org.bootloader.high_fuses=0xd0
arduboy-homemade.menu.boot.org.bootloader.file={org_bootloader_file}
-arduboy-homemade.menu.boot.cathy3k=Cathy3K
+arduboy-homemade.menu.boot.cathy3k=Cathy3K (starts with menu)
arduboy-homemade.menu.boot.cathy3k.upload.maximum_size=29696
arduboy-homemade.menu.boot.cathy3k.bootloader.high_fuses=0xd2
arduboy-homemade.menu.boot.cathy3k.bootloader.file={c3k_bootloader_file}
-arduboy-homemade.menu.boot.cathy2k=Cathy2K
-arduboy-homemade.menu.boot.cathy2k.upload.maximum_size=30720
-arduboy-homemade.menu.boot.cathy2k.bootloader.high_fuses=0xd2
-arduboy-homemade.menu.boot.cathy2k.bootloader.file={c2k_bootloader_file}
+arduboy-homemade.menu.boot.cathy3kg=Cathy3K (starts with game)
+arduboy-homemade.menu.boot.cathy3kg.upload.maximum_size=29696
+arduboy-homemade.menu.boot.cathy3kg.bootloader.high_fuses=0xd2
+arduboy-homemade.menu.boot.cathy3kg.bootloader.file={c3kg_bootloader_file}
# core #
+arduboy-homemade.menu.core.arduboy-core=Arduboy optimized core
+arduboy-homemade.menu.core.arduboy-core.build.core=arduboy
+
arduboy-homemade.menu.core.arduino-core=Standard Arduino core
arduboy-homemade.menu.core.arduino-core.build.core=arduino:arduino
-arduboy-homemade.menu.core.arduboy-core=Arduboy optimized core
-arduboy-homemade.menu.core.arduboy-core.build.core=arduboy
# display #
arduboy-homemade.menu.display.sh1106=SH1106
@@ -309,26 +310,26 @@ arduboy.build.extra_flags=-DARDUBOY_10 {build.flash_cs} {build.usb_flags}
# Arduboy menu options #########################################################
-arduboy.menu.core.arduino-core=Standard Arduino core
-arduboy.menu.core.arduino-core.build.core=arduino:arduino
-
arduboy.menu.core.arduboy-core=Arduboy optimized core
arduboy.menu.core.arduboy-core.build.core=arduboy
+arduboy.menu.core.arduino-core=Standard Arduino core
+arduboy.menu.core.arduino-core.build.core=arduino:arduino
+
arduboy.menu.boot.org=original (Caterina)
arduboy.menu.boot.org.upload.maximum_size=28672
arduboy.menu.boot.org.bootloader.high_fuses=0xd0
arduboy.menu.boot.org.bootloader.file=caterina/Caterina-Leonardo.hex
-arduboy.menu.boot.cathy3k=Cathy3K
+arduboy.menu.boot.cathy3k=Cathy3K (starts with menu)
arduboy.menu.boot.cathy3k.upload.maximum_size=29696
arduboy.menu.boot.cathy3k.bootloader.high_fuses=0xd2
-arduboy.menu.boot.cathy3k.bootloader.file=cathy3k/arduboy3k-bootloader-sda.hex
+arduboy.menu.boot.cathy3k.bootloader.file=cathy3k/arduboy3k-bootloader-menu-sda.hex
-arduboy.menu.boot.cathy2k=Cathy2K
-arduboy.menu.boot.cathy2k.upload.maximum_size=30720
-arduboy.menu.boot.cathy2k.bootloader.high_fuses=0xd2
-arduboy.menu.boot.cathy2k.bootloader.file=cathy2k/arduboy2k-bootloader.hex
+arduboy.menu.boot.cathy3kg=Cathy3K (starts with game)
+arduboy.menu.boot.cathy3kg.upload.maximum_size=29696
+arduboy.menu.boot.cathy3kg.bootloader.high_fuses=0xd2
+arduboy.menu.boot.cathy3kg.bootloader.file=cathy3k/arduboy3k-bootloader-game-sda.hex
################################################################################
# Arduboy DevKit board
@@ -394,25 +395,25 @@ arduboy-devkit.build.extra_flags=-DAB_DEVKIT {build.usb_flags}
# DevKit menu options ##########################################################
-arduboy-devkit.menu.core.arduino=Standard Arduino core
-arduboy-devkit.menu.core.arduino.build.core=arduino:arduino
-
arduboy-devkit.menu.core.arduboy=Arduboy optimized core
arduboy-devkit.menu.core.arduboy.build.core=arduboy
+arduboy-devkit.menu.core.arduino=Standard Arduino core
+arduboy-devkit.menu.core.arduino.build.core=arduino:arduino
+
arduboy-devkit.menu.boot.org=original (Caterina)
arduboy-devkit.menu.boot.org.upload.maximum_size=28672
arduboy-devkit.menu.boot.org.bootloader.high_fuses=0xd0
arduboy-devkit.menu.boot.org.bootloader.file=caterina/Caterina-Leonardo.hex
-arduboy-devkit.menu.boot.cathy3k=Cathy3K
+arduboy-devkit.menu.boot.cathy3k=Cathy3K (starts with menu)
arduboy-devkit.menu.boot.cathy3k.upload.maximum_size=29696
arduboy-devkit.menu.boot.cathy3k.bootloader.high_fuses=0xd2
-arduboy-devkit.menu.boot.cathy3k.bootloader.file=cathy3k/arduboy3k-bootloader-devkit.hex
+arduboy-devkit.menu.boot.cathy3k.bootloader.file=cathy3k/arduboy3k-bootloader-menu-devkit.hex
-arduboy-devkit.menu.boot.cathy2k=Cathy2K
-arduboy-devkit.menu.boot.cathy2k.upload.maximum_size=30720
-arduboy-devkit.menu.boot.cathy2k.bootloader.high_fuses=0xd2
-arduboy-devkit.menu.boot.cathy2k.bootloader.file=cathy2k/arduboy2k-bootloader-devkit.hex
+arduboy-devkit.menu.boot.cathy3kg=Cathy3K (starts with game)
+arduboy-devkit.menu.boot.cathy3kg.upload.maximum_size=29696
+arduboy-devkit.menu.boot.cathy3kg.bootloader.high_fuses=0xd2
+arduboy-devkit.menu.boot.cathy3kg.bootloader.file=cathy3k/arduboy3k-bootloader-game-devkit.hex
################################################################################
diff --git a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-devkit.hex b/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-devkit.hex
deleted file mode 100644
index 9c23285..0000000
--- a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-devkit.hex
+++ /dev/null
@@ -1,130 +0,0 @@
-:1078000011241FBE8DEF9AE09EBF8DBF04B714BE3A
-:1078100088E18093600010926000409100085091D0
-:1078200001086F917F9199C00F928F939F931F9240
-:107830000FB60F9211244F936F938091DA0080FF5F
-:107840003FC02BC00F920FB68F939F93EF93FF9380
-:1078500088278093850080938400EEE7F1E0908193
-:107860008917980B919309F45D9A90818917980B69
-:10787000908309F4289A1E9B05C05BD319F0C101BF
-:1078800001961C01FF91EF915CC080E189BD82E10E
-:1078900089BD09B400FEFDCF08958091D80080FF16
-:1078A0000FC08091DA008E7F8093DA008091D9003A
-:1078B00080FF04C0EADF81E08EBB02C019BC1EBAA3
-:1078C0008091E10080FF0BC0BBD180FF08C0BBD11D
-:1078D0008091D800806275D219BC85E08EBB809102
-:1078E000E10084FF1AC0ACD184FF17C0CEDF8091C5
-:1078F000D8008F7D66D28FEE2AD0A2D18F7E816094
-:10790000A5D180918501882331F48091E30087FD22
-:1079100002C081E001C084E08EBB8091E10083FF62
-:107920000CC08ED183FF09C087EF11D082E08EBBDF
-:10793000109285010BD087D19BD16F914F910F9001
-:107940001F909F918F910FBE0F9018958EEF009012
-:10795000E10008220092E100089514B880E485B99E
-:10796000569A5E98A0E0B1E0E0E7FFE705900D923F
-:10797000AD37E1F71D92BB30E9F75E9A01FD0FC00C
-:1079800000FF03C01E9B0BC008C003FF08C0675761
-:10799000774729F04757574711F0CBD251F4E3D13D
-:1079A00078942224332439D0B4D2C10180549F4129
-:1079B000D0F3F89481E08093E00010926F00109271
-:1079C0008100109285001092840081E085BF15BE71
-:1079D0005D9A289A0C9400002ED107C0DBD002C01B
-:1079E00095D239F02AD182FFFBCF85FFF7CF809166
-:1079F000F1000895082E83E01FD185FD07C014D142
-:107A000002C084D249F019D180FFFBCF0092F1006F
-:107A10005D9884E680937E0108950DD182FFD5C0E4
-:107A2000289884E680937F01D7DF182FF2018534F0
-:107A300031F48CE49DE11C0182D28DE096C0843546
-:107A400011F4CADFFACF8C34C1F38035B1F3843737
-:107A500021F484E4CFDF80E088C0813611F489E529
-:107A600084C0813431F4B8DFF82FB6DFE82F7CD240
-:107A7000E4CF803711F483E578C0833539F4C0E072
-:107A8000D1E08991B7DFC730E1F770C0863521F4C6
-:107A900081E3B0DF82E369C0833731F487E8AADF8E
-:107AA00085E9A8DF8EE161C0853639F4E0E8F7E7C3
-:107AB00084D0E058F040E0F7C0CF823631F489E559
-:107AC00099DF80E097DF80E850C0823419F0873674
-:107AD00009F037C0222433247FDFD82F7DDFC82F61
-:107AE0007BDF082F8554823008F03EC010926F0073
-:107AF000173659F406C0063411F4859101C027D217
-:107B000079DF2197C2F72F0118C04F01063461F4C5
-:107B100054D00AC061DF063431F4C0FB16F0182ED1
-:107B200046D0082E01C017D22197A2F72F010634A4
-:107B300011F4F4013AD08DE05DDF82E080936F00B4
-:107B400015C08237E1E049F08634E0E031F08E3450
-:107B5000E3E019F0813531F4E2E0F0E089E087BF3D
-:107B6000849103C08B3111F08FE344DF83E0DED1D9
-:107B70005BD095FF03C009C0C9D139F15ED080FF49
-:107B8000FBCF52D002C0C2D101F157D080FFFBCF52
-:107B900084E0CCD18BE749C010D090E40D901D90CB
-:107BA00006D09A95D9F7E058F04085E007C081E00B
-:107BB00087BFE89511243296089583E001D081E1D2
-:107BC00087BFE89507B600FCFDCF089590918D0121
-:107BD00080918E01913231F0913A61F5813251F507
-:107BE00038D083C0803231F534D090D1E9F085307F
-:107BF000D9F023D083FD18C082FFF7CF04C0F7DE91
-:107C00008193615031F09091F3008091F200892BC3
-:107C1000B1F7C0DF611549F704C078D129F085308C
-:107C200019F00BD080FFF9CF8EE79091E8008923FF
-:107C30008093E800089584E079D18091E800089568
-:107C40008091E2000895FCDF8E7F80618093E200E6
-:107C500008955AD1E6E8F1E067E0089582E061EC2A
-:107C600009D083E061E802D084E060E842E103C02B
-:107C700080E060E042E05AD181E007D01092ED0050
-:107C80006093EC004093ED0008959091EB00892BF8
-:107C90008093EB00089560E0923039F0933041F02A
-:107CA000913079F4E7E062E10CC0E9E16EE309C0EC
-:107CB000813018F4E7E564E004C019F4EBE562E212
-:107CC00000C0F1E0089580918D0188234CF402C03A
-:107CD0001DD151F0B2DF82FFFBCF5CCF17D121F075
-:107CE000ACDF80FFFBCFA0DF08954091930150915E
-:107CF00094014617510510F490E028C0611511F069
-:107D0000462FFACF91DF40E0F7CF00D159F185300F
-:107D100049F193DF83FD3ECF90DF82FD20C080FFDD
-:107D200015C03091F3002091F20005C0819180933D
-:107D3000F10041502F5F411519F028303105B0F3A3
-:107D400050E02830310509F451E06EDF4115E9F6C5
-:107D50005523D9F604C0DAD029F0853019F06DDF4B
-:107D600082FFF9CF17CF20E82093610010926100C5
-:107D700081E085BF32E035BF209A289A559A5D9AF6
-:107D8000109289008AEF8093880030936F0083E01F
-:107D90008093810081E08093D7008AE482BF1092B3
-:107DA000D8001092E2001092DA001092E10080E810
-:107DB00008D019BC1EBA1092E0005ADF89E046DFF5
-:107DC00081E98093D8000895EDE8F1E010DE819319
-:107DD000E539E1F7FBDE31DF83FF91C080918D0152
-:107DE00090918E01913009F170F09330F1F095305F
-:107DF00009F444C0963009F456C0983009F460C0C4
-:107E0000993059F767C0823841F7809191018DD040
-:107E10002091EB001092E90077D0229526952170F1
-:107E20002093F1001092F10052C0882311F08230AB
-:107E3000A1F68F71823089F680918F018823D1F469
-:107E400020919101277049F22093E9008091EB0085
-:107E500080FF10C0933011F480E20BC080E115DF89
-:107E600081E0880F2A95E9F78093EA001092EA00F2
-:107E700088E00BDF1092E90047D02AC0882391F4F4
-:107E800010918F0110680FB7F8943ED01CDFD5DE3B
-:107E900080FFFDCF1093E300103883E009F482E007
-:107EA0008EBB0FBF2CC08058823048F580918F0167
-:107EB00090919001F0DE603011F126D016DF1FC0E6
-:107EC0008038E9F421D0809185018093F100ACDE07
-:107ED000FADE15C0882399F490918F01923078F4DE
-:107EE0009093850111D0EFDE80918501882321F4E4
-:107EF0008091E30091E087FD94E09EBBAFDE9DDEC4
-:107F000083FF089580E2C1DE87EF8FCE8EB3882392
-:107F10000895FCDF69F08091E9008F931092E900E9
-:107F20008CDE83FF01C050DF8F9187708093E90062
-:107F30000895E0E0F0E08591949101960895F201B2
-:107F4000F695E795F999FECFF2BDE1BD0895F7DF0B
-:107F5000F89A80B508C0F3DF1FBA80BD0FB6F89459
-:107F6000FA9AF99A0FBE3196EE0FFF1F2F0108956E
-:107F700041524455424F591201100102000008417C
-:107F800023360001000001000109023E0002010049
-:107F900080320904000001020201000524001001E2
-:107FA000042402040524060001070582030800FFDB
-:107FB00009040100020A0000000705040210000184
-:107FC0000705830210000104030904220341007223
-:107FD000006400750069006E006F0020004C0065B1
-:0E7FE000006F006E006100720064006F000010
-:047FFC00CDCDFBDC10
-:040000030000780081
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-micro.hex b/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-micro.hex
deleted file mode 100644
index 4a9015a..0000000
--- a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-micro.hex
+++ /dev/null
@@ -1,130 +0,0 @@
-:1078000011241FBE8DEF9AE09EBF8DBF04B714BE3A
-:1078100088E18093600010926000409100085091D0
-:1078200001086F917F9199C00F928F939F931F9240
-:107830000FB60F9211244F936F938091DA0080FF5F
-:107840003FC02BC00F920FB68F939F93EF93FF9380
-:1078500088278093850080938400EEE7F1E0908193
-:107860008917980B919309F45D9890818917980B6B
-:10787000908309F428987C9B05C05BD319F0C10163
-:1078800001961C01FF91EF915CC080E189BD82E10E
-:1078900089BD09B400FEFDCF08958091D80080FF16
-:1078A0000FC08091DA008E7F8093DA008091D9003A
-:1078B00080FF04C0EADF81E08EBB02C019BC1EBAA3
-:1078C0008091E10080FF0BC0BBD180FF08C0BBD11D
-:1078D0008091D800806275D219BC85E08EBB809102
-:1078E000E10084FF1AC0ACD184FF17C0CEDF8091C5
-:1078F000D8008F7D66D28FEE2AD0A2D18F7E816094
-:10790000A5D180918501882331F48091E30087FD22
-:1079100002C081E001C084E08EBB8091E10083FF62
-:107920000CC08ED183FF09C087EF11D082E08EBBDF
-:10793000109285010BD087D19BD16F914F910F9001
-:107940001F909F918F910FBE0F9018958EEF009012
-:10795000E10008220092E100089510BA80E181BBA5
-:10796000579A5F98A0E0B1E0E0E7FFE705900D923D
-:10797000AD37E1F71D92BB30E9F75F9A01FD0FC00B
-:1079800000FF03C07C9B0BC008C003FF08C0675703
-:10799000774729F04757574711F0CBD251F4E3D13D
-:1079A00078942224332439D0B4D2C10180549F4129
-:1079B000D0F3F89481E08093E00010926F00109271
-:1079C0008100109285001092840081E085BF15BE71
-:1079D0005D9828980C9400002ED107C0DBD002C01F
-:1079E00095D239F02AD182FFFBCF85FFF7CF809166
-:1079F000F1000895082E83E01FD185FD07C014D142
-:107A000002C084D249F019D180FFFBCF0092F1006F
-:107A10005D9A84E680937E0108950DD182FFD5C0E2
-:107A2000289A84E680937F01D7DF182FF2018534EE
-:107A300031F48CE49DE11C0182D28DE096C0843546
-:107A400011F4CADFFACF8C34C1F38035B1F3843737
-:107A500021F484E4CFDF80E088C0813611F489E529
-:107A600084C0813431F4B8DFF82FB6DFE82F7CD240
-:107A7000E4CF803711F483E578C0833539F4C0E072
-:107A8000D1E08991B7DFC730E1F770C0863521F4C6
-:107A900081E3B0DF82E369C0833731F487E8AADF8E
-:107AA00085E9A8DF8EE161C0853639F4E0E8F7E7C3
-:107AB00084D0E058F040E0F7C0CF823631F489E559
-:107AC00099DF80E097DF80E850C0823419F0873674
-:107AD00009F037C0222433247FDFD82F7DDFC82F61
-:107AE0007BDF082F8554823008F03EC010926F0073
-:107AF000173659F406C0063411F4859101C027D217
-:107B000079DF2197C2F72F0118C04F01063461F4C5
-:107B100054D00AC061DF063431F4C0FB16F0182ED1
-:107B200046D0082E01C017D22197A2F72F010634A4
-:107B300011F4F4013AD08DE05DDF82E080936F00B4
-:107B400015C08237E1E049F08634E0E031F08E3450
-:107B5000E3E019F0813531F4E2E0F0E089E087BF3D
-:107B6000849103C08B3111F08FE344DF83E0DED1D9
-:107B70005BD095FF03C009C0C9D139F15ED080FF49
-:107B8000FBCF52D002C0C2D101F157D080FFFBCF52
-:107B900084E0CCD18BE749C010D090E40D901D90CB
-:107BA00006D09A95D9F7E058F04085E007C081E00B
-:107BB00087BFE89511243296089583E001D081E1D2
-:107BC00087BFE89507B600FCFDCF089590918D0121
-:107BD00080918E01913231F0913A61F5813251F507
-:107BE00038D083C0803231F534D090D1E9F085307F
-:107BF000D9F023D083FD18C082FFF7CF04C0F7DE91
-:107C00008193615031F09091F3008091F200892BC3
-:107C1000B1F7C0DF611549F704C078D129F085308C
-:107C200019F00BD080FFF9CF8EE79091E8008923FF
-:107C30008093E800089584E079D18091E800089568
-:107C40008091E2000895FCDF8E7F80618093E200E6
-:107C500008955AD1E6E8F1E067E0089582E061EC2A
-:107C600009D083E061E802D084E060E842E103C02B
-:107C700080E060E042E05AD181E007D01092ED0050
-:107C80006093EC004093ED0008959091EB00892BF8
-:107C90008093EB00089560E0923039F0933041F02A
-:107CA000913079F4E7E062E10CC0E9E16EE309C0EC
-:107CB000813018F4E7E564E004C019F4EBE562E212
-:107CC00000C0F1E0089580918D0188234CF402C03A
-:107CD0001DD151F0B2DF82FFFBCF5CCF17D121F075
-:107CE000ACDF80FFFBCFA0DF08954091930150915E
-:107CF00094014617510510F490E028C0611511F069
-:107D0000462FFACF91DF40E0F7CF00D159F185300F
-:107D100049F193DF83FD3ECF90DF82FD20C080FFDD
-:107D200015C03091F3002091F20005C0819180933D
-:107D3000F10041502F5F411519F028303105B0F3A3
-:107D400050E02830310509F451E06EDF4115E9F6C5
-:107D50005523D9F604C0DAD029F0853019F06DDF4B
-:107D600082FFF9CF17CF20E82093610010926100C5
-:107D700081E085BF32E035BF209A2898559A5D98FA
-:107D8000109289008AEF8093880030936F0083E01F
-:107D90008093810081E08093D7008AE482BF1092B3
-:107DA000D8001092E2001092DA001092E10080E810
-:107DB00008D019BC1EBA1092E0005ADF89E046DFF5
-:107DC00081E98093D8000895EDE8F1E010DE819319
-:107DD000E539E1F7FBDE31DF83FF91C080918D0152
-:107DE00090918E01913009F170F09330F1F095305F
-:107DF00009F444C0963009F456C0983009F460C0C4
-:107E0000993059F767C0823841F7809191018DD040
-:107E10002091EB001092E90077D0229526952170F1
-:107E20002093F1001092F10052C0882311F08230AB
-:107E3000A1F68F71823089F680918F018823D1F469
-:107E400020919101277049F22093E9008091EB0085
-:107E500080FF10C0933011F480E20BC080E115DF89
-:107E600081E0880F2A95E9F78093EA001092EA00F2
-:107E700088E00BDF1092E90047D02AC0882391F4F4
-:107E800010918F0110680FB7F8943ED01CDFD5DE3B
-:107E900080FFFDCF1093E300103883E009F482E007
-:107EA0008EBB0FBF2CC08058823048F580918F0167
-:107EB00090919001F0DE603011F126D016DF1FC0E6
-:107EC0008038E9F421D0809185018093F100ACDE07
-:107ED000FADE15C0882399F490918F01923078F4DE
-:107EE0009093850111D0EFDE80918501882321F4E4
-:107EF0008091E30091E087FD94E09EBBAFDE9DDEC4
-:107F000083FF089580E2C1DE87EF8FCE8EB3882392
-:107F10000895FCDF69F08091E9008F931092E900E9
-:107F20008CDE83FF01C050DF8F9187708093E90062
-:107F30000895E0E0F0E08591949101960895F201B2
-:107F4000F695E795F999FECFF2BDE1BD0895F7DF0B
-:107F5000F89A80B508C0F3DF1FBA80BD0FB6F89459
-:107F6000FA9AF99A0FBE3196EE0FFF1F2F0108956E
-:107F700041524455424F591201100102000008417C
-:107F800023370001000001000109023E0002010048
-:107F900080320904000001020201000524001001E2
-:107FA000042402040524060001070582030800FFDB
-:107FB00009040100020A0000000705040210000184
-:107FC0000705830210000104030904220341007223
-:107FD000006400750069006E006F0020004D0069AC
-:0E7FE00000630072006F0020002000200000EF
-:047FFC00CDCDFBDC10
-:040000030000780081
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-promicro.hex b/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-promicro.hex
deleted file mode 100644
index 6465b0c..0000000
--- a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader-promicro.hex
+++ /dev/null
@@ -1,130 +0,0 @@
-:1078000011241FBE8DEF9AE09EBF8DBF04B714BE3A
-:1078100088E18093600010926000409100085091D0
-:1078200001086F917F9199C00F928F939F931F9240
-:107830000FB60F9211244F936F938091DA0080FF5F
-:107840003FC02BC00F920FB68F939F93EF93FF9380
-:1078500088278093850080938400EEE7F1E0908193
-:107860008917980B919309F45D9A90818917980B69
-:10787000908309F4289A7C9B05C05BD319F0C10161
-:1078800001961C01FF91EF915CC080E189BD82E10E
-:1078900089BD09B400FEFDCF08958091D80080FF16
-:1078A0000FC08091DA008E7F8093DA008091D9003A
-:1078B00080FF04C0EADF81E08EBB02C019BC1EBAA3
-:1078C0008091E10080FF0BC0BBD180FF08C0BBD11D
-:1078D0008091D800806275D219BC85E08EBB809102
-:1078E000E10084FF1AC0ACD184FF17C0CEDF8091C5
-:1078F000D8008F7D66D28FEE2AD0A2D18F7E816094
-:10790000A5D180918501882331F48091E30087FD22
-:1079100002C081E001C084E08EBB8091E10083FF62
-:107920000CC08ED183FF09C087EF11D082E08EBBDF
-:10793000109285010BD087D19BD16F914F910F9001
-:107940001F909F918F910FBE0F9018958EEF009012
-:10795000E10008220092E100089510BA80E181BBA5
-:10796000519A5998A0E0B1E0E0E7FFE705900D9249
-:10797000AD37E1F71D92BB30E9F7599A01FD0FC011
-:1079800000FF03C07C9B0BC008C003FF08C0675703
-:10799000774729F04757574711F0CBD251F4E3D13D
-:1079A00078942224332439D0B4D2C10180549F4129
-:1079B000D0F3F89481E08093E00010926F00109271
-:1079C0008100109285001092840081E085BF15BE71
-:1079D0005D9A289A0C9400002ED107C0DBD002C01B
-:1079E00095D239F02AD182FFFBCF85FFF7CF809166
-:1079F000F1000895082E83E01FD185FD07C014D142
-:107A000002C084D249F019D180FFFBCF0092F1006F
-:107A10005D9884E680937E0108950DD182FFD5C0E4
-:107A2000289884E680937F01D7DF182FF2018534F0
-:107A300031F48CE49DE11C0182D28DE096C0843546
-:107A400011F4CADFFACF8C34C1F38035B1F3843737
-:107A500021F484E4CFDF80E088C0813611F489E529
-:107A600084C0813431F4B8DFF82FB6DFE82F7CD240
-:107A7000E4CF803711F483E578C0833539F4C0E072
-:107A8000D1E08991B7DFC730E1F770C0863521F4C6
-:107A900081E3B0DF82E369C0833731F487E8AADF8E
-:107AA00085E9A8DF8EE161C0853639F4E0E8F7E7C3
-:107AB00084D0E058F040E0F7C0CF823631F489E559
-:107AC00099DF80E097DF80E850C0823419F0873674
-:107AD00009F037C0222433247FDFD82F7DDFC82F61
-:107AE0007BDF082F8554823008F03EC010926F0073
-:107AF000173659F406C0063411F4859101C027D217
-:107B000079DF2197C2F72F0118C04F01063461F4C5
-:107B100054D00AC061DF063431F4C0FB16F0182ED1
-:107B200046D0082E01C017D22197A2F72F010634A4
-:107B300011F4F4013AD08DE05DDF82E080936F00B4
-:107B400015C08237E1E049F08634E0E031F08E3450
-:107B5000E3E019F0813531F4E2E0F0E089E087BF3D
-:107B6000849103C08B3111F08FE344DF83E0DED1D9
-:107B70005BD095FF03C009C0C9D139F15ED080FF49
-:107B8000FBCF52D002C0C2D101F157D080FFFBCF52
-:107B900084E0CCD18BE749C010D090E40D901D90CB
-:107BA00006D09A95D9F7E058F04085E007C081E00B
-:107BB00087BFE89511243296089583E001D081E1D2
-:107BC00087BFE89507B600FCFDCF089590918D0121
-:107BD00080918E01913231F0913A61F5813251F507
-:107BE00038D083C0803231F534D090D1E9F085307F
-:107BF000D9F023D083FD18C082FFF7CF04C0F7DE91
-:107C00008193615031F09091F3008091F200892BC3
-:107C1000B1F7C0DF611549F704C078D129F085308C
-:107C200019F00BD080FFF9CF8EE79091E8008923FF
-:107C30008093E800089584E079D18091E800089568
-:107C40008091E2000895FCDF8E7F80618093E200E6
-:107C500008955AD1E6E8F1E067E0089582E061EC2A
-:107C600009D083E061E802D084E060E842E103C02B
-:107C700080E060E042E05AD181E007D01092ED0050
-:107C80006093EC004093ED0008959091EB00892BF8
-:107C90008093EB00089560E0923039F0933041F02A
-:107CA000913079F4E7E062E10CC0E9E16EE309C0EC
-:107CB000813018F4E7E564E004C019F4EBE562E212
-:107CC00000C0F1E0089580918D0188234CF402C03A
-:107CD0001DD151F0B2DF82FFFBCF5CCF17D121F075
-:107CE000ACDF80FFFBCFA0DF08954091930150915E
-:107CF00094014617510510F490E028C0611511F069
-:107D0000462FFACF91DF40E0F7CF00D159F185300F
-:107D100049F193DF83FD3ECF90DF82FD20C080FFDD
-:107D200015C03091F3002091F20005C0819180933D
-:107D3000F10041502F5F411519F028303105B0F3A3
-:107D400050E02830310509F451E06EDF4115E9F6C5
-:107D50005523D9F604C0DAD029F0853019F06DDF4B
-:107D600082FFF9CF17CF20E82093610010926100C5
-:107D700081E085BF32E035BF209A289A559A5D9AF6
-:107D8000109289008AEF8093880030936F0083E01F
-:107D90008093810081E08093D7008AE482BF1092B3
-:107DA000D8001092E2001092DA001092E10080E810
-:107DB00008D019BC1EBA1092E0005ADF89E046DFF5
-:107DC00081E98093D8000895EDE8F1E010DE819319
-:107DD000E539E1F7FBDE31DF83FF91C080918D0152
-:107DE00090918E01913009F170F09330F1F095305F
-:107DF00009F444C0963009F456C0983009F460C0C4
-:107E0000993059F767C0823841F7809191018DD040
-:107E10002091EB001092E90077D0229526952170F1
-:107E20002093F1001092F10052C0882311F08230AB
-:107E3000A1F68F71823089F680918F018823D1F469
-:107E400020919101277049F22093E9008091EB0085
-:107E500080FF10C0933011F480E20BC080E115DF89
-:107E600081E0880F2A95E9F78093EA001092EA00F2
-:107E700088E00BDF1092E90047D02AC0882391F4F4
-:107E800010918F0110680FB7F8943ED01CDFD5DE3B
-:107E900080FFFDCF1093E300103883E009F482E007
-:107EA0008EBB0FBF2CC08058823048F580918F0167
-:107EB00090919001F0DE603011F126D016DF1FC0E6
-:107EC0008038E9F421D0809185018093F100ACDE07
-:107ED000FADE15C0882399F490918F01923078F4DE
-:107EE0009093850111D0EFDE80918501882321F4E4
-:107EF0008091E30091E087FD94E09EBBAFDE9DDEC4
-:107F000083FF089580E2C1DE87EF8FCE8EB3882392
-:107F10000895FCDF69F08091E9008F931092E900E9
-:107F20008CDE83FF01C050DF8F9187708093E90062
-:107F30000895E0E0F0E08591949101960895F201B2
-:107F4000F695E795F999FECFF2BDE1BD0895F7DF0B
-:107F5000F89A80B508C0F3DF1FBA80BD0FB6F89459
-:107F6000FA9AF99A0FBE3196EE0FFF1F2F0108956E
-:107F700041524455424F591201100102000008417C
-:107F800023360001000001000109023E0002010049
-:107F900080320904000001020201000524001001E2
-:107FA000042402040524060001070582030800FFDB
-:107FB00009040100020A0000000705040210000184
-:107FC0000705830210000104030904220341007223
-:107FD000006400750069006E006F0020004C0065B1
-:0E7FE000006F006E006100720064006F000010
-:047FFC00CDCDFBDC10
-:040000030000780081
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader.hex b/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader.hex
deleted file mode 100644
index 3787681..0000000
--- a/board-package-source/bootloaders/cathy2k/arduboy2k-bootloader.hex
+++ /dev/null
@@ -1,130 +0,0 @@
-:1078000011241FBE8DEF9AE09EBF8DBF04B714BE3A
-:1078100088E18093600010926000409100085091D0
-:1078200001086F917F9199C00F928F939F931F9240
-:107830000FB60F9211244F936F938091DA0080FF5F
-:107840003FC02BC00F920FB68F939F93EF93FF9380
-:1078500088278093850080938400EEE7F1E0908193
-:107860008917980B919309F45D9A90818917980B69
-:10787000908309F4289A7C9B05C05BD319F0C10161
-:1078800001961C01FF91EF915CC080E189BD82E10E
-:1078900089BD09B400FEFDCF08958091D80080FF16
-:1078A0000FC08091DA008E7F8093DA008091D9003A
-:1078B00080FF04C0EADF81E08EBB02C019BC1EBAA3
-:1078C0008091E10080FF0BC0BBD180FF08C0BBD11D
-:1078D0008091D800806275D219BC85E08EBB809102
-:1078E000E10084FF1AC0ACD184FF17C0CEDF8091C5
-:1078F000D8008F7D66D28FEE2AD0A2D18F7E816094
-:10790000A5D180918501882331F48091E30087FD22
-:1079100002C081E001C084E08EBB8091E10083FF62
-:107920000CC08ED183FF09C087EF11D082E08EBBDF
-:10793000109285010BD087D19BD16F914F910F9001
-:107940001F909F918F910FBE0F9018958EEF009012
-:10795000E10008220092E100089510BA80E181BBA5
-:10796000579A5F98A0E0B1E0E0E7FFE705900D923D
-:10797000AD37E1F71D92BB30E9F75F9A01FD0FC00B
-:1079800000FF03C07C9B0BC008C003FF08C0675703
-:10799000774729F04757574711F0CBD251F4E3D13D
-:1079A00078942224332439D0B4D2C10180549F4129
-:1079B000D0F3F89481E08093E00010926F00109271
-:1079C0008100109285001092840081E085BF15BE71
-:1079D0005D9A289A0C9400002ED107C0DBD002C01B
-:1079E00095D239F02AD182FFFBCF85FFF7CF809166
-:1079F000F1000895082E83E01FD185FD07C014D142
-:107A000002C084D249F019D180FFFBCF0092F1006F
-:107A10005D9884E680937E0108950DD182FFD5C0E4
-:107A2000289884E680937F01D7DF182FF2018534F0
-:107A300031F48CE49DE11C0182D28DE096C0843546
-:107A400011F4CADFFACF8C34C1F38035B1F3843737
-:107A500021F484E4CFDF80E088C0813611F489E529
-:107A600084C0813431F4B8DFF82FB6DFE82F7CD240
-:107A7000E4CF803711F483E578C0833539F4C0E072
-:107A8000D1E08991B7DFC730E1F770C0863521F4C6
-:107A900081E3B0DF82E369C0833731F487E8AADF8E
-:107AA00085E9A8DF8EE161C0853639F4E0E8F7E7C3
-:107AB00084D0E058F040E0F7C0CF823631F489E559
-:107AC00099DF80E097DF80E850C0823419F0873674
-:107AD00009F037C0222433247FDFD82F7DDFC82F61
-:107AE0007BDF082F8554823008F03EC010926F0073
-:107AF000173659F406C0063411F4859101C027D217
-:107B000079DF2197C2F72F0118C04F01063461F4C5
-:107B100054D00AC061DF063431F4C0FB16F0182ED1
-:107B200046D0082E01C017D22197A2F72F010634A4
-:107B300011F4F4013AD08DE05DDF82E080936F00B4
-:107B400015C08237E1E049F08634E0E031F08E3450
-:107B5000E3E019F0813531F4E2E0F0E089E087BF3D
-:107B6000849103C08B3111F08FE344DF83E0DED1D9
-:107B70005BD095FF03C009C0C9D139F15ED080FF49
-:107B8000FBCF52D002C0C2D101F157D080FFFBCF52
-:107B900084E0CCD18BE749C010D090E40D901D90CB
-:107BA00006D09A95D9F7E058F04085E007C081E00B
-:107BB00087BFE89511243296089583E001D081E1D2
-:107BC00087BFE89507B600FCFDCF089590918D0121
-:107BD00080918E01913231F0913A61F5813251F507
-:107BE00038D083C0803231F534D090D1E9F085307F
-:107BF000D9F023D083FD18C082FFF7CF04C0F7DE91
-:107C00008193615031F09091F3008091F200892BC3
-:107C1000B1F7C0DF611549F704C078D129F085308C
-:107C200019F00BD080FFF9CF8EE79091E8008923FF
-:107C30008093E800089584E079D18091E800089568
-:107C40008091E2000895FCDF8E7F80618093E200E6
-:107C500008955AD1E6E8F1E067E0089582E061EC2A
-:107C600009D083E061E802D084E060E842E103C02B
-:107C700080E060E042E05AD181E007D01092ED0050
-:107C80006093EC004093ED0008959091EB00892BF8
-:107C90008093EB00089560E0923039F0933041F02A
-:107CA000913079F4E7E062E10CC0E9E16EE309C0EC
-:107CB000813018F4E7E564E004C019F4EBE562E212
-:107CC00000C0F1E0089580918D0188234CF402C03A
-:107CD0001DD151F0B2DF82FFFBCF5CCF17D121F075
-:107CE000ACDF80FFFBCFA0DF08954091930150915E
-:107CF00094014617510510F490E028C0611511F069
-:107D0000462FFACF91DF40E0F7CF00D159F185300F
-:107D100049F193DF83FD3ECF90DF82FD20C080FFDD
-:107D200015C03091F3002091F20005C0819180933D
-:107D3000F10041502F5F411519F028303105B0F3A3
-:107D400050E02830310509F451E06EDF4115E9F6C5
-:107D50005523D9F604C0DAD029F0853019F06DDF4B
-:107D600082FFF9CF17CF20E82093610010926100C5
-:107D700081E085BF32E035BF209A289A559A5D9AF6
-:107D8000109289008AEF8093880030936F0083E01F
-:107D90008093810081E08093D7008AE482BF1092B3
-:107DA000D8001092E2001092DA001092E10080E810
-:107DB00008D019BC1EBA1092E0005ADF89E046DFF5
-:107DC00081E98093D8000895EDE8F1E010DE819319
-:107DD000E539E1F7FBDE31DF83FF91C080918D0152
-:107DE00090918E01913009F170F09330F1F095305F
-:107DF00009F444C0963009F456C0983009F460C0C4
-:107E0000993059F767C0823841F7809191018DD040
-:107E10002091EB001092E90077D0229526952170F1
-:107E20002093F1001092F10052C0882311F08230AB
-:107E3000A1F68F71823089F680918F018823D1F469
-:107E400020919101277049F22093E9008091EB0085
-:107E500080FF10C0933011F480E20BC080E115DF89
-:107E600081E0880F2A95E9F78093EA001092EA00F2
-:107E700088E00BDF1092E90047D02AC0882391F4F4
-:107E800010918F0110680FB7F8943ED01CDFD5DE3B
-:107E900080FFFDCF1093E300103883E009F482E007
-:107EA0008EBB0FBF2CC08058823048F580918F0167
-:107EB00090919001F0DE603011F126D016DF1FC0E6
-:107EC0008038E9F421D0809185018093F100ACDE07
-:107ED000FADE15C0882399F490918F01923078F4DE
-:107EE0009093850111D0EFDE80918501882321F4E4
-:107EF0008091E30091E087FD94E09EBBAFDE9DDEC4
-:107F000083FF089580E2C1DE87EF8FCE8EB3882392
-:107F10000895FCDF69F08091E9008F931092E900E9
-:107F20008CDE83FF01C050DF8F9187708093E90062
-:107F30000895E0E0F0E08591949101960895F201B2
-:107F4000F695E795F999FECFF2BDE1BD0895F7DF0B
-:107F5000F89A80B508C0F3DF1FBA80BD0FB6F89459
-:107F6000FA9AF99A0FBE3196EE0FFF1F2F0108956E
-:107F700041524455424F591201100102000008417C
-:107F800023360001000001000109023E0002010049
-:107F900080320904000001020201000524001001E2
-:107FA000042402040524060001070582030800FFDB
-:107FB00009040100020A0000000705040210000184
-:107FC0000705830210000104030904220341007223
-:107FD000006400750069006E006F0020004C0065B1
-:0E7FE000006F006E006100720064006F000010
-:047FFC00CDCDFBDC10
-:040000030000780081
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader-game.hex b/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader-game.hex
new file mode 100644
index 0000000..9c08255
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader-game.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CCD569F08091E9008F931092E900A1D456
+:1074200083FF01C020D58F9187708093E900089574
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00064D489E055D481E98093D8001B
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A729809C005D085E08D
+:10750000FADF05D080FDFDCF729A5E9808958EBD9A
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF90101D520584D
+:1075B0003F4F040D151D9A9411F714C28301282D15
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC057D280FF08C057D2F3
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC048D284FF17C091DD809177
+:1078E000D8008F7DF3DD8FEEA4DD3ED28F7E8160E8
+:1078F00041D280915301882331F48091E30087FDC8
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC02AD283FF09C087EF8BDD82E08EBBCB
+:107920001092530185DD23D232D26F914F910F9087
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B984E08DB984E48EB910BA83EFE0
+:1079600081BB80E68BB980EF8AB980E58CBDBDBD57
+:10797000A0E0E4E9F7E705900D92A035E1F71D924C
+:10798000BB30E9F701FD06C000FF04C07C9B02C0CC
+:107990006BDD41F56FDD78945BDE71F0ABE9B7E04C
+:1079A000E3E6F7E790E105900D929A95E1F7A0598B
+:1079B000BF4FE339B9F7B5DD52D02ADD80915201CE
+:1079C000807861F48FB18095807F66991C9B84607C
+:1079D000982E18DE8110B8DD92FC02C0332062F7C9
+:1079E00043DD51F3F89489EB7DDD81E08093E00085
+:1079F00010926F0010928100109285001092840006
+:107A000081E085BF15BE2E9A2F9A2D9A5D9A289AED
+:107A10000C940000A4D107C057D102C0C6D239F0DF
+:107A2000A0D182FFFBCF85FFF7CF8091F1000895B1
+:107A3000082E83E095D185FD07C08AD102C0B5D25A
+:107A400069F08FD180FFFBCF0092F100809152014D
+:107A5000807221F45D9884E68093500108957FD16F
+:107A600082FF34C180915201807221F4289884E60B
+:107A700080935101CFDF182F853431F422248EE713
+:107A8000382EDDDC8DE00BC1843511F4C3DFFACF75
+:107A90008C34C1F38035B1F3843721F484E4C8DF3A
+:107AA00080E0FDC0813611F489E5F9C0813429F404
+:107AB000B1DF582EAFDF482EE5CF803711F483E5D4
+:107AC000EEC0833539F4E0E5F7E78591B1DFE735BE
+:107AD000E1F7E6C0863521F481E3AADF89E3DFC060
+:107AE000863761F481E3669B8E5F1C9B8F5FA0DF0E
+:107AF0008FB1809582958F708F5BD1C08837A9F444
+:107B000089DF80935201289A84FD28985D9A83FD2D
+:107B10005D982E9A81FD2E982F9A82FD2F982D9A8E
+:107B200080FD2D9887FD8824ADCF8A3649F48FE9F2
+:107B3000E2DCC3E0ECDC7CDFCA95E1F7E5DCB0C059
+:107B4000833731F487E874DF85E972DF8EE1A7C0FF
+:107B5000853639F4E0E8F3E73ED2E058F040E0F74C
+:107B600091CF823631F489E563DF80E061DF80E820
+:107B700096C0823419F0873609F07DC033244ADF7D
+:107B8000D82F48DFC82F46DF082F8354843008F0F1
+:107B900085C0063411F4440C551CF20110926F009C
+:107BA0001736B9F4033489F483E09FDCB0DC8EB57A
+:107BB0001EBC3EDF0DB42197D1F7A6DC08C0063409
+:107BC00011F4859101C041DC33DF2197C2F72F0109
+:107BD0004AC00334A9F4E11104C083DC88ED85DCDC
+:107BE0008DDC7FDC82E081DC15DF0DB48EBDCA95B3
+:107BF000D9F731968DDC82DCDA9569F72F0131C037
+:107C00000634F1F49F01F437D8F4E5D119C002DF4E
+:107C1000063461F4C0FB46F0F43728F4182E81E0F6
+:107C200087BFE89511243296082E0AC0043439F42F
+:107C3000DF01B370AD59B94F8D93319601C009DCA6
+:107C400021972AF7043431F42F01F370FE2B49F405
+:107C500068DC07C0063429F42F01F901F43708F471
+:107C6000B8D18DE0E5DE063411F45694479482E0F5
+:107C700080936F0015C08237E1E049F08634E0E080
+:107C800031F08E34E3E019F0813531F4E2E0F0E0D8
+:107C900089E087BF849103C08B3111F08FE3C8DE88
+:107CA00083E0C3DB55D095FF03C009C07ED171F0DE
+:107CB00058D080FFFBCF4CD002C077D139F051D0E3
+:107CC00080FFFBCF84E0B1DB8BE743C00895E4E5A0
+:107CD000F1E067E090915B0180915C01913231F0BD
+:107CE000913AE1F58132D1F55ED181C0823271F4F1
+:107CF0008191805B8191844089F580915D0180FD57
+:107D00002DC0F89481E08093E0007ACD803231F587
+:107D10004AD14BD1E9F08530D9F023D083FD18C08A
+:107D200082FFF7CF04C081DE8193615031F09091E2
+:107D3000F3008091F200892BB1F7C6DF611549F796
+:107D400004C033D129F0853019F00BD080FFF9CF72
+:107D50008EE79091E80089238093E800089584E0FD
+:107D600064DB8091E80008958091E2000895FCDFD3
+:107D70008E7F80618093E200089582E061EC09D0FB
+:107D800083E061E802D084E060E842E103C080E083
+:107D900060E042E04ADB81E007D01092ED006093A2
+:107DA000EC004093ED0008959091EB00892B8093B7
+:107DB000EB00089560E0923029F0913029F4E0E082
+:107DC00062E102C0E2E16EE3F1E0089580915B01BF
+:107DD00088234CF402C0E9D0C1F3C3DF82FFFBCF9C
+:107DE00073CFE3D091F3BDDF80FFFBCFB1CF4091E4
+:107DF0006101509162014617510520F0462F61152F
+:107E000009F4A6DF50E022C0D0D061F1853051F1F5
+:107E1000A8DF83FD59CFA5DF82FD21C080FF16C0FA
+:107E20003091F3002091F20006C081918093F1001F
+:107E300041502F5F3F4F411519F028303105A8F30D
+:107E400050E02830310509F451E082DF4115E1F6B8
+:107E50005523D1F604C0A9D029F0853019F081DF6F
+:107E600082FFF9CF31CFEBE5F1E0DFDD8193E3363F
+:107E7000E1F72DDF76DF83FF91C080915B01909168
+:107E80005C01913009F170F09330F1F0953009F414
+:107E900044C0963009F456C0983009F460C0993057
+:107EA00059F767C0823841F780915F01BDDA2091B0
+:107EB000EB001092E90077D022952695217020934F
+:107EC000F1001092F10052C0882311F08230A1F627
+:107ED0008F71823089F680915D018823D1F42091E1
+:107EE0005F01277049F22093E9008091EB0080FF49
+:107EF00010C0933011F480E20BC080E155DF81E0C7
+:107F0000880F2A95E9F78093EA001092EA0088E04A
+:107F10004BDF1092E90047D02AC0882391F41091DA
+:107F20005D0110680FB7F8943ED050DF1ADF80FF74
+:107F3000FDCF1093E300103883E009F482E08EBB9C
+:107F40000FBF2CC08058823048F580915D01909120
+:107F50005E0130DF603011F126D049DF1FC080386C
+:107F6000E9F421D0809153018093F100F1DE2EDFFE
+:107F700015C0882399F490915D01923078F4909324
+:107F8000530111D023DF80915301882321F4809184
+:107F9000E30091E087FD94E09EBBEFDEE2DE83FF2D
+:107FA000089580E201DF87EFD4CE8EB38823089551
+:107FB000A3E6B1E0F437B8F40ED090E40D901D9034
+:107FC00081E087BFE89532969A95C1F71124E05871
+:107FD000F04085E001C083E001D081E187BFE895F2
+:087FE00007B600FCFDCF089577
+:067FFA003139DBCFFBDC96
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader-menu.hex b/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader-menu.hex
new file mode 100644
index 0000000..bff4393
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader-menu.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CCD569F08091E9008F931092E900A1D456
+:1074200083FF01C020D58F9187708093E900089574
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00064D489E055D481E98093D8001B
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A729809C005D085E08D
+:10750000FADF05D080FDFDCF729A5E9808958EBD9A
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF90101D520584D
+:1075B0003F4F040D151D9A9411F714C28301282D15
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC057D280FF08C057D2F3
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC048D284FF17C091DD809177
+:1078E000D8008F7DF3DD8FEEA4DD3ED28F7E8160E8
+:1078F00041D280915301882331F48091E30087FDC8
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC02AD283FF09C087EF8BDD82E08EBBCB
+:107920001092530185DD23D232D26F914F910F9087
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B984E08DB984E48EB910BA83EFE0
+:1079600081BB80E68BB980EF8AB980E58CBDBDBD57
+:10797000A0E0E4E9F7E705900D92A035E1F71D924C
+:10798000BB30E9F701FD06C0000004C07C9B02C0CB
+:107990006BDD41F56FDD78945BDE71F0ABE9B7E04C
+:1079A000E3E6F7E790E105900D929A95E1F7A0598B
+:1079B000BF4FE339B9F7B5DD52D02ADD80915201CE
+:1079C000807861F48FB18095807F66991C9B84607C
+:1079D000982E18DE8110B8DD92FC02C0332062F7C9
+:1079E00043DD51F3F89489EB7DDD81E08093E00085
+:1079F00010926F0010928100109285001092840006
+:107A000081E085BF15BE2E9A2F9A2D9A5D9A289AED
+:107A10000C940000A4D107C057D102C0C6D239F0DF
+:107A2000A0D182FFFBCF85FFF7CF8091F1000895B1
+:107A3000082E83E095D185FD07C08AD102C0B5D25A
+:107A400069F08FD180FFFBCF0092F100809152014D
+:107A5000807221F45D9884E68093500108957FD16F
+:107A600082FF34C180915201807221F4289884E60B
+:107A700080935101CFDF182F853431F422248EE713
+:107A8000382EDDDC8DE00BC1843511F4C3DFFACF75
+:107A90008C34C1F38035B1F3843721F484E4C8DF3A
+:107AA00080E0FDC0813611F489E5F9C0813429F404
+:107AB000B1DF582EAFDF482EE5CF803711F483E5D4
+:107AC000EEC0833539F4E0E5F7E78591B1DFE735BE
+:107AD000E1F7E6C0863521F481E3AADF89E3DFC060
+:107AE000863761F481E3669B8E5F1C9B8F5FA0DF0E
+:107AF0008FB1809582958F708F5BD1C08837A9F444
+:107B000089DF80935201289A84FD28985D9A83FD2D
+:107B10005D982E9A81FD2E982F9A82FD2F982D9A8E
+:107B200080FD2D9887FD8824ADCF8A3649F48FE9F2
+:107B3000E2DCC3E0ECDC7CDFCA95E1F7E5DCB0C059
+:107B4000833731F487E874DF85E972DF8EE1A7C0FF
+:107B5000853639F4E0E8F3E73ED2E058F040E0F74C
+:107B600091CF823631F489E563DF80E061DF80E820
+:107B700096C0823419F0873609F07DC033244ADF7D
+:107B8000D82F48DFC82F46DF082F8354843008F0F1
+:107B900085C0063411F4440C551CF20110926F009C
+:107BA0001736B9F4033489F483E09FDCB0DC8EB57A
+:107BB0001EBC3EDF0DB42197D1F7A6DC08C0063409
+:107BC00011F4859101C041DC33DF2197C2F72F0109
+:107BD0004AC00334A9F4E11104C083DC88ED85DCDC
+:107BE0008DDC7FDC82E081DC15DF0DB48EBDCA95B3
+:107BF000D9F731968DDC82DCDA9569F72F0131C037
+:107C00000634F1F49F01F437D8F4E5D119C002DF4E
+:107C1000063461F4C0FB46F0F43728F4182E81E0F6
+:107C200087BFE89511243296082E0AC0043439F42F
+:107C3000DF01B370AD59B94F8D93319601C009DCA6
+:107C400021972AF7043431F42F01F370FE2B49F405
+:107C500068DC07C0063429F42F01F901F43708F471
+:107C6000B8D18DE0E5DE063411F45694479482E0F5
+:107C700080936F0015C08237E1E049F08634E0E080
+:107C800031F08E34E3E019F0813531F4E2E0F0E0D8
+:107C900089E087BF849103C08B3111F08FE3C8DE88
+:107CA00083E0C3DB55D095FF03C009C07ED171F0DE
+:107CB00058D080FFFBCF4CD002C077D139F051D0E3
+:107CC00080FFFBCF84E0B1DB8BE743C00895E4E5A0
+:107CD000F1E067E090915B0180915C01913231F0BD
+:107CE000913AE1F58132D1F55ED181C0823271F4F1
+:107CF0008191805B8191844089F580915D0180FD57
+:107D00002DC0F89481E08093E0007ACD803231F587
+:107D10004AD14BD1E9F08530D9F023D083FD18C08A
+:107D200082FFF7CF04C081DE8193615031F09091E2
+:107D3000F3008091F200892BB1F7C6DF611549F796
+:107D400004C033D129F0853019F00BD080FFF9CF72
+:107D50008EE79091E80089238093E800089584E0FD
+:107D600064DB8091E80008958091E2000895FCDFD3
+:107D70008E7F80618093E200089582E061EC09D0FB
+:107D800083E061E802D084E060E842E103C080E083
+:107D900060E042E04ADB81E007D01092ED006093A2
+:107DA000EC004093ED0008959091EB00892B8093B7
+:107DB000EB00089560E0923029F0913029F4E0E082
+:107DC00062E102C0E2E16EE3F1E0089580915B01BF
+:107DD00088234CF402C0E9D0C1F3C3DF82FFFBCF9C
+:107DE00073CFE3D091F3BDDF80FFFBCFB1CF4091E4
+:107DF0006101509162014617510520F0462F61152F
+:107E000009F4A6DF50E022C0D0D061F1853051F1F5
+:107E1000A8DF83FD59CFA5DF82FD21C080FF16C0FA
+:107E20003091F3002091F20006C081918093F1001F
+:107E300041502F5F3F4F411519F028303105A8F30D
+:107E400050E02830310509F451E082DF4115E1F6B8
+:107E50005523D1F604C0A9D029F0853019F081DF6F
+:107E600082FFF9CF31CFEBE5F1E0DFDD8193E3363F
+:107E7000E1F72DDF76DF83FF91C080915B01909168
+:107E80005C01913009F170F09330F1F0953009F414
+:107E900044C0963009F456C0983009F460C0993057
+:107EA00059F767C0823841F780915F01BDDA2091B0
+:107EB000EB001092E90077D022952695217020934F
+:107EC000F1001092F10052C0882311F08230A1F627
+:107ED0008F71823089F680915D018823D1F42091E1
+:107EE0005F01277049F22093E9008091EB0080FF49
+:107EF00010C0933011F480E20BC080E155DF81E0C7
+:107F0000880F2A95E9F78093EA001092EA0088E04A
+:107F10004BDF1092E90047D02AC0882391F41091DA
+:107F20005D0110680FB7F8943ED050DF1ADF80FF74
+:107F3000FDCF1093E300103883E009F482E08EBB9C
+:107F40000FBF2CC08058823048F580915D01909120
+:107F50005E0130DF603011F126D049DF1FC080386C
+:107F6000E9F421D0809153018093F100F1DE2EDFFE
+:107F700015C0882399F490915D01923078F4909324
+:107F8000530111D023DF80915301882321F4809184
+:107F9000E30091E087FD94E09EBBEFDEE2DE83FF2D
+:107FA000089580E201DF87EFD4CE8EB38823089551
+:107FB000A3E6B1E0F437B8F40ED090E40D901D9034
+:107FC00081E087BFE89532969A95C1F71124E05871
+:107FD000F04085E001C083E001D081E187BFE895F2
+:087FE00007B600FCFDCF089577
+:067FFA003139DBCFFBDC96
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader.hex b/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader.hex
deleted file mode 100644
index 4eb7981..0000000
--- a/board-package-source/bootloaders/cathy3k/arduBigBOY-bootloader.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CFD569F08091E9008F931092E900A4D450
-:1074200083FF01C023D58F9187708093E900089571
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00067D489E058D481E98093D80015
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A729809C005D085E08D
-:10750000FADF05D080FDFDCF729A5E9808958EBD9A
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00002D520583F4F040D151D8A9411F715C2AE
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC05AD280FF08C05AD2ED
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC04BD284FF17C091DD809174
-:1078E000D8008F7DF3DD8FEEA4DD41D28F7E8160E5
-:1078F00044D280915301882331F48091E30087FDC5
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02DD283FF09C087EF8BDD82E08EBBC8
-:107920001092530185DD26D235D26F914F910F9081
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B984E08DB984E48EB910BA80EFE3
-:1079600081BB80E68BB980EF8AB980E58CBDBDBD57
-:10797000A0E0E4E9F7E705900D92A035E1F71D924C
-:10798000BB30E9F701FD09C000FF07C07C9B05C0C3
-:107990005CDD882312F068DD41F56CDD789458DEFB
-:1079A00071F0ABE9B7E0E3E6F7E790E105900D92FF
-:1079B0009A95E1F7A059BF4FE339B9F7B2DD52D03C
-:1079C00027DD80915201807861F48FB18095807FAE
-:1079D00066991C9B8460982E15DE8110B5DD92FCA3
-:1079E00002C0332062F740DD51F3F89489EB7ADD71
-:1079F00081E08093E00010926F001092810010925D
-:107A000085001092840081E085BF15BE2E9A2F9AC2
-:107A10002D9A5D9A289A0C940000A4D107C057D1E2
-:107A200002C0C6D239F0A0D182FFFBCF85FFF7CFCD
-:107A30008091F1000895082E83E095D185FD07C05F
-:107A40008AD102C0B5D269F08FD180FFFBCF0092FE
-:107A5000F10080915201807221F45D9884E6809358
-:107A6000500108957FD182FF34C18091520180720C
-:107A700021F4289884E680935101CFDF182F8534B4
-:107A800031F422248EE7382EDADC8DE00BC1843508
-:107A900011F4C3DFFACF8C34C1F38035B1F38437EE
-:107AA00021F484E4C8DF80E0FDC0813611F489E56B
-:107AB000F9C0813429F4B1DF582EAFDF482EE5CF6D
-:107AC000803711F483E5EEC0833539F4E0E5F7E75C
-:107AD0008591B1DFE735E1F7E6C0863521F481E332
-:107AE000AADF87E3DFC0863761F481E3669B8E5FA0
-:107AF0001C9B8F5FA0DF8FB1809582958F708F5B0D
-:107B0000D1C08837A9F489DF80935201289A84FD77
-:107B100028985D9A83FD5D982E9A81FD2E982F9A64
-:107B200082FD2F982D9A80FD2D9887FD8824ADCF5A
-:107B30008A3649F48FE9DFDCC3E0E9DC7CDFCA95F3
-:107B4000E1F7E2DCB0C0833731F487E874DF85E920
-:107B500072DF8EE1A7C0853639F4E0E8F3E73ED264
-:107B6000E058F040E0F791CF823631F489E563DFE9
-:107B700080E061DF80E896C0823419F0873609F032
-:107B80007DC033244ADFD82F48DFC82F46DF082FB7
-:107B90008354843008F085C0063411F4440C551C1D
-:107BA000F20110926F001736B9F4033489F483E0C0
-:107BB0009CDCADDC8EB51EBC3EDF0DB42197D1F749
-:107BC000A3DC08C0063411F4859101C03EDC33DF2C
-:107BD0002197C2F72F014AC00334A9F4E11104C070
-:107BE00080DC88ED82DC8ADC7CDC82E07EDC15DFF8
-:107BF0000DB48EBDCA95D9F731968ADC7FDCDA9553
-:107C000069F72F0131C00634F1F49F01F437D8F43D
-:107C1000E5D119C002DF063461F4C0FB46F0F43749
-:107C200028F4182E81E087BFE89511243296082E9B
-:107C30000AC0043439F4DF01B370AD59B94F8D93E4
-:107C4000319601C006DC21972AF7043431F42F0164
-:107C5000F370FE2B49F465DC07C0063429F42F01CC
-:107C6000F901F43708F4B8D18DE0E5DE063411F4FB
-:107C70005694479482E080936F0015C08237E1E00C
-:107C800049F08634E0E031F08E34E3E019F08135DC
-:107C900031F4E2E0F0E089E087BF849103C08B31EA
-:107CA00011F08FE3C8DE83E0C0DB55D095FF03C041
-:107CB00009C07ED171F058D080FFFBCF4CD002C0FC
-:107CC00077D139F051D080FFFBCF84E0AEDB8BE77A
-:107CD00043C00895E4E5F1E067E090915B01809195
-:107CE0005C01913231F0913AE1F58132D1F55ED10A
-:107CF00081C0823271F48191805B8191844089F5E9
-:107D000080915D0180FD2DC0F89481E08093E000BA
-:107D100077CD803231F54AD14BD1E9F08530D9F0B9
-:107D200023D083FD18C082FFF7CF04C081DE81938A
-:107D3000615031F09091F3008091F200892BB1F7FE
-:107D4000C6DF611549F704C033D129F0853019F039
-:107D50000BD080FFF9CF8EE79091E80089238093C4
-:107D6000E800089584E061DB8091E8000895809147
-:107D7000E2000895FCDF8E7F80618093E200089529
-:107D800082E061EC09D083E061E802D084E060E841
-:107D900042E103C080E060E042E047DB81E007D0E1
-:107DA0001092ED006093EC004093ED0008959091E7
-:107DB000EB00892B8093EB00089560E0923029F06E
-:107DC000913029F4E0E062E102C0E2E16EE3F1E02B
-:107DD000089580915B0188234CF402C0E9D0C1F37F
-:107DE000C3DF82FFFBCF73CFE3D091F3BDDF80FF12
-:107DF000FBCFB1CF4091610150916201461751050F
-:107E000020F0462F611509F4A6DF50E022C0D0D043
-:107E100061F1853051F1A8DF83FD59CFA5DF82FDE7
-:107E200021C080FF16C03091F3002091F20006C0FF
-:107E300081918093F10041502F5F3F4F411519F020
-:107E400028303105A8F350E02830310509F451E01D
-:107E500082DF4115E1F65523D1F604C0A9D029F0FF
-:107E6000853019F081DF82FFF9CF31CFEBE5F1E00A
-:107E7000DFDD8193E336E1F72DDF76DF83FF91C00D
-:107E800080915B0190915C01913009F170F0933029
-:107E9000F1F0953009F444C0963009F456C098309A
-:107EA00009F460C0993059F767C0823841F7809172
-:107EB0005F01BADA2091EB001092E90077D02295A9
-:107EC000269521702093F1001092F10052C0882372
-:107ED00011F08230A1F68F71823089F680915D01B8
-:107EE0008823D1F420915F01277049F22093E900A3
-:107EF0008091EB0080FF10C0933011F480E20BC042
-:107F000080E155DF81E0880F2A95E9F78093EA0048
-:107F10001092EA0088E04BDF1092E90047D02AC0B7
-:107F2000882391F410915D0110680FB7F8943ED04A
-:107F300050DF1ADF80FFFDCF1093E300103883E09D
-:107F400009F482E08EBB0FBF2CC08058823048F508
-:107F500080915D0190915E0130DF603011F126D09B
-:107F600049DF1FC08038E9F421D08091530180930C
-:107F7000F100F1DE2EDF15C0882399F490915D01A8
-:107F8000923078F49093530111D023DF8091530104
-:107F9000882321F48091E30091E087FD94E09EBB6B
-:107FA000EFDEE2DE83FF089580E201DF87EFD4CECB
-:107FB0008EB388230895A3E6B1E0F437B8F40ED069
-:107FC00090E40D901D9081E087BFE89532969A95D8
-:107FD000C1F71124E058F04085E001C083E001D0F2
-:0E7FE00081E187BFE89507B600FCFDCF08954C
-:067FFA003137DECFFBDC95
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-devkit.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-devkit.hex
deleted file mode 100644
index a8ed473..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-devkit.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000D3D569F08091E9008F931092E900A8D448
-:1074200083FF01C027D58F9187708093E90008956D
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E0006BD489E05CD481E98093D8000D
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05F9A5A9809C005D085E0A4
-:10750000FADF05D080FDFDCF5A9A5F9808958EBDB1
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E094FC38C001
-:1075500096FC4FC090FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00006D520583F4F040D151D8A9411F715C2AA
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C092FE089591E0A5
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC094FC62
-:1076800053C096FC35C0C3E6D2E0E3E6F6E098E0EE
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC05ED280FF08C05ED2E5
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC04FD284FF17C091DD809170
-:1078E000D8008F7DF3DD8FEEA4DD45D28F7E8160E1
-:1078F00048D280915301882331F48091E30087FDC1
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC031D283FF09C087EF8BDD82E08EBBC4
-:107920001092530185DD2AD239D26F914F910F9079
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF87E084B9E5
-:1079500081E785B917B8469A10BA80EC81BB84EAF2
-:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C01E9B05C05EDD882306
-:1079900012F06ADD51F56EDD78945ADE71F0ABE9D4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD54D029DD809128
-:1079C0005201807871F483B180958077369B846012
-:1079D0007F997E9B8160982E15DE8110B5DD90FC2D
-:1079E00002C0332052F740DD41F3F89489EB7ADD91
-:1079F00081E08093E00010926F001092810010925D
-:107A000085001092840081E085BF15BE289A289ACF
-:107A1000289A5D9A289A0C940000A8D107C05BD1DF
-:107A200002C0CAD239F0A4D182FFFBCF85FFF7CFC5
-:107A30008091F1000895082E83E099D185FD07C05B
-:107A40008ED102C0B9D269F093D180FFFBCF0092F2
-:107A5000F10080915201807221F45D9884E6809358
-:107A60005001089583D182FF38C180915201807204
-:107A700021F4289884E680935101CFDF182F8534B4
-:107A800031F422248EE7382EDADC8DE00FC1843504
-:107A900011F4C3DFFACF8C34C1F38035B1F38437EE
-:107AA00021F484E4C8DF80E001C1813611F489E566
-:107AB000FDC0813429F4B1DF582EAFDF482EE5CF69
-:107AC000803711F483E5F2C0833539F4E0E5F7E758
-:107AD0008591B1DFE735E1F7EAC0863521F481E32E
-:107AE000AADF87E3E3C0863781F481E37F9B8E5F63
-:107AF0007E9B8F5FA0DF81E41C9B885F369B8C5F41
-:107B00001D9B8E5F1E9B8F5FD1C08837A9F485DFD8
-:107B100080935201289A84FD28985D9A83FD5D9890
-:107B2000289A81FD2898289A82FD2898289A80FD15
-:107B3000289887FD8824A9CF8A3649F48FE9DBDCB1
-:107B4000C3E0E5DC78DFCA95E1F7DEDCB0C083375F
-:107B500031F487E870DF85E96EDF8EE1A7C08536F6
-:107B600039F4E0E8F3E73ED2E058F040E0F78DCF9B
-:107B7000823631F489E55FDF80E05DDF80E896C022
-:107B8000823419F0873609F07DC0332446DFD82FC0
-:107B900044DFC82F42DF082F8354843008F085C0AB
-:107BA000063411F4440C551CF20110926F00173684
-:107BB000B9F4033489F483E098DCA9DC8EB51EBCEB
-:107BC0003ADF0DB42197D1F79FDC08C0063411F4D9
-:107BD000859101C03ADC2FDF2197C2F72F014AC0FF
-:107BE0000334A9F4E11104C07CDC88ED7EDC86DC82
-:107BF00078DC82E07ADC11DF0DB48EBDCA95D9F74E
-:107C0000319686DC7BDCDA9569F72F0131C00634CA
-:107C1000F1F49F01F437D8F4E5D119C0FEDE063443
-:107C200061F4C0FB46F0F43728F4182E81E087BFDA
-:107C3000E89511243296082E0AC0043439F4DF0185
-:107C4000B370AD59B94F8D93319601C002DC2197C5
-:107C50002AF7043431F42F01F370FE2B49F461DC70
-:107C600007C0063429F42F01F901F43708F4B8D11C
-:107C70008DE0E1DE063411F45694479482E080935F
-:107C80006F0015C08237E1E049F08634E0E031F062
-:107C90008E34E3E019F0813531F4E2E0F0E089E080
-:107CA00087BF849103C08B3111F08FE3C4DE83E082
-:107CB000BCDB55D095FF03C009C07ED171F058D010
-:107CC00080FFFBCF4CD002C077D139F051D080FF7C
-:107CD000FBCF84E0AADB8BE743C00895E4E5F1E045
-:107CE00067E090915B0180915C01913231F0913AB3
-:107CF000E1F58132D1F55ED181C0823271F481919A
-:107D0000805B8191844089F580915D0180FD2DC06B
-:107D1000F89481E08093E00073CD803231F54AD150
-:107D20004BD1E9F08530D9F023D083FD18C082FF14
-:107D3000F7CF04C07DDE8193615031F09091F30064
-:107D40008091F200892BB1F7C6DF611549F704C0B5
-:107D500033D129F0853019F00BD080FFF9CF8EE7B1
-:107D60009091E80089238093E800089584E05DDB2A
-:107D70008091E80008958091E2000895FCDF8E7FF5
-:107D800080618093E200089582E061EC09D083E095
-:107D900061E802D084E060E842E103C080E060E096
-:107DA00042E043DB81E007D01092ED006093EC00ED
-:107DB0004093ED0008959091EB00892B8093EB00A8
-:107DC000089560E0923029F0913029F4E0E062E11A
-:107DD00002C0E2E16EE3F1E0089580915B01882347
-:107DE0004CF402C0E9D0C1F3C3DF82FFFBCF73CFF5
-:107DF000E3D091F3BDDF80FFFBCFB1CF40916101B4
-:107E0000509162014617510520F0462F611509F483
-:107E1000A6DF50E022C0D0D061F1853051F1A8DF5B
-:107E200083FD59CFA5DF82FD21C080FF16C03091B0
-:107E3000F3002091F20006C081918093F10041503F
-:107E40002F5F3F4F411519F028303105A8F350E05E
-:107E50002830310509F451E082DF4115E1F6552360
-:107E6000D1F604C0A9D029F0853019F081DF82FF56
-:107E7000F9CF31CFEBE5F1E0DBDD8193E336E1F7DC
-:107E80002DDF76DF83FF91C080915B0190915C01D3
-:107E9000913009F170F09330F1F0953009F444C05D
-:107EA000963009F456C0983009F460C0993059F7FB
-:107EB00067C0823841F780915F01B6DA2091EB000C
-:107EC0001092E90077D02295269521702093F10039
-:107ED0001092F10052C0882311F08230A1F68F7108
-:107EE000823089F680915D018823D1F420915F0171
-:107EF000277049F22093E9008091EB0080FF10C0C9
-:107F0000933011F480E20BC080E155DF81E0880FEF
-:107F10002A95E9F78093EA001092EA0088E04BDFA7
-:107F20001092E90047D02AC0882391F410915D0196
-:107F300010680FB7F8943ED050DF1ADF80FFFDCFF6
-:107F40001093E300103883E009F482E08EBB0FBF8A
-:107F50002CC08058823048F580915D0190915E017F
-:107F600030DF603011F126D049DF1FC08038E9F4DE
-:107F700021D0809153018093F100F1DE2EDF15C0F6
-:107F8000882399F490915D01923078F49093530195
-:107F900011D023DF80915301882321F48091E300E5
-:107FA00091E087FD94E09EBBEFDEE2DE83FF089563
-:107FB00080E201DF87EFD4CE8EB388230895A3E655
-:107FC000B1E0F437B8F40ED090E40D901D9081E04C
-:107FD00087BFE89532969A95C1F71124E058F04092
-:107FE00085E001C083E001D081E187BFE89507B655
-:067FF00000FCFDCF089526
-:067FFA003137E2CFFBDC91
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-devkit.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-devkit.hex
new file mode 100644
index 0000000..1f21f7e
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-devkit.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000D0D569F08091E9008F931092E900A5D44E
+:1074200083FF01C024D58F9187708093E900089570
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00068D489E059D481E98093D80013
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05F9A5A9809C005D085E0A4
+:10750000FADF05D080FDFDCF5A9A5F9808958EBDB1
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E094FC36C003
+:1075500096FC4DC090FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF90105D5205849
+:1075B0003F4F040D151D9A9411F714C28301282D15
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E426
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C092FE089591E0B5
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E194FC55C096FC2A
+:1076800037C092FE1AC0C3E6D2E0E3E6F6E098E027
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC05BD280FF08C05BD2EB
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC04CD284FF17C091DD809173
+:1078E000D8008F7DF3DD8FEEA4DD42D28F7E8160E4
+:1078F00045D280915301882331F48091E30087FDC4
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC02ED283FF09C087EF8BDD82E08EBBC7
+:107920001092530185DD27D236D26F914F910F907F
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF87E084B9E5
+:1079500081E785B917B8469A10BA80EC81BB84EAF2
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C01E9B02C06DDD51F565
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD54D02CDD80915201807871F495
+:1079C00083B180958077369B84607F997E9B8160B0
+:1079D000982E18DE8110B8DD90FC02C0332052F7DB
+:1079E00043DD41F3F89489EB7DDD81E08093E00095
+:1079F00010926F0010928100109285001092840006
+:107A000081E085BF15BE289A289A289A5D9A289AFF
+:107A10000C940000A8D107C05BD102C0CAD239F0D3
+:107A2000A4D182FFFBCF85FFF7CF8091F1000895AD
+:107A3000082E83E099D185FD07C08ED102C0B9D24E
+:107A400069F093D180FFFBCF0092F1008091520149
+:107A5000807221F45D9884E680935001089583D16B
+:107A600082FF38C180915201807221F4289884E607
+:107A700080935101CFDF182F853431F422248EE713
+:107A8000382EDDDC8DE00FC1843511F4C3DFFACF71
+:107A90008C34C1F38035B1F3843721F484E4C8DF3A
+:107AA00080E001C1813611F489E5FDC0813429F4FB
+:107AB000B1DF582EAFDF482EE5CF803711F483E5D4
+:107AC000F2C0833539F4E0E5F7E78591B1DFE735BA
+:107AD000E1F7EAC0863521F481E3AADF89E3E3C058
+:107AE000863781F481E37F9B8E5F7E9B8F5FA0DF73
+:107AF00081E41C9B885F369B8C5F1D9B8E5F1E9B69
+:107B00008F5FD1C08837A9F485DF80935201289A0E
+:107B100084FD28985D9A83FD5D98289A81FD2898B8
+:107B2000289A82FD2898289A80FD289887FD882425
+:107B3000A9CF8A3649F48FE9DEDCC3E0E8DC78DFE0
+:107B4000CA95E1F7E1DCB0C0833731F487E870DF34
+:107B500085E96EDF8EE1A7C0853639F4E0E8F3E70A
+:107B60003ED2E058F040E0F78DCF823631F489E51F
+:107B70005FDF80E05DDF80E896C0823419F08736F1
+:107B800009F07DC0332446DFD82F44DFC82F42DF01
+:107B9000082F8354843008F085C0063411F4440C57
+:107BA000551CF20110926F001736B9F4033489F4B2
+:107BB00083E09BDCACDC8EB51EBC3ADF0DB42197B4
+:107BC000D1F7A2DC08C0063411F4859101C03DDC78
+:107BD0002FDF2197C2F72F014AC00334A9F4E11126
+:107BE00004C07FDC88ED81DC89DC7BDC82E07DDC2D
+:107BF00011DF0DB48EBDCA95D9F7319689DC7EDCD4
+:107C0000DA9569F72F0131C00634F1F49F01F4379A
+:107C1000D8F4E5D119C0FEDE063461F4C0FB46F0AD
+:107C2000F43728F4182E81E087BFE89511243296A6
+:107C3000082E0AC0043439F4DF01B370AD59B94FCE
+:107C40008D93319601C005DC21972AF7043431F475
+:107C50002F01F370FE2B49F464DC07C0063429F4CD
+:107C60002F01F901F43708F4B8D18DE0E1DE0634D4
+:107C700011F45694479482E080936F0015C08237C8
+:107C8000E1E049F08634E0E031F08E34E3E019F0D1
+:107C9000813531F4E2E0F0E089E087BF849103C0F0
+:107CA0008B3111F08FE3C4DE83E0BFDB55D095FF4D
+:107CB00003C009C07ED171F058D080FFFBCF4CD0FB
+:107CC00002C077D139F051D080FFFBCF84E0ADDB2B
+:107CD0008BE743C00895E4E5F1E067E090915B0134
+:107CE00080915C01913231F0913AE1F58132D1F528
+:107CF0005ED181C0823271F48191805B8191844038
+:107D000089F580915D0180FD2DC0F89481E080931C
+:107D1000E00076CD803231F54AD14BD1E9F08530A3
+:107D2000D9F023D083FD18C082FFF7CF04C07DDED9
+:107D30008193615031F09091F3008091F200892B92
+:107D4000B1F7C6DF611549F704C033D129F085309A
+:107D500019F00BD080FFF9CF8EE79091E8008923CE
+:107D60008093E800089584E060DB8091E800089546
+:107D70008091E2000895FCDF8E7F80618093E200B5
+:107D8000089582E061EC09D083E061E802D084E0EC
+:107D900060E842E103C080E060E042E046DB81E071
+:107DA00007D01092ED006093EC004093ED00089531
+:107DB0009091EB00892B8093EB00089560E0923066
+:107DC00029F0913029F4E0E062E102C0E2E16EE3E3
+:107DD000F1E0089580915B0188234CF402C0E9D062
+:107DE000C1F3C3DF82FFFBCF73CFE3D091F3BDDFDD
+:107DF00080FFFBCFB1CF40916101509162014617E6
+:107E0000510520F0462F611509F4A6DF50E022C08D
+:107E1000D0D061F1853051F1A8DF83FD59CFA5DFC6
+:107E200082FD21C080FF16C03091F3002091F20046
+:107E300006C081918093F10041502F5F3F4F411563
+:107E400019F028303105A8F350E02830310509F445
+:107E500051E082DF4115E1F65523D1F604C0A9D0E7
+:107E600029F0853019F081DF82FFF9CF31CFEBE5C2
+:107E7000F1E0DBDD8193E336E1F72DDF76DF83FF91
+:107E800091C080915B0190915C01913009F170F09B
+:107E90009330F1F0953009F444C0963009F456C09F
+:107EA000983009F460C0993059F767C0823841F7BB
+:107EB00080915F01B9DA2091EB001092E90077D050
+:107EC0002295269521702093F1001092F10052C066
+:107ED000882311F08230A1F68F71823089F680916B
+:107EE0005D018823D1F420915F01277049F220932E
+:107EF000E9008091EB0080FF10C0933011F480E224
+:107F00000BC080E155DF81E0880F2A95E9F7809367
+:107F1000EA001092EA0088E04BDF1092E90047D0B7
+:107F20002AC0882391F410915D0110680FB7F8946E
+:107F30003ED050DF1ADF80FFFDCF1093E3001038F2
+:107F400083E009F482E08EBB0FBF2CC080588230E2
+:107F500048F580915D0190915E0130DF603011F154
+:107F600026D049DF1FC08038E9F421D08091530129
+:107F70008093F100F1DE2EDF15C0882399F49091F3
+:107F80005D01923078F49093530111D023DF8091FA
+:107F90005301882321F48091E30091E087FD94E070
+:107FA0009EBBEFDEE2DE83FF089580E201DF87EF14
+:107FB000D4CE8EB388230895A3E6B1E0F437B8F4A5
+:107FC0000ED090E40D901D9081E087BFE895329629
+:107FD0009A95C1F71124E058F04085E001C083E094
+:107FE00001D081E187BFE89507B600FCFDCF089579
+:067FFA003139DFCFFBDC92
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sda.hex
new file mode 100644
index 0000000..1058841
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sh1106-sda.hex
new file mode 100644
index 0000000..45e4c8e
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sh1106-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sh1106.hex
new file mode 100644
index 0000000..b9b1f38
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-sh1106.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x128-sda.hex
new file mode 100644
index 0000000..4f3b673
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x128-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x128.hex
new file mode 100644
index 0000000..7435604
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x128.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x96-sda.hex
new file mode 100644
index 0000000..0f93c59
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x96.hex
new file mode 100644
index 0000000..d1ed3cb
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-128x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-96x96-sda.hex
new file mode 100644
index 0000000..0ec2b9b
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-96x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-96x96.hex
new file mode 100644
index 0000000..47c7934
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-ssd132x-96x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-st7565-sda.hex
new file mode 100644
index 0000000..f469d2c
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-st7565-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB983EF8AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9828980C940000FC
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-st7565.hex
new file mode 100644
index 0000000..cf1db7f
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro-st7565.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB985EF8AB980E58CBDBDBDA0E0E4E9A7
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9828980C940000FC
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro.hex
new file mode 100644
index 0000000..a0449a9
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-micro.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sda.hex
new file mode 100644
index 0000000..7fccfef
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sda.hex
@@ -0,0 +1,192 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA34D0109289008E
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E3E5F7E7859138D0EF35E1F781E04A
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E818D08D939A95E1F76E
+:1074E000089586E008D00FC083E005D08F2F0DD01F
+:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
+:1075000004D080FDFDCF599A08958EBD8DB587FFBB
+:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
+:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
+:107530008191EBDF83E68E278F77D1F79395983B88
+:1075400089F70895E3E6F1E097FC36C094FC4DC05E
+:1075500092FE089596849920D1F3F894C089D78536
+:1075600020E030E080E090E4AFEFBFEF11968919A2
+:107570009040E0F72D01BD4F8D0127FD13C0E0E0E5
+:10758000F8E011928EE7819392E4E11791939AE5E6
+:1075900008F092E4E334C9F781931082BFDFFE0163
+:1075A0002196A2DF96DFF90101D520583F4F040D47
+:1075B000151D9A9411F714C28301282D60906C0157
+:1075C00070906B0143D019F48823C1F708953801F6
+:1075D00088243CD0C9F580916A01821709F483019F
+:1075E00060906E0170906D01F4CF80E1982E6090F4
+:1075F0006E0170906D012AD059F48823B1F7089577
+:107600009FEF95FC03C096FE089591E097FB890ECD
+:10761000662477248301222719D0B1F48823A1F3AB
+:1076200080916A0136F0881650F4821730F02130CC
+:1076300003C0881520F4281710F48301282F6090C8
+:107640006E0170906D01E8CF3801822EF3014CDF9E
+:1076500040DFC3E6D1E0ECE4F7E709908591081636
+:1076600021F4E335D1F7088080104DCFC9E033DF36
+:10767000CA95E9F7D0E197FC55C094FC37C096FE57
+:107680001AC0C3E6D2E0E3E6F6E098E088E78E0FA2
+:1076900000840192E817E1F7884F09900192E817FA
+:1076A000E1F7C858DF4F9A9589F735DFC85FD340B7
+:1076B000C33E49F749C0C3E6D6E0EBE5FAE098E0FF
+:1076C0008E2F885702900086E817E1F738960A90C7
+:1076D0000292E817E1F73897C857D0409A9581F79A
+:1076E0001ADFC850DC4FC33E41F72EC0A3EEB6E010
+:1076F000E3E6F6E09AE0C6E00D9080818025807F89
+:10770000802582958193A336B90709F4B2E0E33668
+:10771000F90709F4F2E0E336FC0771F7FCDEDA95CD
+:1077200029F712C0A3EEB9E0E3E6FAE092E00E908A
+:10773000829180258F70802582958083E336F907BA
+:10774000B1F7E9DEDA9571F788270895415244557B
+:10775000424F59D5F08D14A1C881CFD9F1AF0000A7
+:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
+:10777000067E7E06FE46565616FE0656461EFE3F00
+:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
+:107790001201100102000008412336000100000020
+:1077A000000109023E0002010080320904000001CC
+:1077B000020201000524001001042402040524062D
+:1077C0000001070582030800FF09040100020A0006
+:1077D00000000705040210000107058302100001E4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945BDE71F0ABE9B7E0EFE5F7E716
+:1079A00090E105900D929A95E1F7A059BF4FEF38FD
+:1079B000B9F7B5DD52D02CDD80915201807861F4A9
+:1079C0008FB18095807F66991C9B8460982E18DE0D
+:1079D0008110B8DD92FC02C0332062F745DD51F31F
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4ECE4F7E78591B1DFE335E1F7E6C09F
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000ECDC7CDFCA95E1F7E6DCB0C0833731F4DA
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB0DC8EB51EBC3EDF7B
+:107BB0000DB42197D1F7A7DC08C0063411F48591E4
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8EDC81DC52
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008DDC83DCDA9569F72F0131C00634F1F4AE
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F468DC07C0D3
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sh1106-sda.hex
new file mode 100644
index 0000000..7c944ce
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sh1106-sda.hex
@@ -0,0 +1,192 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA34D0109289008E
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E3E5F7E7859138D0EF35E1F781E04A
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E818D08D939A95E1F76E
+:1074E000089586E008D00FC083E005D08F2F0DD01F
+:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
+:1075000004D080FDFDCF599A08958EBD8DB587FFBB
+:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
+:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
+:107530008191EBDF83E68E278F77D1F79395983B88
+:1075400089F70895E3E6F1E097FC36C094FC4DC05E
+:1075500092FE089596849920D1F3F894C089D78536
+:1075600020E030E080E090E4AFEFBFEF11968919A2
+:107570009040E0F72D01BD4F8D0127FD13C0E0E0E5
+:10758000F8E011928EE7819392E4E11791939AE5E6
+:1075900008F092E4E334C9F781931082BFDFFE0163
+:1075A0002196A2DF96DFF90101D520583F4F040D47
+:1075B000151D9A9411F714C28301282D60906C0157
+:1075C00070906B0143D019F48823C1F708953801F6
+:1075D00088243CD0C9F580916A01821709F483019F
+:1075E00060906E0170906D01F4CF80E1982E6090F4
+:1075F0006E0170906D012AD059F48823B1F7089577
+:107600009FEF95FC03C096FE089591E097FB890ECD
+:10761000662477248301222719D0B1F48823A1F3AB
+:1076200080916A0136F0881650F4821730F02130CC
+:1076300003C0881520F4281710F48301282F6090C8
+:107640006E0170906D01E8CF3801822EF3014CDF9E
+:1076500040DFC3E6D1E0ECE4F7E709908591081636
+:1076600021F4E335D1F7088080104DCFC9E033DF36
+:10767000CA95E9F7D0E197FC55C094FC37C096FE57
+:107680001AC0C3E6D2E0E3E6F6E098E088E78E0FA2
+:1076900000840192E817E1F7884F09900192E817FA
+:1076A000E1F7C858DF4F9A9589F735DFC85FD340B7
+:1076B000C33E49F749C0C3E6D6E0EBE5FAE098E0FF
+:1076C0008E2F885702900086E817E1F738960A90C7
+:1076D0000292E817E1F73897C857D0409A9581F79A
+:1076E0001ADFC850DC4FC33E41F72EC0A3EEB6E010
+:1076F000E3E6F6E09AE0C6E00D9080818025807F89
+:10770000802582958193A336B90709F4B2E0E33668
+:10771000F90709F4F2E0E336FC0771F7FCDEDA95CD
+:1077200029F712C0A3EEB9E0E3E6FAE092E00E908A
+:10773000829180258F70802582958083E336F907BA
+:10774000B1F7E9DEDA9571F788270895415244557B
+:10775000424F59D5F08D14A1C881CFD9F1AF0200A5
+:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
+:10777000067E7E06FE46565616FE0656461EFE3F00
+:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
+:107790001201100102000008412336000100000020
+:1077A000000109023E0002010080320904000001CC
+:1077B000020201000524001001042402040524062D
+:1077C0000001070582030800FF09040100020A0006
+:1077D00000000705040210000107058302100001E4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945BDE71F0ABE9B7E0EFE5F7E716
+:1079A00090E105900D929A95E1F7A059BF4FEF38FD
+:1079B000B9F7B5DD52D02CDD80915201807861F4A9
+:1079C0008FB18095807F66991C9B8460982E18DE0D
+:1079D0008110B8DD92FC02C0332062F745DD51F31F
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4ECE4F7E78591B1DFE335E1F7E6C09F
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000ECDC7CDFCA95E1F7E6DCB0C0833731F4DA
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB0DC8EB51EBC3EDF7B
+:107BB0000DB42197D1F7A7DC08C0063411F48591E4
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8EDC81DC52
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008DDC83DCDA9569F72F0131C00634F1F4AE
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F468DC07C0D3
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sh1106.hex
new file mode 100644
index 0000000..1ac8db3
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-sh1106.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA34D01092890084
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
+:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x128-sda.hex
new file mode 100644
index 0000000..fe755c0
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x128-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA37D0109289008B
+:107480008AEF8093880082E080936F0083E080938E
+:10749000810048D047D05C98E9E6F7E7859138D07D
+:1074A000EC37E1F781E08093D7008AE482BF109245
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E818D040
+:1074E0008D939A95E1F7089586E008D00FC083E068
+:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
+:1075000005D085E0FBDF04D080FDFDCF599A0895BA
+:107510008EBD8DB587FFFDCF8EB508958FE082219A
+:10752000E9F7F4DFE3E6F6E05C9A40E458E06081D6
+:10753000718198E08FEF60FF8F7070FF807FE8DFD0
+:10754000669576959A95B1F7E058FF4F5A9579F779
+:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
+:1075600036C094FC4DC092FE089596849920D1F3C4
+:10757000F894C089D78520E030E080E090E4AFEF58
+:10758000BFEF119689199040E0F72D01BD4F8D0195
+:1075900027FD13C0E0E0F8E011928EE7819392E4BA
+:1075A000E11791939AE508F092E4E334C9F78193E7
+:1075B0001082B7DFFE0121969ADF8EDFF901F6D443
+:1075C00020583F4F040D151D9A9411F709C28301ED
+:1075D000282D60906C0170906B0143D019F48823C2
+:1075E000C1F70895380188243CD0C9F580916A011B
+:1075F000821709F4830160906E0170906D01F4CFE1
+:1076000080E1982E60906E0170906D012AD059F43F
+:107610008823B1F708959FEF95FC03C096FE089567
+:1076200091E097FB890E662477248301222719D0E5
+:10763000B1F48823A1F380916A0136F0881650F4E2
+:10764000821730F0213003C0881520F4281710F479
+:107650008301282F60906E0170906D01E8CF380192
+:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
+:1076700009908591081621F4E936D1F70880801029
+:1076800045CFC9E02BDFCA95E9F7D0E197FC55C09B
+:1076900094FC37C096FE1AC0C3E6D2E0E3E6F6E0FB
+:1076A00098E088E78E0F00840192E817E1F7884F91
+:1076B00009900192E817E1F7C858DF4F9A9589F7CA
+:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
+:1076D000EBE5FAE098E08E2F885702900086E817D5
+:1076E000E1F738960A900292E817E1F73897C85701
+:1076F000D0409A9581F712DFC850DC4FC33E41F766
+:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
+:1077100080818025807F802582958193A336B9075B
+:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
+:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
+:10774000FAE092E00E90829180258F7080258295DC
+:107750008083E336F907B1F7E1DEDA9571F7882720
+:10776000089541524455424F5915003F75205FA07E
+:1077700055A100A200A87F81CFB121AF0000FFFF7B
+:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
+:1077900006FE46565616FE0656461EFE3F61E9E3B5
+:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
+:1077AC001201100102000008412336000100000004
+:1077BC00000109023E0002010080320904000001B0
+:1077CC000202010005240010010424020405240611
+:1077DC000001070582030800FF09040100020A00EA
+:1077EC0000000705040210000107058302100001C8
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789466DE71F0ABE9B7E0ECE7F7E70C
+:1079A00090E105900D929A95E1F7A059BF4FEC3AFE
+:1079B000B9F7B8DD52D02CDD80915201807861F4A6
+:1079C0008FB18095807F66991C9B8460982E23DE02
+:1079D0008110C3DD92FC02C0332062F745DD51F314
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E6F7E78591B1DFE936E1F7E6C0A0
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000EFDC7CDFCA95E1F7E9DCB0C0833731F4D4
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB3DC8EB51EBC3EDF75
+:107BB0000DB42197D1F7AADC08C0063411F48591E1
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC91DC84DC46
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00090DC86DCDA9569F72F0131C00634F1F4A8
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46BDC07C0D0
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x128.hex
new file mode 100644
index 0000000..643457e
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x128.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA37D01092890081
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005B9808958EBD8DB587FFFDCF8EB508951C
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x96-sda.hex
new file mode 100644
index 0000000..2762214
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA37D0109289008B
+:107480008AEF8093880082E080936F0083E080938E
+:10749000810048D047D05C98E9E6F7E7859138D07D
+:1074A000EC37E1F781E08093D7008AE482BF109245
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E818D040
+:1074E0008D939A95E1F7089586E008D00FC083E068
+:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
+:1075000005D085E0FBDF04D080FDFDCF599A0895BA
+:107510008EBD8DB587FFFDCF8EB508958FE082219A
+:10752000E9F7F4DFE3E6F6E05C9A40E458E06081D6
+:10753000718198E08FEF60FF8F7070FF807FE8DFD0
+:10754000669576959A95B1F7E058FF4F5A9579F779
+:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
+:1075600036C094FC4DC092FE089596849920D1F3C4
+:10757000F894C089D78520E030E080E090E4AFEF58
+:10758000BFEF119689199040E0F72D01BD4F8D0195
+:1075900027FD13C0E0E0F8E011928EE7819392E4BA
+:1075A000E11791939AE508F092E4E334C9F78193E7
+:1075B0001082B7DFFE0121969ADF8EDFF901F6D443
+:1075C00020583F4F040D151D9A9411F709C28301ED
+:1075D000282D60906C0170906B0143D019F48823C2
+:1075E000C1F70895380188243CD0C9F580916A011B
+:1075F000821709F4830160906E0170906D01F4CFE1
+:1076000080E1982E60906E0170906D012AD059F43F
+:107610008823B1F708959FEF95FC03C096FE089567
+:1076200091E097FB890E662477248301222719D0E5
+:10763000B1F48823A1F380916A0136F0881650F4E2
+:10764000821730F0213003C0881520F4281710F479
+:107650008301282F60906E0170906D01E8CF380192
+:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
+:1076700009908591081621F4E936D1F70880801029
+:1076800045CFC9E02BDFCA95E9F7D0E197FC55C09B
+:1076900094FC37C096FE1AC0C3E6D2E0E3E6F6E0FB
+:1076A00098E088E78E0F00840192E817E1F7884F91
+:1076B00009900192E817E1F7C858DF4F9A9589F7CA
+:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
+:1076D000EBE5FAE098E08E2F885702900086E817D5
+:1076E000E1F738960A900292E817E1F73897C85701
+:1076F000D0409A9581F712DFC850DC4FC33E41F766
+:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
+:1077100080818025807F802582958193A336B9075B
+:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
+:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
+:10774000FAE092E00E90829180258F7080258295DC
+:107750008083E336F907B1F7E1DEDA9571F7882720
+:10776000089541524455424F5915003F75104FA09E
+:1077700055A100A200A87F81CFB121AF0000FFFF7B
+:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
+:1077900006FE46565616FE0656461EFE3F61E9E3B5
+:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
+:1077AC001201100102000008412336000100000004
+:1077BC00000109023E0002010080320904000001B0
+:1077CC000202010005240010010424020405240611
+:1077DC000001070582030800FF09040100020A00EA
+:1077EC0000000705040210000107058302100001C8
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789466DE71F0ABE9B7E0ECE7F7E70C
+:1079A00090E105900D929A95E1F7A059BF4FEC3AFE
+:1079B000B9F7B8DD52D02CDD80915201807861F4A6
+:1079C0008FB18095807F66991C9B8460982E23DE02
+:1079D0008110C3DD92FC02C0332062F745DD51F314
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E6F7E78591B1DFE936E1F7E6C0A0
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000EFDC7CDFCA95E1F7E9DCB0C0833731F4D4
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB3DC8EB51EBC3EDF75
+:107BB0000DB42197D1F7AADC08C0063411F48591E1
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC91DC84DC46
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00090DC86DCDA9569F72F0131C00634F1F4A8
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46BDC07C0D0
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x96.hex
new file mode 100644
index 0000000..d9689f3
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-128x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA37D01092890081
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005B9808958EBD8DB587FFFDCF8EB508951C
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-96x96-sda.hex
new file mode 100644
index 0000000..324575c
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-96x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA37D0109289008B
+:107480008AEF8093880082E080936F0083E080938E
+:10749000810048D047D05C98E9E6F7E7859138D07D
+:1074A000EC37E1F781E08093D7008AE482BF109245
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E818D040
+:1074E0008D939A95E1F7089586E008D00FC083E068
+:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
+:1075000005D085E0FBDF04D080FDFDCF599A0895BA
+:107510008EBD8DB587FFFDCF8EB508958FE082219A
+:10752000E9F7F4DFE3E7F6E05C9A40E358E06081D6
+:10753000718198E08FEF60FF8F7070FF807FE8DFD0
+:10754000669576959A95B1F7E058FF4F5A9579F779
+:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
+:1075600036C094FC4DC092FE089596849920D1F3C4
+:10757000F894C089D78520E030E080E090E4AFEF58
+:10758000BFEF119689199040E0F72D01BD4F8D0195
+:1075900027FD13C0E0E0F8E011928EE7819392E4BA
+:1075A000E11791939AE508F092E4E334C9F78193E7
+:1075B0001082B7DFFE0121969ADF8EDFF901F6D443
+:1075C00020583F4F040D151D9A9411F709C28301ED
+:1075D000282D60906C0170906B0143D019F48823C2
+:1075E000C1F70895380188243CD0C9F580916A011B
+:1075F000821709F4830160906E0170906D01F4CFE1
+:1076000080E1982E60906E0170906D012AD059F43F
+:107610008823B1F708959FEF95FC03C096FE089567
+:1076200091E097FB890E662477248301222719D0E5
+:10763000B1F48823A1F380916A0136F0881650F4E2
+:10764000821730F0213003C0881520F4281710F479
+:107650008301282F60906E0170906D01E8CF380192
+:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
+:1076700009908591081621F4E936D1F70880801029
+:1076800045CFC9E02BDFCA95E9F7D0E197FC55C09B
+:1076900094FC37C096FE1AC0C3E6D2E0E3E6F6E0FB
+:1076A00098E088E78E0F00840192E817E1F7884F91
+:1076B00009900192E817E1F7C858DF4F9A9589F7CA
+:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
+:1076D000EBE5FAE098E08E2F885702900086E817D5
+:1076E000E1F738960A900292E817E1F73897C85701
+:1076F000D0409A9581F712DFC850DC4FC33E41F766
+:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
+:1077100080818025807F802582958193A336B9075B
+:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
+:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
+:10774000FAE092E00E90829180258F7080258295DC
+:107750008083E336F907B1F7E1DEDA9571F7882720
+:10776000089541524455424F5915103F75306FA04E
+:1077700055A100A200A87F81CFB121AF0000FFFF7B
+:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
+:1077900006FE46565616FE0656461EFE3F61E9E3B5
+:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
+:1077AC001201100102000008412336000100000004
+:1077BC00000109023E0002010080320904000001B0
+:1077CC000202010005240010010424020405240611
+:1077DC000001070582030800FF09040100020A00EA
+:1077EC0000000705040210000107058302100001C8
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789466DE71F0ABE9B7E0ECE7F7E70C
+:1079A00090E105900D929A95E1F7A059BF4FEC3AFE
+:1079B000B9F7B8DD52D02CDD80915201807861F4A6
+:1079C0008FB18095807F66991C9B8460982E23DE02
+:1079D0008110C3DD92FC02C0332062F745DD51F314
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E6F7E78591B1DFE936E1F7E6C0A0
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000EFDC7CDFCA95E1F7E9DCB0C0833731F4D4
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB3DC8EB51EBC3EDF75
+:107BB0000DB42197D1F7AADC08C0063411F48591E1
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC91DC84DC46
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00090DC86DCDA9569F72F0131C00634F1F4A8
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46BDC07C0D0
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-96x96.hex
new file mode 100644
index 0000000..8ed9135
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-ssd132x-96x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA37D01092890081
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005B9808958EBD8DB587FFFDCF8EB508951C
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-st7565-sda.hex
new file mode 100644
index 0000000..7e85486
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-st7565-sda.hex
@@ -0,0 +1,192 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA34D0109289008E
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E9E5F7E7859138D0EF35E1F781E044
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E818D08D939A95E1F76E
+:1074E000089586E008D00FC083E005D08F2F0DD01F
+:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
+:1075000004D080FDFDCF599A08958EBD8DB587FFBB
+:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
+:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
+:107530008191EBDF83E68E278F77D1F79395983B88
+:1075400089F708952E9A589A2D9AE3E6F1E097FC70
+:1075500036C094FC4DC092FE089596849920D1F3D4
+:10756000F894C089D78520E030E080E090E4AFEF68
+:10757000BFEF119689199040E0F72D01BD4F8D01A5
+:1075800027FD13C0E0E0F8E011928EE7819392E4CA
+:10759000E11791939AE508F092E4E334C9F78193F7
+:1075A0001082BCDFFE0121969FDF93DFF901FED43C
+:1075B00020583F4F040D151D9A9411F711C28301F5
+:1075C000282D60906C0170906B0143D019F48823D2
+:1075D000C1F70895380188243CD0C9F580916A012B
+:1075E000821709F4830160906E0170906D01F4CFF1
+:1075F00080E1982E60906E0170906D012AD059F450
+:107600008823B1F708959FEF95FC03C096FE089577
+:1076100091E097FB890E662477248301222719D0F5
+:10762000B1F48823A1F380916A0136F0881650F4F2
+:10763000821730F0213003C0881520F4281710F489
+:107640008301282F60906E0170906D01E8CF3801A2
+:10765000822EF30149DF3DDFC3E6D1E0E2E5F7E743
+:1076600009908591081621F4E935D1F7088080103A
+:107670004ACFC9E030DFCA95E9F7D0E197FC55C0A1
+:1076800094FC37C096FE1AC0C3E6D2E0E3E6F6E00B
+:1076900098E088E78E0F00840192E817E1F7884FA1
+:1076A00009900192E817E1F7C858DF4F9A9589F7DA
+:1076B00032DFC85FD340C33E49F749C0C3E6D6E0D6
+:1076C000EBE5FAE098E08E2F885702900086E817E5
+:1076D000E1F738960A900292E817E1F73897C85711
+:1076E000D0409A9581F717DFC850DC4FC33E41F771
+:1076F0002EC0A3EEB6E0E3E6F6E09AE0C6E00D9019
+:1077000080818025807F802582958193A336B9076B
+:1077100009F4B2E0E336F90709F4F2E0E336FC07D6
+:1077200071F7F9DEDA9529F712C0A3EEB9E0E3E6C6
+:10773000FAE092E00E90829180258F7080258295EC
+:107740008083E336F907B1F7E6DEDA9571F788272B
+:10775000089541524455424F59C82F258113AF0017
+:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
+:10777000067E7E06FE46565616FE0656461EFE3F00
+:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
+:107790001201100102000008412336000100000020
+:1077A000000109023E0002010080320904000001CC
+:1077B000020201000524001001042402040524062D
+:1077C0000001070582030800FF09040100020A0006
+:1077D00000000705040210000107058302100001E4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945EDE71F0ABE9B7E0EFE5F7E713
+:1079A00090E105900D929A95E1F7A059BF4FEF38FD
+:1079B000B9F7B5DD52D02CDD80915201807861F4A9
+:1079C0008FB18095807F66991C9B8460982E1BDE0A
+:1079D0008110B8DD92FC02C0332062F745DD51F31F
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9858982D985D9A289A0C940000CF
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E5F7E78591B1DFE935E1F7E6C0A2
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A589882FD589A2D9880FD2D9AB5
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000ECDC7CDFCA95E1F7E6DCB0C0833731F4DA
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB0DC8EB51EBC3EDF7B
+:107BB0000DB42197D1F7A7DC08C0063411F48591E4
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8EDC81DC52
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008DDC83DCDA9569F72F0131C00634F1F4AE
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F468DC07C0D3
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-st7565.hex
new file mode 100644
index 0000000..4f0fe23
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro-st7565.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA34D01092890084
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
+:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A589A2D9AE3E6D9
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9858982D985D9A289A0C940000CF
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A589882FD589A2D9880FD2D9AB5
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro.hex
new file mode 100644
index 0000000..415409a
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-promicro.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA34D01092890084
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
+:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sda.hex
new file mode 100644
index 0000000..7553124
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sh1106-sda.hex
new file mode 100644
index 0000000..2108826
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sh1106-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sh1106.hex
new file mode 100644
index 0000000..5ef513b
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-sh1106.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x128-sda.hex
new file mode 100644
index 0000000..34b06fb
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x128-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x128.hex
new file mode 100644
index 0000000..2b7cf15
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x128.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x96-sda.hex
new file mode 100644
index 0000000..d29af4a
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x96.hex
new file mode 100644
index 0000000..d26ff06
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-128x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-96x96-sda.hex
new file mode 100644
index 0000000..5297ce0
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-96x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-96x96.hex
new file mode 100644
index 0000000..f7ada27
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-ssd132x-96x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-st7565-sda.hex
new file mode 100644
index 0000000..a9574a1
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-st7565-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB983EF8AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9A289A0C940000F8
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-st7565.hex
new file mode 100644
index 0000000..2be5ef0
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game-st7565.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB985EF8AB980E58CBDBDBDA0E0E4E9A7
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9A289A0C940000F8
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game.hex
new file mode 100644
index 0000000..d50aae7
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-game.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C000FF04C07C9B02C06DDD41F517
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-devkit.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-devkit.hex
new file mode 100644
index 0000000..cb64398
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-devkit.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000D0D569F08091E9008F931092E900A5D44E
+:1074200083FF01C024D58F9187708093E900089570
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00068D489E059D481E98093D80013
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05F9A5A9809C005D085E0A4
+:10750000FADF05D080FDFDCF5A9A5F9808958EBDB1
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E094FC36C003
+:1075500096FC4DC090FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF90105D5205849
+:1075B0003F4F040D151D9A9411F714C28301282D15
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E426
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C092FE089591E0B5
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E194FC55C096FC2A
+:1076800037C092FE1AC0C3E6D2E0E3E6F6E098E027
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC05BD280FF08C05BD2EB
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC04CD284FF17C091DD809173
+:1078E000D8008F7DF3DD8FEEA4DD42D28F7E8160E4
+:1078F00045D280915301882331F48091E30087FDC4
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC02ED283FF09C087EF8BDD82E08EBBC7
+:107920001092530185DD27D236D26F914F910F907F
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF87E084B9E5
+:1079500081E785B917B8469A10BA80EC81BB84EAF2
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C01E9B02C06DDD51F564
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD54D02CDD80915201807871F495
+:1079C00083B180958077369B84607F997E9B8160B0
+:1079D000982E18DE8110B8DD90FC02C0332052F7DB
+:1079E00043DD41F3F89489EB7DDD81E08093E00095
+:1079F00010926F0010928100109285001092840006
+:107A000081E085BF15BE289A289A289A5D9A289AFF
+:107A10000C940000A8D107C05BD102C0CAD239F0D3
+:107A2000A4D182FFFBCF85FFF7CF8091F1000895AD
+:107A3000082E83E099D185FD07C08ED102C0B9D24E
+:107A400069F093D180FFFBCF0092F1008091520149
+:107A5000807221F45D9884E680935001089583D16B
+:107A600082FF38C180915201807221F4289884E607
+:107A700080935101CFDF182F853431F422248EE713
+:107A8000382EDDDC8DE00FC1843511F4C3DFFACF71
+:107A90008C34C1F38035B1F3843721F484E4C8DF3A
+:107AA00080E001C1813611F489E5FDC0813429F4FB
+:107AB000B1DF582EAFDF482EE5CF803711F483E5D4
+:107AC000F2C0833539F4E0E5F7E78591B1DFE735BA
+:107AD000E1F7EAC0863521F481E3AADF89E3E3C058
+:107AE000863781F481E37F9B8E5F7E9B8F5FA0DF73
+:107AF00081E41C9B885F369B8C5F1D9B8E5F1E9B69
+:107B00008F5FD1C08837A9F485DF80935201289A0E
+:107B100084FD28985D9A83FD5D98289A81FD2898B8
+:107B2000289A82FD2898289A80FD289887FD882425
+:107B3000A9CF8A3649F48FE9DEDCC3E0E8DC78DFE0
+:107B4000CA95E1F7E1DCB0C0833731F487E870DF34
+:107B500085E96EDF8EE1A7C0853639F4E0E8F3E70A
+:107B60003ED2E058F040E0F78DCF823631F489E51F
+:107B70005FDF80E05DDF80E896C0823419F08736F1
+:107B800009F07DC0332446DFD82F44DFC82F42DF01
+:107B9000082F8354843008F085C0063411F4440C57
+:107BA000551CF20110926F001736B9F4033489F4B2
+:107BB00083E09BDCACDC8EB51EBC3ADF0DB42197B4
+:107BC000D1F7A2DC08C0063411F4859101C03DDC78
+:107BD0002FDF2197C2F72F014AC00334A9F4E11126
+:107BE00004C07FDC88ED81DC89DC7BDC82E07DDC2D
+:107BF00011DF0DB48EBDCA95D9F7319689DC7EDCD4
+:107C0000DA9569F72F0131C00634F1F49F01F4379A
+:107C1000D8F4E5D119C0FEDE063461F4C0FB46F0AD
+:107C2000F43728F4182E81E087BFE89511243296A6
+:107C3000082E0AC0043439F4DF01B370AD59B94FCE
+:107C40008D93319601C005DC21972AF7043431F475
+:107C50002F01F370FE2B49F464DC07C0063429F4CD
+:107C60002F01F901F43708F4B8D18DE0E1DE0634D4
+:107C700011F45694479482E080936F0015C08237C8
+:107C8000E1E049F08634E0E031F08E34E3E019F0D1
+:107C9000813531F4E2E0F0E089E087BF849103C0F0
+:107CA0008B3111F08FE3C4DE83E0BFDB55D095FF4D
+:107CB00003C009C07ED171F058D080FFFBCF4CD0FB
+:107CC00002C077D139F051D080FFFBCF84E0ADDB2B
+:107CD0008BE743C00895E4E5F1E067E090915B0134
+:107CE00080915C01913231F0913AE1F58132D1F528
+:107CF0005ED181C0823271F48191805B8191844038
+:107D000089F580915D0180FD2DC0F89481E080931C
+:107D1000E00076CD803231F54AD14BD1E9F08530A3
+:107D2000D9F023D083FD18C082FFF7CF04C07DDED9
+:107D30008193615031F09091F3008091F200892B92
+:107D4000B1F7C6DF611549F704C033D129F085309A
+:107D500019F00BD080FFF9CF8EE79091E8008923CE
+:107D60008093E800089584E060DB8091E800089546
+:107D70008091E2000895FCDF8E7F80618093E200B5
+:107D8000089582E061EC09D083E061E802D084E0EC
+:107D900060E842E103C080E060E042E046DB81E071
+:107DA00007D01092ED006093EC004093ED00089531
+:107DB0009091EB00892B8093EB00089560E0923066
+:107DC00029F0913029F4E0E062E102C0E2E16EE3E3
+:107DD000F1E0089580915B0188234CF402C0E9D062
+:107DE000C1F3C3DF82FFFBCF73CFE3D091F3BDDFDD
+:107DF00080FFFBCFB1CF40916101509162014617E6
+:107E0000510520F0462F611509F4A6DF50E022C08D
+:107E1000D0D061F1853051F1A8DF83FD59CFA5DFC6
+:107E200082FD21C080FF16C03091F3002091F20046
+:107E300006C081918093F10041502F5F3F4F411563
+:107E400019F028303105A8F350E02830310509F445
+:107E500051E082DF4115E1F65523D1F604C0A9D0E7
+:107E600029F0853019F081DF82FFF9CF31CFEBE5C2
+:107E7000F1E0DBDD8193E336E1F72DDF76DF83FF91
+:107E800091C080915B0190915C01913009F170F09B
+:107E90009330F1F0953009F444C0963009F456C09F
+:107EA000983009F460C0993059F767C0823841F7BB
+:107EB00080915F01B9DA2091EB001092E90077D050
+:107EC0002295269521702093F1001092F10052C066
+:107ED000882311F08230A1F68F71823089F680916B
+:107EE0005D018823D1F420915F01277049F220932E
+:107EF000E9008091EB0080FF10C0933011F480E224
+:107F00000BC080E155DF81E0880F2A95E9F7809367
+:107F1000EA001092EA0088E04BDF1092E90047D0B7
+:107F20002AC0882391F410915D0110680FB7F8946E
+:107F30003ED050DF1ADF80FFFDCF1093E3001038F2
+:107F400083E009F482E08EBB0FBF2CC080588230E2
+:107F500048F580915D0190915E0130DF603011F154
+:107F600026D049DF1FC08038E9F421D08091530129
+:107F70008093F100F1DE2EDF15C0882399F49091F3
+:107F80005D01923078F49093530111D023DF8091FA
+:107F90005301882321F48091E30091E087FD94E070
+:107FA0009EBBEFDEE2DE83FF089580E201DF87EF14
+:107FB000D4CE8EB388230895A3E6B1E0F437B8F4A5
+:107FC0000ED090E40D901D9081E087BFE895329629
+:107FD0009A95C1F71124E058F04085E001C083E094
+:107FE00001D081E187BFE89507B600FCFDCF089579
+:067FFA003139DFCFFBDC92
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sda.hex
new file mode 100644
index 0000000..6a9f1e9
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sh1106-sda.hex
new file mode 100644
index 0000000..17a94f3
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sh1106-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sh1106.hex
new file mode 100644
index 0000000..b3fdfc1
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-sh1106.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x128-sda.hex
new file mode 100644
index 0000000..35e7d20
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x128-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x128.hex
new file mode 100644
index 0000000..b686e98
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x128.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x96-sda.hex
new file mode 100644
index 0000000..dfc94d1
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x96.hex
new file mode 100644
index 0000000..c28b041
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-128x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-96x96-sda.hex
new file mode 100644
index 0000000..7248a49
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-96x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-96x96.hex
new file mode 100644
index 0000000..69d59e2
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-ssd132x-96x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B00012011001020000084123370001000000FF
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-st7565-sda.hex
new file mode 100644
index 0000000..d31bd35
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-st7565-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB983EF8AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9828980C940000FC
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-st7565.hex
new file mode 100644
index 0000000..c003103
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro-st7565.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB985EF8AB980E58CBDBDBDA0E0E4E9A7
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9828980C940000FC
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro.hex
new file mode 100644
index 0000000..d32e626
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-micro.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233700010000001B
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9868
+:1078700091818917980B918309F42898239411F426
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF80EF85B9DC
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9828980C940000F6
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9A84E68093500108957FD182FF34C1FE
+:107A600080915201807221F4289A84E6809351011A
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289884FD289A5D9883FD5D9A2E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sda.hex
new file mode 100644
index 0000000..5723f31
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sda.hex
@@ -0,0 +1,192 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA34D0109289008E
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E3E5F7E7859138D0EF35E1F781E04A
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E818D08D939A95E1F76E
+:1074E000089586E008D00FC083E005D08F2F0DD01F
+:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
+:1075000004D080FDFDCF599A08958EBD8DB587FFBB
+:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
+:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
+:107530008191EBDF83E68E278F77D1F79395983B88
+:1075400089F70895E3E6F1E097FC36C094FC4DC05E
+:1075500092FE089596849920D1F3F894C089D78536
+:1075600020E030E080E090E4AFEFBFEF11968919A2
+:107570009040E0F72D01BD4F8D0127FD13C0E0E0E5
+:10758000F8E011928EE7819392E4E11791939AE5E6
+:1075900008F092E4E334C9F781931082BFDFFE0163
+:1075A0002196A2DF96DFF90101D520583F4F040D47
+:1075B000151D9A9411F714C28301282D60906C0157
+:1075C00070906B0143D019F48823C1F708953801F6
+:1075D00088243CD0C9F580916A01821709F483019F
+:1075E00060906E0170906D01F4CF80E1982E6090F4
+:1075F0006E0170906D012AD059F48823B1F7089577
+:107600009FEF95FC03C096FE089591E097FB890ECD
+:10761000662477248301222719D0B1F48823A1F3AB
+:1076200080916A0136F0881650F4821730F02130CC
+:1076300003C0881520F4281710F48301282F6090C8
+:107640006E0170906D01E8CF3801822EF3014CDF9E
+:1076500040DFC3E6D1E0ECE4F7E709908591081636
+:1076600021F4E335D1F7088080104DCFC9E033DF36
+:10767000CA95E9F7D0E197FC55C094FC37C096FE57
+:107680001AC0C3E6D2E0E3E6F6E098E088E78E0FA2
+:1076900000840192E817E1F7884F09900192E817FA
+:1076A000E1F7C858DF4F9A9589F735DFC85FD340B7
+:1076B000C33E49F749C0C3E6D6E0EBE5FAE098E0FF
+:1076C0008E2F885702900086E817E1F738960A90C7
+:1076D0000292E817E1F73897C857D0409A9581F79A
+:1076E0001ADFC850DC4FC33E41F72EC0A3EEB6E010
+:1076F000E3E6F6E09AE0C6E00D9080818025807F89
+:10770000802582958193A336B90709F4B2E0E33668
+:10771000F90709F4F2E0E336FC0771F7FCDEDA95CD
+:1077200029F712C0A3EEB9E0E3E6FAE092E00E908A
+:10773000829180258F70802582958083E336F907BA
+:10774000B1F7E9DEDA9571F788270895415244557B
+:10775000424F59D5F08D14A1C881CFD9F1AF0000A7
+:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
+:10777000067E7E06FE46565616FE0656461EFE3F00
+:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
+:107790001201100102000008412336000100000020
+:1077A000000109023E0002010080320904000001CC
+:1077B000020201000524001001042402040524062D
+:1077C0000001070582030800FF09040100020A0006
+:1077D00000000705040210000107058302100001E4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945BDE71F0ABE9B7E0EFE5F7E716
+:1079A00090E105900D929A95E1F7A059BF4FEF38FD
+:1079B000B9F7B5DD52D02CDD80915201807861F4A9
+:1079C0008FB18095807F66991C9B8460982E18DE0D
+:1079D0008110B8DD92FC02C0332062F745DD51F31F
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4ECE4F7E78591B1DFE335E1F7E6C09F
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000ECDC7CDFCA95E1F7E6DCB0C0833731F4DA
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB0DC8EB51EBC3EDF7B
+:107BB0000DB42197D1F7A7DC08C0063411F48591E4
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8EDC81DC52
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008DDC83DCDA9569F72F0131C00634F1F4AE
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F468DC07C0D3
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sh1106-sda.hex
new file mode 100644
index 0000000..5ae42dd
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sh1106-sda.hex
@@ -0,0 +1,192 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA34D0109289008E
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E3E5F7E7859138D0EF35E1F781E04A
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E818D08D939A95E1F76E
+:1074E000089586E008D00FC083E005D08F2F0DD01F
+:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
+:1075000004D080FDFDCF599A08958EBD8DB587FFBB
+:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
+:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
+:107530008191EBDF83E68E278F77D1F79395983B88
+:1075400089F70895E3E6F1E097FC36C094FC4DC05E
+:1075500092FE089596849920D1F3F894C089D78536
+:1075600020E030E080E090E4AFEFBFEF11968919A2
+:107570009040E0F72D01BD4F8D0127FD13C0E0E0E5
+:10758000F8E011928EE7819392E4E11791939AE5E6
+:1075900008F092E4E334C9F781931082BFDFFE0163
+:1075A0002196A2DF96DFF90101D520583F4F040D47
+:1075B000151D9A9411F714C28301282D60906C0157
+:1075C00070906B0143D019F48823C1F708953801F6
+:1075D00088243CD0C9F580916A01821709F483019F
+:1075E00060906E0170906D01F4CF80E1982E6090F4
+:1075F0006E0170906D012AD059F48823B1F7089577
+:107600009FEF95FC03C096FE089591E097FB890ECD
+:10761000662477248301222719D0B1F48823A1F3AB
+:1076200080916A0136F0881650F4821730F02130CC
+:1076300003C0881520F4281710F48301282F6090C8
+:107640006E0170906D01E8CF3801822EF3014CDF9E
+:1076500040DFC3E6D1E0ECE4F7E709908591081636
+:1076600021F4E335D1F7088080104DCFC9E033DF36
+:10767000CA95E9F7D0E197FC55C094FC37C096FE57
+:107680001AC0C3E6D2E0E3E6F6E098E088E78E0FA2
+:1076900000840192E817E1F7884F09900192E817FA
+:1076A000E1F7C858DF4F9A9589F735DFC85FD340B7
+:1076B000C33E49F749C0C3E6D6E0EBE5FAE098E0FF
+:1076C0008E2F885702900086E817E1F738960A90C7
+:1076D0000292E817E1F73897C857D0409A9581F79A
+:1076E0001ADFC850DC4FC33E41F72EC0A3EEB6E010
+:1076F000E3E6F6E09AE0C6E00D9080818025807F89
+:10770000802582958193A336B90709F4B2E0E33668
+:10771000F90709F4F2E0E336FC0771F7FCDEDA95CD
+:1077200029F712C0A3EEB9E0E3E6FAE092E00E908A
+:10773000829180258F70802582958083E336F907BA
+:10774000B1F7E9DEDA9571F788270895415244557B
+:10775000424F59D5F08D14A1C881CFD9F1AF0200A5
+:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
+:10777000067E7E06FE46565616FE0656461EFE3F00
+:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
+:107790001201100102000008412336000100000020
+:1077A000000109023E0002010080320904000001CC
+:1077B000020201000524001001042402040524062D
+:1077C0000001070582030800FF09040100020A0006
+:1077D00000000705040210000107058302100001E4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945BDE71F0ABE9B7E0EFE5F7E716
+:1079A00090E105900D929A95E1F7A059BF4FEF38FD
+:1079B000B9F7B5DD52D02CDD80915201807861F4A9
+:1079C0008FB18095807F66991C9B8460982E18DE0D
+:1079D0008110B8DD92FC02C0332062F745DD51F31F
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4ECE4F7E78591B1DFE335E1F7E6C09F
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000ECDC7CDFCA95E1F7E6DCB0C0833731F4DA
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB0DC8EB51EBC3EDF7B
+:107BB0000DB42197D1F7A7DC08C0063411F48591E4
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8EDC81DC52
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008DDC83DCDA9569F72F0131C00634F1F4AE
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F468DC07C0D3
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sh1106.hex
new file mode 100644
index 0000000..77eaa3e
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-sh1106.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA34D01092890084
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
+:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x128-sda.hex
new file mode 100644
index 0000000..d523677
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x128-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA37D0109289008B
+:107480008AEF8093880082E080936F0083E080938E
+:10749000810048D047D05C98E9E6F7E7859138D07D
+:1074A000EC37E1F781E08093D7008AE482BF109245
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E818D040
+:1074E0008D939A95E1F7089586E008D00FC083E068
+:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
+:1075000005D085E0FBDF04D080FDFDCF599A0895BA
+:107510008EBD8DB587FFFDCF8EB508958FE082219A
+:10752000E9F7F4DFE3E6F6E05C9A40E458E06081D6
+:10753000718198E08FEF60FF8F7070FF807FE8DFD0
+:10754000669576959A95B1F7E058FF4F5A9579F779
+:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
+:1075600036C094FC4DC092FE089596849920D1F3C4
+:10757000F894C089D78520E030E080E090E4AFEF58
+:10758000BFEF119689199040E0F72D01BD4F8D0195
+:1075900027FD13C0E0E0F8E011928EE7819392E4BA
+:1075A000E11791939AE508F092E4E334C9F78193E7
+:1075B0001082B7DFFE0121969ADF8EDFF901F6D443
+:1075C00020583F4F040D151D9A9411F709C28301ED
+:1075D000282D60906C0170906B0143D019F48823C2
+:1075E000C1F70895380188243CD0C9F580916A011B
+:1075F000821709F4830160906E0170906D01F4CFE1
+:1076000080E1982E60906E0170906D012AD059F43F
+:107610008823B1F708959FEF95FC03C096FE089567
+:1076200091E097FB890E662477248301222719D0E5
+:10763000B1F48823A1F380916A0136F0881650F4E2
+:10764000821730F0213003C0881520F4281710F479
+:107650008301282F60906E0170906D01E8CF380192
+:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
+:1076700009908591081621F4E936D1F70880801029
+:1076800045CFC9E02BDFCA95E9F7D0E197FC55C09B
+:1076900094FC37C096FE1AC0C3E6D2E0E3E6F6E0FB
+:1076A00098E088E78E0F00840192E817E1F7884F91
+:1076B00009900192E817E1F7C858DF4F9A9589F7CA
+:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
+:1076D000EBE5FAE098E08E2F885702900086E817D5
+:1076E000E1F738960A900292E817E1F73897C85701
+:1076F000D0409A9581F712DFC850DC4FC33E41F766
+:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
+:1077100080818025807F802582958193A336B9075B
+:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
+:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
+:10774000FAE092E00E90829180258F7080258295DC
+:107750008083E336F907B1F7E1DEDA9571F7882720
+:10776000089541524455424F5915003F75205FA07E
+:1077700055A100A200A87F81CFB121AF0000FFFF7B
+:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
+:1077900006FE46565616FE0656461EFE3F61E9E3B5
+:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
+:1077AC001201100102000008412336000100000004
+:1077BC00000109023E0002010080320904000001B0
+:1077CC000202010005240010010424020405240611
+:1077DC000001070582030800FF09040100020A00EA
+:1077EC0000000705040210000107058302100001C8
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789466DE71F0ABE9B7E0ECE7F7E70C
+:1079A00090E105900D929A95E1F7A059BF4FEC3AFE
+:1079B000B9F7B8DD52D02CDD80915201807861F4A6
+:1079C0008FB18095807F66991C9B8460982E23DE02
+:1079D0008110C3DD92FC02C0332062F745DD51F314
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E6F7E78591B1DFE936E1F7E6C0A0
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000EFDC7CDFCA95E1F7E9DCB0C0833731F4D4
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB3DC8EB51EBC3EDF75
+:107BB0000DB42197D1F7AADC08C0063411F48591E1
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC91DC84DC46
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00090DC86DCDA9569F72F0131C00634F1F4A8
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46BDC07C0D0
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x128.hex
new file mode 100644
index 0000000..4c6bf7b
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x128.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA37D01092890081
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005B9808958EBD8DB587FFFDCF8EB508951C
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x96-sda.hex
new file mode 100644
index 0000000..c449f23
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA37D0109289008B
+:107480008AEF8093880082E080936F0083E080938E
+:10749000810048D047D05C98E9E6F7E7859138D07D
+:1074A000EC37E1F781E08093D7008AE482BF109245
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E818D040
+:1074E0008D939A95E1F7089586E008D00FC083E068
+:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
+:1075000005D085E0FBDF04D080FDFDCF599A0895BA
+:107510008EBD8DB587FFFDCF8EB508958FE082219A
+:10752000E9F7F4DFE3E6F6E05C9A40E458E06081D6
+:10753000718198E08FEF60FF8F7070FF807FE8DFD0
+:10754000669576959A95B1F7E058FF4F5A9579F779
+:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
+:1075600036C094FC4DC092FE089596849920D1F3C4
+:10757000F894C089D78520E030E080E090E4AFEF58
+:10758000BFEF119689199040E0F72D01BD4F8D0195
+:1075900027FD13C0E0E0F8E011928EE7819392E4BA
+:1075A000E11791939AE508F092E4E334C9F78193E7
+:1075B0001082B7DFFE0121969ADF8EDFF901F6D443
+:1075C00020583F4F040D151D9A9411F709C28301ED
+:1075D000282D60906C0170906B0143D019F48823C2
+:1075E000C1F70895380188243CD0C9F580916A011B
+:1075F000821709F4830160906E0170906D01F4CFE1
+:1076000080E1982E60906E0170906D012AD059F43F
+:107610008823B1F708959FEF95FC03C096FE089567
+:1076200091E097FB890E662477248301222719D0E5
+:10763000B1F48823A1F380916A0136F0881650F4E2
+:10764000821730F0213003C0881520F4281710F479
+:107650008301282F60906E0170906D01E8CF380192
+:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
+:1076700009908591081621F4E936D1F70880801029
+:1076800045CFC9E02BDFCA95E9F7D0E197FC55C09B
+:1076900094FC37C096FE1AC0C3E6D2E0E3E6F6E0FB
+:1076A00098E088E78E0F00840192E817E1F7884F91
+:1076B00009900192E817E1F7C858DF4F9A9589F7CA
+:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
+:1076D000EBE5FAE098E08E2F885702900086E817D5
+:1076E000E1F738960A900292E817E1F73897C85701
+:1076F000D0409A9581F712DFC850DC4FC33E41F766
+:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
+:1077100080818025807F802582958193A336B9075B
+:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
+:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
+:10774000FAE092E00E90829180258F7080258295DC
+:107750008083E336F907B1F7E1DEDA9571F7882720
+:10776000089541524455424F5915003F75104FA09E
+:1077700055A100A200A87F81CFB121AF0000FFFF7B
+:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
+:1077900006FE46565616FE0656461EFE3F61E9E3B5
+:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
+:1077AC001201100102000008412336000100000004
+:1077BC00000109023E0002010080320904000001B0
+:1077CC000202010005240010010424020405240611
+:1077DC000001070582030800FF09040100020A00EA
+:1077EC0000000705040210000107058302100001C8
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789466DE71F0ABE9B7E0ECE7F7E70C
+:1079A00090E105900D929A95E1F7A059BF4FEC3AFE
+:1079B000B9F7B8DD52D02CDD80915201807861F4A6
+:1079C0008FB18095807F66991C9B8460982E23DE02
+:1079D0008110C3DD92FC02C0332062F745DD51F314
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E6F7E78591B1DFE936E1F7E6C0A0
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000EFDC7CDFCA95E1F7E9DCB0C0833731F4D4
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB3DC8EB51EBC3EDF75
+:107BB0000DB42197D1F7AADC08C0063411F48591E1
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC91DC84DC46
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00090DC86DCDA9569F72F0131C00634F1F4A8
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46BDC07C0D0
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x96.hex
new file mode 100644
index 0000000..7a958db
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-128x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA37D01092890081
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005B9808958EBD8DB587FFFDCF8EB508951C
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-96x96-sda.hex
new file mode 100644
index 0000000..683830c
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-96x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA37D0109289008B
+:107480008AEF8093880082E080936F0083E080938E
+:10749000810048D047D05C98E9E6F7E7859138D07D
+:1074A000EC37E1F781E08093D7008AE482BF109245
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E818D040
+:1074E0008D939A95E1F7089586E008D00FC083E068
+:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
+:1075000005D085E0FBDF04D080FDFDCF599A0895BA
+:107510008EBD8DB587FFFDCF8EB508958FE082219A
+:10752000E9F7F4DFE3E7F6E05C9A40E358E06081D6
+:10753000718198E08FEF60FF8F7070FF807FE8DFD0
+:10754000669576959A95B1F7E058FF4F5A9579F779
+:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
+:1075600036C094FC4DC092FE089596849920D1F3C4
+:10757000F894C089D78520E030E080E090E4AFEF58
+:10758000BFEF119689199040E0F72D01BD4F8D0195
+:1075900027FD13C0E0E0F8E011928EE7819392E4BA
+:1075A000E11791939AE508F092E4E334C9F78193E7
+:1075B0001082B7DFFE0121969ADF8EDFF901F6D443
+:1075C00020583F4F040D151D9A9411F709C28301ED
+:1075D000282D60906C0170906B0143D019F48823C2
+:1075E000C1F70895380188243CD0C9F580916A011B
+:1075F000821709F4830160906E0170906D01F4CFE1
+:1076000080E1982E60906E0170906D012AD059F43F
+:107610008823B1F708959FEF95FC03C096FE089567
+:1076200091E097FB890E662477248301222719D0E5
+:10763000B1F48823A1F380916A0136F0881650F4E2
+:10764000821730F0213003C0881520F4281710F479
+:107650008301282F60906E0170906D01E8CF380192
+:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
+:1076700009908591081621F4E936D1F70880801029
+:1076800045CFC9E02BDFCA95E9F7D0E197FC55C09B
+:1076900094FC37C096FE1AC0C3E6D2E0E3E6F6E0FB
+:1076A00098E088E78E0F00840192E817E1F7884F91
+:1076B00009900192E817E1F7C858DF4F9A9589F7CA
+:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
+:1076D000EBE5FAE098E08E2F885702900086E817D5
+:1076E000E1F738960A900292E817E1F73897C85701
+:1076F000D0409A9581F712DFC850DC4FC33E41F766
+:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
+:1077100080818025807F802582958193A336B9075B
+:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
+:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
+:10774000FAE092E00E90829180258F7080258295DC
+:107750008083E336F907B1F7E1DEDA9571F7882720
+:10776000089541524455424F5915103F75306FA04E
+:1077700055A100A200A87F81CFB121AF0000FFFF7B
+:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
+:1077900006FE46565616FE0656461EFE3F61E9E3B5
+:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
+:1077AC001201100102000008412336000100000004
+:1077BC00000109023E0002010080320904000001B0
+:1077CC000202010005240010010424020405240611
+:1077DC000001070582030800FF09040100020A00EA
+:1077EC0000000705040210000107058302100001C8
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789466DE71F0ABE9B7E0ECE7F7E70C
+:1079A00090E105900D929A95E1F7A059BF4FEC3AFE
+:1079B000B9F7B8DD52D02CDD80915201807861F4A6
+:1079C0008FB18095807F66991C9B8460982E23DE02
+:1079D0008110C3DD92FC02C0332062F745DD51F314
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E6F7E78591B1DFE936E1F7E6C0A0
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000EFDC7CDFCA95E1F7E9DCB0C0833731F4D4
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB3DC8EB51EBC3EDF75
+:107BB0000DB42197D1F7AADC08C0063411F48591E1
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC91DC84DC46
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00090DC86DCDA9569F72F0131C00634F1F4A8
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46BDC07C0D0
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-96x96.hex
new file mode 100644
index 0000000..adb8b71
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-ssd132x-96x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA37D01092890081
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005B9808958EBD8DB587FFFDCF8EB508951C
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-st7565-sda.hex
new file mode 100644
index 0000000..6524782
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-st7565-sda.hex
@@ -0,0 +1,192 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580E28BB98BEA34D0109289008E
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E9E5F7E7859138D0EF35E1F781E044
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E818D08D939A95E1F76E
+:1074E000089586E008D00FC083E005D08F2F0DD01F
+:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
+:1075000004D080FDFDCF599A08958EBD8DB587FFBB
+:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
+:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
+:107530008191EBDF83E68E278F77D1F79395983B88
+:1075400089F708952E9A589A2D9AE3E6F1E097FC70
+:1075500036C094FC4DC092FE089596849920D1F3D4
+:10756000F894C089D78520E030E080E090E4AFEF68
+:10757000BFEF119689199040E0F72D01BD4F8D01A5
+:1075800027FD13C0E0E0F8E011928EE7819392E4CA
+:10759000E11791939AE508F092E4E334C9F78193F7
+:1075A0001082BCDFFE0121969FDF93DFF901FED43C
+:1075B00020583F4F040D151D9A9411F711C28301F5
+:1075C000282D60906C0170906B0143D019F48823D2
+:1075D000C1F70895380188243CD0C9F580916A012B
+:1075E000821709F4830160906E0170906D01F4CFF1
+:1075F00080E1982E60906E0170906D012AD059F450
+:107600008823B1F708959FEF95FC03C096FE089577
+:1076100091E097FB890E662477248301222719D0F5
+:10762000B1F48823A1F380916A0136F0881650F4F2
+:10763000821730F0213003C0881520F4281710F489
+:107640008301282F60906E0170906D01E8CF3801A2
+:10765000822EF30149DF3DDFC3E6D1E0E2E5F7E743
+:1076600009908591081621F4E935D1F7088080103A
+:107670004ACFC9E030DFCA95E9F7D0E197FC55C0A1
+:1076800094FC37C096FE1AC0C3E6D2E0E3E6F6E00B
+:1076900098E088E78E0F00840192E817E1F7884FA1
+:1076A00009900192E817E1F7C858DF4F9A9589F7DA
+:1076B00032DFC85FD340C33E49F749C0C3E6D6E0D6
+:1076C000EBE5FAE098E08E2F885702900086E817E5
+:1076D000E1F738960A900292E817E1F73897C85711
+:1076E000D0409A9581F717DFC850DC4FC33E41F771
+:1076F0002EC0A3EEB6E0E3E6F6E09AE0C6E00D9019
+:1077000080818025807F802582958193A336B9076B
+:1077100009F4B2E0E336F90709F4F2E0E336FC07D6
+:1077200071F7F9DEDA9529F712C0A3EEB9E0E3E6C6
+:10773000FAE092E00E90829180258F7080258295EC
+:107740008083E336F907B1F7E6DEDA9571F788272B
+:10775000089541524455424F59C82F258113AF0017
+:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
+:10777000067E7E06FE46565616FE0656461EFE3F00
+:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
+:107790001201100102000008412336000100000020
+:1077A000000109023E0002010080320904000001CC
+:1077B000020201000524001001042402040524062D
+:1077C0000001070582030800FF09040100020A0006
+:1077D00000000705040210000107058302100001E4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E2B4
+:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945EDE71F0ABE9B7E0EFE5F7E713
+:1079A00090E105900D929A95E1F7A059BF4FEF38FD
+:1079B000B9F7B5DD52D02CDD80915201807861F4A9
+:1079C0008FB18095807F66991C9B8460982E1BDE0A
+:1079D0008110B8DD92FC02C0332062F745DD51F31F
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9858982D985D9A289A0C940000CF
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E2E5F7E78591B1DFE935E1F7E6C0A2
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A589882FD589A2D9880FD2D9AB5
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000ECDC7CDFCA95E1F7E6DCB0C0833731F4DA
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB0DC8EB51EBC3EDF7B
+:107BB0000DB42197D1F7A7DC08C0063411F48591E4
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8EDC81DC52
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008DDC83DCDA9569F72F0131C00634F1F4AE
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F468DC07C0D3
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-st7565.hex
new file mode 100644
index 0000000..61858cd
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro-st7565.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA34D01092890084
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
+:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A589A2D9AE3E6D9
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9858982D985D9A289A0C940000CF
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A589882FD589A2D9880FD2D9AB5
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro.hex
new file mode 100644
index 0000000..3f8c446
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-promicro.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:10747000019608958AE28BB98BEA34D01092890084
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
+:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB8CE2AA
+:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A589A2D9A5D9A289A0C940000C9
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E98589A82FD58982D9A80FD2D98B7
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sda.hex
new file mode 100644
index 0000000..eff085a
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sh1106-sda.hex
new file mode 100644
index 0000000..557c180
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sh1106-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sh1106.hex
new file mode 100644
index 0000000..6b93680
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-sh1106.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x128-sda.hex
new file mode 100644
index 0000000..504a601
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x128-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x128.hex
new file mode 100644
index 0000000..08ce609
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x128.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075205FA055A100A200A87F81CFB121AFE5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x96-sda.hex
new file mode 100644
index 0000000..4e86ed9
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x96.hex
new file mode 100644
index 0000000..965daba
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-128x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915003FFB
+:1077700075104FA055A100A200A87F81CFB121AF05
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-96x96-sda.hex
new file mode 100644
index 0000000..27d23c7
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-96x96-sda.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
+:1075000009C005D085E0FADF05D080FDFDCF599A8E
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-96x96.hex
new file mode 100644
index 0000000..7b7d745
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-ssd132x-96x96.hex
@@ -0,0 +1,194 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA37D0109289007F
+:107480008AEF8093880082E080936F0083E080938E
+:1074900081004AD049D05C98EDE6F7E785913AD073
+:1074A000E038E1F781E08093D7008AE482BF109250
+:1074B000D8001092E2001092DA001092E10080E809
+:1074C00008D019BC1EBA1092E0005FD489E050D4F5
+:1074D00081E98093D8000895A3E6B1E090E81AD03E
+:1074E0008D939A95E1F7089586E008D010C083E067
+:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
+:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
+:107510005E9808958EBD8DB587FFFDCF8EB5089519
+:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
+:1075300058E06081718198E08FEF60FF8F7070FF7D
+:10754000807FE8DF669576959A95B1F7E058FF4F12
+:107550005A9579F7EE5FF3404A9551F70895E3E6BF
+:10756000F1E097FC36C094FC4DC092FE08959684DD
+:107570009920D1F3F894C089D78520E030E080E0ED
+:1075800090E4AFEFBFEF119689199040E0F72D011D
+:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
+:1075A000819392E4E11791939AE508F092E4E33431
+:1075B000C9F781931082B7DFFE01219698DF8CDF37
+:1075C000F901F4D420583F4F040D151D9A9411F77A
+:1075D00007C28301282D60906C0170906B0143D02D
+:1075E00019F48823C1F70895380188243CD0C9F5DF
+:1075F00080916A01821709F4830160906E01709096
+:107600006D01F4CF80E1982E60906E0170906D0155
+:107610002AD059F48823B1F708959FEF95FC03C051
+:1076200096FE089591E097FB890E662477248301E6
+:10763000222719D0B1F48823A1F380916A0136F092
+:10764000881650F4821730F0213003C0881520F4DA
+:10765000281710F48301282F60906E0170906D013F
+:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
+:10767000E6E6F7E709908591081621F4ED36D1F793
+:107680000880801044CFC9E029DFCA95E9F7D0E12E
+:1076900097FC55C094FC37C096FE1AC0C3E6D2E0F2
+:1076A000E3E6F6E098E088E78E0F00840192E817A1
+:1076B000E1F7884F09900192E817E1F7C858DF4FCA
+:1076C0009A9589F72DDFC85FD340C33E49F749C07B
+:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
+:1076E0000086E817E1F738960A900292E817E1F76A
+:1076F0003897C857D0409A9581F712DFC850DC4FB1
+:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
+:10771000C6E00D9080818025807F802582958193B1
+:10772000A336B90709F4B2E0E336F90709F4F2E049
+:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
+:10774000B9E0E3E6FAE092E00E90829180258F7036
+:10775000802582958083E336F907B1F7E1DEDA957B
+:1077600071F78827089541524455424F5915103FEB
+:1077700075306FA055A100A200A87F81CFB121AFC5
+:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
+:10779000FE067E7E06FE46565616FE0656461EFE21
+:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
+:1077B0001201100102000008412336000100000000
+:1077C000000109023E0002010080320904000001AC
+:1077D000020201000524001001042402040524060D
+:1077E0000001070582030800FF09040100020A00E6
+:1077F00000000705040210000107058302100001C4
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806205DE19BC85E08EBB809176
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF6DD8FEEA4DD3CD28F7E8160E7
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789468DE71F0ABE9B7E0E0E8F7E715
+:1079A00090E105900D929A95E1F7A059BF4FE03B09
+:1079B000B9F7BADD52D02CDD80915201807861F4A4
+:1079C0008FB18095807F66991C9B8460982E25DE00
+:1079D0008110C5DD92FC02C0332062F745DD51F312
+:1079E000F89489EB82DD81E08093E00010926F00D3
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E6F7E78591B1DFED36E1F7E6C098
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E7DCC3E0CE
+:107B3000F1DC7CDFCA95E1F7EADCB0C0833731F4D1
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A4DCB5DC8EB51EBC3EDF73
+:107BB0000DB42197D1F7ABDC08C0063411F48591E0
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C088DC88ED8ADC92DC84DC45
+:107BE00082E086DC15DF0DB48EBDCA95D9F73196DB
+:107BF00092DC87DCDA9569F72F0131C00634F1F4A5
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46DDC07C0CE
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-st7565-sda.hex
new file mode 100644
index 0000000..252de82
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-st7565-sda.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A599809C005D085E0A6
+:10750000FADF05D080FDFDCF599A5E9808958EBDB3
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB82E6B0
+:107960008BB983EF8AB980E58CBDBDBDA0E0E4E9A9
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9A289A0C940000F8
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-st7565.hex
new file mode 100644
index 0000000..83255fa
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu-st7565.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100EDE5F7E785913AD0E336E1F781E049
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F708952E9A2F9A2D9AE3E602
+:10755000F1E097FC36C094FC4DC092FE08959684ED
+:107560009920D1F3F894C089D78520E030E080E0FD
+:1075700090E4AFEFBFEF119689199040E0F72D012D
+:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
+:10759000819392E4E11791939AE508F092E4E33441
+:1075A000C9F781931082BCDFFE0121969DDF91DF38
+:1075B000F901FCD420583F4F040D151D9A9411F782
+:1075C0000FC28301282D60906C0170906B0143D035
+:1075D00019F48823C1F70895380188243CD0C9F5EF
+:1075E00080916A01821709F4830160906E017090A6
+:1075F0006D01F4CF80E1982E60906E0170906D0166
+:107600002AD059F48823B1F708959FEF95FC03C061
+:1076100096FE089591E097FB890E662477248301F6
+:10762000222719D0B1F48823A1F380916A0136F0A2
+:10763000881650F4821730F0213003C0881520F4EA
+:10764000281710F48301282F60906E0170906D014F
+:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
+:10766000E6E5F7E709908591081621F4ED35D1F7A5
+:107670000880801049CFC9E02EDFCA95E9F7D0E134
+:1076800097FC55C094FC37C096FE1AC0C3E6D2E002
+:10769000E3E6F6E098E088E78E0F00840192E817B1
+:1076A000E1F7884F09900192E817E1F7C858DF4FDA
+:1076B0009A9589F732DFC85FD340C33E49F749C086
+:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
+:1076D0000086E817E1F738960A900292E817E1F77A
+:1076E0003897C857D0409A9581F717DFC850DC4FBC
+:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
+:10770000C6E00D9080818025807F802582958193C1
+:10771000A336B90709F4B2E0E336F90709F4F2E059
+:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
+:10773000B9E0E3E6FAE092E00E90829180258F7046
+:10774000802582958083E336F907B1F7E6DEDA9586
+:1077500071F78827089541524455424F59C82F2543
+:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB985EF8AB980E58CBDBDBDA0E0E4E9A7
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD789460DE71F0ABE9B7E0E3E6F7E71C
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1DDE08
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E982F982D985D9A289A0C940000F8
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E6E5F7E78591B1DFED35E1F7E6C09A
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E98ED
+:107B100081FD2E9A2F9882FD2F9A2D9880FD2D9A07
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu.hex
new file mode 100644
index 0000000..3029a8b
--- /dev/null
+++ b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-menu.hex
@@ -0,0 +1,193 @@
+:1074000080E189BD82E189BD09B400FEFDCF089508
+:10741000CAD569F08091E9008F931092E9009FD45A
+:1074200083FF01C01ED58F9187708093E900089576
+:107430008EEF0090E10008220092E1000895F20131
+:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
+:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
+:107460000FBE31962F010895E0E0F0E085919491F0
+:107470000196089580EE8BB98BEA34D01092890082
+:107480008AEF8093880082E080936F0083E080938E
+:107490008100E7E5F7E785913AD0E336E1F781E04F
+:1074A0008093D7008AE482BF1092D8001092E20045
+:1074B0001092DA001092E10080E808D019BC1EBAE0
+:1074C0001092E00062D489E053D481E98093D8001F
+:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
+:1074E000089586E008D010C083E005D08F2F0FD01C
+:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
+:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
+:107510008DB587FFFDCF8EB508958FE08221E9F705
+:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
+:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
+:107540009395983B89F70895E3E6F1E097FC36C000
+:1075500094FC4DC092FE089596849920D1F3F8943E
+:10756000C089D78520E030E080E090E4AFEFBFEF46
+:10757000119689199040E0F72D01BD4F8D0127FD2F
+:1075800013C0E0E0F8E011928EE7819392E4E117F6
+:1075900091939AE508F092E4E334C9F7819310825D
+:1075A000BFDFFE012196A0DF94DFF901FFD4205850
+:1075B0003F4F040D151D9A9411F712C28301282D17
+:1075C00060906C0170906B0143D019F48823C1F76F
+:1075D0000895380188243CD0C9F580916A0182174A
+:1075E00009F4830160906E0170906D01F4CF80E129
+:1075F000982E60906E0170906D012AD059F4882306
+:10760000B1F708959FEF95FC03C096FE089591E0B1
+:1076100097FB890E662477248301222719D0B1F4C1
+:107620008823A1F380916A0136F0881650F48217FE
+:1076300030F0213003C0881520F4281710F483019E
+:10764000282F60906E0170906D01E8CF3801822E76
+:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
+:107660008591081621F4E735D1F7088080104CCFBA
+:10767000C9E031DFCA95E9F7D0E197FC55C094FC29
+:1076800037C096FE1AC0C3E6D2E0E3E6F6E098E023
+:1076900088E78E0F00840192E817E1F7884F099080
+:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
+:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
+:1076C000FAE098E08E2F885702900086E817E1F7DD
+:1076D00038960A900292E817E1F73897C857D040D9
+:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
+:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
+:107700008025807F802582958193A336B90709F46F
+:10771000B2E0E336F90709F4F2E0E336FC0771F76B
+:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
+:1077300092E00E90829180258F70802582958083C3
+:10774000E336F907B1F7E9DEDA9571F7882708958E
+:1077500041524455424F59D5F08D14A1C881CFD91B
+:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
+:10777000FF0000FE067E7E06FE46565616FE0656A4
+:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
+:04779000E16B3F006A
+:10779400120110010200000841233600010000001C
+:1077A400000109023E0002010080320904000001C8
+:1077B4000202010005240010010424020405240629
+:1077C4000001070582030800FF09040100020A0002
+:1077D40000000705040210000107058302100001E0
+:1078000011241FBE04B714BE88E18093600010925B
+:1078100060008EEF9AE09EBF8DBF222433242101A9
+:107820003101410180E88AC00F928F939F931F928C
+:107830000FB60F9211244F936F938091DA0080FF5F
+:1078400037C023C00F920FB68F939F93EF93FF9390
+:1078500088278093850080938400E0E5F1E09281A1
+:10786000907261F490818917980B908309F45D9A66
+:1078700091818917980B918309F4289A239411F424
+:107880008315381EFF91EF9154C08091D80080FF7E
+:107890000FC08091DA008E7F8093DA008091D9004A
+:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
+:1078B0008091E10080FF0BC055D280FF08C055D2F7
+:1078C0008091D800806202DE19BC85E08EBB809179
+:1078D000E10084FF1AC046D284FF17C091DD809179
+:1078E000D8008F7DF3DD8FEEA4DD3CD28F7E8160EA
+:1078F0003FD280915301882331F48091E30087FDCA
+:1079000002C081E001C084E08EBB8091E10083FF72
+:107910000CC028D283FF09C087EF8BDD82E08EBBCD
+:107920001092530185DD21D230D26F914F910F908B
+:107930001F909F918F910FBE0F90189580936100BB
+:1079400010926100B1E0B5BF82E085BF81EF85B9DB
+:1079500087EE84B91DB8769A10BA83EF81BB84E6AE
+:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
+:10797000F7E705900D92A035E1F71D92BB30E9F7CE
+:1079800001FD06C0000004C07C9B02C06DDD41F516
+:1079900071DD78945DDE71F0ABE9B7E0E3E6F7E71F
+:1079A00090E105900D929A95E1F7A059BF4FE33908
+:1079B000B9F7B7DD52D02CDD80915201807861F4A7
+:1079C0008FB18095807F66991C9B8460982E1ADE0B
+:1079D0008110BADD92FC02C0332062F745DD51F31D
+:1079E000F89489EB7FDD81E08093E00010926F00D6
+:1079F00010928100109285001092840081E085BF72
+:107A000015BE2E9A2F9A2D9A5D9A289A0C940000F2
+:107A1000A4D107C057D102C0C6D239F0A0D182FF8D
+:107A2000FBCF85FFF7CF8091F1000895082E83E00A
+:107A300095D185FD07C08AD102C0B5D269F08FD13A
+:107A400080FFFBCF0092F10080915201807221F4FF
+:107A50005D9884E68093500108957FD182FF34C100
+:107A600080915201807221F4289884E6809351011C
+:107A7000CFDF182F853431F422248EE7382EDFDC57
+:107A80008DE00BC1843511F4C3DFFACF8C34C1F320
+:107A90008035B1F3843721F484E4C8DF80E0FDC091
+:107AA000813611F489E5F9C0813429F4B1DF582E0B
+:107AB000AFDF482EE5CF803711F483E5EEC0833584
+:107AC00039F4E0E5F7E78591B1DFE735E1F7E6C0A6
+:107AD000863521F481E3AADF89E3DFC0863761F4CC
+:107AE00081E3669B8E5F1C9B8F5FA0DF8FB18095CB
+:107AF00082958F708F5BD1C08837A9F489DF80931E
+:107B00005201289A84FD28985D9A83FD5D982E9AEB
+:107B100081FD2E982F9A82FD2F982D9A80FD2D9809
+:107B200087FD8824ADCF8A3649F48FE9E4DCC3E0D1
+:107B3000EEDC7CDFCA95E1F7E7DCB0C0833731F4D7
+:107B400087E874DF85E972DF8EE1A7C0853639F4F6
+:107B5000E0E8F3E73ED2E058F040E0F791CF82361C
+:107B600031F489E563DF80E061DF80E896C082342C
+:107B700019F0873609F07DC033244ADFD82F48DF5B
+:107B8000C82F46DF082F8354843008F085C00634A0
+:107B900011F4440C551CF20110926F001736B9F421
+:107BA000033489F483E0A1DCB2DC8EB51EBC3EDF79
+:107BB0000DB42197D1F7A8DC08C0063411F48591E3
+:107BC00001C043DC33DF2197C2F72F014AC00334E1
+:107BD000A9F4E11104C085DC88ED87DC8FDC81DC51
+:107BE00082E083DC15DF0DB48EBDCA95D9F73196DE
+:107BF0008FDC84DCDA9569F72F0131C00634F1F4AB
+:107C00009F01F437D8F4E5D119C002DF063461F4DE
+:107C1000C0FB46F0F43728F4182E81E087BFE895C2
+:107C200011243296082E0AC0043439F4DF01B370EF
+:107C3000AD59B94F8D93319601C00BDC21972AF7CE
+:107C4000043431F42F01F370FE2B49F46ADC07C0D1
+:107C5000063429F42F01F901F43708F4B8D18DE086
+:107C6000E5DE063411F45694479482E080936F0069
+:107C700015C08237E1E049F08634E0E031F08E341F
+:107C8000E3E019F0813531F4E2E0F0E089E087BF0C
+:107C9000849103C08B3111F08FE3C8DE83E0C5DB34
+:107CA00055D095FF03C009C07ED171F058D080FF38
+:107CB000FBCF4CD002C077D139F051D080FFFBCF41
+:107CC00084E0B3DB8BE743C00895E4E5F1E067E0CF
+:107CD00090915B0180915C01913231F0913AE1F534
+:107CE0008132D1F55ED181C0823271F48191805BA5
+:107CF0008191844089F580915D0180FD2DC0F894CB
+:107D000081E08093E0007CCD803231F54AD14BD1C7
+:107D1000E9F08530D9F023D083FD18C082FFF7CF7A
+:107D200004C081DE8193615031F09091F300809125
+:107D3000F200892BB1F7C6DF611549F704C033D1D2
+:107D400029F0853019F00BD080FFF9CF8EE79091A4
+:107D5000E80089238093E800089584E066DB809141
+:107D6000E80008958091E2000895FCDF8E7F806135
+:107D70008093E200089582E061EC09D083E061E83D
+:107D800002D084E060E842E103C080E060E042E0CD
+:107D90004CDB81E007D01092ED006093EC00409343
+:107DA000ED0008959091EB00892B8093EB000895EE
+:107DB00060E0923029F0913029F4E0E062E102C005
+:107DC000E2E16EE3F1E0089580915B0188234CF4D9
+:107DD00002C0E9D0C1F3C3DF82FFFBCF73CFE3D092
+:107DE00091F3BDDF80FFFBCFB1CF40916101509196
+:107DF00062014617510520F0462F611509F4A6DFF0
+:107E000050E022C0D0D061F1853051F1A8DF83FD70
+:107E100059CFA5DF82FD21C080FF16C03091F3004D
+:107E20002091F20006C081918093F10041502F5FB4
+:107E30003F4F411519F028303105A8F350E02830A4
+:107E4000310509F451E082DF4115E1F65523D1F601
+:107E500004C0A9D029F0853019F081DF82FFF9CF65
+:107E600031CFEBE5F1E0DFDD8193E336E1F72DDFA4
+:107E700076DF83FF91C080915B0190915C0191302E
+:107E800009F170F09330F1F0953009F444C0963068
+:107E900009F456C0983009F460C0993059F767C0AA
+:107EA000823841F780915F01BFDA2091EB00109298
+:107EB000E90077D02295269521702093F100109249
+:107EC000F10052C0882311F08230A1F68F71823008
+:107ED00089F680915D018823D1F420915F0127709C
+:107EE00049F22093E9008091EB0080FF10C09330AD
+:107EF00011F480E20BC080E155DF81E0880F2A9504
+:107F0000E9F78093EA001092EA0088E04BDF1092D4
+:107F1000E90047D02AC0882391F410915D011068D0
+:107F20000FB7F8943ED050DF1ADF80FFFDCF1093DB
+:107F3000E300103883E009F482E08EBB0FBF2CC051
+:107F40008058823048F580915D0190915E0130DF6C
+:107F5000603011F126D049DF1FC08038E9F421D00C
+:107F6000809153018093F100F1DE2EDF15C088234C
+:107F700099F490915D01923078F49093530111D06F
+:107F800023DF80915301882321F48091E30091E065
+:107F900087FD94E09EBBEFDEE2DE83FF089580E282
+:107FA00001DF87EFD4CE8EB388230895A3E6B1E036
+:107FB000F437B8F40ED090E40D901D9081E087BFA7
+:107FC000E89532969A95C1F71124E058F04085E083
+:107FD00001C083E001D081E187BFE89507B600FCCE
+:047FE000FDCF089534
+:067FFA003139D9CFFBDC98
+:040000030000740085
+:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sda.hex
deleted file mode 100644
index 377626a..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sda.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A599809C005D085E0A6
-:10750000FADF05D080FDFDCF599A5E9808958EBDB3
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233700010000001B
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sh1106-sda.hex
deleted file mode 100644
index ae23d04..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sh1106-sda.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A599809C005D085E0A6
-:10750000FADF05D080FDFDCF599A5E9808958EBDB3
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233700010000001B
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sh1106.hex
deleted file mode 100644
index 7793e65..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-sh1106.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
-:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233700010000001B
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x128-sda.hex
deleted file mode 100644
index 8fb25b9..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x128-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
-:1075000009C005D085E0FADF05D080FDFDCF599A8E
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075205FA055A100A200A87F81CFB121AFE5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B00012011001020000084123370001000000FF
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x128.hex
deleted file mode 100644
index 73cea69..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x128.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075205FA055A100A200A87F81CFB121AFE5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B00012011001020000084123370001000000FF
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x96-sda.hex
deleted file mode 100644
index 1f1b757..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x96-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
-:1075000009C005D085E0FADF05D080FDFDCF599A8E
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075104FA055A100A200A87F81CFB121AF05
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B00012011001020000084123370001000000FF
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x96.hex
deleted file mode 100644
index ddb0550..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-128x96.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075104FA055A100A200A87F81CFB121AF05
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B00012011001020000084123370001000000FF
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-96x96-sda.hex
deleted file mode 100644
index 2d8da4d..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-96x96-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
-:1075000009C005D085E0FADF05D080FDFDCF599A8E
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915103FEB
-:1077700075306FA055A100A200A87F81CFB121AFC5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B00012011001020000084123370001000000FF
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-96x96.hex
deleted file mode 100644
index a968454..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-ssd132x-96x96.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915103FEB
-:1077700075306FA055A100A200A87F81CFB121AFC5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B00012011001020000084123370001000000FF
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-st7565-sda.hex
deleted file mode 100644
index 6019887..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-st7565-sda.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100EDE5F7E785913AD0E336E1F781E049
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A599809C005D085E0A6
-:10750000FADF05D080FDFDCF599A5E9808958EBDB3
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F708952E9A2F9A2D9AE3E602
-:10755000F1E097FC38C094FC4FC092FE08958684F9
-:10756000882011F4992459C0F894C089D78520E067
-:1075700030E080E090E4AFEFBFEF119688199040C3
-:10758000E0F72D01BD4F8D0127FD13C0E0E0F8E0CD
-:1075900011928EE7819392E4E11791939AE508F0B6
-:1075A00092E4E334C9F781931082BADFFE01219699
-:1075B0009BDF8FDFF901FDD420583F4F040D151DCF
-:1075C0008A9411F710C28301282D60906C0170908D
-:1075D0006B0141D019F48823C1F70895380188243C
-:1075E0003AD0B9F580916A01821709F4830160905D
-:1075F0006E0170906D01F4CF60906E0170906D011E
-:107600002AD059F48823C1F708959FEF95FC03C051
-:1076100096FE089591E097FB890E662477248301F6
-:10762000222719D0B1F48823A1F380916A0136F0A2
-:10763000881650F4821730F0213003C0881520F4EA
-:10764000281710F48301282F60906E0170906D014F
-:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
-:10766000E6E5F7E709908591081621F4ED35D1F7A5
-:107670000880801049CFC9E02EDFCA95E9F7D0E134
-:1076800095FC1EC097FC53C094FC35C0C3E6D2E005
-:10769000E3E6F6E098E088E78E0F00840192E817B1
-:1076A000E1F7884F09900192E817E1F7C858DF4FDA
-:1076B0009A9589F732DFC85FD340C33E49F749C086
-:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
-:1076D0000086E817E1F738960A900292E817E1F77A
-:1076E0003897C857D0409A9581F717DFC850DC4FBC
-:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
-:10770000C6E00D9080818025807F802582958193C1
-:10771000A336B90709F4B2E0E336F90709F4F2E059
-:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
-:10773000B9E0E3E6FAE092E00E90829180258F7046
-:10774000802582958083E336F907B1F7E6DEDA9586
-:1077500071F78827089541524455424F59C82F2543
-:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233700010000001B
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB983EF8AB980E58CBDBDBDA0E0E4E9A9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945DDE71F0ABE9E1
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E1ADE8110B7DD92FC02C033203D
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E982F982D985D9833
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E5F7E78591B1DF6C
-:107AD000ED35E1F7E6C0863521F481E3AADF87E3DF
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9881FD2E9A2F9882FD2F9AD3
-:107B20002D9880FD2D9A87FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-st7565.hex
deleted file mode 100644
index bcd0acf..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro-st7565.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100EDE5F7E785913AD0E336E1F781E049
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
-:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F708952E9A2F9A2D9AE3E602
-:10755000F1E097FC38C094FC4FC092FE08958684F9
-:10756000882011F4992459C0F894C089D78520E067
-:1075700030E080E090E4AFEFBFEF119688199040C3
-:10758000E0F72D01BD4F8D0127FD13C0E0E0F8E0CD
-:1075900011928EE7819392E4E11791939AE508F0B6
-:1075A00092E4E334C9F781931082BADFFE01219699
-:1075B0009BDF8FDFF901FDD420583F4F040D151DCF
-:1075C0008A9411F710C28301282D60906C0170908D
-:1075D0006B0141D019F48823C1F70895380188243C
-:1075E0003AD0B9F580916A01821709F4830160905D
-:1075F0006E0170906D01F4CF60906E0170906D011E
-:107600002AD059F48823C1F708959FEF95FC03C051
-:1076100096FE089591E097FB890E662477248301F6
-:10762000222719D0B1F48823A1F380916A0136F0A2
-:10763000881650F4821730F0213003C0881520F4EA
-:10764000281710F48301282F60906E0170906D014F
-:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
-:10766000E6E5F7E709908591081621F4ED35D1F7A5
-:107670000880801049CFC9E02EDFCA95E9F7D0E134
-:1076800095FC1EC097FC53C094FC35C0C3E6D2E005
-:10769000E3E6F6E098E088E78E0F00840192E817B1
-:1076A000E1F7884F09900192E817E1F7C858DF4FDA
-:1076B0009A9589F732DFC85FD340C33E49F749C086
-:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
-:1076D0000086E817E1F738960A900292E817E1F77A
-:1076E0003897C857D0409A9581F717DFC850DC4FBC
-:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
-:10770000C6E00D9080818025807F802582958193C1
-:10771000A336B90709F4B2E0E336F90709F4F2E059
-:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
-:10773000B9E0E3E6FAE092E00E90829180258F7046
-:10774000802582958083E336F907B1F7E6DEDA9586
-:1077500071F78827089541524455424F59C82F2543
-:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233700010000001B
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB985EF8AB980E58CBDBDBDA0E0E4E9A7
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945DDE71F0ABE9E1
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E1ADE8110B7DD92FC02C033203D
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E982F982D985D9833
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E5F7E78591B1DF6C
-:107AD000ED35E1F7E6C0863521F481E3AADF87E3DF
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9881FD2E9A2F9882FD2F9AD3
-:107B20002D9880FD2D9A87FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro.hex
deleted file mode 100644
index 3577cc4..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-micro.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
-:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233700010000001B
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9868
-:1078700091818917980B918309F42898239411F426
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF80EF85B9DC
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D982D
-:107A100028980C940000A4D107C057D102C0C6D248
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9A84E68093500108956A
-:107A60007FD182FF34C180915201807221F4289A23
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289884FD289A5D9812
-:107B100083FD5D9A2E9A81FD2E982F9A82FD2F98D3
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sda.hex
deleted file mode 100644
index dcfe8fa..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sda.hex
+++ /dev/null
@@ -1,192 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580E28BB98BEA34D0109289008E
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E3E5F7E7859138D0EF35E1F781E04A
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E818D08D939A95E1F76E
-:1074E000089586E008D00FC083E005D08F2F0DD01F
-:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
-:1075000004D080FDFDCF599A08958EBD8DB587FFBB
-:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
-:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
-:107530008191EBDF83E68E278F77D1F79395983B88
-:1075400089F70895E3E6F1E097FC38C094FC4FC05A
-:1075500092FE08958684882011F4992459C0F894E5
-:10756000C089D78520E030E080E090E4AFEFBFEF46
-:10757000119688199040E0F72D01BD4F8D0127FD30
-:1075800013C0E0E0F8E011928EE7819392E4E117F6
-:1075900091939AE508F092E4E334C9F7819310825D
-:1075A000BDDFFE012196A0DF94DFF90102D520584E
-:1075B0003F4F040D151D8A9411F715C28301282D24
-:1075C00060906C0170906B0141D019F48823C1F771
-:1075D0000895380188243AD0B9F580916A0182175C
-:1075E00009F4830160906E0170906D01F4CF60909A
-:1075F0006E0170906D012AD059F48823C1F7089567
-:107600009FEF95FC03C096FE089591E097FB890ECD
-:10761000662477248301222719D0B1F48823A1F3AB
-:1076200080916A0136F0881650F4821730F02130CC
-:1076300003C0881520F4281710F48301282F6090C8
-:107640006E0170906D01E8CF3801822EF3014CDF9E
-:1076500040DFC3E6D1E0ECE4F7E709908591081636
-:1076600021F4E335D1F7088080104DCFC9E033DF36
-:10767000CA95E9F7D0E195FC1EC097FC53C094FC75
-:1076800035C0C3E6D2E0E3E6F6E098E088E78E0F87
-:1076900000840192E817E1F7884F09900192E817FA
-:1076A000E1F7C858DF4F9A9589F735DFC85FD340B7
-:1076B000C33E49F749C0C3E6D6E0EBE5FAE098E0FF
-:1076C0008E2F885702900086E817E1F738960A90C7
-:1076D0000292E817E1F73897C857D0409A9581F79A
-:1076E0001ADFC850DC4FC33E41F72EC0A3EEB6E010
-:1076F000E3E6F6E09AE0C6E00D9080818025807F89
-:10770000802582958193A336B90709F4B2E0E33668
-:10771000F90709F4F2E0E336FC0771F7FCDEDA95CD
-:1077200029F712C0A3EEB9E0E3E6FAE092E00E908A
-:10773000829180258F70802582958083E336F907BA
-:10774000B1F7E9DEDA9571F788270895415244557B
-:10775000424F59D5F08D14A1C881CFD9F1AF0000A7
-:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
-:10777000067E7E06FE46565616FE0656461EFE3F00
-:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
-:107790001201100102000008412336000100000020
-:1077A000000109023E0002010080320904000001CC
-:1077B000020201000524001001042402040524062D
-:1077C0000001070582030800FF09040100020A0006
-:1077D00000000705040210000107058302100001E4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E2B7
-:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789458DE71F0ABE9E6
-:1079A000B7E0EFE5F7E790E105900D929A95E1F7E2
-:1079B000A059BF4FEF38B9F7B2DD52D029DD809121
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E15DE8110B5DD92FC02C0332044
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4ECE4F7E78591B1DF67
-:107AD000E335E1F7E6C0863521F481E3AADF87E3E9
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0E9DC7CDFCA95E1F7E3DC57
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCADDC52
-:107BB0008EB51EBC3EDF0DB42197D1F7A4DC08C002
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8BDC7EDC82E080DC15DF0DB48EBDB6
-:107BF000CA95D9F731968ADC80DCDA9569F72F01CE
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F465DC07C0063429F42F01F901F43733
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sh1106-sda.hex
deleted file mode 100644
index 3c3fbac..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sh1106-sda.hex
+++ /dev/null
@@ -1,192 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580E28BB98BEA34D0109289008E
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E3E5F7E7859138D0EF35E1F781E04A
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E818D08D939A95E1F76E
-:1074E000089586E008D00FC083E005D08F2F0DD01F
-:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
-:1075000004D080FDFDCF599A08958EBD8DB587FFBB
-:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
-:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
-:107530008191EBDF83E68E278F77D1F79395983B88
-:1075400089F70895E3E6F1E097FC38C094FC4FC05A
-:1075500092FE08958684882011F4992459C0F894E5
-:10756000C089D78520E030E080E090E4AFEFBFEF46
-:10757000119688199040E0F72D01BD4F8D0127FD30
-:1075800013C0E0E0F8E011928EE7819392E4E117F6
-:1075900091939AE508F092E4E334C9F7819310825D
-:1075A000BDDFFE012196A0DF94DFF90102D520584E
-:1075B0003F4F040D151D8A9411F715C28301282D24
-:1075C00060906C0170906B0141D019F48823C1F771
-:1075D0000895380188243AD0B9F580916A0182175C
-:1075E00009F4830160906E0170906D01F4CF60909A
-:1075F0006E0170906D012AD059F48823C1F7089567
-:107600009FEF95FC03C096FE089591E097FB890ECD
-:10761000662477248301222719D0B1F48823A1F3AB
-:1076200080916A0136F0881650F4821730F02130CC
-:1076300003C0881520F4281710F48301282F6090C8
-:107640006E0170906D01E8CF3801822EF3014CDF9E
-:1076500040DFC3E6D1E0ECE4F7E709908591081636
-:1076600021F4E335D1F7088080104DCFC9E033DF36
-:10767000CA95E9F7D0E195FC1EC097FC53C094FC75
-:1076800035C0C3E6D2E0E3E6F6E098E088E78E0F87
-:1076900000840192E817E1F7884F09900192E817FA
-:1076A000E1F7C858DF4F9A9589F735DFC85FD340B7
-:1076B000C33E49F749C0C3E6D6E0EBE5FAE098E0FF
-:1076C0008E2F885702900086E817E1F738960A90C7
-:1076D0000292E817E1F73897C857D0409A9581F79A
-:1076E0001ADFC850DC4FC33E41F72EC0A3EEB6E010
-:1076F000E3E6F6E09AE0C6E00D9080818025807F89
-:10770000802582958193A336B90709F4B2E0E33668
-:10771000F90709F4F2E0E336FC0771F7FCDEDA95CD
-:1077200029F712C0A3EEB9E0E3E6FAE092E00E908A
-:10773000829180258F70802582958083E336F907BA
-:10774000B1F7E9DEDA9571F788270895415244557B
-:10775000424F59D5F08D14A1C881CFD9F1AF0200A5
-:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
-:10777000067E7E06FE46565616FE0656461EFE3F00
-:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
-:107790001201100102000008412336000100000020
-:1077A000000109023E0002010080320904000001CC
-:1077B000020201000524001001042402040524062D
-:1077C0000001070582030800FF09040100020A0006
-:1077D00000000705040210000107058302100001E4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E2B7
-:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789458DE71F0ABE9E6
-:1079A000B7E0EFE5F7E790E105900D929A95E1F7E2
-:1079B000A059BF4FEF38B9F7B2DD52D029DD809121
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E15DE8110B5DD92FC02C0332044
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4ECE4F7E78591B1DF67
-:107AD000E335E1F7E6C0863521F481E3AADF87E3E9
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0E9DC7CDFCA95E1F7E3DC57
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCADDC52
-:107BB0008EB51EBC3EDF0DB42197D1F7A4DC08C002
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8BDC7EDC82E080DC15DF0DB48EBDB6
-:107BF000CA95D9F731968ADC80DCDA9569F72F01CE
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F465DC07C0063429F42F01F901F43733
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sh1106.hex
deleted file mode 100644
index 5ab00a5..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-sh1106.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:10747000019608958AE28BB98BEA34D01092890084
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
-:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB8CE2AD
-:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x128-sda.hex
deleted file mode 100644
index c71059e..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x128-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580E28BB98BEA37D0109289008B
-:107480008AEF8093880082E080936F0083E080938E
-:10749000810048D047D05C98E9E6F7E7859138D07D
-:1074A000EC37E1F781E08093D7008AE482BF109245
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E818D040
-:1074E0008D939A95E1F7089586E008D00FC083E068
-:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
-:1075000005D085E0FBDF04D080FDFDCF599A0895BA
-:107510008EBD8DB587FFFDCF8EB508958FE082219A
-:10752000E9F7F4DFE3E6F6E05C9A40E458E06081D6
-:10753000718198E08FEF60FF8F7070FF807FE8DFD0
-:10754000669576959A95B1F7E058FF4F5A9579F779
-:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
-:1075600038C094FC4FC092FE08958684882011F4A0
-:10757000992459C0F894C089D78520E030E080E094
-:1075800090E4AFEFBFEF119688199040E0F72D011E
-:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
-:1075A000819392E4E11791939AE508F092E4E33431
-:1075B000C9F781931082B5DFFE01219698DF8CDF39
-:1075C000F901F7D420583F4F040D151D8A9411F787
-:1075D0000AC28301282D60906C0170906B0141D02C
-:1075E00019F48823C1F70895380188243AD0B9F5F1
-:1075F00080916A01821709F4830160906E01709096
-:107600006D01F4CF60906E0170906D012AD059F435
-:107610008823C1F708959FEF95FC03C096FE089557
-:1076200091E097FB890E662477248301222719D0E5
-:10763000B1F48823A1F380916A0136F0881650F4E2
-:10764000821730F0213003C0881520F4281710F479
-:107650008301282F60906E0170906D01E8CF380192
-:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
-:1076700009908591081621F4E936D1F70880801029
-:1076800045CFC9E02BDFCA95E9F7D0E195FC1EC0D4
-:1076900097FC53C094FC35C0C3E6D2E0E3E6F6E0C5
-:1076A00098E088E78E0F00840192E817E1F7884F91
-:1076B00009900192E817E1F7C858DF4F9A9589F7CA
-:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
-:1076D000EBE5FAE098E08E2F885702900086E817D5
-:1076E000E1F738960A900292E817E1F73897C85701
-:1076F000D0409A9581F712DFC850DC4FC33E41F766
-:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
-:1077100080818025807F802582958193A336B9075B
-:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
-:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
-:10774000FAE092E00E90829180258F7080258295DC
-:107750008083E336F907B1F7E1DEDA9571F7882720
-:10776000089541524455424F5915003F75205FA07E
-:1077700055A100A200A87F81CFB121AF0000FFFF7B
-:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
-:1077900006FE46565616FE0656461EFE3F61E9E3B5
-:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
-:1077AC001201100102000008412336000100000004
-:1077BC00000109023E0002010080320904000001B0
-:1077CC000202010005240010010424020405240611
-:1077DC000001070582030800FF09040100020A00EA
-:1077EC0000000705040210000107058302100001C8
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E2B7
-:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789463DE71F0ABE9DB
-:1079A000B7E0ECE7F7E790E105900D929A95E1F7E3
-:1079B000A059BF4FEC3AB9F7B5DD52D029DD80911F
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E20DE8110C0DD92FC02C033202E
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E2E6F7E78591B1DF6F
-:107AD000E936E1F7E6C0863521F481E3AADF87E3E2
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0ECDC7CDFCA95E1F7E6DC4E
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB0DC4C
-:107BB0008EB51EBC3EDF0DB42197D1F7A7DC08C0FF
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8EDC81DC82E083DC15DF0DB48EBDAA
-:107BF000CA95D9F731968DDC83DCDA9569F72F01C8
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F468DC07C0063429F42F01F901F43730
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x128.hex
deleted file mode 100644
index 585c904..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x128.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:10747000019608958AE28BB98BEA37D01092890081
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005B9808958EBD8DB587FFFDCF8EB508951C
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075205FA055A100A200A87F81CFB121AFE5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB8CE2AD
-:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x96-sda.hex
deleted file mode 100644
index 9da8b44..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x96-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580E28BB98BEA37D0109289008B
-:107480008AEF8093880082E080936F0083E080938E
-:10749000810048D047D05C98E9E6F7E7859138D07D
-:1074A000EC37E1F781E08093D7008AE482BF109245
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E818D040
-:1074E0008D939A95E1F7089586E008D00FC083E068
-:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
-:1075000005D085E0FBDF04D080FDFDCF599A0895BA
-:107510008EBD8DB587FFFDCF8EB508958FE082219A
-:10752000E9F7F4DFE3E6F6E05C9A40E458E06081D6
-:10753000718198E08FEF60FF8F7070FF807FE8DFD0
-:10754000669576959A95B1F7E058FF4F5A9579F779
-:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
-:1075600038C094FC4FC092FE08958684882011F4A0
-:10757000992459C0F894C089D78520E030E080E094
-:1075800090E4AFEFBFEF119688199040E0F72D011E
-:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
-:1075A000819392E4E11791939AE508F092E4E33431
-:1075B000C9F781931082B5DFFE01219698DF8CDF39
-:1075C000F901F7D420583F4F040D151D8A9411F787
-:1075D0000AC28301282D60906C0170906B0141D02C
-:1075E00019F48823C1F70895380188243AD0B9F5F1
-:1075F00080916A01821709F4830160906E01709096
-:107600006D01F4CF60906E0170906D012AD059F435
-:107610008823C1F708959FEF95FC03C096FE089557
-:1076200091E097FB890E662477248301222719D0E5
-:10763000B1F48823A1F380916A0136F0881650F4E2
-:10764000821730F0213003C0881520F4281710F479
-:107650008301282F60906E0170906D01E8CF380192
-:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
-:1076700009908591081621F4E936D1F70880801029
-:1076800045CFC9E02BDFCA95E9F7D0E195FC1EC0D4
-:1076900097FC53C094FC35C0C3E6D2E0E3E6F6E0C5
-:1076A00098E088E78E0F00840192E817E1F7884F91
-:1076B00009900192E817E1F7C858DF4F9A9589F7CA
-:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
-:1076D000EBE5FAE098E08E2F885702900086E817D5
-:1076E000E1F738960A900292E817E1F73897C85701
-:1076F000D0409A9581F712DFC850DC4FC33E41F766
-:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
-:1077100080818025807F802582958193A336B9075B
-:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
-:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
-:10774000FAE092E00E90829180258F7080258295DC
-:107750008083E336F907B1F7E1DEDA9571F7882720
-:10776000089541524455424F5915003F75104FA09E
-:1077700055A100A200A87F81CFB121AF0000FFFF7B
-:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
-:1077900006FE46565616FE0656461EFE3F61E9E3B5
-:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
-:1077AC001201100102000008412336000100000004
-:1077BC00000109023E0002010080320904000001B0
-:1077CC000202010005240010010424020405240611
-:1077DC000001070582030800FF09040100020A00EA
-:1077EC0000000705040210000107058302100001C8
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E2B7
-:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789463DE71F0ABE9DB
-:1079A000B7E0ECE7F7E790E105900D929A95E1F7E3
-:1079B000A059BF4FEC3AB9F7B5DD52D029DD80911F
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E20DE8110C0DD92FC02C033202E
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E2E6F7E78591B1DF6F
-:107AD000E936E1F7E6C0863521F481E3AADF87E3E2
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0ECDC7CDFCA95E1F7E6DC4E
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB0DC4C
-:107BB0008EB51EBC3EDF0DB42197D1F7A7DC08C0FF
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8EDC81DC82E083DC15DF0DB48EBDAA
-:107BF000CA95D9F731968DDC83DCDA9569F72F01C8
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F468DC07C0063429F42F01F901F43730
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x96.hex
deleted file mode 100644
index 62807cb..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-128x96.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:10747000019608958AE28BB98BEA37D01092890081
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005B9808958EBD8DB587FFFDCF8EB508951C
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075104FA055A100A200A87F81CFB121AF05
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB8CE2AD
-:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-96x96-sda.hex
deleted file mode 100644
index 857d39d..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-96x96-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580E28BB98BEA37D0109289008B
-:107480008AEF8093880082E080936F0083E080938E
-:10749000810048D047D05C98E9E6F7E7859138D07D
-:1074A000EC37E1F781E08093D7008AE482BF109245
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E818D040
-:1074E0008D939A95E1F7089586E008D00FC083E068
-:1074F00005D08F2F0DD08E2F0BD080E0599808C06B
-:1075000005D085E0FBDF04D080FDFDCF599A0895BA
-:107510008EBD8DB587FFFDCF8EB508958FE082219A
-:10752000E9F7F4DFE3E7F6E05C9A40E358E06081D6
-:10753000718198E08FEF60FF8F7070FF807FE8DFD0
-:10754000669576959A95B1F7E058FF4F5A9579F779
-:10755000EE5FF3404A9551F70895E3E6F1E097FCBA
-:1075600038C094FC4FC092FE08958684882011F4A0
-:10757000992459C0F894C089D78520E030E080E094
-:1075800090E4AFEFBFEF119688199040E0F72D011E
-:10759000BD4F8D0127FD13C0E0E0F8E011928EE7AA
-:1075A000819392E4E11791939AE508F092E4E33431
-:1075B000C9F781931082B5DFFE01219698DF8CDF39
-:1075C000F901F7D420583F4F040D151D8A9411F787
-:1075D0000AC28301282D60906C0170906B0141D02C
-:1075E00019F48823C1F70895380188243AD0B9F5F1
-:1075F00080916A01821709F4830160906E01709096
-:107600006D01F4CF60906E0170906D012AD059F435
-:107610008823C1F708959FEF95FC03C096FE089557
-:1076200091E097FB890E662477248301222719D0E5
-:10763000B1F48823A1F380916A0136F0881650F4E2
-:10764000821730F0213003C0881520F4281710F479
-:107650008301282F60906E0170906D01E8CF380192
-:10766000822EF30144DF38DFC3E6D1E0E2E6F7E73C
-:1076700009908591081621F4E936D1F70880801029
-:1076800045CFC9E02BDFCA95E9F7D0E195FC1EC0D4
-:1076900097FC53C094FC35C0C3E6D2E0E3E6F6E0C5
-:1076A00098E088E78E0F00840192E817E1F7884F91
-:1076B00009900192E817E1F7C858DF4F9A9589F7CA
-:1076C0002DDFC85FD340C33E49F749C0C3E6D6E0CB
-:1076D000EBE5FAE098E08E2F885702900086E817D5
-:1076E000E1F738960A900292E817E1F73897C85701
-:1076F000D0409A9581F712DFC850DC4FC33E41F766
-:107700002EC0A3EEB6E0E3E6F6E09AE0C6E00D9008
-:1077100080818025807F802582958193A336B9075B
-:1077200009F4B2E0E336F90709F4F2E0E336FC07C6
-:1077300071F7F4DEDA9529F712C0A3EEB9E0E3E6BB
-:10774000FAE092E00E90829180258F7080258295DC
-:107750008083E336F907B1F7E1DEDA9571F7882720
-:10776000089541524455424F5915103F75306FA04E
-:1077700055A100A200A87F81CFB121AF0000FFFF7B
-:10778000CFCFFFFFFFFFCFCFFFFF0000FE067E7EC3
-:1077900006FE46565616FE0656461EFE3F61E9E3B5
-:0C77A000FFE3EBE3FFE3EBE3FFE16B3FF3
-:1077AC001201100102000008412336000100000004
-:1077BC00000109023E0002010080320904000001B0
-:1077CC000202010005240010010424020405240611
-:1077DC000001070582030800FF09040100020A00EA
-:1077EC0000000705040210000107058302100001C8
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E2B7
-:107960008BB983E38AB980E58CBDBDBDA0E0ECEAAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789463DE71F0ABE9DB
-:1079A000B7E0ECE7F7E790E105900D929A95E1F7E3
-:1079B000A059BF4FEC3AB9F7B5DD52D029DD80911F
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E20DE8110C0DD92FC02C033202E
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E2E6F7E78591B1DF6F
-:107AD000E936E1F7E6C0863521F481E3AADF87E3E2
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0ECDC7CDFCA95E1F7E6DC4E
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB0DC4C
-:107BB0008EB51EBC3EDF0DB42197D1F7A7DC08C0FF
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8EDC81DC82E083DC15DF0DB48EBDAA
-:107BF000CA95D9F731968DDC83DCDA9569F72F01C8
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F468DC07C0063429F42F01F901F43730
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-96x96.hex
deleted file mode 100644
index a82d0f5..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-ssd132x-96x96.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:10747000019608958AE28BB98BEA37D01092890081
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05B9A5A9839
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005B9808958EBD8DB587FFFDCF8EB508951C
-:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915103FEB
-:1077700075306FA055A100A200A87F81CFB121AFC5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB8CE2AD
-:107960008BB98FE38AB980E58CBDBDBDA0E0E0EBAB
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-st7565-sda.hex
deleted file mode 100644
index cccbe00..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-st7565-sda.hex
+++ /dev/null
@@ -1,192 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580E28BB98BEA34D0109289008E
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E9E5F7E7859138D0EF35E1F781E044
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E818D08D939A95E1F76E
-:1074E000089586E008D00FC083E005D08F2F0DD01F
-:1074F0008E2F0BD080E0599808C005D085E0FBDFC7
-:1075000004D080FDFDCF599A08958EBD8DB587FFBB
-:10751000FDCF8EB508958FE08221E9F7F4DFE3E631
-:10752000F6E090EB5C98892FF0DF80E1EEDF5C9A6B
-:107530008191EBDF83E68E278F77D1F79395983B88
-:1075400089F708952E9A589A2D9AE3E6F1E097FC70
-:1075500038C094FC4FC092FE08958684882011F4B0
-:10756000992459C0F894C089D78520E030E080E0A4
-:1075700090E4AFEFBFEF119688199040E0F72D012E
-:10758000BD4F8D0127FD13C0E0E0F8E011928EE7BA
-:10759000819392E4E11791939AE508F092E4E33441
-:1075A000C9F781931082BADFFE0121969DDF91DF3A
-:1075B000F901FFD420583F4F040D151D8A9411F78F
-:1075C00012C28301282D60906C0170906B0141D034
-:1075D00019F48823C1F70895380188243AD0B9F501
-:1075E00080916A01821709F4830160906E017090A6
-:1075F0006D01F4CF60906E0170906D012AD059F446
-:107600008823C1F708959FEF95FC03C096FE089567
-:1076100091E097FB890E662477248301222719D0F5
-:10762000B1F48823A1F380916A0136F0881650F4F2
-:10763000821730F0213003C0881520F4281710F489
-:107640008301282F60906E0170906D01E8CF3801A2
-:10765000822EF30149DF3DDFC3E6D1E0E2E5F7E743
-:1076600009908591081621F4E935D1F7088080103A
-:107670004ACFC9E030DFCA95E9F7D0E195FC1EC0DA
-:1076800097FC53C094FC35C0C3E6D2E0E3E6F6E0D5
-:1076900098E088E78E0F00840192E817E1F7884FA1
-:1076A00009900192E817E1F7C858DF4F9A9589F7DA
-:1076B00032DFC85FD340C33E49F749C0C3E6D6E0D6
-:1076C000EBE5FAE098E08E2F885702900086E817E5
-:1076D000E1F738960A900292E817E1F73897C85711
-:1076E000D0409A9581F717DFC850DC4FC33E41F771
-:1076F0002EC0A3EEB6E0E3E6F6E09AE0C6E00D9019
-:1077000080818025807F802582958193A336B9076B
-:1077100009F4B2E0E336F90709F4F2E0E336FC07D6
-:1077200071F7F9DEDA9529F712C0A3EEB9E0E3E6C6
-:10773000FAE092E00E90829180258F7080258295EC
-:107740008083E336F907B1F7E6DEDA9571F788272B
-:10775000089541524455424F59C82F258113AF0017
-:1077600000FFFFCFCFFFFFFFFFCFCFFFFF0000FEE7
-:10777000067E7E06FE46565616FE0656461EFE3F00
-:1077800061E9E3FFE3EBE3FFE3EBE3FFE16B3F00E2
-:107790001201100102000008412336000100000020
-:1077A000000109023E0002010080320904000001CC
-:1077B000020201000524001001042402040524062D
-:1077C0000001070582030800FF09040100020A0006
-:1077D00000000705040210000107058302100001E4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E2B7
-:107960008BB983E38AB980E58CBDBDBDA0E0E0E9B9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945BDE71F0ABE9E3
-:1079A000B7E0EFE5F7E790E105900D929A95E1F7E2
-:1079B000A059BF4FEF38B9F7B2DD52D029DD809121
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E18DE8110B5DD92FC02C0332041
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9858982D985D9A08
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E2E5F7E78591B1DF70
-:107AD000E935E1F7E6C0863521F481E3AADF87E3E3
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9881FD2E9A589882FD589A83
-:107B20002D9880FD2D9A87FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0E9DC7CDFCA95E1F7E3DC57
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCADDC52
-:107BB0008EB51EBC3EDF0DB42197D1F7A4DC08C002
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8BDC7EDC82E080DC15DF0DB48EBDB6
-:107BF000CA95D9F731968ADC80DCDA9569F72F01CE
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F465DC07C0063429F42F01F901F43733
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-st7565.hex
deleted file mode 100644
index a8d0acf..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro-st7565.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:10747000019608958AE28BB98BEA34D01092890084
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100EDE5F7E785913AD0E336E1F781E049
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
-:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F708952E9A589A2D9AE3E6D9
-:10755000F1E097FC38C094FC4FC092FE08958684F9
-:10756000882011F4992459C0F894C089D78520E067
-:1075700030E080E090E4AFEFBFEF119688199040C3
-:10758000E0F72D01BD4F8D0127FD13C0E0E0F8E0CD
-:1075900011928EE7819392E4E11791939AE508F0B6
-:1075A00092E4E334C9F781931082BADFFE01219699
-:1075B0009BDF8FDFF901FDD420583F4F040D151DCF
-:1075C0008A9411F710C28301282D60906C0170908D
-:1075D0006B0141D019F48823C1F70895380188243C
-:1075E0003AD0B9F580916A01821709F4830160905D
-:1075F0006E0170906D01F4CF60906E0170906D011E
-:107600002AD059F48823C1F708959FEF95FC03C051
-:1076100096FE089591E097FB890E662477248301F6
-:10762000222719D0B1F48823A1F380916A0136F0A2
-:10763000881650F4821730F0213003C0881520F4EA
-:10764000281710F48301282F60906E0170906D014F
-:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
-:10766000E6E5F7E709908591081621F4ED35D1F7A5
-:107670000880801049CFC9E02EDFCA95E9F7D0E134
-:1076800095FC1EC097FC53C094FC35C0C3E6D2E005
-:10769000E3E6F6E098E088E78E0F00840192E817B1
-:1076A000E1F7884F09900192E817E1F7C858DF4FDA
-:1076B0009A9589F732DFC85FD340C33E49F749C086
-:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
-:1076D0000086E817E1F738960A900292E817E1F77A
-:1076E0003897C857D0409A9581F717DFC850DC4FBC
-:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
-:10770000C6E00D9080818025807F802582958193C1
-:10771000A336B90709F4B2E0E336F90709F4F2E059
-:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
-:10773000B9E0E3E6FAE092E00E90829180258F7046
-:10774000802582958083E336F907B1F7E6DEDA9586
-:1077500071F78827089541524455424F59C82F2543
-:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB8CE2AD
-:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945DDE71F0ABE9E1
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E1ADE8110B7DD92FC02C033203D
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9858982D985D9A08
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E5F7E78591B1DF6C
-:107AD000ED35E1F7E6C0863521F481E3AADF87E3DF
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9881FD2E9A589882FD589A83
-:107B20002D9880FD2D9A87FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro.hex
deleted file mode 100644
index a38e3ad..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-promicro.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:10747000019608958AE28BB98BEA34D01092890084
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05B9A5A9809C005D085E0A8
-:10750000FADF05D080FDFDCF5A9A5B9808958EBDB5
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB8CE2AD
-:107960008BB98FE38AB980E58CBDBDBDA0E0E4E9A9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A589A2D9A5D9A02
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E98589A82FD589883
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sda.hex
deleted file mode 100644
index 925bd63..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sda.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A599809C005D085E0A6
-:10750000FADF05D080FDFDCF599A5E9808958EBDB3
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sh1106-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sh1106-sda.hex
deleted file mode 100644
index 8d110e3..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sh1106-sda.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A599809C005D085E0A6
-:10750000FADF05D080FDFDCF599A5E9808958EBDB3
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E4E9AA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sh1106.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sh1106.hex
deleted file mode 100644
index f8b8c85..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-sh1106.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
-:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF020000FFFFCFCFFFFFFFFFCFCFFF42
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x128-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x128-sda.hex
deleted file mode 100644
index 9ba6f25..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x128-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
-:1075000009C005D085E0FADF05D080FDFDCF599A8E
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075205FA055A100A200A87F81CFB121AFE5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x128.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x128.hex
deleted file mode 100644
index 276b42b..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x128.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075205FA055A100A200A87F81CFB121AFE5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x96-sda.hex
deleted file mode 100644
index d9a80f4..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x96-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
-:1075000009C005D085E0FADF05D080FDFDCF599A8E
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075104FA055A100A200A87F81CFB121AF05
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x96.hex
deleted file mode 100644
index 42215fe..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-128x96.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E6F6E05C9A40E4DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915003FFB
-:1077700075104FA055A100A200A87F81CFB121AF05
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-96x96-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-96x96-sda.hex
deleted file mode 100644
index f2ec11a..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-96x96-sda.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A599837
-:1075000009C005D085E0FADF05D080FDFDCF599A8E
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915103FEB
-:1077700075306FA055A100A200A87F81CFB121AFC5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB982EF8AB980E58CBDBDBDA0E0E0EBAC
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-96x96.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-96x96.hex
deleted file mode 100644
index fb6b252..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-ssd132x-96x96.hex
+++ /dev/null
@@ -1,194 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA37D0109289007F
-:107480008AEF8093880082E080936F0083E080938E
-:1074900081004AD049D05C98EDE6F7E785913AD073
-:1074A000E038E1F781E08093D7008AE482BF109250
-:1074B000D8001092E2001092DA001092E10080E809
-:1074C00008D019BC1EBA1092E00062D489E053D4EF
-:1074D00081E98093D8000895A3E6B1E090E81AD03E
-:1074E0008D939A95E1F7089586E008D010C083E067
-:1074F00005D08F2F0FD08E2F0DD080E05E9A5A9836
-:1075000009C005D085E0FADF05D080FDFDCF5A9A8D
-:107510005E9808958EBD8DB587FFFDCF8EB5089519
-:107520008FE08221E9F7F3DFE3E7F6E05C9A40E3DE
-:1075300058E06081718198E08FEF60FF8F7070FF7D
-:10754000807FE8DF669576959A95B1F7E058FF4F12
-:107550005A9579F7EE5FF3404A9551F70895E3E6BF
-:10756000F1E097FC38C094FC4FC092FE08958684E9
-:10757000882011F4992459C0F894C089D78520E057
-:1075800030E080E090E4AFEFBFEF119688199040B3
-:10759000E0F72D01BD4F8D0127FD13C0E0E0F8E0BD
-:1075A00011928EE7819392E4E11791939AE508F0A6
-:1075B00092E4E334C9F781931082B5DFFE0121968E
-:1075C00096DF8ADFF901F5D420583F4F040D151DD1
-:1075D0008A9411F708C28301282D60906C01709085
-:1075E0006B0141D019F48823C1F70895380188242C
-:1075F0003AD0B9F580916A01821709F4830160904D
-:107600006E0170906D01F4CF60906E0170906D010D
-:107610002AD059F48823C1F708959FEF95FC03C041
-:1076200096FE089591E097FB890E662477248301E6
-:10763000222719D0B1F48823A1F380916A0136F092
-:10764000881650F4821730F0213003C0881520F4DA
-:10765000281710F48301282F60906E0170906D013F
-:10766000E8CF3801822EF30142DF36DFC3E6D1E0F6
-:10767000E6E6F7E709908591081621F4ED36D1F793
-:107680000880801044CFC9E029DFCA95E9F7D0E12E
-:1076900095FC1EC097FC53C094FC35C0C3E6D2E0F5
-:1076A000E3E6F6E098E088E78E0F00840192E817A1
-:1076B000E1F7884F09900192E817E1F7C858DF4FCA
-:1076C0009A9589F72DDFC85FD340C33E49F749C07B
-:1076D000C3E6D6E0EBE5FAE098E08E2F88570290FB
-:1076E0000086E817E1F738960A900292E817E1F76A
-:1076F0003897C857D0409A9581F712DFC850DC4FB1
-:10770000C33E41F72EC0A3EEB6E0E3E6F6E09AE012
-:10771000C6E00D9080818025807F802582958193B1
-:10772000A336B90709F4B2E0E336F90709F4F2E049
-:10773000E336FC0771F7F4DEDA9529F712C0A3EE01
-:10774000B9E0E3E6FAE092E00E90829180258F7036
-:10775000802582958083E336F907B1F7E1DEDA957B
-:1077600071F78827089541524455424F5915103FEB
-:1077700075306FA055A100A200A87F81CFB121AFC5
-:107780000000FFFFCFCFFFFFFFFFCFCFFFFF0000C5
-:10779000FE067E7E06FE46565616FE0656461EFE21
-:1077A0003F61E9E3FFE3EBE3FFE3EBE3FFE16B3F83
-:1077B0001201100102000008412336000100000000
-:1077C000000109023E0002010080320904000001AC
-:1077D000020201000524001001042402040524060D
-:1077E0000001070582030800FF09040100020A00E6
-:1077F00000000705040210000107058302100001C4
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806205DE19BC85E08EBB809176
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF6DD8FEEA4DD3FD28F7E8160E4
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E0EBAA
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD789465DE71F0ABE9D9
-:1079A000B7E0E0E8F7E790E105900D929A95E1F7EE
-:1079B000A059BF4FE03BB9F7B7DD52D029DD809128
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E22DE8110C2DD92FC02C033202A
-:1079E00062F742DD51F3F89489EB7FDD81E080930B
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E6F7E78591B1DF6B
-:107AD000ED36E1F7E6C0863521F481E3AADF87E3DE
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E4DCC3E0EEDC7CDFCA95E1F7E7DC4B
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E0A1DCB2DC4A
-:107BB0008EB51EBC3EDF0DB42197D1F7A8DC08C0FE
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C085DC88ED0B
-:107BE00087DC8FDC81DC82E083DC15DF0DB48EBDA9
-:107BF000CA95D9F731968FDC84DCDA9569F72F01C5
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F46ADC07C0063429F42F01F901F4372E
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-st7565-sda.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-st7565-sda.hex
deleted file mode 100644
index a1b25b8..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-st7565-sda.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100EDE5F7E785913AD0E336E1F781E049
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A599809C005D085E0A6
-:10750000FADF05D080FDFDCF599A5E9808958EBDB3
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F708952E9A2F9A2D9AE3E602
-:10755000F1E097FC38C094FC4FC092FE08958684F9
-:10756000882011F4992459C0F894C089D78520E067
-:1075700030E080E090E4AFEFBFEF119688199040C3
-:10758000E0F72D01BD4F8D0127FD13C0E0E0F8E0CD
-:1075900011928EE7819392E4E11791939AE508F0B6
-:1075A00092E4E334C9F781931082BADFFE01219699
-:1075B0009BDF8FDFF901FDD420583F4F040D151DCF
-:1075C0008A9411F710C28301282D60906C0170908D
-:1075D0006B0141D019F48823C1F70895380188243C
-:1075E0003AD0B9F580916A01821709F4830160905D
-:1075F0006E0170906D01F4CF60906E0170906D011E
-:107600002AD059F48823C1F708959FEF95FC03C051
-:1076100096FE089591E097FB890E662477248301F6
-:10762000222719D0B1F48823A1F380916A0136F0A2
-:10763000881650F4821730F0213003C0881520F4EA
-:10764000281710F48301282F60906E0170906D014F
-:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
-:10766000E6E5F7E709908591081621F4ED35D1F7A5
-:107670000880801049CFC9E02EDFCA95E9F7D0E134
-:1076800095FC1EC097FC53C094FC35C0C3E6D2E005
-:10769000E3E6F6E098E088E78E0F00840192E817B1
-:1076A000E1F7884F09900192E817E1F7C858DF4FDA
-:1076B0009A9589F732DFC85FD340C33E49F749C086
-:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
-:1076D0000086E817E1F738960A900292E817E1F77A
-:1076E0003897C857D0409A9581F717DFC850DC4FBC
-:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
-:10770000C6E00D9080818025807F802582958193C1
-:10771000A336B90709F4B2E0E336F90709F4F2E059
-:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
-:10773000B9E0E3E6FAE092E00E90829180258F7046
-:10774000802582958083E336F907B1F7E6DEDA9586
-:1077500071F78827089541524455424F59C82F2543
-:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB82E6B3
-:107960008BB983EF8AB980E58CBDBDBDA0E0E4E9A9
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945DDE71F0ABE9E1
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E1ADE8110B7DD92FC02C033203D
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E982F982D985D9A31
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E5F7E78591B1DF6C
-:107AD000ED35E1F7E6C0863521F481E3AADF87E3DF
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9881FD2E9A2F9882FD2F9AD5
-:107B20002D9880FD2D9A87FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-st7565.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-st7565.hex
deleted file mode 100644
index 4de53c5..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader-st7565.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100EDE5F7E785913AD0E336E1F781E049
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
-:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F708952E9A2F9A2D9AE3E602
-:10755000F1E097FC38C094FC4FC092FE08958684F9
-:10756000882011F4992459C0F894C089D78520E067
-:1075700030E080E090E4AFEFBFEF119688199040C3
-:10758000E0F72D01BD4F8D0127FD13C0E0E0F8E0CD
-:1075900011928EE7819392E4E11791939AE508F0B6
-:1075A00092E4E334C9F781931082BADFFE01219699
-:1075B0009BDF8FDFF901FDD420583F4F040D151DCF
-:1075C0008A9411F710C28301282D60906C0170908D
-:1075D0006B0141D019F48823C1F70895380188243C
-:1075E0003AD0B9F580916A01821709F4830160905D
-:1075F0006E0170906D01F4CF60906E0170906D011E
-:107600002AD059F48823C1F708959FEF95FC03C051
-:1076100096FE089591E097FB890E662477248301F6
-:10762000222719D0B1F48823A1F380916A0136F0A2
-:10763000881650F4821730F0213003C0881520F4EA
-:10764000281710F48301282F60906E0170906D014F
-:10765000E8CF3801822EF30147DF3BDFC3E6D1E0FC
-:10766000E6E5F7E709908591081621F4ED35D1F7A5
-:107670000880801049CFC9E02EDFCA95E9F7D0E134
-:1076800095FC1EC097FC53C094FC35C0C3E6D2E005
-:10769000E3E6F6E098E088E78E0F00840192E817B1
-:1076A000E1F7884F09900192E817E1F7C858DF4FDA
-:1076B0009A9589F732DFC85FD340C33E49F749C086
-:1076C000C3E6D6E0EBE5FAE098E08E2F885702900B
-:1076D0000086E817E1F738960A900292E817E1F77A
-:1076E0003897C857D0409A9581F717DFC850DC4FBC
-:1076F000C33E41F72EC0A3EEB6E0E3E6F6E09AE023
-:10770000C6E00D9080818025807F802582958193C1
-:10771000A336B90709F4B2E0E336F90709F4F2E059
-:10772000E336FC0771F7F9DEDA9529F712C0A3EE0C
-:10773000B9E0E3E6FAE092E00E90829180258F7046
-:10774000802582958083E336F907B1F7E6DEDA9586
-:1077500071F78827089541524455424F59C82F2543
-:107760008113AF0000FFFFCFCFFFFFFFFFCFCFFFA1
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB985EF8AB980E58CBDBDBDA0E0E4E9A7
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945DDE71F0ABE9E1
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E1ADE8110B7DD92FC02C033203D
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E982F982D985D9A31
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E6E5F7E78591B1DF6C
-:107AD000ED35E1F7E6C0863521F481E3AADF87E3DF
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9881FD2E9A2F9882FD2F9AD5
-:107B20002D9880FD2D9A87FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader.hex b/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader.hex
deleted file mode 100644
index b830c66..0000000
--- a/board-package-source/bootloaders/cathy3k/arduboy3k-bootloader.hex
+++ /dev/null
@@ -1,193 +0,0 @@
-:1074000080E189BD82E189BD09B400FEFDCF089508
-:10741000CDD569F08091E9008F931092E900A2D454
-:1074200083FF01C021D58F9187708093E900089573
-:107430008EEF0090E10008220092E1000895F20131
-:10744000F999FECFF2BDE1BD0895F9DFF89A80B554
-:1074500008C0F5DF1FBA80BD0FB6F894FA9AF99A02
-:107460000FBE31962F010895E0E0F0E085919491F0
-:107470000196089580EE8BB98BEA34D01092890082
-:107480008AEF8093880082E080936F0083E080938E
-:107490008100E7E5F7E785913AD0E336E1F781E04F
-:1074A0008093D7008AE482BF1092D8001092E20045
-:1074B0001092DA001092E10080E808D019BC1EBAE0
-:1074C0001092E00065D489E056D481E98093D80019
-:1074D0000895A3E6B1E090E81AD08D939A95E1F76C
-:1074E000089586E008D010C083E005D08F2F0FD01C
-:1074F0008E2F0DD080E05E9A5A9809C005D085E0A5
-:10750000FADF05D080FDFDCF5A9A5E9808958EBDB2
-:107510008DB587FFFDCF8EB508958FE08221E9F705
-:10752000F3DFE3E6F6E090EB5C98892FF0DF80E193
-:10753000EEDF5C9A8191EBDF83E68E278F77D1F7C0
-:107540009395983B89F70895E3E6F1E097FC38C0FE
-:1075500094FC4FC092FE08958684882011F49924EB
-:1075600059C0F894C089D78520E030E080E090E4ED
-:10757000AFEFBFEF119688199040E0F72D01BD4F96
-:107580008D0127FD13C0E0E0F8E011928EE78193B2
-:1075900092E4E11791939AE508F092E4E334C9F795
-:1075A00081931082BDDFFE0121969EDF92DFF901FB
-:1075B00000D520583F4F040D151D8A9411F713C2B2
-:1075C0008301282D60906C0170906B0141D019F4FB
-:1075D0008823C1F70895380188243AD0B9F58091FD
-:1075E0006A01821709F4830160906E0170906D0149
-:1075F000F4CF60906E0170906D012AD059F4882309
-:10760000C1F708959FEF95FC03C096FE089591E0A1
-:1076100097FB890E662477248301222719D0B1F4C1
-:107620008823A1F380916A0136F0881650F48217FE
-:1076300030F0213003C0881520F4281710F483019E
-:10764000282F60906E0170906D01E8CF3801822E76
-:10765000F3014ADF3EDFC3E6D1E0E0E5F7E709905A
-:107660008591081621F4E735D1F7088080104CCFBA
-:10767000C9E031DFCA95E9F7D0E195FC1EC097FC5F
-:1076800053C094FC35C0C3E6D2E0E3E6F6E098E0F0
-:1076900088E78E0F00840192E817E1F7884F099080
-:1076A0000192E817E1F7C858DF4F9A9589F735DF5F
-:1076B000C85FD340C33E49F749C0C3E6D6E0EBE517
-:1076C000FAE098E08E2F885702900086E817E1F7DD
-:1076D00038960A900292E817E1F73897C857D040D9
-:1076E0009A9581F71ADFC850DC4FC33E41F72EC090
-:1076F000A3EEB6E0E3E6F6E09AE0C6E00D90808106
-:107700008025807F802582958193A336B90709F46F
-:10771000B2E0E336F90709F4F2E0E336FC0771F76B
-:10772000FCDEDA9529F712C0A3EEB9E0E3E6FAE051
-:1077300092E00E90829180258F70802582958083C3
-:10774000E336F907B1F7E9DEDA9571F7882708958E
-:1077500041524455424F59D5F08D14A1C881CFD91B
-:10776000F1AF000000FFFFCFCFFFFFFFFFCFCFFF44
-:10777000FF0000FE067E7E06FE46565616FE0656A4
-:10778000461EFE3F61E9E3FFE3EBE3FFE3EBE3FFCC
-:04779000E16B3F006A
-:10779400120110010200000841233600010000001C
-:1077A400000109023E0002010080320904000001C8
-:1077B4000202010005240010010424020405240629
-:1077C4000001070582030800FF09040100020A0002
-:1077D40000000705040210000107058302100001E0
-:1078000011241FBE04B714BE88E18093600010925B
-:1078100060008EEF9AE09EBF8DBF222433242101A9
-:107820003101410180E88AC00F928F939F931F928C
-:107830000FB60F9211244F936F938091DA0080FF5F
-:1078400037C023C00F920FB68F939F93EF93FF9390
-:1078500088278093850080938400E0E5F1E09281A1
-:10786000907261F490818917980B908309F45D9A66
-:1078700091818917980B918309F4289A239411F424
-:107880008315381EFF91EF9154C08091D80080FF7E
-:107890000FC08091DA008E7F8093DA008091D9004A
-:1078A00080FF04C0ADDD81E08EBB02C019BC1EBAF2
-:1078B0008091E10080FF0BC058D280FF08C058D2F1
-:1078C0008091D800806202DE19BC85E08EBB809179
-:1078D000E10084FF1AC049D284FF17C091DD809176
-:1078E000D8008F7DF3DD8FEEA4DD3FD28F7E8160E7
-:1078F00042D280915301882331F48091E30087FDC7
-:1079000002C081E001C084E08EBB8091E10083FF72
-:107910000CC02BD283FF09C087EF8BDD82E08EBBCA
-:107920001092530185DD24D233D26F914F910F9085
-:107930001F909F918F910FBE0F90189580936100BB
-:1079400010926100B1E0B5BF82E085BF81EF85B9DB
-:1079500087EE84B91DB8769A10BA80EF81BB84E6B1
-:107960008BB984EF8AB980E58CBDBDBDA0E0E4E9A8
-:10797000F7E705900D92A035E1F71D92BB30E9F7CE
-:1079800001FD09C000FF07C07C9B05C05EDD8823A8
-:1079900012F06ADD41F56EDD78945ADE71F0ABE9E4
-:1079A000B7E0E3E6F7E790E105900D929A95E1F7ED
-:1079B000A059BF4FE339B9F7B4DD52D029DD80912A
-:1079C0005201807861F48FB18095807F66991C9B0D
-:1079D0008460982E17DE8110B7DD92FC02C0332040
-:1079E00062F742DD51F3F89489EB7CDD81E080930E
-:1079F000E00010926F0010928100109285001092AA
-:107A0000840081E085BF15BE2E9A2F9A2D9A5D9A2B
-:107A1000289A0C940000A4D107C057D102C0C6D246
-:107A200039F0A0D182FFFBCF85FFF7CF8091F10025
-:107A30000895082E83E095D185FD07C08AD102C044
-:107A4000B5D269F08FD180FFFBCF0092F100809119
-:107A50005201807221F45D9884E68093500108956C
-:107A60007FD182FF34C180915201807221F4289825
-:107A700084E680935101CFDF182F853431F422241E
-:107A80008EE7382EDCDC8DE00BC1843511F4C3DFCA
-:107A9000FACF8C34C1F38035B1F3843721F484E418
-:107AA000C8DF80E0FDC0813611F489E5F9C081347A
-:107AB00029F4B1DF582EAFDF482EE5CF803711F41F
-:107AC00083E5EEC0833539F4E0E5F7E78591B1DF72
-:107AD000E735E1F7E6C0863521F481E3AADF87E3E5
-:107AE000DFC0863761F481E3669B8E5F1C9B8F5FEE
-:107AF000A0DF8FB1809582958F708F5BD1C0883762
-:107B0000A9F489DF80935201289A84FD28985D9A10
-:107B100083FD5D982E9A81FD2E982F9A82FD2F98D5
-:107B20002D9A80FD2D9887FD8824ADCF8A3649F4A3
-:107B30008FE9E1DCC3E0EBDC7CDFCA95E1F7E4DC54
-:107B4000B0C0833731F487E874DF85E972DF8EE1F6
-:107B5000A7C0853639F4E0E8F3E73ED2E058F040BC
-:107B6000E0F791CF823631F489E563DF80E061DFB1
-:107B700080E896C0823419F0873609F07DC033243E
-:107B80004ADFD82F48DFC82F46DF082F83548430C0
-:107B900008F085C0063411F4440C551CF201109213
-:107BA0006F001736B9F4033489F483E09EDCAFDC50
-:107BB0008EB51EBC3EDF0DB42197D1F7A5DC08C001
-:107BC000063411F4859101C040DC33DF2197C2F700
-:107BD0002F014AC00334A9F4E11104C082DC88ED0E
-:107BE00084DC8CDC7EDC82E080DC15DF0DB48EBDB5
-:107BF000CA95D9F731968CDC81DCDA9569F72F01CB
-:107C000031C00634F1F49F01F437D8F4E5D119C03E
-:107C100002DF063461F4C0FB46F0F43728F4182E76
-:107C200081E087BFE89511243296082E0AC00434FB
-:107C300039F4DF01B370AD59B94F8D93319601C05E
-:107C400008DC21972AF7043431F42F01F370FE2B5E
-:107C500049F467DC07C0063429F42F01F901F43731
-:107C600008F4B8D18DE0E5DE063411F4569447945B
-:107C700082E080936F0015C08237E1E049F08634DE
-:107C8000E0E031F08E34E3E019F0813531F4E2E0E8
-:107C9000F0E089E087BF849103C08B3111F08FE35E
-:107CA000C8DE83E0C2DB55D095FF03C009C07ED19A
-:107CB00071F058D080FFFBCF4CD002C077D139F0A3
-:107CC00051D080FFFBCF84E0B0DB8BE743C0089549
-:107CD000E4E5F1E067E090915B0180915C01913215
-:107CE00031F0913AE1F58132D1F55ED181C0823235
-:107CF00071F48191805B8191844089F580915D016F
-:107D000080FD2DC0F89481E08093E00079CD803231
-:107D100031F54AD14BD1E9F08530D9F023D083FD3C
-:107D200018C082FFF7CF04C081DE8193615031F02B
-:107D30009091F3008091F200892BB1F7C6DF6115B5
-:107D400049F704C033D129F0853019F00BD080FFFA
-:107D5000F9CF8EE79091E80089238093E800089599
-:107D600084E063DB8091E80008958091E20008954B
-:107D7000FCDF8E7F80618093E200089582E061ECF9
-:107D800009D083E061E802D084E060E842E103C00A
-:107D900080E060E042E049DB81E007D01092ED0036
-:107DA0006093EC004093ED0008959091EB00892BD7
-:107DB0008093EB00089560E0923029F0913029F42F
-:107DC000E0E062E102C0E2E16EE3F1E0089580915B
-:107DD0005B0188234CF402C0E9D0C1F3C3DF82FF0A
-:107DE000FBCF73CFE3D091F3BDDF80FFFBCFB1CFEB
-:107DF00040916101509162014617510520F0462FD4
-:107E0000611509F4A6DF50E022C0D0D061F18530C1
-:107E100051F1A8DF83FD59CFA5DF82FD21C080FF8E
-:107E200016C03091F3002091F20006C0819180933A
-:107E3000F10041502F5F3F4F411519F028303105B7
-:107E4000A8F350E02830310509F451E082DF4115F4
-:107E5000E1F65523D1F604C0A9D029F0853019F0F8
-:107E600081DF82FFF9CF31CFEBE5F1E0DFDD8193F8
-:107E7000E336E1F72DDF76DF83FF91C080915B0170
-:107E800090915C01913009F170F09330F1F09530F0
-:107E900009F444C0963009F456C0983009F460C023
-:107EA000993059F767C0823841F780915F01BCDA99
-:107EB0002091EB001092E90077D022952695217051
-:107EC0002093F1001092F10052C0882311F082300B
-:107ED000A1F68F71823089F680915D018823D1F4FB
-:107EE00020915F01277049F22093E9008091EB0017
-:107EF00080FF10C0933011F480E20BC080E155DFA9
-:107F000081E0880F2A95E9F78093EA001092EA0051
-:107F100088E04BDF1092E90047D02AC0882391F413
-:107F200010915D0110680FB7F8943ED050DF1ADF52
-:107F300080FFFDCF1093E300103883E009F482E066
-:107F40008EBB0FBF2CC08058823048F580915D01F8
-:107F500090915E0130DF603011F126D049DF1FC003
-:107F60008038E9F421D0809153018093F100F1DE53
-:107F70002EDF15C0882399F490915D01923078F43A
-:107F80009093530111D023DF80915301882321F472
-:107F90008091E30091E087FD94E09EBBEFDEE2DE9E
-:107FA00083FF089580E201DF87EFD4CE8EB388236C
-:107FB0000895A3E6B1E0F437B8F40ED090E40D9044
-:107FC0001D9081E087BFE89532969A95C1F71124FC
-:107FD000E058F04085E001C083E001D081E187BF37
-:0A7FE000E89507B600FCFDCF0895F8
-:067FFA003137DCCFFBDC97
-:040000030000740085
-:00000001FF
diff --git a/board-package-source/cores/arduboy/wiring.c b/board-package-source/cores/arduboy/wiring.c
index 477d4e8..40363d6 100644
--- a/board-package-source/cores/arduboy/wiring.c
+++ b/board-package-source/cores/arduboy/wiring.c
@@ -47,26 +47,26 @@ ISR(TIM0_OVF_vect, ISR_NAKED)
ISR(TIMER0_OVF_vect, ISR_NAKED)
#endif
{
-/*
- // copy these to local variables so they can be stored in registers
- // (volatile variables must be read from memory on every access)
- unsigned long m = timer0_millis;
- unsigned char f = timer0_fract;
+/*
+ // copy these to local variables so they can be stored in registers
+ // (volatile variables must be read from memory on every access)
+ unsigned long m = timer0_millis;
+ unsigned char f = timer0_fract;
- m += MILLIS_INC;
- f += FRACT_INC;
- if (f >= FRACT_MAX) {
- f -= FRACT_MAX;
- m += 1;
- }
- timer0_fract = f;
- timer0_millis = m;
- timer0_overflow_count++;
-
- assembly optimisation saves 46 bytes compared to compiled C++ version
- by adding arduboy button combo code takes 8 bytes more than C++ version
- 3 bytes ram saved (1 byte used extra for button_ticks_hold but 4 bytes
- saved due to less stack pushes)
+ m += MILLIS_INC;
+ f += FRACT_INC;
+ if (f >= FRACT_MAX) {
+ f -= FRACT_MAX;
+ m += 1;
+ }
+ timer0_fract = f;
+ timer0_millis = m;
+ timer0_overflow_count++;
+
+ assembly optimisation saves 50 bytes compared to compiled C++ version (148 bytes)
+ with 28 bytes button code and 22 bytes exit to bootloader code, we end up with the
+ same size but a cool feature added and 3 bytes ram saved (1 byte used extra for
+ button_ticks_hold but 4 bytes saved due to less stack pushes)
*/
asm volatile(
// save registers and SREG before 12622 after 12576 (saving 46 bytes)
@@ -75,24 +75,21 @@ ISR(TIMER0_OVF_vect, ISR_NAKED)
" push r24 \n"
" push r25 \n"
" push r30 \n"
- " push r31 \n"
- " ldi r25, - %[millis_inc] \n" // millis_inc = MILLIS_INC;
+ " push r31 \n" // millis_inc = MILLIS_INC; (MILLIS_INC == 1)
" lds r24, %[fract] \n" // f= timer0_fract;
" subi r24, - %[fract_inc] \n" // f += FRACT_INC;
" cpi r24, %[fract_max] \n" // if (f >= FRACT_MAX)
" brcs 1f \n" // {
-
- " subi r24, %[fract_max] \n" // f -= FRACT_MAX;
- " dec r25 \n" // millis_inc++
+ " subi r24, %[fract_max] \n" // f -= FRACT_MAX; millis_inc++; (++ in the form of reverse carry)
"1: \n" // }
" sts %[fract], r24 \n" // timer0_fract = f;
- // timer0_millis += millis_inc (addition by substracting negative value)
+ // timer0_millis += millis_inc (addition by substracting negative value)
" ldi r30, lo8(%[millis]) \n"
" ldi r31, hi8(%[millis]) \n"
- " ld r24, z \n"
- " sub r24, r25 \n"
+ " ld r24, z \n"
+ " sbci r24, -%[millis_inc] - 1 \n" // r24 -= 0 - MILLIS_INC - 1 + (f >= FRACT_MAX ? 0 : 1)
" st z, r24 \n"
- " ldd r25, z+1 \n"
+ " ldd r25, z+1 \n"
" sbci r25, 0xFF \n" // save (uint8_t)(timer0_millis >> 8) in 25
" std z+1, r25 \n"
" ldd r24, z+2 \n"
@@ -101,7 +98,7 @@ ISR(TIMER0_OVF_vect, ISR_NAKED)
" ldd r24, z+3 \n"
" sbci r24, 0xFF \n"
" std z+3, r24 \n"
- //timer0_overflow_count++;
+ // timer0_overflow_count++;
" ldi r30, lo8(%[count]) \n"
" ldi r31, hi8(%[count]) \n"
" ld r24, z \n"
@@ -116,47 +113,47 @@ ISR(TIMER0_OVF_vect, ISR_NAKED)
" ldd r24, z+3 \n"
" sbci r24, 0xFF \n"
" std z+3, r24 \n"
- //read Arduboy buttons
+ //read Arduboy buttons
#ifdef AB_DEVKIT
- " in r24, %[pinb] \n" // down, left, up buttons
- " andi r24, 0x8F \n"
- " sbis %[pinc], 6 \n" // right button
- " andi r24, 0xFB \n"
- " sbis %[pinf], 7 \n" // A button
- " andi r24, 0xFD \n"
- " sbis %[pinf], 6 \n" // B button
- " andi r24, 0xFE \n"
- " cpi r24, 0xAF \n" // test DevKit UP+DOWN for bootloader
-#else
- " in r24, %[pinf] \n" // directional buttons
- " ori r24, 0x0F \n"
- " sbis %[pine], 6 \n" // A button
- " andi r24, 0xF7 \n"
- " sbis %[pinb], 4 \n" // B button
- " andi r24, 0xFB \n"
- " cpi r24, 0x6F \n" // test arduboy UP+DOWN for bootloader
+ " in r24, %[pinb] \n" // down, left, up buttons
+ " ori r24, 0x8F \n"
+ " sbis %[pinc], 6 \n" // skip right button not pressed
+ " andi r24, 0xFB \n"
+ " sbic %[pinf], 7 \n" // skip A button pressed
+ " sbis %[pinf], 6 \n" // skip B button not pressed
+ " clr r24 \n"
+ " cpi r24, 0xAF \n" // test DevKit UP+DOWN for bootloader
+#else
+ " in r24, %[pinf] \n" // directional buttons
+ " ori r24, 0x0F \n" // ignore unon button bits
+ " sbic %[pine], 6 \n" // skip A button pressed
+ " sbis %[pinb], 4 \n" // skip B button not pressed
+ " clr r24 \n" // A or B is pressed here, make compare fail
+ " cpi r24, 0x6F \n" // test arduboy UP+DOWN only for bootloader
#endif
" brne 5f \n" // skip button combo not pressed
// test button combo hold long enough
- "2: lds r24, %[hold] \n"
+ "2: lds r24, %[hold] \n"
" sub r25, r24 \n" // (uint8_t)(timer0_millis >> 8) - button_ticks_hold
" cpi r25, 6 \n" // 1536ms >> 8
" brcs 6f \n" // skip not long enough
- //button combo pressed long enough: trigger bootloader mode
+ //button combo pressed long enough: trigger bootloader mode
".global exit_to_bootloader \n"
"exit_to_bootloader: \n"
- "3: ldi r24, 0x77 \n" // set bootloader MAGIC KEY
- " sts 0x800, r24 \n"
- " sts 0x801, r24 \n"
- " ldi r24, %[value1] \n" // set watchdog timer
- " ldi r25, %[value2] \n"
- " sts %[wdtcsr], r24 \n"
- " sts %[wdtcsr], r25 \n"
+ " ldi r30, 0x00 \n" //MAGIC KEY address (r30 is 0 from above)
+ " ldi r31, 0x08 \n"
+ " ldi r24, 0x77 \n" //MAGIC KEY
+ " st Z, r24 \n"
+ " std Z+1, r24 \n"
+ " ldi r24, %[value1] \n" // set watchdog timer
+ " ; ldi r31, %[value2] \n"
+ " sts %[wdtcsr], r24 \n"
+ " sts %[wdtcsr], r31 \n" //r31 == 08 == _BV(WDE)
" rjmp .-2 \n" // infinite loop will trigger watchdog reset
"5: \n" // }
// reset button_ticks_hold
" sts %[hold], r25 \n" // button_ticks_hold = (uint8_t)(Millis >> 8)
- "6: \n"
+ "6: \n"
//restore registers and return from interrupt
" pop r31 \n"
" pop r30 \n"
@@ -178,7 +175,7 @@ ISR(TIMER0_OVF_vect, ISR_NAKED)
[pinc] "I" (_SFR_IO_ADDR(PINC)),
[pinb] "I" (_SFR_IO_ADDR(PINB)),
[value1] "M" ((uint8_t)(_BV(WDCE) | _BV(WDE))),
- [value2] "M" ((uint8_t)(_BV(WDE))),
+ [value2] "M" ((uint8_t)(_BV(WDE))),
[wdtcsr] "M" (_SFR_MEM_ADDR(WDTCSR))
:
);
@@ -202,7 +199,7 @@ unsigned long micros() {
/*
unsigned long m;
uint8_t oldSREG = SREG, t;
-
+
cli();
m = timer0_overflow_count;
#if defined(TCNT0)
@@ -212,7 +209,7 @@ unsigned long micros() {
#else
#error TIMER 0 not defined
#endif
-
+
#ifdef TIFR0
if ((TIFR0 & _BV(TOV0)) && (t < 255))
m++;
@@ -229,11 +226,11 @@ unsigned long micros() {
" in r18, %[sreg] \n" //oldSREG = SREG
" cli \n" //
" ld r23, x+ \n" // m = timer0_overflow_count << 8
- " ld r24, x+ \n"
- " ld r25, x \n"
- " in r22, %[tcnt] \n" // (m << 8) | t
+ " ld r24, x+ \n"
+ " ld r25, x \n"
+ " in r22, %[tcnt] \n" // (m << 8) | t
" out %[sreg], r18 \n" //SREG = oldSREG
- " sbis %[tif], %[tov] \n" // if ((TIFR & _BV(TOV) &&
+ " sbis %[tif], %[tov] \n" // if ((TIFR & _BV(TOV) &&
" rjmp 1f \n"
" cpi r22, 0xFF \n" // t < 0xFF)
" brcc 1f \n"
@@ -259,19 +256,19 @@ unsigned long micros() {
#else
#error TIMER 0 not defined
#endif
- #ifdef TIFR0
+ #ifdef TIFR0
[tif] "I" (_SFR_IO_ADDR(TIFR0)),
- #else
+ #else
[tif] "I" (_SFR_IO_ADDR(TIFR)),
#endif
[tov] "M" (TOV0),
#if (F_CPU == 8000000L)
[fm] "M" (4),
#elif (F_CPU ==16000000L)
- [fm] "M" (2),
- #else
+ [fm] "M" (2),
+ #else
#error this version of wiring.c only supports 8MHz and 16MHz CPU clock
- #endif
+ #endif
"x" (&timer0_overflow_count)
: "r18"
);
@@ -294,32 +291,32 @@ void delay(unsigned long ms)
" movw r20, %A0 \n" //ms
" movw r30, %C0 \n"
" call micros \n" //endMicros = micros()
- "1: \n"
+ "1: \n"
" subi r20, 1 \n" //while (ms > 0)
- " sbc r21, r1 \n"
- " sbc r30, r1 \n"
- " sbc r31, r1 \n"
- " brcs 2f \n"
- " \n"
+ " sbc r21, r1 \n"
+ " sbc r30, r1 \n"
+ " sbc r31, r1 \n"
+ " brcs 2f \n"
+ " \n"
" subi r22, 0x18 \n" //endMicros += 1000
- " sbci r23, 0xFC \n"
- " sbci r24, 0xFF \n"
- " sbci r25, 0xFF \n"
- " rjmp 1b \n"
- "2: \n"
- " movw r20, r22 \n"
- " movw r30, r24 \n"
- "3: \n"
+ " sbci r23, 0xFC \n"
+ " sbci r24, 0xFF \n"
+ " sbci r25, 0xFF \n"
+ " rjmp 1b \n"
+ "2: \n"
+ " movw r20, r22 \n"
+ " movw r30, r24 \n"
+ "3: \n"
" call micros \n" //while (micros() < endMicros);
- " cp r22, r20 \n"
- " cpc r23, r21 \n"
- " cpc r24, r30 \n"
- " cpc r25, r31 \n"
- " brcs 3b \n"
- :
+ " cp r22, r20 \n"
+ " cpc r23, r21 \n"
+ " cpc r24, r30 \n"
+ " cpc r25, r31 \n"
+ " brcs 3b \n"
+ :
: "d" (ms),
"" (micros)
-
+
: "r20", "r21", "r30", "r31", /*from micros: */ "r18", "r26", "r27"
);
}
@@ -328,29 +325,29 @@ void delayShort(unsigned short ms)
{
asm volatile(
" call micros \n" //endMicros = micros()
- "1: \n"
+ "1: \n"
" sbiw r30, 1 \n" //while (ms > 0)
- " brcs 2f \n"
- " \n"
+ " brcs 2f \n"
+ " \n"
" subi r22, 0x18 \n" //endMicros += 1000
- " sbci r23, 0xFC \n"
- " sbci r24, 0xFF \n"
- " sbci r25, 0xFF \n"
- " rjmp 1b \n"
- "2: \n"
- " movw r20, r22 \n"
- " movw r30, r24 \n"
- "3: \n"
+ " sbci r23, 0xFC \n"
+ " sbci r24, 0xFF \n"
+ " sbci r25, 0xFF \n"
+ " rjmp 1b \n"
+ "2: \n"
+ " movw r20, r22 \n"
+ " movw r30, r24 \n"
+ "3: \n"
" call micros \n" //while (micros() < endMicros);
- " cp r22, r20 \n"
- " cpc r23, r21 \n"
- " cpc r24, r30 \n"
- " cpc r25, r31 \n"
- " brcs 3b \n"
- :
+ " cp r22, r20 \n"
+ " cpc r23, r21 \n"
+ " cpc r24, r30 \n"
+ " cpc r25, r31 \n"
+ " brcs 3b \n"
+ :
: "z" (ms),
"" (micros)
-
+
: "r20", "r21", "r22", "r23", /*from micros: */ "r18", "r26", "r27"
);
}
@@ -465,7 +462,7 @@ void delayMicroseconds(unsigned int us)
// per iteration, so execute it us/4 times
// us is at least 4, divided by 4 gives us 1 (no zero delay bug)
us >>= 2; // us div 4, = 4 cycles
-
+
#endif
@@ -482,7 +479,7 @@ void init() //assembly optimized by 68 bytes
// this needs to be called before setup() or some functions won't
// work there
sei();
-
+
// on the ATmega168, timer 0 is also used for fast hardware pwm
// (using phase-correct PWM would mean that timer 0 overflowed half as often
// resulting in different millis() behavior on the ATmega8 and ATmega168)
@@ -490,8 +487,8 @@ void init() //assembly optimized by 68 bytes
//sbi(TCCR0A, WGM01);
//sbi(TCCR0A, WGM00);
asm volatile(
- " ldi r24, %[value] \n"
- " out %[tccr0a], r24 \n"
+ " ldi r24, %[value] \n"
+ " out %[tccr0a], r24 \n"
:
: [tccr0a] "I" (_SFR_IO_ADDR(TCCR0A)),
[value] "M" (_BV(WGM01) | _BV(WGM00))
@@ -512,8 +509,8 @@ void init() //assembly optimized by 68 bytes
//sbi(TCCR0B, CS01);
//sbi(TCCR0B, CS00);
asm volatile(
- " ldi r24, %[value] \n"
- " out %[tccr0b], r24 \n"
+ " ldi r24, %[value] \n"
+ " out %[tccr0b], r24 \n"
:
: [tccr0b] "I" (_SFR_IO_ADDR(TCCR0B)),
[value] "M" (_BV(CS01) | _BV(CS00))
@@ -548,22 +545,22 @@ void init() //assembly optimized by 68 bytes
//sbi(TCCR1B, CS11);
//#if F_CPU >= 8000000L
//sbi(TCCR1B, CS10);
-//#endif
+//#endif
asm volatile(
- " ldi r30, %[tccr1b] \n"
- " ldi r31, 0x00 \n"
- " ldi r24, %[value] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr1b] \n"
+ " ldi r31, 0x00 \n"
+ " ldi r24, %[value] \n"
+ " st z, r24 \n"
:
: [tccr1b] "M" (_SFR_MEM_ADDR(TCCR1B)),
#if F_CPU >= 8000000L
[value] "M" (_BV(CS11) | _BV(CS10))
-#else
+#else
[value] "M" (_BV(CS11))
-#endif
+#endif
: "r24", "r30", "r31"
);
-
+
#elif defined(TCCR1) && defined(CS11) && defined(CS10)
sbi(TCCR1, CS11);
#if F_CPU >= 8000000L
@@ -574,9 +571,9 @@ void init() //assembly optimized by 68 bytes
#if defined(TCCR1A) && defined(WGM10)
//sbi(TCCR1A, WGM10);
asm volatile(
- " ldi r30, %[tccr1a] \n"
- " ldi r24, %[wgm10] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr1a] \n"
+ " ldi r24, %[wgm10] \n"
+ " st z, r24 \n"
:
: [tccr1a] "M" (_SFR_MEM_ADDR(TCCR1A)),
[wgm10] "M" (_BV(WGM10))
@@ -606,9 +603,9 @@ void init() //assembly optimized by 68 bytes
//sbi(TCCR3B, CS31); // set timer 3 prescale factor to 64
//sbi(TCCR3B, CS30);
asm volatile(
- " ldi r30, %[tccr3b] \n"
- " ldi r24, %[value] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr3b] \n"
+ " ldi r24, %[value] \n"
+ " st z, r24 \n"
:
: [tccr3b] "M" (_SFR_MEM_ADDR(TCCR3B)),
[value] "M" (_BV(CS31) | _BV(CS30))
@@ -616,9 +613,9 @@ void init() //assembly optimized by 68 bytes
);
//sbi(TCCR3A, WGM30); // put timer 3 in 8-bit phase correct pwm mode
asm volatile(
- " ldi r30, %[tccr3a] \n"
- " ldi r24, %[wgm30] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr3a] \n"
+ " ldi r24, %[wgm30] \n"
+ " st z, r24 \n"
:
: [tccr3a] "M" (_SFR_MEM_ADDR(TCCR3A)),
[wgm30] "M" (_BV(WGM30))
@@ -631,19 +628,19 @@ void init() //assembly optimized by 68 bytes
//sbi(TCCR4B, CS41);
//sbi(TCCR4B, CS40);
asm volatile(
- " ldi r30, %[tccr4b] \n"
- " ldi r24, %[value] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr4b] \n"
+ " ldi r24, %[value] \n"
+ " st z, r24 \n"
:
: [tccr4b] "M" (_SFR_MEM_ADDR(TCCR4B)),
[value] "M" (_BV(CS42) | _BV(CS41) | _BV(CS40))
: "r24", "r30", "r31"
);
- //sbi(TCCR4D, WGM40); // put timer 4 in phase- and frequency-correct PWM mode
+ //sbi(TCCR4D, WGM40); // put timer 4 in phase- and frequency-correct PWM mode
asm volatile(
- " ldi r30, %[tccr4d] \n"
- " ldi r24, %[wgm40] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr4d] \n"
+ " ldi r24, %[wgm40] \n"
+ " st z, r24 \n"
:
: [tccr4d] "M" (_SFR_MEM_ADDR(TCCR4D)),
[wgm40] "M" (_BV(WGM40))
@@ -651,9 +648,9 @@ void init() //assembly optimized by 68 bytes
);
//sbi(TCCR4A, PWM4A); // enable PWM mode for comparator OCR4A
asm volatile(
- " ldi r30, %[tccr4a] \n"
- " ldi r24, %[pwm4a] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr4a] \n"
+ " ldi r24, %[pwm4a] \n"
+ " st z, r24 \n"
:
: [tccr4a] "M" (_SFR_MEM_ADDR(TCCR4A)),
[pwm4a] "M" (_BV(PWM4A))
@@ -661,9 +658,9 @@ void init() //assembly optimized by 68 bytes
);
//sbi(TCCR4C, PWM4D); // enable PWM mode for comparator OCR4D
asm volatile(
- " ldi r30, %[tccr4c] \n"
- " ldi r24, %[value] \n"
- " st z, r24 \n"
+ " ldi r30, %[tccr4c] \n"
+ " ldi r24, %[value] \n"
+ " st z, r24 \n"
:
: [tccr4c] "M" (_SFR_MEM_ADDR(TCCR4C)),
[value] "M" (_BV(PWM4D))
@@ -675,7 +672,7 @@ void init() //assembly optimized by 68 bytes
sbi(TCCR4B, CS40);
sbi(TCCR4A, WGM40); // put timer 4 in 8-bit phase correct pwm mode
#endif
-#endif /* end timer4 block for ATMEGA1280/2560 and similar */
+#endif /* end timer4 block for ATMEGA1280/2560 and similar */
#if defined(TCCR5B) && defined(CS51) && defined(WGM50)
sbi(TCCR5B, CS51); // set timer 5 prescale factor to 64
@@ -690,9 +687,9 @@ void init() //assembly optimized by 68 bytes
//sbi(ADCSRA, ADPS1);
//sbi(ADCSRA, ADPS0);
asm volatile(
- " ldi r30, %[adcsra] \n"
- " ldi r24, %[value] \n"
- " st z, r24 \n"
+ " ldi r30, %[adcsra] \n"
+ " ldi r24, %[value] \n"
+ " st z, r24 \n"
:
: [adcsra] "M" (_SFR_MEM_ADDR(ADCSRA)),
[value] "M" (_BV(ADPS2) |_BV(ADPS1) | _BV(ADPS0))
@@ -703,9 +700,9 @@ void init() //assembly optimized by 68 bytes
//sbi(ADCSRA, ADPS1);
//cbi(ADCSRA, ADPS0);
asm volatile(
- " ldi r30, %[adcsra] \n"
- " ldi r24, %[value] \n"
- " st z, r24 \n"
+ " ldi r30, %[adcsra] \n"
+ " ldi r24, %[value] \n"
+ " st z, r24 \n"
:
: [adcsra] "M" (_SFR_MEM_ADDR(ADCSRA)),
[value] "M" (_BV(ADPS2) | _BV(ADPS1))
@@ -731,8 +728,8 @@ void init() //assembly optimized by 68 bytes
// enable a2d conversions
//sbi(ADCSRA, ADEN);
asm volatile(
- " ori r24, %[aden] \n"
- " st z, r24 \n"
+ " ori r24, %[aden] \n"
+ " st z, r24 \n"
:
: [aden] "M" (_BV(ADEN))
: "r24", "r30", "r31"
diff --git a/board-package-source/libraries/ATMlib/.gitignore b/board-package-source/libraries/ATMlib/.gitignore
new file mode 100644
index 0000000..9bea433
--- /dev/null
+++ b/board-package-source/libraries/ATMlib/.gitignore
@@ -0,0 +1,2 @@
+
+.DS_Store
diff --git a/board-package-source/libraries/Arduboy-TinyFont/.gitignore b/board-package-source/libraries/Arduboy-TinyFont/.gitignore
new file mode 100644
index 0000000..599f404
--- /dev/null
+++ b/board-package-source/libraries/Arduboy-TinyFont/.gitignore
@@ -0,0 +1,6 @@
+# OS X
+*.DS_Store
+.pioenvs
+.piolibdeps
+.clang_complete
+.gcc-flags.json
diff --git a/board-package-source/libraries/Arduboy-TinyFont/.travis.yml b/board-package-source/libraries/Arduboy-TinyFont/.travis.yml
new file mode 100644
index 0000000..2c4ff5c
--- /dev/null
+++ b/board-package-source/libraries/Arduboy-TinyFont/.travis.yml
@@ -0,0 +1,65 @@
+# Continuous Integration (CI) is the practice, in software
+# engineering, of merging all developer working copies with a shared mainline
+# several times a day < http://docs.platformio.org/page/ci/index.html >
+#
+# Documentation:
+#
+# * Travis CI Embedded Builds with PlatformIO
+# < https://docs.travis-ci.com/user/integration/platformio/ >
+#
+# * PlatformIO integration with Travis CI
+# < http://docs.platformio.org/page/ci/travis.html >
+#
+# * User Guide for `platformio ci` command
+# < http://docs.platformio.org/page/userguide/cmd_ci.html >
+#
+#
+# Please choice one of the following templates (proposed below) and uncomment
+# it (remove "# " before each line) or use own configuration according to the
+# Travis CI documentation (see above).
+#
+
+
+#
+# Template #1: General project. Test it using existing `platformio.ini`.
+#
+
+# language: python
+# python:
+# - "2.7"
+#
+# sudo: false
+# cache:
+# directories:
+# - "~/.platformio"
+#
+# install:
+# - pip install -U platformio
+#
+# script:
+# - platformio run
+
+
+#
+# Template #2: The project is intended to by used as a library with examples
+#
+
+# language: python
+# python:
+# - "2.7"
+#
+# sudo: false
+# cache:
+# directories:
+# - "~/.platformio"
+#
+# env:
+# - PLATFORMIO_CI_SRC=path/to/test/file.c
+# - PLATFORMIO_CI_SRC=examples/file.ino
+# - PLATFORMIO_CI_SRC=path/to/test/directory
+#
+# install:
+# - pip install -U platformio
+#
+# script:
+# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N
diff --git a/board-package-source/libraries/Arduboy-TinyFont/src/TinyfontSprite.c b/board-package-source/libraries/Arduboy-TinyFont/src/TinyfontSprite.c
index 686da16..57a5bde 100644
--- a/board-package-source/libraries/Arduboy-TinyFont/src/TinyfontSprite.c
+++ b/board-package-source/libraries/Arduboy-TinyFont/src/TinyfontSprite.c
@@ -7,30 +7,293 @@
const unsigned char PROGMEM TINYFONT_SPRITE[] =
{
- 0x00, 0xb0, 0x00, 0x00, 0xa1, 0x70, 0xe1, 0x50,
- 0x96, 0x4f, 0x26, 0x90, 0x0f, 0x1d, 0x07, 0x0c,
- 0x00, 0x96, 0x69, 0x00, 0x4a, 0xe4, 0x4a, 0x00,
- 0x48, 0x44, 0x40, 0x00, 0x80, 0x68, 0x10, 0x00,
- 0x0f, 0x99, 0xfb, 0x8f, 0x9d, 0xbd, 0xbb, 0xfb,
- 0x77, 0xd4, 0xd4, 0xdf, 0x1f, 0x1a, 0x1a, 0xfe,
- 0x7f, 0x5d, 0x5d, 0xff, 0x80, 0x5a, 0x00, 0x00,
- 0xa0, 0xa4, 0xaa, 0x00, 0x10, 0xba, 0x34, 0x00,
- 0xff, 0x59, 0x53, 0xf3, 0xff, 0x9b, 0x9b, 0x9e,
- 0xff, 0xb9, 0xb9, 0x96, 0xff, 0x95, 0x95, 0xd1,
- 0x9f, 0xf4, 0x94, 0x0f, 0xfc, 0x29, 0x5f, 0x91,
- 0xff, 0x18, 0x38, 0xf8, 0xff, 0x92, 0x94, 0xff,
- 0xff, 0x95, 0xd5, 0xf7, 0xbf, 0xb5, 0xdd, 0xd7,
- 0xf1, 0x8f, 0x81, 0xf1, 0xf7, 0x88, 0xc8, 0xf7,
- 0x79, 0xc6, 0x46, 0x79, 0x09, 0xfd, 0x9b, 0x09,
- 0x01, 0x96, 0xf8, 0x00, 0x82, 0x81, 0x82, 0x80,
- 0x50, 0x71, 0x62, 0x00, 0x77, 0x56, 0x56, 0x00,
- 0x76, 0x76, 0x37, 0x00, 0xa2, 0xb7, 0x73, 0x01,
- 0x07, 0x72, 0x06, 0x00, 0x78, 0x27, 0x50, 0x00,
- 0x73, 0x34, 0x74, 0x00, 0x77, 0x51, 0x76, 0x00,
- 0x7f, 0x55, 0xf7, 0x00, 0x47, 0x71, 0x10, 0x00,
- 0x32, 0x47, 0x72, 0x00, 0x73, 0x64, 0x73, 0x00,
- 0x15, 0xa2, 0x75, 0x00, 0x61, 0x67, 0x94, 0x00,
- 0x00, 0x9f, 0x60, 0x60, 0xf4, 0xf2, 0xf6, 0xf2,
+ // #32 & #33 - Symbol ' ' (space) & Symbol '!'.
+ 0x00, // B00000000 → ! ░░░░ ░░░░
+ 0xB0, // B10110000 → ▓░▓▓ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #34 & #35 - Symbol '"' & Symbol '#'.
+ 0xA1, // B10100001 → # ▓░▓░ " ░░░▓
+ 0x70, // B01110000 → ░▓▓▓ ░░░░
+ 0xE1, // B11100001 → ▓▓▓░ ░░░▓
+ 0x50, // B01010000 → ░▓░▓ ░░░░
+
+ // #36 & #37 - Symbol '$' & Symbol '%'.
+ 0x96, // B10010110 → % ▓░░▓ $ ░▓▓░
+ 0x4F, // B01001111 → ░▓░░ ▓▓▓▓
+ 0x26, // B00100110 → ░░▓░ ░▓▓░
+ 0x90, // B10010000 → ▓░░▓ ░░░░
+
+ // #38 & #39 - Symbol '&' & Symbol '''.
+ 0x0F, // B00001111 → ' ░░░░ & ▓▓▓▓
+ 0x1D, // B00011101 → ░░░▓ ▓▓░▓
+ 0x07, // B00000111 → ░░░░ ░▓▓▓
+ 0x0C, // B00001100 → ░░░░ ▓▓░░
+
+ // #40 & #41 - Symbol '(' & Symbol ')'.
+ 0x00, // B00000000 → ) ░░░░ ( ░░░░
+ 0x96, // B10010110 → ▓░░▓ ░▓▓░
+ 0x69, // B01101001 → ░▓▓░ ▓░░▓
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #42 & #43 - Symbol '*' & Symbol '+'.
+ 0x4A, // B01001010 → + ░▓░░ * ▓░▓░
+ 0xE4, // B11100100 → ▓▓▓░ ░▓░░
+ 0x4A, // B01001010 → ░▓░░ ▓░▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #44 & #45 - Symbol ',' & Symbol '-'.
+ 0x48, // B01001000 → - ░▓░░ , ▓░░░
+ 0x44, // B01000100 → ░▓░░ ░▓░░
+ 0x40, // B01000000 → ░▓░░ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #46 & #47 - Symbol '.' & Symbol '/'.
+ 0x80, // B10000000 → / ▓░░░ ░░░░
+ 0x68, // B01101000 → ░▓▓░ ▓░░░
+ 0x10, // B00010000 → ░░░▓ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #48 & #49 - Number '0' & Number '1'.
+ 0x0F, // B00001111 → 1 ░░░░ 0 ▓▓▓▓
+ 0x99, // B10011001 → ▓░░▓ ▓░░▓
+ 0xFB, // B11111011 → ▓▓▓▓ ▓░▓▓
+ 0x8F, // B10001111 → ▓░░░ ▓▓▓▓
+
+ // #50 & #51 - Number '2' & Number '3'.
+ 0x9D, // B10011101 → 3 ▓░░▓ 2 ▓▓░▓
+ 0xBD, // B10111101 → ▓░▓▓ ▓▓░▓
+ 0xBB, // B10111011 → ▓░▓▓ ▓░▓▓
+ 0xFB, // B11111011 → ▓▓▓▓ ▓░▓▓
+
+ // #52 & #53 - Number '4' & Number '5'.
+ 0x77, // B01110111 → 5 ░▓▓▓ 4 ░▓▓▓
+ 0xD4, // B11010100 → ▓▓░▓ ░▓░░
+ 0xD4, // B11010100 → ▓▓░▓ ░▓░░
+ 0xDF, // B11011111 → ▓▓░▓ ▓▓▓▓
+
+ // #54 & #55 - Number '6' & Number '7'.
+ 0x1F, // B00011111 → 7 ░░░▓ 6 ▓▓▓▓
+ 0x1A, // B00011010 → ░░░▓ ▓░▓░
+ 0x1A, // B00011010 → ░░░▓ ▓░▓░
+ 0xFE, // B11111110 → ▓▓▓▓ ▓▓▓░
+
+ // #56 & #57 - Number '8' & Number '9'.
+ 0x7F, // B01111111 → 9 ░▓▓▓ 8 ▓▓▓▓
+ 0x5D, // B01011101 → ░▓░▓ ▓▓░▓
+ 0x5D, // B01011101 → ░▓░▓ ▓▓░▓
+ 0xFF, // B11111111 → ▓▓▓▓ ▓▓▓▓
+
+ // #58 & #59 - Symbol ':' & Symbol ';'.
+ 0x80, // B10000000 → ; ▓░░░ : ░░░░
+ 0x5A, // B01011010 → ░▓░▓ ▓░▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #60 & #61 - Symbol '<' & Symbol '='.
+ 0xA0, // B10100000 → = ▓░▓░ < ░░░░
+ 0xA4, // B10100100 → ▓░▓░ ░▓░░
+ 0xAA, // B10101010 → ▓░▓░ ▓░▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #62 & #63 - Symbol '>' & Symbol '?'.
+ 0x10, // B00010000 → ? ░░░▓ > ░░░░
+ 0xBA, // B10111010 → ▓░▓▓ ▓░▓░
+ 0x34, // B00110100 → ░░▓▓ ░▓░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #64 & #65 - Symbol '@' & Letter 'A'.
+ 0xFF, // B11111111 → A ▓▓▓▓ @ ▓▓▓▓
+ 0x59, // B01011001 → ░▓░▓ ▓░░▓
+ 0x53, // B01010011 → ░▓░▓ ░░▓▓
+ 0xF3, // B11110011 → ▓▓▓▓ ░░▓▓
+
+ // #66 & #67 - Letter 'B' & Letter 'C'.
+ 0xFF, // B11111111 → C ▓▓▓▓ B ▓▓▓▓
+ 0x9B, // B10011011 → ▓░░▓ ▓░▓▓
+ 0x9B, // B10011011 → ▓░░▓ ▓░▓▓
+ 0x9E, // B10011110 → ▓░░▓ ▓▓▓░
+
+ // #68 & #69 - Letter 'D' & Letter 'E'.
+ 0xFF, // B11111111 → E ▓▓▓▓ D ▓▓▓▓
+ 0xB9, // B10111001 → ▓░▓▓ ▓░░▓
+ 0xB9, // B10111001 → ▓░▓▓ ▓░░▓
+ 0x96, // B10010110 → ▓░░▓ ░▓▓░
+
+ // #70 & #71 - Letter 'F' & Letter 'G'.
+ 0xFF, // B11111111 → G ▓▓▓▓ F ▓▓▓▓
+ 0x95, // B10010101 → ▓░░▓ ░▓░▓
+ 0x95, // B10010101 → ▓░░▓ ░▓░▓
+ 0xD1, // B11010001 → ▓▓░▓ ░░░▓
+
+ // #72 & #73 - Letter 'H' & Letter 'I'.
+ 0x9F, // B10011111 → I ▓░░▓ H ▓▓▓▓
+ 0xF4, // B11110100 → ▓▓▓▓ ░▓░░
+ 0x94, // B10010100 → ▓░░▓ ░▓░░
+ 0x0F, // B00001111 → ░░░░ ▓▓▓▓
+
+ // #74 & #75 - Letter 'J' & Letter 'K'.
+ 0xFC, // B11111100 → K ▓▓▓▓ J ▓▓░░
+ 0x29, // B00101001 → ░░▓░ ▓░░▓
+ 0x5F, // B01011111 → ░▓░▓ ▓▓▓▓
+ 0x91, // B10010001 → ▓░░▓ ░░░▓
+
+ // #76 & #77 - Letter 'L' & Letter 'M'.
+ 0xFF, // B11111111 → M ▓▓▓▓ L ▓▓▓▓
+ 0x18, // B00011000 → ░░░▓ ▓░░░
+ 0x38, // B00111000 → ░░▓▓ ▓░░░
+ 0xF8, // B11111000 → ▓▓▓▓ ▓░░░
+
+ // #78 & #79 - Letter 'N' & Letter 'O'.
+ 0xFF, // B11111111 → O ▓▓▓▓ N ▓▓▓▓
+ 0x92, // B10010010 → ▓░░▓ ░░▓░
+ 0x94, // B10010100 → ▓░░▓ ░▓░░
+ 0xFF, // B11111111 → ▓▓▓▓ ▓▓▓▓
+
+ // #80 & #81 - Letter 'P' & Letter 'Q'.
+ 0xFF, // B11111111 → Q ▓▓▓▓ P ▓▓▓▓
+ 0x95, // B10010101 → ▓░░▓ ░▓░▓
+ 0xD5, // B11010101 → ▓▓░▓ ░▓░▓
+ 0xF7, // B11110111 → ▓▓▓▓ ░▓▓▓
+
+ // #82 & #83 - Letter 'R' & Letter 'S'.
+ 0xBF, // B10111111 → S ▓░▓▓ R ▓▓▓▓
+ 0xB5, // B10110101 → ▓░▓▓ ░▓░▓
+ 0xDD, // B11011101 → ▓▓░▓ ▓▓░▓
+ 0xD7, // B11010111 → ▓▓░▓ ░▓▓▓
+
+ // #84 & #85 - Letter 'T' & Letter 'U'.
+ 0xF1, // B11110001 → U ▓▓▓▓ T ░░░▓
+ 0x8F, // B10001111 → ▓░░░ ▓▓▓▓
+ 0x81, // B10000001 → ▓░░░ ░░░▓
+ 0xF1, // B11110001 → ▓▓▓▓ ░░░▓
+
+ // #86 & #87 - Letter 'V' & Letter 'W'.
+ 0xF7, // B11110111 → W ▓▓▓▓ V ░▓▓▓
+ 0x88, // B10001000 → ▓░░░ ▓░░░
+ 0xC8, // B11001000 → ▓▓░░ ▓░░░
+ 0xF7, // B11110111 → ▓▓▓▓ ░▓▓▓
+
+ // #88 & #89 - Letter 'X' & Letter 'Y'.
+ 0x79, // B01111001 → Y ░▓▓▓ X ▓░░▓
+ 0xC6, // B11000110 → ▓▓░░ ░▓▓░
+ 0x46, // B01000110 → ░▓░░ ░▓▓░
+ 0x79, // B01111001 → ░▓▓▓ ▓░░▓
+
+ // #90 & #91 - Letter 'Z' & Symbol '['.
+ 0x09, // B00001001 → [ ░░░░ Z ▓░░▓
+ 0xFD, // B11111101 → ▓▓▓▓ ▓▓░▓
+ 0x9B, // B10011011 → ▓░░▓ ▓░▓▓
+ 0x09, // B00001001 → ░░░░ ▓░░▓
+
+ // #92 & #93 - Symbol '\' & Symbol ']'.
+ 0x01, // B00000001 → ] ░░░░ \ ░░░▓
+ 0x96, // B10010110 → ▓░░▓ ░▓▓░
+ 0xF8, // B11111000 → ▓▓▓▓ ▓░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #94 & #95 - Symbol '^' & Symbol '_'.
+ 0x82, // B10000010 → _ ▓░░░ ^ ░░▓░
+ 0x81, // B10000001 → ▓░░░ ░░░▓
+ 0x82, // B10000010 → ▓░░░ ░░▓░
+ 0x80, // B10000000 → ▓░░░ ░░░░
+
+ // #96 & #97 - Symbol '`' & Letter 'a'.
+ 0x50, // B01010000 → a ░▓░▓ ` ░░░░
+ 0x71, // B01110001 → ░▓▓▓ ░░░▓
+ 0x62, // B01100010 → ░▓▓░ ░░▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #98 & #99 - Letter 'b' & Letter 'c'.
+ 0x77, // B01110111 → c ░▓▓▓ b ░▓▓▓
+ 0x56, // B01010110 → ░▓░▓ ░▓▓░
+ 0x56, // B01010110 → ░▓░▓ ░▓▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #100 & #101 - Letter 'd' & Letter 'e'.
+ 0x76, // B01110110 → e ░▓▓▓ d ░▓▓░
+ 0x76, // B01110110 → ░▓▓▓ ░▓▓░
+ 0x37, // B00110111 → ░░▓▓ ░▓▓▓
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #102 & #103 - Letter 'f' & Letter 'g'.
+ 0xA2, // B10100010 → g ▓░▓░ f ░░▓░
+ 0xB7, // B10110111 → ▓░▓▓ ░▓▓▓
+ 0x73, // B01110011 → ░▓▓▓ ░░▓▓
+ 0x01, // B00000001 → ░░░░ ░░░▓
+
+ // #104 & #105 - Letter 'h' & Letter 'i'.
+ 0x07, // B00000111 → i ░░░░ h ░▓▓▓
+ 0x72, // B01110010 → ░▓▓▓ ░░▓░
+ 0x06, // B00000110 → ░░░░ ░▓▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #106 & #107 - Letter 'j' & Letter 'k'.
+ 0x78, // B01111000 → k ░▓▓▓ j ▓░░░
+ 0x27, // B00100111 → ░░▓░ ░▓▓▓
+ 0x50, // B01010000 → ░▓░▓ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #108 & #109 - Letter 'l' & Letter 'm'.
+ 0x73, // B01110011 → m ░▓▓▓ l ░░▓▓
+ 0x34, // B00110100 → ░░▓▓ ░▓░░
+ 0x74, // B01110100 → ░▓▓▓ ░▓░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #110 & #111 - Letter 'n' & Letter 'o'.
+ 0x77, // B01110111 → o ░▓▓▓ n ░▓▓▓
+ 0x51, // B01010001 → ░▓░▓ ░░░▓
+ 0x76, // B01110110 → ░▓▓▓ ░▓▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #112 & #113 - Letter 'p' & Letter 'q'.
+ 0x7F, // B01111111 → q ░▓▓▓ p ▓▓▓▓
+ 0x55, // B01010101 → ░▓░▓ ░▓░▓
+ 0xF7, // B11110111 → ▓▓▓▓ ░▓▓▓
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #114 & #115 - Letter 'r' & Letter 's'.
+ 0x47, // B01000111 → s ░▓░░ r ░▓▓▓
+ 0x71, // B01110001 → ░▓▓▓ ░░░▓
+ 0x10, // B00010000 → ░░░▓ ░░░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #116 & #117 - Letter 't' & Letter 'u'.
+ 0x32, // B00110010 → u ░░▓▓ t ░░▓░
+ 0x47, // B01000111 → ░▓░░ ░▓▓▓
+ 0x72, // B01110010 → ░▓▓▓ ░░▓░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #118 & #119 - Letter 'v' & Letter 'w'.
+ 0x73, // B01110011 → w ░▓▓▓ v ░░▓▓
+ 0x64, // B01100100 → ░▓▓░ ░▓░░
+ 0x73, // B01110011 → ░▓▓▓ ░░▓▓
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #120 & #121 - Letter 'x' & Letter 'y'.
+ 0x15, // B00010101 → y ░░░▓ x ░▓░▓
+ 0xA2, // B10100010 → ▓░▓░ ░░▓░
+ 0x75, // B01110101 → ░▓▓▓ ░▓░▓
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #122 & #123 - Letter 'z' & Symbol '{'.
+ 0x61, // B01100001 → { ░▓▓░ z ░░░▓
+ 0x67, // B01100111 → ░▓▓░ ░▓▓▓
+ 0x94, // B10010100 → ▓░░▓ ░▓░░
+ 0x00, // B00000000 → ░░░░ ░░░░
+
+ // #124 & #125 - Symbol '|' & Symbol '}'.
+ 0x00, // B00000000 → } ░░░░ | ░░░░
+ 0x9F, // B10011111 → ▓░░▓ ▓▓▓▓
+ 0x60, // B01100000 → ░▓▓░ ░░░░
+ 0x60, // B01100000 → ░▓▓░ ░░░░
+
+ // #126 & #127 - Symbol '~' & Symbol 'â– '.
+ 0xF4, // B11110100 → ■▓▓▓▓ ~ ░▓░░
+ 0xF2, // B11110010 → ▓▓▓▓ ░░▓░
+ 0xF6, // B11110110 → ▓▓▓▓ ░▓▓░
+ 0xF2 // B11110010 → ▓▓▓▓ ░░▓░
};
#endif
diff --git a/board-package-source/libraries/Arduboy2/LICENSE.txt b/board-package-source/libraries/Arduboy2/LICENSE.txt
index 843a365..3fc9077 100644
--- a/board-package-source/libraries/Arduboy2/LICENSE.txt
+++ b/board-package-source/libraries/Arduboy2/LICENSE.txt
@@ -8,7 +8,7 @@ Software License Agreements
Licensed under the BSD 3-clause license:
Arduboy2 library:
-Copyright (c) 2016-2018, Scott Allen
+Copyright (c) 2016-2020, Scott Allen
All rights reserved.
The Arduboy2 library was forked from the Arduboy library:
@@ -24,7 +24,7 @@ Copyright (c) 2012, Adafruit Industries
All rights reserved.
SetSystemEEPROM example sketch:
-Copyright (c) 2018, Scott Allen
+Copyright (c) 2018-2020, Scott Allen
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,6 @@ https://github.com/yyyc514/ArduboyExtra
Copyright (c) 2015 Josh Goebel
Code for drawing compressed bitmaps:
-https://github.com/TEAMarg/drawCompressed
Copyright (c) 2016 TEAM a.r.g.
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -135,7 +134,32 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
-------------------------------------------------------------------------------
-Placed in the public domain:
+Licensed under the zlib license:
+
+LodePNG
+https://github.com/lvandeve/lodepng
+Copyright (c) 2005-2020 Lode Vandevenne
+(Used by the Cabi program)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+-------------------------------------------------------------------------------
+Placed in the public domain using Creative Commons CC0:
+https://creativecommons.org/publicdomain/zero/1.0/
BeepDemo example sketch:
By Scott Allen
@@ -143,6 +167,131 @@ By Scott Allen
RGBled example sketch:
By Scott Allen
+Cabi PNG file converter program:
+By zep
+
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
+
===============================================================================
\endverbatim
*/
diff --git a/board-package-source/libraries/Arduboy2/README.md b/board-package-source/libraries/Arduboy2/README.md
index 5bb6f7e..0a6d151 100644
--- a/board-package-source/libraries/Arduboy2/README.md
+++ b/board-package-source/libraries/Arduboy2/README.md
@@ -14,7 +14,7 @@ For notes on the differences between the *Arduboy2* library and the original *Ar
## Library documentation
-Comments in the library header files are formatted for the [Doxygen](http://www.doxygen.org) document generation system. The HTML files generated using the configuration file _extras/Doxyfile_ can be found at:
+Comments in the library header files are formatted for the [Doxygen](https://www.doxygen.nl/) document generation system. The HTML files generated using the configuration file _extras/Doxyfile_ can be found at:
https://MLXXXp.github.io/documents/Arduino/libraries/Arduboy2/Doxygen/html/index.html
@@ -45,7 +45,7 @@ At the start of the sketch, the **ARDUBOY** logo scrolls down from the top of th
The RGB LED lights red then green then blue while the logo is scrolling. (If your Arduboy is one of those that has the RGB LED installed incorrectly, then it will light blue then off then red). For users who do not wish to have the RGB LED flash during the boot logo sequence, a flag can be set in system EEPROM to have it remain off. The included *SetSystemEEPROM* example sketch can be used to set this flag.
-A user settable *unit name* of up to 6 characters can be saved in system EEPROM memory. If set, this name will be briefly displayed at the bottom of the boot logo screen, after the logo stops scrolling down. This feature is only available if the *Arduboy2* class is used, not the *Arduboy2Base* class. This is because it requires the text display functions, which are only available in the *Arduboy2* class. A flag in system EEPROM controls whether or not the *unit name* is displayed on the boot logo screen, regardless of whether the *unit name* itself has been set. The included *SetSystemEEPROM* example sketch can be used to set both the *unit name* and this flag.
+A user settable *unit name* can be saved in system EEPROM memory. If set, this name will be briefly displayed at the bottom of the boot logo screen, after the logo stops scrolling down. This feature is only available if the *Arduboy2* class is used, not the *Arduboy2Base* class. This is because it requires the text display functions, which are only available in the *Arduboy2* class. A flag in system EEPROM controls whether or not the *unit name* is displayed on the boot logo screen, regardless of whether the *unit name* itself has been set. The included *SetSystemEEPROM* example sketch can be used to set both the *unit name* and this flag.
Once the logo display sequence completes, the sketch continues.
@@ -109,11 +109,11 @@ Sample sketches have been included with the library as examples of how to use it
`File > Examples > Arduboy2`
-More information on writing sketches for the Arduboy can be found in the [Arduboy Community Forum](http://community.arduboy.com/).
+More information on writing sketches for the Arduboy can be found in the [Arduboy Community Forum](https://community.arduboy.com/).
-### Using EEPROM in a sketch
+### Using EEPROM in a sketch <- THIS IS IMPORTANT!
-The Arduboy2 library reserves an area at the start of EEPROM for storing system information, such as the current audio mute state and the Unit Name and Unit ID. A sketch **must not** use this reserved area for its own purposes. A sketch may use any EEPROM past this reserved area. The first EEPROM address available for sketch use is given as the defined value *EEPROM_STORAGE_SPACE_START*
+The Arduboy2 library reserves an area at the start of EEPROM for storing system information, such as the current audio mute state and the Unit Name and Unit ID. A sketch **MUST NOT** use this reserved area for its own purposes. A sketch may use any EEPROM past this reserved area. The first EEPROM address available for sketch use is given as the defined value *EEPROM_STORAGE_SPACE_START*
### Audio control functions
@@ -149,7 +149,7 @@ If you want to be able to play sequences of tones or background music, using the
#### Remove the text functions
-If your sketch doesn't use any of the functions for displaying text, such as *setCursor()* and *print()*, you can remove them. You could do this if your sketch generates whatever text it requires by some other means. Removing the text functions frees up code by not including the font table and some code that is always pulled in by inheriting the [Arduino *Print* class](http://playground.arduino.cc/Code/Printclass).
+If your sketch doesn't use any of the functions for displaying text, such as *setCursor()* and *print()*, you can remove them. You could do this if your sketch generates whatever text it requires by some other means. Removing the text functions frees up code by not including the font table and some code that is always pulled in by inheriting the [Arduino *Print* class](https://playground.arduino.cc/Code/Printclass/).
To eliminate text capability in your sketch, when creating the library object simply use the *Arduboy2Base* class instead of *Arduboy2*:
@@ -264,7 +264,7 @@ Main differences between Arduboy2 and Arduboy V1.1 are:
- The *beginNoLogo()* function is not included. This function could be used in Arduboy V1.1 in place of *begin()* to suppress the displaying of the ARDUBOY logo and thus free up the code that it required. Instead, Arduboy2 allows a sketch to call *boot()* and then add in any extra features that *begin()* provides by calling their functions directly after *boot()*, if desired.
- The *ArduboyCore* and *ArduboyAudio* base classes, previously only available to, and used to derive, the *Arduboy* class, have been made publicly available for the benefit of developers who may wish to use them as the base of an entirely new library. This change doesn't affect the existing API.
-As of version 2.1.0 functionality from the [Team A.R.G.](http://www.team-arg.org/) *Arglib* library has been added:
+As of version 2.1.0 functionality from the Team A.R.G. *Arglib* library has been added:
- The sprite drawing functions, collision detection functions, and button handling functions that Team A.R.G. incorporated from the [ArduboyExtra](https://github.com/yyyc514/ArduboyExtra) project. The *poll()* function was renamed *pollButtons()* for clarity. The *Sprites* class doesn't require a parameter for the constructor, whereas in *Arglib* a pointer to an Arduboy class object is required.
- The *drawCompressed()* function, which allows compressed bitmaps to be drawn. Saving bitmaps in compressed form may reduce overall sketch size.
@@ -307,11 +307,11 @@ Arduboy2 arduboy;
If the sketch doesn't use any *tunes* functions, there's a good chance this is all that has to be done to make it compile.
-### Sketch uses only *tunes.tone()* for sound
+### Sketch uses only tunes.tone() for sound
If the sketch has sound but only uses *tunes.tone()*, solutions are:
-#### Solution 1: Switch to using Arduino *tone()*
+#### Solution 1: Switch to using Arduino tone()
An easy change is to use the Arduino built in *tone()* function. You can add a function to the sketch that wraps *tone()* so that it works like *tunes.tone()*, like so:
@@ -374,7 +374,7 @@ See the [ArduboyTones](https://github.com/MLXXXp/ArduboyTones) README file for m
See the following for how to do this:
-### Sketch uses *tunes.playScore()*
+### Sketch uses tunes.playScore()
If the sketch uses *tunes.playScore()*, probably the easiest solution is to use the *ArduboyPlaytune* library. *ArduboyPlaytune* is essentially the code that was in the Arduboy V1.1 *tunes* subclass, which has been removed from Arduboy2. It's been cleaned up and a few enhancements have been added, but all the Arduboy V1.1 *tunes* functions are available.
@@ -424,7 +424,7 @@ If you don't need to play scores containing two parts, and don't require tones t
The benefit of using *ArduboyTones* would be reduced code size and possibly easier addition of new sequences without the need of a MIDI to Playtune format converter.
-### Sketch uses the *beginNoLogo()* function instead of *begin()*
+### Sketch uses the beginNoLogo() function instead of begin()
The *beginNoLogo()* function has been removed. Instead, *boot()* can be used with additional functions following it to add back in desired boot functionality. See the information above, under the heading *Remove boot up features*, for more details. Assuming the object is named *arduboy*, a direct replacement for *beginNoLogo()* would be:
diff --git a/board-package-source/libraries/Arduboy2/examples/ArduBreakout/ArduBreakout.ino b/board-package-source/libraries/Arduboy2/examples/ArduBreakout/ArduBreakout.ino
index 4dcd4ef..d152180 100644
--- a/board-package-source/libraries/Arduboy2/examples/ArduBreakout/ArduBreakout.ino
+++ b/board-package-source/libraries/Arduboy2/examples/ArduBreakout/ArduBreakout.ino
@@ -3,7 +3,8 @@
Copyright (C) 2011 Sebastian Goscik
All rights reserved.
- Modifications by Scott Allen 2016 (after previous changes by ???)
+ Modifications by Scott Allen 2016, 2018, 2020
+ after previous changes by person(s) unknown.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,20 +17,38 @@
// block in EEPROM to save high scores
#define EE_FILE 2
+// EEPROM space used: 35 bytes (7*(3+2)) starting at
+// EEPROM_STORAGE_SPACE_START + (EE_FILE * 35)
+
Arduboy2 arduboy;
BeepPin1 beep;
-const unsigned int FRAME_RATE = 40; // Frame rate in frames per second
-const unsigned int COLUMNS = 13; //Columns of bricks
-const unsigned int ROWS = 4; //Rows of bricks
+constexpr uint8_t frameRate = 40; // Frame rate in frames per second
+
+// Tone frequencies. Converted to count values for the beep class
+constexpr uint16_t tonePaddle = beep.freq(200); // Ball hits paddle
+constexpr uint16_t toneBrick = beep.freq(261); // Ball hits a brick
+constexpr uint16_t toneEdge = beep.freq(523); // Ball hits top or sides
+constexpr uint16_t toneMiss = beep.freq(175); // Ball misses paddle, lose life
+constexpr uint16_t toneInitialsChange = beep.freq(523); // Change initials
+constexpr uint16_t toneInitialsMove = beep.freq(1046); // Select initials
+// Tone durations
+constexpr uint8_t toneTimeBeep = 250 / (1000 / frameRate); // Game (frames)
+constexpr uint16_t toneTimeMiss = 500; // Miss paddle (milliseconds)
+constexpr uint16_t toneTimeInitials = 80; // Initials entry (milliseconds)
+
+
+constexpr unsigned int columns = 13; //Columns of bricks
+constexpr unsigned int rows = 4; //Rows of bricks
+
int dx = -1; //Initial movement of ball
int dy = -1; //Initial movement of ball
-int xb; //Balls starting possition
-int yb; //Balls starting possition
+int xb; //Ball's starting position
+int yb; //Ball's starting position
boolean released; //If the ball has been released by the player
boolean paused = false; //If the game has been paused
byte xPaddle; //X position of paddle
-boolean isHit[ROWS][COLUMNS]; //Array of if bricks are hit or not
+boolean isHit[rows][columns]; //Array of if bricks are hit or not
boolean bounced=false; //Used to fix double bounce glitch
byte lives = 3; //Amount of lives
byte level = 1; //Current level
@@ -60,7 +79,7 @@ void setup()
{
arduboy.begin();
beep.begin();
- arduboy.setFrameRate(FRAME_RATE);
+ arduboy.setFrameRate(frameRate);
arduboy.initRandomSeed();
}
@@ -92,9 +111,9 @@ void loop()
//Selects Font
//Draws the new level
level = 1;
+ initialDraw=true;
newLevel();
score = 0;
- initialDraw=true;
}
if (lives>0)
@@ -113,7 +132,7 @@ void loop()
oldpad = pad;
drawBall();
- if(brickCount == ROWS * COLUMNS)
+ if(brickCount == rows * columns)
{
level++;
newLevel();
@@ -164,12 +183,15 @@ void moveBall()
if(released)
{
//Move ball
- if (abs(dx)==2) {
+ if (abs(dx)==2)
+ {
xb += dx/2;
// 2x speed is really 1.5 speed
if (tick%2==0)
xb += dx/2;
- } else {
+ }
+ else
+ {
xb += dx;
}
yb=yb + dy;
@@ -185,18 +207,18 @@ void moveBall()
{
yb = 2;
dy = -dy;
- playTone(523, 250);
+ playTone(toneEdge, toneTimeBeep);
}
//Lose a life if bottom edge hit
if (yb >= 64)
{
- arduboy.drawRect(xPaddle, 63, 11, 1, 0);
+ arduboy.drawRect(xPaddle, 63, 11, 1, BLACK);
xPaddle = 54;
yb=60;
released = false;
lives--;
- playToneTimed(175, 500);
+ playToneTimed(toneMiss, toneTimeMiss);
if (random(0, 2) == 0)
{
dx = 1;
@@ -212,7 +234,7 @@ void moveBall()
{
xb = 2;
dx = -dx;
- playTone(523, 250);
+ playTone(toneEdge, toneTimeBeep);
}
//Bounce off right side
@@ -220,7 +242,7 @@ void moveBall()
{
xb = WIDTH - 4;
dx = -dx;
- playTone(523, 250);
+ playTone(toneEdge, toneTimeBeep);
}
//Bounce off paddle
@@ -229,16 +251,17 @@ void moveBall()
dy = -dy;
dx = ((xb-(xPaddle+6))/3); //Applies spin on the ball
// prevent straight bounce
- if (dx == 0) {
- dx = (random(0,2) == 1) ? 1 : -1;
+ if (dx == 0)
+ {
+ dx = (random(0, 2) == 1) ? 1 : -1;
}
- playTone(200, 250);
+ playTone(tonePaddle, toneTimeBeep);
}
//Bounce off Bricks
- for (byte row = 0; row < ROWS; row++)
+ for (byte row = 0; row < rows; row++)
{
- for (byte column = 0; column < COLUMNS; column++)
+ for (byte column = 0; column < columns; column++)
{
if (!isHit[row][column])
{
@@ -255,7 +278,7 @@ void moveBall()
Score();
brickCount++;
isHit[row][column] = true;
- arduboy.drawRect(10*column, 2+6*row, 8, 4, 0);
+ arduboy.drawRect(10*column, 2+6*row, 8, 4, BLACK);
//Vertical collision
if (bottomBall > bottomBrick || topBall < topBrick)
@@ -266,7 +289,7 @@ void moveBall()
dy =- dy;
yb += dy;
bounced = true;
- playTone(261, 250);
+ playTone(toneBrick, toneTimeBeep);
}
}
@@ -279,7 +302,7 @@ void moveBall()
dx =- dx;
xb += dx;
bounced = true;
- playTone(261, 250);
+ playTone(toneBrick, toneTimeBeep);
}
}
}
@@ -318,35 +341,32 @@ void moveBall()
void drawBall()
{
- // arduboy.setCursor(0,0);
- // arduboy.print(arduboy.cpuLoad());
- // arduboy.print(" ");
- arduboy.drawPixel(xb, yb, 0);
- arduboy.drawPixel(xb+1, yb, 0);
- arduboy.drawPixel(xb, yb+1, 0);
- arduboy.drawPixel(xb+1, yb+1, 0);
+ arduboy.drawPixel(xb, yb, BLACK);
+ arduboy.drawPixel(xb+1, yb, BLACK);
+ arduboy.drawPixel(xb, yb+1, BLACK);
+ arduboy.drawPixel(xb+1, yb+1, BLACK);
moveBall();
- arduboy.drawPixel(xb, yb, 1);
- arduboy.drawPixel(xb+1, yb, 1);
- arduboy.drawPixel(xb, yb+1, 1);
- arduboy.drawPixel(xb+1, yb+1, 1);
+ arduboy.drawPixel(xb, yb, WHITE);
+ arduboy.drawPixel(xb+1, yb, WHITE);
+ arduboy.drawPixel(xb, yb+1, WHITE);
+ arduboy.drawPixel(xb+1, yb+1, WHITE);
}
void drawPaddle()
{
- arduboy.drawRect(xPaddle, 63, 11, 1, 0);
+ arduboy.drawRect(xPaddle, 63, 11, 1, BLACK);
movePaddle();
- arduboy.drawRect(xPaddle, 63, 11, 1, 1);
+ arduboy.drawRect(xPaddle, 63, 11, 1, WHITE);
}
void drawGameOver()
{
- arduboy.drawPixel(xb, yb, 0);
- arduboy.drawPixel(xb+1, yb, 0);
- arduboy.drawPixel(xb, yb+1, 0);
- arduboy.drawPixel(xb+1, yb+1, 0);
+ arduboy.drawPixel(xb, yb, BLACK);
+ arduboy.drawPixel(xb+1, yb, BLACK);
+ arduboy.drawPixel(xb, yb+1, BLACK);
+ arduboy.drawPixel(xb+1, yb+1, BLACK);
arduboy.setCursor(37, 42);
arduboy.print("Game Over");
arduboy.setCursor(31, 56);
@@ -359,6 +379,8 @@ void drawGameOver()
void pause()
{
paused = true;
+ //Stop tone if playing
+ beep.noTone();
//Draw pause to the screen
arduboy.setCursor(52, 45);
arduboy.print("PAUSE");
@@ -370,7 +392,7 @@ void pause()
pad2 = arduboy.pressed(A_BUTTON) || arduboy.pressed(B_BUTTON);
if (pad2 == true && oldpad2 == false && released)
{
- arduboy.fillRect(52, 45, 30, 11, 0);
+ arduboy.fillRect(52, 45, 30, 11, BLACK);
paused=false;
}
@@ -383,15 +405,16 @@ void Score()
score += (level*10);
}
-void newLevel(){
+void newLevel()
+{
//Undraw paddle
- arduboy.drawRect(xPaddle, 63, 11, 1, 0);
+ arduboy.drawRect(xPaddle, 63, 11, 1, BLACK);
//Undraw ball
- arduboy.drawPixel(xb, yb, 0);
- arduboy.drawPixel(xb+1, yb, 0);
- arduboy.drawPixel(xb, yb+1, 0);
- arduboy.drawPixel(xb+1, yb+1, 0);
+ arduboy.drawPixel(xb, yb, BLACK);
+ arduboy.drawPixel(xb+1, yb, BLACK);
+ arduboy.drawPixel(xb, yb+1, BLACK);
+ arduboy.drawPixel(xb+1, yb+1, BLACK);
//Alter various variables to reset the game
xPaddle = 54;
@@ -400,15 +423,23 @@ void newLevel(){
released = false;
//Draws new bricks and resets their values
- for (byte row = 0; row < 4; row++) {
+ for (byte row = 0; row < 4; row++)
+ {
for (byte column = 0; column < 13; column++)
{
isHit[row][column] = false;
- arduboy.drawRect(10*column, 2+6*row, 8, 4, 1);
+ arduboy.drawRect(10*column, 2+6*row, 8, 4, WHITE);
}
}
- arduboy.display();
+ if (!initialDraw)
+ {
+ arduboy.clear();
+ }
+ else
+ {
+ arduboy.display();
+ }
}
//Used to delay images while reading button input
@@ -445,7 +476,7 @@ boolean displayHighScores(byte file)
for(int i = 0; i < 7; i++)
{
sprintf(text_buffer, "%2d", i+1);
- arduboy.setCursor(x,y+(i*8));
+ arduboy.setCursor(x, y+(i*8));
arduboy.print(text_buffer);
arduboy.display();
hi = EEPROM.read(address + (5*i));
@@ -484,7 +515,7 @@ boolean titleScreen()
{
//Clears the screen
arduboy.clear();
- arduboy.setCursor(16,22);
+ arduboy.setCursor(16, 22);
arduboy.setTextSize(2);
arduboy.print("BREAKOUT");
arduboy.setTextSize(1);
@@ -537,7 +568,7 @@ void enterInitials()
arduboy.display();
arduboy.clear();
- arduboy.setCursor(16,0);
+ arduboy.setCursor(16, 0);
arduboy.print("HIGH SCORE");
sprintf(text_buffer, "%u", score);
arduboy.setCursor(88, 0);
@@ -550,10 +581,10 @@ void enterInitials()
arduboy.print(initials[2]);
for(byte i = 0; i < 3; i++)
{
- arduboy.drawLine(56 + (i*8), 27, 56 + (i*8) + 6, 27, 1);
+ arduboy.drawLine(56 + (i*8), 27, 56 + (i*8) + 6, 27, WHITE);
}
- arduboy.drawLine(56, 28, 88, 28, 0);
- arduboy.drawLine(56 + (index*8), 28, 56 + (index*8) + 6, 28, 1);
+ arduboy.drawLine(56, 28, 88, 28, BLACK);
+ arduboy.drawLine(56 + (index*8), 28, 56 + (index*8) + 6, 28, WHITE);
arduboy.delayShort(70);
if (arduboy.pressed(LEFT_BUTTON) || arduboy.pressed(B_BUTTON))
@@ -561,7 +592,7 @@ void enterInitials()
if (index > 0)
{
index--;
- playToneTimed(1046, 80);
+ playToneTimed(toneInitialsMove, toneTimeInitials);
}
}
@@ -570,14 +601,14 @@ void enterInitials()
if (index < 2)
{
index++;
- playToneTimed(1046, 80);
+ playToneTimed(toneInitialsMove, toneTimeInitials);
}
}
if (arduboy.pressed(UP_BUTTON))
{
initials[index]++;
- playToneTimed(523, 80);
+ playToneTimed(toneInitialsChange, toneTimeInitials);
// A-Z 0-9 :-? !-/ ' '
if (initials[index] == '0')
{
@@ -600,28 +631,34 @@ void enterInitials()
if (arduboy.pressed(DOWN_BUTTON))
{
initials[index]--;
- playToneTimed(523, 80);
- if (initials[index] == ' ') {
+ playToneTimed(toneInitialsChange, toneTimeInitials);
+ if (initials[index] == ' ')
+ {
initials[index] = '?';
}
- if (initials[index] == '/') {
+ if (initials[index] == '/')
+ {
initials[index] = 'Z';
}
- if (initials[index] == 31) {
+ if (initials[index] == 31)
+ {
initials[index] = '/';
}
- if (initials[index] == '@') {
+ if (initials[index] == '@')
+ {
initials[index] = ' ';
}
}
if (arduboy.pressed(A_BUTTON))
{
- playToneTimed(1046, 80);
+ playToneTimed(toneInitialsMove, toneTimeInitials);
if (index < 2)
{
index++;
- } else {
+ }
+ else
+ {
return;
}
}
@@ -648,7 +685,8 @@ void enterHighScore(byte file)
// The values are uninitialized, so treat this entry
// as a score of 0.
tmpScore = 0;
- } else
+ }
+ else
{
tmpScore = (hi << 8) | lo;
}
@@ -698,18 +736,19 @@ void enterHighScore(byte file)
}
}
-// Play a tone at the specified frequency for the specified duration.
-void playTone(unsigned int frequency, unsigned int duration)
+// Play a tone at a frequency coresponding to the specified precomputed count,
+// for the specified number of frames.
+void playTone(uint16_t count, uint8_t frames)
{
- beep.tone(beep.freq(frequency), duration / (1000 / FRAME_RATE));
+ beep.tone(count, frames);
}
-// Play a tone at the specified frequency for the specified duration using
-// a delay to time the tone.
+// Play a tone at a frequency coresponding to the specified precomputed count,
+// for the specified duration in milliseconds, using a delay.
// Used when beep.timer() isn't being called.
-void playToneTimed(unsigned int frequency, unsigned int duration)
+void playToneTimed(uint16_t count, uint16_t duration)
{
- beep.tone(beep.freq(frequency));
+ beep.tone(count);
arduboy.delayShort(duration);
beep.noTone();
}
diff --git a/board-package-source/libraries/Arduboy2/examples/BeepDemo/BeepDemo.ino b/board-package-source/libraries/Arduboy2/examples/BeepDemo/BeepDemo.ino
index 2b179f2..7df55d7 100644
--- a/board-package-source/libraries/Arduboy2/examples/BeepDemo/BeepDemo.ino
+++ b/board-package-source/libraries/Arduboy2/examples/BeepDemo/BeepDemo.ino
@@ -1,11 +1,19 @@
/*
+BeepDemo.ino
+
This sketch provides an example of using the Arduboy2 library's BeepPin1 class
to play simple tones.
*/
/*
-To the extent possible under law, Scott Allen has waived all copyright and
-related or neighboring rights to this BeepDemo program.
+Written in 2018 by Scott Allen saydisp-git@yahoo.ca
+
+To the extent possible under law, the author(s) have dedicated all copyright
+and related and neighboring rights to this software to the public domain
+worldwide. This software is distributed without any warranty.
+
+You should have received a copy of the CC0 Public Domain Dedication along with
+this software. If not, see .
*/
// Comments are only provided for code dealing with tone generation or control.
diff --git a/board-package-source/libraries/Arduboy2/examples/BeepDemo/COPYING b/board-package-source/libraries/Arduboy2/examples/BeepDemo/COPYING
new file mode 100644
index 0000000..6ca207e
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/examples/BeepDemo/COPYING
@@ -0,0 +1,122 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
+
diff --git a/board-package-source/libraries/Arduboy2/examples/RGBled/COPYING b/board-package-source/libraries/Arduboy2/examples/RGBled/COPYING
new file mode 100644
index 0000000..6ca207e
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/examples/RGBled/COPYING
@@ -0,0 +1,122 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
+
diff --git a/board-package-source/libraries/Arduboy2/examples/RGBled/RGBled.ino b/board-package-source/libraries/Arduboy2/examples/RGBled/RGBled.ino
index 9ff3fde..89b213d 100644
--- a/board-package-source/libraries/Arduboy2/examples/RGBled/RGBled.ino
+++ b/board-package-source/libraries/Arduboy2/examples/RGBled/RGBled.ino
@@ -1,11 +1,19 @@
/*
+RGBled
+
This sketch demonstrates controlling the Arduboy's RGB LED,
in both analog and digital modes.
*/
/*
-To the extent possible under law, Scott Allen has waived all copyright and
-related or neighboring rights to this BeepDemo program.
+Written in 2018 by Scott Allen saydisp-git@yahoo.ca
+
+To the extent possible under law, the author(s) have dedicated all copyright
+and related and neighboring rights to this software to the public domain
+worldwide. This software is distributed without any warranty.
+
+You should have received a copy of the CC0 Public Domain Dedication along with
+this software. If not, see .
*/
#include
diff --git a/board-package-source/libraries/Arduboy2/examples/SetSystemEEPROM/SetSystemEEPROM.ino b/board-package-source/libraries/Arduboy2/examples/SetSystemEEPROM/SetSystemEEPROM.ino
index 3c65371..149cf8b 100644
--- a/board-package-source/libraries/Arduboy2/examples/SetSystemEEPROM/SetSystemEEPROM.ino
+++ b/board-package-source/libraries/Arduboy2/examples/SetSystemEEPROM/SetSystemEEPROM.ino
@@ -33,11 +33,11 @@ This sketch also allows:
------------------------------------------------------------------------------
*/
-// Version 2.0
+// Version 2.1
/*
------------------------------------------------------------------------------
-Copyright (c) 2018, Scott Allen
+Copyright (c) 2018-2020, Scott Allen
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -298,27 +298,27 @@ void screenSaveName(), screenSaveID(), screenResetSys(), screenResetUser();
Arduboy2 arduboy;
-char unitName[ARDUBOY_UNIT_NAME_LEN + 1];
-byte nameIndex;
+char unitName[ARDUBOY_UNIT_NAME_BUFFER_SIZE];
+uint8_t nameIndex;
uint16_t unitID;
-byte idIndex;
+uint8_t idIndex;
-boolean showLogoFlag;
-boolean showLEDsFlag;
-boolean showNameFlag;
+bool showLogoFlag;
+bool showLEDsFlag;
+bool showNameFlag;
// Selected flag
-enum SelectedFlag : byte {
+enum class SelectedFlag : uint8_t {
selFlagLogo,
selFlagLEDs,
selFlagName
};
-byte currentFlag;
+SelectedFlag currentFlag;
// Assign numbers for each state/screen
-enum State : byte {
+enum class State : uint8_t {
sMain,
sName,
sID,
@@ -331,10 +331,10 @@ enum State : byte {
sMAX = sResetUser
};
-byte currentState;
+State currentState;
// Function pointer array for button handling
-void (*stateFunc[sMAX + 1])() = {
+void (*stateFunc[static_cast(State::sMAX) + 1])() = {
stateMain,
stateName,
stateID,
@@ -347,7 +347,7 @@ void (*stateFunc[sMAX + 1])() = {
};
// Function pointer array for screen drawing
-void (*screenFunc[sMAX + 1])() = {
+void (*screenFunc[static_cast(State::sMAX) + 1])() = {
screenMain,
screenName,
screenID,
@@ -360,14 +360,14 @@ void (*screenFunc[sMAX + 1])() = {
};
unsigned int delayCount = 0;
-boolean repeating = false;
+bool repeating = false;
// ============================= SETUP ===================================
void setup() {
arduboy.begin();
arduboy.setFrameRate(FRAME_RATE);
- setState(sMain);
+ setState(State::sMain);
}
// =======================================================================
@@ -380,7 +380,7 @@ void loop() {
arduboy.pollButtons();
- (*stateFunc[currentState])();
+ (*stateFunc[static_cast(currentState)])();
if ((delayCount != 0) && (--delayCount == 0)) {
repeating = true;
@@ -393,7 +393,7 @@ void loop() {
// Set to the given state and display the screen for that state
// Can be called with the current state to update the current screen
-void setState(byte newState) {
+void setState(State newState) {
currentState = newState;
stopButtonRepeat();
drawScreen();
@@ -402,16 +402,16 @@ void setState(byte newState) {
// STATE: Main selection screen
void stateMain() {
if (arduboy.justPressed(UP_BUTTON)) {
- setState(sName);
+ setState(State::sName);
}
else if (arduboy.justPressed(DOWN_BUTTON)) {
- setState(sID);
+ setState(State::sID);
}
else if (arduboy.justPressed(LEFT_BUTTON)) {
- setState(sFlags);
+ setState(State::sFlags);
}
else if (arduboy.justPressed(RIGHT_BUTTON)) {
- setState(sReset);
+ setState(State::sReset);
}
}
@@ -438,10 +438,10 @@ void stateName() {
nameCursorLeft();
}
else if (arduboy.justPressed(A_BUTTON)) {
- setState(sMain);
+ setState(State::sMain);
}
else if (arduboy.justPressed(B_BUTTON)) {
- setState(sSaveName);
+ setState(State::sSaveName);
}
else if (repeating) {
stopButtonRepeat();
@@ -475,10 +475,10 @@ void stateID() {
idCursorLeft();
}
else if (arduboy.justPressed(A_BUTTON)) {
- setState(sMain);
+ setState(State::sMain);
}
else if (arduboy.justPressed(B_BUTTON)) {
- setState(sSaveID);
+ setState(State::sSaveID);
}
else if (repeating) {
stopButtonRepeat();
@@ -496,8 +496,8 @@ void stateFlags() {
else {
displayNoLogo();
}
- currentFlag = selFlagLogo;
- setState(sFlags);
+ currentFlag = SelectedFlag::selFlagLogo;
+ setState(State::sFlags);
}
else if (arduboy.justPressed(UP_BUTTON)) {
flagsCursorUp();
@@ -510,24 +510,24 @@ void stateFlags() {
flagToggle();
}
else if (arduboy.justPressed(A_BUTTON)) {
- setState(sMain);
+ setState(State::sMain);
}
else if (arduboy.justPressed(B_BUTTON)) {
saveFlags();
- setState(sFlags);
+ setState(State::sFlags);
}
}
// STATE: Reset EEPROM areas
void stateReset() {
if (arduboy.justPressed(UP_BUTTON)) {
- setState(sResetSys);
+ setState(State::sResetSys);
}
else if (arduboy.justPressed(DOWN_BUTTON)) {
- setState(sResetUser);
+ setState(State::sResetUser);
}
else if (arduboy.justPressed(A_BUTTON)) {
- setState(sMain);
+ setState(State::sMain);
}
}
@@ -535,10 +535,10 @@ void stateReset() {
void stateSaveName() {
if (arduboy.justPressed(A_BUTTON)) {
arduboy.writeUnitName(unitName);
- setState(sMain);
+ setState(State::sMain);
}
else if (arduboy.justPressed(B_BUTTON)) {
- setState(sName);
+ setState(State::sName);
}
}
@@ -546,10 +546,10 @@ void stateSaveName() {
void stateSaveID() {
if (arduboy.justPressed(A_BUTTON)) {
arduboy.writeUnitID(unitID);
- setState(sMain);
+ setState(State::sMain);
}
else if (arduboy.justPressed(B_BUTTON)) {
- setState(sID);
+ setState(State::sID);
}
}
@@ -557,13 +557,13 @@ void stateSaveID() {
void stateResetSys() {
if (arduboy.justPressed(B_BUTTON) && arduboy.pressed(A_BUTTON)) {
resetSysEEPROM();
- setState(sReset);
+ setState(State::sReset);
}
else if (arduboy.justPressed(UP_BUTTON) ||
arduboy.justPressed(DOWN_BUTTON) ||
arduboy.justPressed(RIGHT_BUTTON) ||
arduboy.justPressed(LEFT_BUTTON)) {
- setState(sReset);
+ setState(State::sReset);
}
}
@@ -571,13 +571,13 @@ void stateResetSys() {
void stateResetUser() {
if (arduboy.justPressed(B_BUTTON) && arduboy.pressed(A_BUTTON)) {
resetUserEEPROM();
- setState(sReset);
+ setState(State::sReset);
}
else if (arduboy.justPressed(UP_BUTTON) ||
arduboy.justPressed(DOWN_BUTTON) ||
arduboy.justPressed(RIGHT_BUTTON) ||
arduboy.justPressed(LEFT_BUTTON)) {
- setState(sReset);
+ setState(State::sReset);
}
}
@@ -586,7 +586,7 @@ void stateResetUser() {
// Display the screen for the current state
void drawScreen() {
arduboy.clear();
- (*screenFunc[currentState])();
+ (*screenFunc[static_cast(currentState)])();
arduboy.display();
}
@@ -594,7 +594,7 @@ void drawScreen() {
void screenMain() {
readEEPROM();
nameIndex = idIndex = 0;
- currentFlag = selFlagLogo;
+ currentFlag = SelectedFlag::selFlagLogo;
printStr_P(MENU_BTN_CHANGE_NAME_X, MENU_BTN_CHANGE_NAME_Y, StrBtnChangeName);
printName(MENU_NAME_X, MENU_NAME_Y);
@@ -745,7 +745,7 @@ void printNameScreenCommon() {
printNameDecimal(NAME_DECIMAL_X, NAME_DECIMAL_Y);
}
-// Print the name entry screen common information
+// Print the ID entry screen common information
void printIDScreenCommon() {
printStr_P(ID_TITLE_X, ID_TITLE_Y, StrID);
printIDDecimalBytes(ID_2_DECIMAL_X, ID_2_DECIMAL_Y);
@@ -789,7 +789,7 @@ void printIDCursors() {
// Print the values and cursor for the flags
void printFlagSettings() {
int cursorY;
- byte cursorLen = strlen_P(StrYes) * CHAR_WIDTH - 1 ;
+ uint8_t cursorLen = strlen_P(StrYes) * CHAR_WIDTH - 1 ;
if (showLogoFlag) {
printStr_P(FLAGS_SET_X, FLAGS_LOGO_Y, StrYes);
@@ -813,13 +813,13 @@ void printFlagSettings() {
}
switch (currentFlag) {
- case selFlagLEDs:
+ case SelectedFlag::selFlagLEDs:
cursorY = FLAGS_LEDS_Y;
if (!showLEDsFlag) {
cursorLen = strlen_P(StrNo) * CHAR_WIDTH - 1;
}
break;
- case selFlagName:
+ case SelectedFlag::selFlagName:
cursorY = FLAGS_NAME_Y;
if (!showNameFlag) {
cursorLen = strlen_P(StrNo) * CHAR_WIDTH - 1;
@@ -845,7 +845,7 @@ void printName(int x, int y) {
printStr(x, y, unitName);
y += (CHAR_HEIGHT + 1);
- for (byte i = 0; i < ARDUBOY_UNIT_NAME_LEN; i++, x += CHAR_WIDTH) {
+ for (uint8_t i = 0; i < ARDUBOY_UNIT_NAME_LEN; i++, x += CHAR_WIDTH) {
arduboy.drawFastHLine(x, y, CHAR_WIDTH - 1);
}
}
@@ -874,7 +874,7 @@ void printNameUnderline(int x, int y) {
// Print the unit name in hex at the given location
void printNameHex(int x, int y) {
- for (byte i = 0; i < ARDUBOY_UNIT_NAME_LEN; i++) {
+ for (uint8_t i = 0; i < ARDUBOY_UNIT_NAME_LEN; i++) {
printHex8(x, y, unitName[i]);
x += CHAR_WIDTH * 3 + SMALL_SPACE;
}
@@ -882,7 +882,7 @@ void printNameHex(int x, int y) {
// Print the unit name in decimal at the given location
void printNameDecimal(int x, int y) {
- for (byte i = 0; i < ARDUBOY_UNIT_NAME_LEN; i++) {
+ for (uint8_t i = 0; i < ARDUBOY_UNIT_NAME_LEN; i++) {
printDecimal8(x, y, unitName[i]);
x += CHAR_WIDTH * 3 + SMALL_SPACE;
}
@@ -918,7 +918,7 @@ void printIDBinary(int x, int y) {
arduboy.print('b');
x += CHAR_WIDTH + SMALL_SPACE;
for (char i = 3 * 4; i >= 0; i -= 4) {
- printBinaryNybble(x, y, (byte)(unitID >> i));
+ printBinaryNybble(x, y, static_cast(unitID >> i));
x += CHAR_WIDTH * 4 + SMALL_SPACE;
}
}
@@ -947,18 +947,18 @@ void printStr_P(int x, int y, const char* str) {
}
// Print an 8 bit number in decimal, right justified with leading spaces
-void printDecimal8(int x, int y, byte val) {
+void printDecimal8(int x, int y, uint8_t val) {
printDecimalHelper(x, y, 2, 100, val);
}
// Print a 16 bit number in decimal, right justified with leading spaces
-void printDecimal16(int x, int y, unsigned int val) {
+void printDecimal16(int x, int y, uint16_t val) {
printDecimalHelper(x, y, 4, 10000, val);
}
// Print a right justified decimal number, given width-1 and (width-1)^10
-void printDecimalHelper(int x, int y, byte width, unsigned int pwr10,
- unsigned int val) {
+void printDecimalHelper(int x, int y, uint8_t width, uint16_t pwr10,
+ uint16_t val) {
arduboy.setCursor(x, y);
while (width > 0) {
if (val >= pwr10) {
@@ -972,7 +972,7 @@ void printDecimalHelper(int x, int y, byte width, unsigned int pwr10,
}
// Print an 8 bit hex number with leading x and zeros
-void printHex8(int x, int y, byte val) {
+void printHex8(int x, int y, uint8_t val) {
arduboy.setCursor(x, y);
arduboy.print('x');
if (val < 16) {
@@ -982,7 +982,7 @@ void printHex8(int x, int y, byte val) {
}
// Print a 16 bit hex number with leading x and zeros
-void printHex16(int x, int y, unsigned int val) {
+void printHex16(int x, int y, uint16_t val) {
arduboy.setCursor(x, y);
arduboy.print('x');
for (char i = 3 * 4; i >= 0; i -= 4) {
@@ -991,7 +991,7 @@ void printHex16(int x, int y, unsigned int val) {
}
// Print a nybble in binary from the lowest 4 bits of the provided byte
-void printBinaryNybble(int x, int y, byte val) {
+void printBinaryNybble(int x, int y, uint8_t val) {
arduboy.setCursor(x, y);
for (char i = 3; i >= 0; i--) {
@@ -1037,8 +1037,8 @@ void nameCharDec() {
}
// Return true if the given character is not allowed
-boolean invalidChar(char c) {
- return (c == '\n') || (c == '\r') || ((byte)c == 0xFF);
+bool invalidChar(char c) {
+ return (c == '\n') || (c == '\r') || (static_cast(c) == 0xFF);
}
// Move the name cursor right
@@ -1100,14 +1100,14 @@ void idCursorLeft() {
// Move the Flags cursor down
void flagsCursorDown() {
switch (currentFlag) {
- case selFlagLogo:
- currentFlag = selFlagLEDs;
+ case SelectedFlag::selFlagLogo:
+ currentFlag = SelectedFlag::selFlagLEDs;
break;
- case selFlagLEDs:
- currentFlag = selFlagName;
+ case SelectedFlag::selFlagLEDs:
+ currentFlag = SelectedFlag::selFlagName;
break;
- case selFlagName:
- currentFlag = selFlagLogo;
+ case SelectedFlag::selFlagName:
+ currentFlag = SelectedFlag::selFlagLogo;
break;
}
drawScreen();
@@ -1116,14 +1116,14 @@ void flagsCursorDown() {
// Move the Flags cursor up
void flagsCursorUp() {
switch (currentFlag) {
- case selFlagName:
- currentFlag = selFlagLEDs;
+ case SelectedFlag::selFlagName:
+ currentFlag = SelectedFlag::selFlagLEDs;
break;
- case selFlagLEDs:
- currentFlag = selFlagLogo;
+ case SelectedFlag::selFlagLEDs:
+ currentFlag = SelectedFlag::selFlagLogo;
break;
- case selFlagLogo:
- currentFlag = selFlagName;
+ case SelectedFlag::selFlagLogo:
+ currentFlag = SelectedFlag::selFlagName;
break;
}
drawScreen();
@@ -1132,13 +1132,13 @@ void flagsCursorUp() {
// Toggle the currently selected flag
void flagToggle() {
switch (currentFlag) {
- case selFlagLogo:
+ case SelectedFlag::selFlagLogo:
showLogoFlag = !showLogoFlag;
break;
- case selFlagLEDs:
+ case SelectedFlag::selFlagLEDs:
showLEDsFlag = !showLEDsFlag;
break;
- case selFlagName:
+ case SelectedFlag::selFlagName:
showNameFlag = !showNameFlag;
break;
}
diff --git a/board-package-source/libraries/Arduboy2/extras/Doxyfile b/board-package-source/libraries/Arduboy2/extras/Doxyfile
index 4b2acd8..195b247 100644
--- a/board-package-source/libraries/Arduboy2/extras/Doxyfile
+++ b/board-package-source/libraries/Arduboy2/extras/Doxyfile
@@ -1,59 +1,50 @@
-# Doxyfile 1.8.11
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
+# Doxyfile 1.8.18
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "Arduboy2 Library"
-PROJECT_NUMBER =
+PROJECT_NUMBER = 5.3.0
PROJECT_BRIEF =
PROJECT_LOGO =
-OUTPUT_DIRECTORY = ./doxygen
+OUTPUT_DIRECTORY = doxygen
CREATE_SUBDIRS = NO
ALLOW_UNICODE_NAMES = NO
OUTPUT_LANGUAGE = English
+OUTPUT_TEXT_DIRECTION = None
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = YES
FULL_PATH_NAMES = YES
-STRIP_FROM_PATH =
+STRIP_FROM_PATH = src
STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
+JAVADOC_BANNER = NO
QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 2
ALIASES =
-TCL_SUBST =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
-EXTENSION_MAPPING = ino=C++
+OPTIMIZE_OUTPUT_SLICE = NO
+EXTENSION_MAPPING =
MARKDOWN_SUPPORT = YES
+TOC_INCLUDE_HEADINGS = 5
AUTOLINK_SUPPORT = YES
BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
IDL_PROPERTY_SUPPORT = YES
DISTRIBUTE_GROUP_DOC = NO
+GROUP_NESTED_COMPOUNDS = NO
SUBGROUPING = YES
INLINE_GROUPED_CLASSES = NO
INLINE_SIMPLE_STRUCTS = NO
@@ -64,14 +55,15 @@ LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
EXTRACT_ALL = NO
EXTRACT_PRIVATE = NO
+EXTRACT_PRIV_VIRTUAL = NO
EXTRACT_PACKAGE = NO
-EXTRACT_STATIC = NO
+EXTRACT_STATIC = YES
EXTRACT_LOCAL_CLASSES = NO
EXTRACT_LOCAL_METHODS = NO
EXTRACT_ANON_NSPACES = NO
HIDE_UNDOC_MEMBERS = YES
HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
+HIDE_FRIEND_COMPOUNDS = YES
HIDE_IN_BODY_DOCS = NO
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = YES
@@ -107,14 +99,18 @@ WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = YES
+WARN_AS_ERROR = YES
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE =
#---------------------------------------------------------------------------
# Configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = ./src ./README.md ./LICENSE.txt
+INPUT = src \
+ README.md \
+ LICENSE.txt
INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.h *.hh *.hxx *.hpp *.h++
+FILE_PATTERNS = *.cpp \
+ *.h
RECURSIVE = NO
EXCLUDE =
EXCLUDE_SYMLINKS = NO
@@ -128,7 +124,7 @@ INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
FILTER_SOURCE_PATTERNS =
-USE_MDFILE_AS_MAINPAGE = ./README.md
+USE_MDFILE_AS_MAINPAGE = README.md
#---------------------------------------------------------------------------
# Configuration options related to source browsing
#---------------------------------------------------------------------------
@@ -143,10 +139,11 @@ USE_HTAGS = NO
VERBATIM_HEADERS = YES
CLANG_ASSISTED_PARSING = NO
CLANG_OPTIONS =
+CLANG_DATABASE_PATH =
#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
+ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
IGNORE_PREFIX =
#---------------------------------------------------------------------------
@@ -164,6 +161,7 @@ HTML_COLORSTYLE_HUE = 245
HTML_COLORSTYLE_SAT = 90
HTML_COLORSTYLE_GAMMA = 95
HTML_TIMESTAMP = YES
+HTML_DYNAMIC_MENUS = NO
HTML_DYNAMIC_SECTIONS = YES
HTML_INDEX_NUM_ENTRIES = 100
GENERATE_DOCSET = NO
@@ -193,11 +191,13 @@ GENERATE_TREEVIEW = YES
ENUM_VALUES_PER_LINE = 4
TREEVIEW_WIDTH = 250
EXT_LINKS_IN_WINDOW = NO
+HTML_FORMULA_FORMAT = png
FORMULA_FONTSIZE = 10
FORMULA_TRANSPARENT = YES
+FORMULA_MACROFILE =
USE_MATHJAX = NO
MATHJAX_FORMAT = HTML-CSS
-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_RELPATH = https://cdn.jsdelivr.net/npm/mathjax@2
MATHJAX_EXTENSIONS =
MATHJAX_CODEFILE =
SEARCHENGINE = YES
@@ -212,8 +212,9 @@ EXTRA_SEARCH_MAPPINGS =
#---------------------------------------------------------------------------
GENERATE_LATEX = YES
LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
+LATEX_CMD_NAME =
MAKEINDEX_CMD_NAME = makeindex
+LATEX_MAKEINDEX_CMD = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4
EXTRA_PACKAGES =
@@ -227,6 +228,8 @@ LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
LATEX_SOURCE_CODE = NO
LATEX_BIB_STYLE = plain
+LATEX_TIMESTAMP = YES
+LATEX_EMOJI_DIRECTORY =
#---------------------------------------------------------------------------
# Configuration options related to the RTF output
#---------------------------------------------------------------------------
@@ -251,6 +254,7 @@ MAN_LINKS = NO
GENERATE_XML = NO
XML_OUTPUT = xml
XML_PROGRAMLISTING = YES
+XML_NS_MEMB_FILE_SCOPE = NO
#---------------------------------------------------------------------------
# Configuration options related to the DOCBOOK output
#---------------------------------------------------------------------------
@@ -288,12 +292,10 @@ GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
EXTERNAL_PAGES = YES
-PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
-MSCGEN_PATH =
DIA_PATH =
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = YES
@@ -304,7 +306,7 @@ DOT_FONTPATH =
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
-UML_LOOK = YES
+UML_LOOK = NO
UML_LIMIT_NUM_FIELDS = 10
TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = YES
@@ -320,6 +322,7 @@ DOTFILE_DIRS =
MSCFILE_DIRS =
DIAFILE_DIRS =
PLANTUML_JAR_PATH =
+PLANTUML_CFG_FILE =
PLANTUML_INCLUDE_PATH =
DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 0
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/COPYING b/board-package-source/libraries/Arduboy2/extras/cabi/COPYING
new file mode 100644
index 0000000..6ca207e
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/extras/cabi/COPYING
@@ -0,0 +1,122 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
+
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/README.md b/board-package-source/libraries/Arduboy2/extras/cabi/README.md
new file mode 100644
index 0000000..b6b8462
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/extras/cabi/README.md
@@ -0,0 +1,203 @@
+# Cabi - Compress Arduboy Image
+
+A command line program to read a PNG (Portable Network Graphics) file
+containing a bitmap image, compress it using RLE encoding and convert it to
+C/C++ code suitable for use with the Team A.R.G. *drawCompressed()* function.
+This function is included in the Arduboy2 library.
+
+Written by zep
+
+https://www.lexaloffle.com/bbs/?uid=1
+
+https://twitter.com/lexaloffle
+
+Contributed to Team A.R.G.
+
+This program uses code from the LodePNG project by Lode Vandevenne to read
+and decode PNG files.
+
+https://github.com/lvandeve/lodepng
+
+This version of Cabi is maintained as part of the Arduboy2 library so that it
+remains available since the demise of Team A.R.G.
+
+## Building the program
+
+Pre-built executable code is not provided due to the difficulty of maintaining
+versions for all the many operating systems that it could be run on.
+
+The code is written in C and should compile properly using any ANSI C99
+compatible compiler, such as (but not limited to) gcc or clang.
+
+### Build examples
+
+To build from a copy of the cabi directory tree provided, while in the base
+directory containing cabi.c use:
+
+`gcc cabi.c lodepng/lodepng.c -o cabi`
+
+or
+
+`clang cabi.c lodepng/lodepng.c -o cabi`
+
+
+For Windows, it may be more desirable to name the program `CABI.EXE` by using:
+
+`-o CABI.EXE`
+
+Compiler options for optimization, etc. (such as -O2 or -Os) can be added if
+desired but likely won't make much difference for most uses.
+
+## Usage
+
+The binary executable file (cabi or CABI.EXE) should be placed somewhere in the
+path for executables on the operating system used, or else include the path as
+part of the command given.
+
+Running Cabi without any parameters will just output a brief program
+description and the usage syntax:
+
+```text
+cabi - Compress Arduboy Image
+Convert a PNG file into RLE encoded C/C++ source
+for use with Arduboy2 drawCompressed()
+
+usage: cabi in.png [array_name_prefix]
+```
+
+For `in.png` substitute the name of the PNG file to be converted. If the file
+isn't in the current directory, the full path and name can be specified.
+
+For `[array_name_prefix]` an optional prefix for the names of the arrays created
+can be given. If this parameter isn't provided, `compressed_image` will be used
+for the prefix.
+
+If the program is unable to produce proper output, an error message will be
+given and a non-zero exit code will be returned.
+
+## Input file decoding
+
+The input file should be a PNG file containing the image to be converted. The
+image will be translated to a raw array of 32 bit RGBA (Red, Green, Blue, Alpha)
+pixels internally before being processed to output. Ideally, pixels that are to
+be drawn (represented as a 1 in the image output) should be fully white.
+Non-drawn (0) pixels should be fully black. Pixels intended to be masked out of
+the image (represented as a 0 in both the image and mask output), should be
+fully transparent and their color doesn't matter.
+
+However, after translation to RGBA, any pixel with an alpha (opaqueness) value
+of 127 or less will be set as non-drawn (0) for both the image and the mask.
+For the image, after the alpha value is first taken into account, pixels with a
+red color value greater than 127 will be set as drawn (1) and others will be
+set as non-drawn (0). For the mask, only the alpha value is used and red is
+ignored. Green and blue color values are ignored for both image and mask.
+
+### To summarize:
+
+For the image:
+
+Green and blue are ignored.
+
+| Alpha | Red | Output |
+|:------:|:-------:|:------:|
+| <= 127 | <= 127 | 0 |
+| <= 127 | > 127 | 0 |
+| > 127 | <= 127 | 0 |
+| > 127 | > 127 | 1 |
+
+For the mask:
+
+Red, green and blue are ignored.
+
+| Alpha | Output |
+|:------:|:------:|
+| <= 127 | 0 |
+| > 127 | 1 |
+
+## Output
+
+Cabi will send all output to `stdout`, which is usually the console unless
+redirected. To save the output, you may be able to copy and paste it into your
+editor, or you can redirect `stdout` to a file for importing. For example:
+
+`cabi PlayerSprite.png PlayerSprite > PlayerSprite.out`
+
+If conversion is successful, the output will be text representing C/C++ code
+for two arrays, an image and a mask, that can be included in a sketch for use
+by the *drawCompressed()* function. The image array will be named the same as
+the prefix. The mask name will be the prefix with `_mask` appended to it.
+
+Along with the actual array text, a comment will be included before each array
+giving the input file name used and the dimensions of the image. A comment
+included after each array will give the size of the array and the compression
+ratio compared to the non-compressed equivalent (although the ratio is based
+on the compressed array including two bytes for the bitmap dimensions compared
+to a non-compressed array without bitmap dimensions).
+
+Note that it's possible that the "compressed" array will actually end up
+larger than the equivalent non-compressed one would. This is indicated by
+a compression ratio greater than 1. The ratio should be noted and taken into
+account when determining whether using Cabi compressed bitmaps is suitable for
+the intended purpose.
+
+If masking isn't required, the mask array can be ignored or deleted.
+
+Note that the usage message or any error message will also be sent to `stdout`,
+rather than `stderr`. Therefore, if you redirect the output to a file, in this
+case the file will contain only that text.
+
+## Using the output with *drawCompressed()*
+
+The Arduboy2 *drawCompressed()* function doesn't natively handle a mask for
+"transparent" pixels in an image. However, masking can be accomplished by
+calling *drawCompressed()* twice with the same coordinates. The first call
+specifies the mask array and the color BLACK. The second call specifies the
+image array and the color WHITE.
+
+An example PNG bitmap named `sample.png` is included with the program. Here is
+an example Arduboy sketch that draws this bitmap with masking, using the Cabi
+output imported into the sketch.
+
+```cpp
+#include
+
+Arduboy2 arduboy;
+
+// ===== Cabi output =====
+// sample.png width: 32 height: 32
+const PROGMEM uint8_t sample[] = {
+0x1f,0x1f,0x68,0x93,0xca,0x39,0xe5,0x9c,0x72,0xca,0xe9,0x74,0x4b,0x25,0x95,0xdc,
+0x6e,0xb7,0xdb,0xed,0x56,0x49,0x65,0xb7,0x4a,0x3a,0xa9,0xac,0x92,0x4e,0x3a,0xa9,
+0x74,0x94,0x8c,0x6a,0xbb,0xdd,0x6e,0xb7,0x8c,0x76,0xbb,0xdd,0x6e,0xb7,0xdb,0xed,
+0x76,0xbb,0xdd,0xf2,0xf1,0xa6,0xb7,0x52,0x79,0xc5,0xa4,0xbc,0x92,0x76,0x1d,0x2f,
+0x9f,0xdd,0x6e,0xb7,0xdb,0xed,0x76,0xbb,0xdd,0x6e,0xb7,0x8c,0xf4,0xd9,0x15,0x23,
+0x65,0x5a,0x49,0x27,0x9d,0x54,0x56,0x49,0x27,0x95,0xdd,0x2a,0xa9,0xec,0x76,0xbb,
+0xdd,0x6e,0x97,0x4a,0x2a,0xb9,0x54,0xce,0x39,0xe5,0x94,0x73,0xca,0x39,0x25,0xa3,
+0x05
+};
+// bytes:113 ratio: 0.883
+
+const PROGMEM uint8_t sample_mask[] = {
+0x1f,0x1f,0x68,0x93,0xca,0x39,0x25,0x95,0xdc,0xa6,0xd3,0xa1,0x35,0x9d,0x4e,0x6f,
+0x95,0x54,0xd2,0x39,0xa9,0x74,0x94,0xe8,0xb4,0xdb,0xed,0x76,0xbb,0xdd,0x6e,0xb7,
+0xdb,0xed,0x16,0x8f,0x8a,0x49,0xe1,0xd1,0x6e,0xb7,0xdb,0xed,0x76,0xbb,0xdd,0x6e,
+0xb7,0x5b,0x74,0x52,0xa6,0x95,0x74,0x4e,0x2a,0xa9,0xec,0x3a,0x9d,0x0e,0xad,0xe9,
+0x74,0x76,0xa9,0xa4,0x72,0x4e,0xc9,0x68,0x01
+};
+// bytes:73 ratio: 0.570
+// =======================
+
+void setup() {
+ arduboy.begin();
+}
+
+void loop() {
+ arduboy.clear();
+
+ arduboy.drawCompressed(20, 10, sample_mask, BLACK);
+ arduboy.drawCompressed(20, 10, sample, WHITE);
+
+ arduboy.display();
+}
+```
+
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/cabi.c b/board-package-source/libraries/Arduboy2/extras/cabi/cabi.c
new file mode 100644
index 0000000..ae88575
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/extras/cabi/cabi.c
@@ -0,0 +1,379 @@
+/*
+cabi - Compress Arduboy Image
+
+A command line program to read a PNG file containing a bitmap image, compress
+it using RLE encoding and convert it to C/C++ code suitable for use with the
+Team A.R.G. drawCompressed() function. This function is included in the
+Arduboy2 library.
+
+Written by zep
+https://www.lexaloffle.com/bbs/?uid=1
+https://twitter.com/lexaloffle
+Contributed to Team A.R.G.
+
+Modifications by Scott Allen - July 2016
+
+To the extent possible under law, the author(s) have dedicated all copyright
+and related and neighboring rights to this software to the public domain
+worldwide. This software is distributed without any warranty.
+
+You should have received a copy of the CC0 Public Domain Dedication along with
+this software. If not, see .
+
+Usage:
+cabi in.png [array_name_prefix]
+*/
+
+#include
+#include
+#include
+#include
+#include "lodepng/lodepng.h"
+
+// alternative pixel order mapping
+//#define READING_ORDER 1
+
+unsigned reading_order = 0;
+
+// one byte encodes a 1x8 stick; low byte at top
+
+
+
+// for testing
+void draw_sprite_ascii(const uint8_t *dat, unsigned w, unsigned h)
+{
+ unsigned x, y;
+ unsigned row, bit;
+
+ for (y = 0; y < h; y ++)
+ {
+ row = y/8;
+ bit = y&7;
+
+ for (x = 0; x < w; x++)
+ {
+ if (dat[x + (row*w)] & (1 << bit))
+ printf("#");
+ else
+ printf(".");
+ }
+ printf("\n");
+ }
+}
+
+
+
+// ----------------------------------------------------------------------------
+// :: Decompress
+// ----------------------------------------------------------------------------
+
+// compression / decompression session state
+
+typedef struct CSESSION{
+ unsigned byte;
+ unsigned bit;
+ const uint8_t *src;
+ uint8_t *dest;
+ unsigned src_pos;
+ unsigned out_pos;
+ unsigned w, h;
+}CSESSION;
+static CSESSION cs;
+
+// get an n-bit number from the compressed data stream
+static unsigned getval(unsigned bits)
+{
+ unsigned val = 0;
+ unsigned i;
+ for (i = 0; i < bits; i++)
+ {
+ if (cs.bit == 0x100)
+ {
+ cs.bit = 0x1;
+ cs.byte = cs.src[cs.src_pos];
+ cs.src_pos ++;
+ }
+ if (cs.byte & cs.bit)
+ val += (1 << i);
+ cs.bit <<= 1;
+ }
+ return val;
+}
+
+
+// decompress_rle
+// if not NULL, w and h give back the size of the sprite.
+void draw_compressed_sprite_ascii(const uint8_t *src)
+{
+ unsigned col;
+ unsigned bl, len;
+ unsigned i;
+ unsigned w, h;
+ unsigned x, y;
+ unsigned total = 0;
+
+ memset(&cs, 0, sizeof(cs));
+ cs.src = src;
+ cs.bit = 0x100;
+ cs.src_pos = 0;
+
+ // header
+
+ w = getval(8) + 1;
+ h = getval(8) + 1;
+ col = getval(1); // starting colour
+
+ x = y = 0;
+
+ while (y < h)
+ {
+ bl = 1;
+ while (!getval(1))
+ bl += 2;
+
+ len = getval(bl)+1; // span length
+
+ for (i = 0; i < len; i++)
+ {
+ //if ((x%8) == 0) // every 8th bit (format test)
+ printf("%s", col ? "#":".");
+
+ if (col) total++;
+ x++;
+ if (x >= w)
+ {
+ printf("\n");
+ y ++;
+ x = 0;
+ }
+
+ //if ((x+y*w)%(w*8) == 0) printf("\n"); // print every 8th line (format test)
+
+ }
+
+ col = 1-col; // toggle
+ }
+ printf("\ntotal: %u\n", total);
+}
+
+
+
+// ----------------------------------------------------------------------------
+// :: Compress
+// ----------------------------------------------------------------------------
+
+/*
+ getcol
+
+ pos is the index of the pixel: 0 .. w*h-1
+*/
+static unsigned getcol(unsigned pos)
+{
+ unsigned x, y;
+
+ // display order
+
+ if (reading_order == 0)
+ {
+ if (cs.src[pos/8] & (1 << (pos&7))) return 1;
+ return 0;
+ }
+
+ // reading order (compresses slightly better but harder to optimize sprite blit)
+ // or use this after loading png into display order (no need for extra conversion)
+
+ x = (pos % cs.w);
+ y = (pos / cs.w);
+ if (cs.src[x + ((y/8)*cs.w)] & (1 << (y&7))) return 1;
+ return 0;
+
+}
+
+static unsigned find_rlen(unsigned pos, unsigned plen)
+{
+ unsigned col;
+ unsigned pos0;
+
+ col = getcol(pos);
+ pos0 = pos;
+
+ while(getcol(pos) == col && pos < plen)
+ pos ++;
+
+ return pos-pos0;
+}
+
+// write a bit to the stream. non-zero val means 1, otherwise 0.
+static void putbit(unsigned val)
+{
+ if (val) cs.byte |= cs.bit;
+ cs.bit <<= 1;
+ if (cs.bit == 0x100)
+ {
+ //output byte
+ if (cs.out_pos != 0) printf(",");
+ if (cs.out_pos % 16 == 0) printf("\n");
+ printf("0x%02x", cs.byte);
+
+ cs.out_pos ++;
+ cs.bit = 0x1;
+ cs.byte = 0;
+
+ }
+}
+
+// write an n-bit (bits) number (val) to the output steam
+static void putval(unsigned val, unsigned bits)
+{
+ unsigned i;
+
+ if (bits <= 0) return;
+ for (i = 0; i < bits; i++)
+ putbit(val & (1 << i));
+}
+
+// write a span length
+// a string of bits encoding the number of bits needed to encode the length,
+// and then the length.
+static void putsplen(unsigned len)
+{
+ unsigned blen = 1; // how bits needed to encode length
+ while ((unsigned)(1 << blen) <= len) {
+ blen += 2;
+ }
+ // write number of bits (1-terminated string of zeroes)
+ putval(0,(blen-1)/2);
+ putval(1,1); // terminator
+ // write length
+ putval(len, blen);
+}
+
+/*
+ comp
+
+ compress plen 1-bit pixels from src to dest
+
+*/
+unsigned compress_rle(const uint8_t *src, unsigned w, unsigned h, char *prefix, char *suffix)
+{
+ unsigned pos;
+ unsigned rlen;
+
+ printf("const PROGMEM uint8_t %s%s[] = {", prefix, suffix);
+ fflush(stdout);
+
+ memset(&cs, 0, sizeof(cs));
+ cs.src = src;
+ cs.bit = 1;
+ cs.w = w;
+ cs.h = h;
+
+ // header
+ putval(w-1, 8);
+ putval(h-1, 8);
+ putval(getcol(0), 1); // first colour
+
+ pos = 0;
+
+ // span data
+
+ while (pos < w*h)
+ {
+ rlen = find_rlen(pos, w*h);
+ pos += rlen;
+ putsplen(rlen-1);
+ }
+
+ // pad with zeros and flush
+ while (cs.bit != 0x1)
+ putbit(0);
+
+ printf("\n};\n");
+
+ return cs.out_pos; // bytes
+}
+
+
+
+int main(int argc, char **argv)
+{
+ unsigned compressed_len;
+ unsigned w, h;
+ unsigned char *bmp = NULL;
+ unsigned char *bmp0 = NULL;
+ unsigned char *bmp1 = NULL;
+ unsigned result;
+ unsigned rawlen;
+ unsigned x, y;
+ unsigned row, bit;
+ char default_prefix[] = "compressed_image";
+ char *prefix = default_prefix;
+
+
+ if (argc < 2)
+ {
+ printf("cabi - Compress Arduboy Image\n");
+ printf("Convert a PNG file into RLE encoded C/C++ source\n");
+ printf("for use with Arduboy2 drawCompressed()\n\n");
+
+ printf("usage: cabi in.png [array_name_prefix]\n");
+ exit(1);
+ }
+
+ if (argc >= 3) {
+ prefix = argv[2];
+ }
+
+ result = lodepng_decode32_file(&bmp, &w, &h, argv[1]);
+
+ if (result != 0) {
+ printf("error %u: file %s: %s\n", result, argv[1], lodepng_error_text(result));
+ free(bmp);
+ exit(result);
+ }
+
+ // generate sprite and mask
+
+ rawlen = w * (h+7) / 8;
+
+ bmp0 = malloc(rawlen); memset(bmp0, 0, rawlen);
+ bmp1 = malloc(rawlen); memset(bmp1, 0, rawlen);
+
+ printf("// %s width: %u height: %u\n", argv[1], w, h);
+
+ for (y = 0; y < h; y++)
+ {
+ for (x = 0; x < w; x++)
+ {
+ row = y/8;
+ bit = y&7;
+
+ if (bmp[(x+y*w)*4 + 3] > 127) // need to be opaque to count
+ if (bmp[(x+y*w)*4 + 0] > 127)
+ {
+ // set sprite
+ bmp0[x + (row*w)] |= (1 << bit);
+ }
+
+ if (bmp[(x+y*w)*4 + 3] > 127)
+ {
+ // set mask
+ bmp1[x + (row*w)] |= (1 << bit);
+ }
+
+ }
+ }
+
+ compressed_len = compress_rle(bmp0, w, h, prefix, "");
+ printf("// bytes:%u ratio: %3.3f\n\n", compressed_len, (float)(compressed_len * 8)/ (float)(w*h));
+
+ compressed_len = compress_rle(bmp1, w, h, prefix, "_mask");
+ printf("// bytes:%u ratio: %3.3f\n\n", compressed_len, (float)(compressed_len * 8)/ (float)(w*h));
+
+
+ free(bmp);
+ free(bmp0);
+ free(bmp1);
+
+ return 0;
+}
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/LICENSE b/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/LICENSE
new file mode 100644
index 0000000..a5fb060
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2005-2018 Lode Vandevenne
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/lodepng.c b/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/lodepng.c
new file mode 100644
index 0000000..ee8cf33
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/lodepng.c
@@ -0,0 +1,6410 @@
+/*
+LodePNG version 20200306
+
+Copyright (c) 2005-2020 Lode Vandevenne
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+*/
+
+/*
+The manual and changelog are in the header file "lodepng.h"
+Rename this file to lodepng.cpp to use it for C++, or to lodepng.c to use it for C.
+*/
+
+#include "lodepng.h"
+
+#ifdef LODEPNG_COMPILE_DISK
+#include /* LONG_MAX */
+#include /* file handling */
+#endif /* LODEPNG_COMPILE_DISK */
+
+#ifdef LODEPNG_COMPILE_ALLOCATORS
+#include /* allocations */
+#endif /* LODEPNG_COMPILE_ALLOCATORS */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1310) /*Visual Studio: A few warning types are not desired here.*/
+#pragma warning( disable : 4244 ) /*implicit conversions: not warned by gcc -Wall -Wextra and requires too much casts*/
+#pragma warning( disable : 4996 ) /*VS does not like fopen, but fopen_s is not standard C so unusable here*/
+#endif /*_MSC_VER */
+
+const char* LODEPNG_VERSION_STRING = "20200306";
+
+/*
+This source file is built up in the following large parts. The code sections
+with the "LODEPNG_COMPILE_" #defines divide this up further in an intermixed way.
+-Tools for C and common code for PNG and Zlib
+-C Code for Zlib (huffman, deflate, ...)
+-C Code for PNG (file format chunks, adam7, PNG filters, color conversions, ...)
+-The C++ wrapper around all of the above
+*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* // Tools for C, and common code for PNG and Zlib. // */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/*The malloc, realloc and free functions defined here with "lodepng_" in front
+of the name, so that you can easily change them to others related to your
+platform if needed. Everything else in the code calls these. Pass
+-DLODEPNG_NO_COMPILE_ALLOCATORS to the compiler, or comment out
+#define LODEPNG_COMPILE_ALLOCATORS in the header, to disable the ones here and
+define them in your own project's source files without needing to change
+lodepng source code. Don't forget to remove "static" if you copypaste them
+from here.*/
+
+#ifdef LODEPNG_COMPILE_ALLOCATORS
+static void* lodepng_malloc(size_t size) {
+#ifdef LODEPNG_MAX_ALLOC
+ if(size > LODEPNG_MAX_ALLOC) return 0;
+#endif
+ return malloc(size);
+}
+
+/* NOTE: when realloc returns NULL, it leaves the original memory untouched */
+static void* lodepng_realloc(void* ptr, size_t new_size) {
+#ifdef LODEPNG_MAX_ALLOC
+ if(new_size > LODEPNG_MAX_ALLOC) return 0;
+#endif
+ return realloc(ptr, new_size);
+}
+
+static void lodepng_free(void* ptr) {
+ free(ptr);
+}
+#else /*LODEPNG_COMPILE_ALLOCATORS*/
+/* TODO: support giving additional void* payload to the custom allocators */
+void* lodepng_malloc(size_t size);
+void* lodepng_realloc(void* ptr, size_t new_size);
+void lodepng_free(void* ptr);
+#endif /*LODEPNG_COMPILE_ALLOCATORS*/
+
+/* convince the compiler to inline a function, for use when this measurably improves performance */
+/* inline is not available in C90, but use it when supported by the compiler */
+#if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || (defined(__cplusplus) && (__cplusplus >= 199711L))
+#define LODEPNG_INLINE inline
+#else
+#define LODEPNG_INLINE /* not available */
+#endif
+
+/* restrict is not available in C90, but use it when supported by the compiler */
+#if (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) ||\
+ (defined(_MSC_VER) && (_MSC_VER >= 1400)) || \
+ (defined(__WATCOMC__) && (__WATCOMC__ >= 1250) && !defined(__cplusplus))
+#define LODEPNG_RESTRICT __restrict
+#else
+#define LODEPNG_RESTRICT /* not available */
+#endif
+
+/* Replacements for C library functions such as memcpy and strlen, to support platforms
+where a full C library is not available. The compiler can recognize them and compile
+to something as fast. */
+
+static void lodepng_memcpy(void* LODEPNG_RESTRICT dst,
+ const void* LODEPNG_RESTRICT src, size_t size) {
+ size_t i;
+ for(i = 0; i < size; i++) ((char*)dst)[i] = ((const char*)src)[i];
+}
+
+static void lodepng_memset(void* LODEPNG_RESTRICT dst,
+ int value, size_t num) {
+ size_t i;
+ for(i = 0; i < num; i++) ((char*)dst)[i] = (char)value;
+}
+
+/* does not check memory out of bounds, do not use on untrusted data */
+static size_t lodepng_strlen(const char* a) {
+ const char* orig = a;
+ /* avoid warning about unused function in case of disabled COMPILE... macros */
+ (void)(&lodepng_strlen);
+ while(*a) a++;
+ return (size_t)(a - orig);
+}
+
+#define LODEPNG_MAX(a, b) (((a) > (b)) ? (a) : (b))
+#define LODEPNG_MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define LODEPNG_ABS(x) ((x) < 0 ? -(x) : (x))
+
+#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER)
+/* Safely check if adding two integers will overflow (no undefined
+behavior, compiler removing the code, etc...) and output result. */
+static int lodepng_addofl(size_t a, size_t b, size_t* result) {
+ *result = a + b; /* Unsigned addition is well defined and safe in C90 */
+ return *result < a;
+}
+#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_DECODER)*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+/* Safely check if multiplying two integers will overflow (no undefined
+behavior, compiler removing the code, etc...) and output result. */
+static int lodepng_mulofl(size_t a, size_t b, size_t* result) {
+ *result = a * b; /* Unsigned multiplication is well defined and safe in C90 */
+ return (a != 0 && *result / a != b);
+}
+
+#ifdef LODEPNG_COMPILE_ZLIB
+/* Safely check if a + b > c, even if overflow could happen. */
+static int lodepng_gtofl(size_t a, size_t b, size_t c) {
+ size_t d;
+ if(lodepng_addofl(a, b, &d)) return 1;
+ return d > c;
+}
+#endif /*LODEPNG_COMPILE_ZLIB*/
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+
+/*
+Often in case of an error a value is assigned to a variable and then it breaks
+out of a loop (to go to the cleanup phase of a function). This macro does that.
+It makes the error handling code shorter and more readable.
+
+Example: if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83);
+*/
+#define CERROR_BREAK(errorvar, code){\
+ errorvar = code;\
+ break;\
+}
+
+/*version of CERROR_BREAK that assumes the common case where the error variable is named "error"*/
+#define ERROR_BREAK(code) CERROR_BREAK(error, code)
+
+/*Set error var to the error code, and return it.*/
+#define CERROR_RETURN_ERROR(errorvar, code){\
+ errorvar = code;\
+ return code;\
+}
+
+/*Try the code, if it returns error, also return the error.*/
+#define CERROR_TRY_RETURN(call){\
+ unsigned error = call;\
+ if(error) return error;\
+}
+
+/*Set error var to the error code, and return from the void function.*/
+#define CERROR_RETURN(errorvar, code){\
+ errorvar = code;\
+ return;\
+}
+
+/*
+About uivector, ucvector and string:
+-All of them wrap dynamic arrays or text strings in a similar way.
+-LodePNG was originally written in C++. The vectors replace the std::vectors that were used in the C++ version.
+-The string tools are made to avoid problems with compilers that declare things like strncat as deprecated.
+-They're not used in the interface, only internally in this file as static functions.
+-As with many other structs in this file, the init and cleanup functions serve as ctor and dtor.
+*/
+
+#ifdef LODEPNG_COMPILE_ZLIB
+#ifdef LODEPNG_COMPILE_ENCODER
+/*dynamic vector of unsigned ints*/
+typedef struct uivector {
+ unsigned* data;
+ size_t size; /*size in number of unsigned longs*/
+ size_t allocsize; /*allocated size in bytes*/
+} uivector;
+
+static void uivector_cleanup(void* p) {
+ ((uivector*)p)->size = ((uivector*)p)->allocsize = 0;
+ lodepng_free(((uivector*)p)->data);
+ ((uivector*)p)->data = NULL;
+}
+
+/*returns 1 if success, 0 if failure ==> nothing done*/
+static unsigned uivector_resize(uivector* p, size_t size) {
+ size_t allocsize = size * sizeof(unsigned);
+ if(allocsize > p->allocsize) {
+ size_t newsize = allocsize + (p->allocsize >> 1u);
+ void* data = lodepng_realloc(p->data, newsize);
+ if(data) {
+ p->allocsize = newsize;
+ p->data = (unsigned*)data;
+ }
+ else return 0; /*error: not enough memory*/
+ }
+ p->size = size;
+ return 1; /*success*/
+}
+
+static void uivector_init(uivector* p) {
+ p->data = NULL;
+ p->size = p->allocsize = 0;
+}
+
+/*returns 1 if success, 0 if failure ==> nothing done*/
+static unsigned uivector_push_back(uivector* p, unsigned c) {
+ if(!uivector_resize(p, p->size + 1)) return 0;
+ p->data[p->size - 1] = c;
+ return 1;
+}
+#endif /*LODEPNG_COMPILE_ENCODER*/
+#endif /*LODEPNG_COMPILE_ZLIB*/
+
+/* /////////////////////////////////////////////////////////////////////////// */
+
+/*dynamic vector of unsigned chars*/
+typedef struct ucvector {
+ unsigned char* data;
+ size_t size; /*used size*/
+ size_t allocsize; /*allocated size*/
+} ucvector;
+
+/*returns 1 if success, 0 if failure ==> nothing done*/
+static unsigned ucvector_resize(ucvector* p, size_t size) {
+ if(size > p->allocsize) {
+ size_t newsize = size + (p->allocsize >> 1u);
+ void* data = lodepng_realloc(p->data, newsize);
+ if(data) {
+ p->allocsize = newsize;
+ p->data = (unsigned char*)data;
+ }
+ else return 0; /*error: not enough memory*/
+ }
+ p->size = size;
+ return 1; /*success*/
+}
+
+static ucvector ucvector_init(unsigned char* buffer, size_t size) {
+ ucvector v;
+ v.data = buffer;
+ v.allocsize = v.size = size;
+ return v;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_PNG
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+
+/*free string pointer and set it to NULL*/
+static void string_cleanup(char** out) {
+ lodepng_free(*out);
+ *out = NULL;
+}
+
+static char* alloc_string_sized(const char* in, size_t insize) {
+ char* out = (char*)lodepng_malloc(insize + 1);
+ if(out) {
+ lodepng_memcpy(out, in, insize);
+ out[insize] = 0;
+ }
+ return out;
+}
+
+/* dynamically allocates a new string with a copy of the null terminated input text */
+static char* alloc_string(const char* in) {
+ return alloc_string_sized(in, lodepng_strlen(in));
+}
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+#endif /*LODEPNG_COMPILE_PNG*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG)
+static unsigned lodepng_read32bitInt(const unsigned char* buffer) {
+ return (((unsigned)buffer[0] << 24u) | ((unsigned)buffer[1] << 16u) |
+ ((unsigned)buffer[2] << 8u) | (unsigned)buffer[3]);
+}
+#endif /*defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_PNG)*/
+
+#if defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)
+/*buffer must have at least 4 allocated bytes available*/
+static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) {
+ buffer[0] = (unsigned char)((value >> 24) & 0xff);
+ buffer[1] = (unsigned char)((value >> 16) & 0xff);
+ buffer[2] = (unsigned char)((value >> 8) & 0xff);
+ buffer[3] = (unsigned char)((value ) & 0xff);
+}
+#endif /*defined(LODEPNG_COMPILE_PNG) || defined(LODEPNG_COMPILE_ENCODER)*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / File IO / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_DISK
+
+/* returns negative value on error. This should be pure C compatible, so no fstat. */
+static long lodepng_filesize(const char* filename) {
+ FILE* file;
+ long size;
+ file = fopen(filename, "rb");
+ if(!file) return -1;
+
+ if(fseek(file, 0, SEEK_END) != 0) {
+ fclose(file);
+ return -1;
+ }
+
+ size = ftell(file);
+ /* It may give LONG_MAX as directory size, this is invalid for us. */
+ if(size == LONG_MAX) size = -1;
+
+ fclose(file);
+ return size;
+}
+
+/* load file into buffer that already has the correct allocated size. Returns error code.*/
+static unsigned lodepng_buffer_file(unsigned char* out, size_t size, const char* filename) {
+ FILE* file;
+ size_t readsize;
+ file = fopen(filename, "rb");
+ if(!file) return 78;
+
+ readsize = fread(out, 1, size, file);
+ fclose(file);
+
+ if(readsize != size) return 78;
+ return 0;
+}
+
+unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename) {
+ long size = lodepng_filesize(filename);
+ if(size < 0) return 78;
+ *outsize = (size_t)size;
+
+ *out = (unsigned char*)lodepng_malloc((size_t)size);
+ if(!(*out) && size > 0) return 83; /*the above malloc failed*/
+
+ return lodepng_buffer_file(*out, (size_t)size, filename);
+}
+
+/*write given buffer to the file, overwriting the file, it doesn't append to it.*/
+unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) {
+ FILE* file;
+ file = fopen(filename, "wb" );
+ if(!file) return 79;
+ fwrite(buffer, 1, buffersize, file);
+ fclose(file);
+ return 0;
+}
+
+#endif /*LODEPNG_COMPILE_DISK*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* // End of common code and tools. Begin of Zlib related code. // */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_ZLIB
+#ifdef LODEPNG_COMPILE_ENCODER
+
+typedef struct {
+ ucvector* data;
+ unsigned char bp; /*ok to overflow, indicates bit pos inside byte*/
+} LodePNGBitWriter;
+
+static void LodePNGBitWriter_init(LodePNGBitWriter* writer, ucvector* data) {
+ writer->data = data;
+ writer->bp = 0;
+}
+
+/*TODO: this ignores potential out of memory errors*/
+#define WRITEBIT(writer, bit){\
+ /* append new byte */\
+ if(((writer->bp) & 7u) == 0) {\
+ if(!ucvector_resize(writer->data, writer->data->size + 1)) return;\
+ writer->data->data[writer->data->size - 1] = 0;\
+ }\
+ (writer->data->data[writer->data->size - 1]) |= (bit << ((writer->bp) & 7u));\
+ ++writer->bp;\
+}
+
+/* LSB of value is written first, and LSB of bytes is used first */
+static void writeBits(LodePNGBitWriter* writer, unsigned value, size_t nbits) {
+ if(nbits == 1) { /* compiler should statically compile this case if nbits == 1 */
+ WRITEBIT(writer, value);
+ } else {
+ /* TODO: increase output size only once here rather than in each WRITEBIT */
+ size_t i;
+ for(i = 0; i != nbits; ++i) {
+ WRITEBIT(writer, (unsigned char)((value >> i) & 1));
+ }
+ }
+}
+
+/* This one is to use for adding huffman symbol, the value bits are written MSB first */
+static void writeBitsReversed(LodePNGBitWriter* writer, unsigned value, size_t nbits) {
+ size_t i;
+ for(i = 0; i != nbits; ++i) {
+ /* TODO: increase output size only once here rather than in each WRITEBIT */
+ WRITEBIT(writer, (unsigned char)((value >> (nbits - 1u - i)) & 1u));
+ }
+}
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+typedef struct {
+ const unsigned char* data;
+ size_t size; /*size of data in bytes*/
+ size_t bitsize; /*size of data in bits, end of valid bp values, should be 8*size*/
+ size_t bp;
+ unsigned buffer; /*buffer for reading bits. NOTE: 'unsigned' must support at least 32 bits*/
+} LodePNGBitReader;
+
+/* data size argument is in bytes. Returns error if size too large causing overflow */
+static unsigned LodePNGBitReader_init(LodePNGBitReader* reader, const unsigned char* data, size_t size) {
+ size_t temp;
+ reader->data = data;
+ reader->size = size;
+ /* size in bits, return error if overflow (if size_t is 32 bit this supports up to 500MB) */
+ if(lodepng_mulofl(size, 8u, &reader->bitsize)) return 105;
+ /*ensure incremented bp can be compared to bitsize without overflow even when it would be incremented 32 too much and
+ trying to ensure 32 more bits*/
+ if(lodepng_addofl(reader->bitsize, 64u, &temp)) return 105;
+ reader->bp = 0;
+ reader->buffer = 0;
+ return 0; /*ok*/
+}
+
+/*
+ensureBits functions:
+Ensures the reader can at least read nbits bits in one or more readBits calls,
+safely even if not enough bits are available.
+Returns 1 if there are enough bits available, 0 if not.
+*/
+
+/*See ensureBits documentation above. This one ensures exactly 1 bit */
+/*static unsigned ensureBits1(LodePNGBitReader* reader) {
+ if(reader->bp >= reader->bitsize) return 0;
+ reader->buffer = (unsigned)reader->data[reader->bp >> 3u] >> (reader->bp & 7u);
+ return 1;
+}*/
+
+/*See ensureBits documentation above. This one ensures up to 9 bits */
+static unsigned ensureBits9(LodePNGBitReader* reader, size_t nbits) {
+ size_t start = reader->bp >> 3u;
+ size_t size = reader->size;
+ if(start + 1u < size) {
+ reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u);
+ reader->buffer >>= (reader->bp & 7u);
+ return 1;
+ } else {
+ reader->buffer = 0;
+ if(start + 0u < size) reader->buffer |= reader->data[start + 0];
+ reader->buffer >>= (reader->bp & 7u);
+ return reader->bp + nbits <= reader->bitsize;
+ }
+}
+
+/*See ensureBits documentation above. This one ensures up to 17 bits */
+static unsigned ensureBits17(LodePNGBitReader* reader, size_t nbits) {
+ size_t start = reader->bp >> 3u;
+ size_t size = reader->size;
+ if(start + 2u < size) {
+ reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) |
+ ((unsigned)reader->data[start + 2] << 16u);
+ reader->buffer >>= (reader->bp & 7u);
+ return 1;
+ } else {
+ reader->buffer = 0;
+ if(start + 0u < size) reader->buffer |= reader->data[start + 0];
+ if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u);
+ reader->buffer >>= (reader->bp & 7u);
+ return reader->bp + nbits <= reader->bitsize;
+ }
+}
+
+/*See ensureBits documentation above. This one ensures up to 25 bits */
+static LODEPNG_INLINE unsigned ensureBits25(LodePNGBitReader* reader, size_t nbits) {
+ size_t start = reader->bp >> 3u;
+ size_t size = reader->size;
+ if(start + 3u < size) {
+ reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) |
+ ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u);
+ reader->buffer >>= (reader->bp & 7u);
+ return 1;
+ } else {
+ reader->buffer = 0;
+ if(start + 0u < size) reader->buffer |= reader->data[start + 0];
+ if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u);
+ if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u);
+ reader->buffer >>= (reader->bp & 7u);
+ return reader->bp + nbits <= reader->bitsize;
+ }
+}
+
+/*See ensureBits documentation above. This one ensures up to 32 bits */
+static LODEPNG_INLINE unsigned ensureBits32(LodePNGBitReader* reader, size_t nbits) {
+ size_t start = reader->bp >> 3u;
+ size_t size = reader->size;
+ if(start + 4u < size) {
+ reader->buffer = (unsigned)reader->data[start + 0] | ((unsigned)reader->data[start + 1] << 8u) |
+ ((unsigned)reader->data[start + 2] << 16u) | ((unsigned)reader->data[start + 3] << 24u);
+ reader->buffer >>= (reader->bp & 7u);
+ reader->buffer |= (((unsigned)reader->data[start + 4] << 24u) << (8u - (reader->bp & 7u)));
+ return 1;
+ } else {
+ reader->buffer = 0;
+ if(start + 0u < size) reader->buffer |= reader->data[start + 0];
+ if(start + 1u < size) reader->buffer |= ((unsigned)reader->data[start + 1] << 8u);
+ if(start + 2u < size) reader->buffer |= ((unsigned)reader->data[start + 2] << 16u);
+ if(start + 3u < size) reader->buffer |= ((unsigned)reader->data[start + 3] << 24u);
+ reader->buffer >>= (reader->bp & 7u);
+ return reader->bp + nbits <= reader->bitsize;
+ }
+}
+
+/* Get bits without advancing the bit pointer. Must have enough bits available with ensureBits. Max nbits is 31. */
+static unsigned peekBits(LodePNGBitReader* reader, size_t nbits) {
+ /* The shift allows nbits to be only up to 31. */
+ return reader->buffer & ((1u << nbits) - 1u);
+}
+
+/* Must have enough bits available with ensureBits */
+static void advanceBits(LodePNGBitReader* reader, size_t nbits) {
+ reader->buffer >>= nbits;
+ reader->bp += nbits;
+}
+
+/* Must have enough bits available with ensureBits */
+static unsigned readBits(LodePNGBitReader* reader, size_t nbits) {
+ unsigned result = peekBits(reader, nbits);
+ advanceBits(reader, nbits);
+ return result;
+}
+
+/* Public for testing only. steps and result must have numsteps values. */
+unsigned lode_png_test_bitreader(const unsigned char* data, size_t size,
+ size_t numsteps, const size_t* steps, unsigned* result) {
+ size_t i;
+ LodePNGBitReader reader;
+ unsigned error = LodePNGBitReader_init(&reader, data, size);
+ if(error) return 0;
+ for(i = 0; i < numsteps; i++) {
+ size_t step = steps[i];
+ unsigned ok;
+ if(step > 25) ok = ensureBits32(&reader, step);
+ else if(step > 17) ok = ensureBits25(&reader, step);
+ else if(step > 9) ok = ensureBits17(&reader, step);
+ else ok = ensureBits9(&reader, step);
+ if(!ok) return 0;
+ result[i] = readBits(&reader, step);
+ }
+ return 1;
+}
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+static unsigned reverseBits(unsigned bits, unsigned num) {
+ /*TODO: implement faster lookup table based version when needed*/
+ unsigned i, result = 0;
+ for(i = 0; i < num; i++) result |= ((bits >> (num - i - 1u)) & 1u) << i;
+ return result;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Deflate - Huffman / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#define FIRST_LENGTH_CODE_INDEX 257
+#define LAST_LENGTH_CODE_INDEX 285
+/*256 literals, the end code, some length codes, and 2 unused codes*/
+#define NUM_DEFLATE_CODE_SYMBOLS 288
+/*the distance codes have their own symbols, 30 used, 2 unused*/
+#define NUM_DISTANCE_SYMBOLS 32
+/*the code length codes. 0-15: code lengths, 16: copy previous 3-6 times, 17: 3-10 zeros, 18: 11-138 zeros*/
+#define NUM_CODE_LENGTH_CODES 19
+
+/*the base lengths represented by codes 257-285*/
+static const unsigned LENGTHBASE[29]
+ = {3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59,
+ 67, 83, 99, 115, 131, 163, 195, 227, 258};
+
+/*the extra bits used by codes 257-285 (added to base length)*/
+static const unsigned LENGTHEXTRA[29]
+ = {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
+ 4, 4, 4, 4, 5, 5, 5, 5, 0};
+
+/*the base backwards distances (the bits of distance codes appear after length codes and use their own huffman tree)*/
+static const unsigned DISTANCEBASE[30]
+ = {1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513,
+ 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577};
+
+/*the extra bits of backwards distances (added to base)*/
+static const unsigned DISTANCEEXTRA[30]
+ = {0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8,
+ 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13};
+
+/*the order in which "code length alphabet code lengths" are stored as specified by deflate, out of this the huffman
+tree of the dynamic huffman tree lengths is generated*/
+static const unsigned CLCL_ORDER[NUM_CODE_LENGTH_CODES]
+ = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/*
+Huffman tree struct, containing multiple representations of the tree
+*/
+typedef struct HuffmanTree {
+ unsigned* codes; /*the huffman codes (bit patterns representing the symbols)*/
+ unsigned* lengths; /*the lengths of the huffman codes*/
+ unsigned maxbitlen; /*maximum number of bits a single code can get*/
+ unsigned numcodes; /*number of symbols in the alphabet = number of codes*/
+ /* for reading only */
+ unsigned char* table_len; /*length of symbol from lookup table, or max length if secondary lookup needed*/
+ unsigned short* table_value; /*value of symbol from lookup table, or pointer to secondary table if needed*/
+} HuffmanTree;
+
+static void HuffmanTree_init(HuffmanTree* tree) {
+ tree->codes = 0;
+ tree->lengths = 0;
+ tree->table_len = 0;
+ tree->table_value = 0;
+}
+
+static void HuffmanTree_cleanup(HuffmanTree* tree) {
+ lodepng_free(tree->codes);
+ lodepng_free(tree->lengths);
+ lodepng_free(tree->table_len);
+ lodepng_free(tree->table_value);
+}
+
+/* amount of bits for first huffman table lookup (aka root bits), see HuffmanTree_makeTable and huffmanDecodeSymbol.*/
+/* values 8u and 9u work the fastest */
+#define FIRSTBITS 9u
+
+/* a symbol value too big to represent any valid symbol, to indicate reading disallowed huffman bits combination,
+which is possible in case of only 0 or 1 present symbols. */
+#define INVALIDSYMBOL 65535u
+
+/* make table for huffman decoding */
+static unsigned HuffmanTree_makeTable(HuffmanTree* tree) {
+ static const unsigned headsize = 1u << FIRSTBITS; /*size of the first table*/
+ static const unsigned mask = (1u << FIRSTBITS) /*headsize*/ - 1u;
+ size_t i, numpresent, pointer, size; /*total table size*/
+ unsigned* maxlens = (unsigned*)lodepng_malloc(headsize * sizeof(unsigned));
+ if(!maxlens) return 83; /*alloc fail*/
+
+ /* compute maxlens: max total bit length of symbols sharing prefix in the first table*/
+ lodepng_memset(maxlens, 0, headsize * sizeof(*maxlens));
+ for(i = 0; i < tree->numcodes; i++) {
+ unsigned symbol = tree->codes[i];
+ unsigned l = tree->lengths[i];
+ unsigned index;
+ if(l <= FIRSTBITS) continue; /*symbols that fit in first table don't increase secondary table size*/
+ /*get the FIRSTBITS MSBs, the MSBs of the symbol are encoded first. See later comment about the reversing*/
+ index = reverseBits(symbol >> (l - FIRSTBITS), FIRSTBITS);
+ maxlens[index] = LODEPNG_MAX(maxlens[index], l);
+ }
+ /* compute total table size: size of first table plus all secondary tables for symbols longer than FIRSTBITS */
+ size = headsize;
+ for(i = 0; i < headsize; ++i) {
+ unsigned l = maxlens[i];
+ if(l > FIRSTBITS) size += (1u << (l - FIRSTBITS));
+ }
+ tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len));
+ tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value));
+ if(!tree->table_len || !tree->table_value) {
+ lodepng_free(maxlens);
+ /* freeing tree->table values is done at a higher scope */
+ return 83; /*alloc fail*/
+ }
+ /*initialize with an invalid length to indicate unused entries*/
+ for(i = 0; i < size; ++i) tree->table_len[i] = 16;
+
+ /*fill in the first table for long symbols: max prefix size and pointer to secondary tables*/
+ pointer = headsize;
+ for(i = 0; i < headsize; ++i) {
+ unsigned l = maxlens[i];
+ if(l <= FIRSTBITS) continue;
+ tree->table_len[i] = l;
+ tree->table_value[i] = pointer;
+ pointer += (1u << (l - FIRSTBITS));
+ }
+ lodepng_free(maxlens);
+
+ /*fill in the first table for short symbols, or secondary table for long symbols*/
+ numpresent = 0;
+ for(i = 0; i < tree->numcodes; ++i) {
+ unsigned l = tree->lengths[i];
+ unsigned symbol = tree->codes[i]; /*the huffman bit pattern. i itself is the value.*/
+ /*reverse bits, because the huffman bits are given in MSB first order but the bit reader reads LSB first*/
+ unsigned reverse = reverseBits(symbol, l);
+ if(l == 0) continue;
+ numpresent++;
+
+ if(l <= FIRSTBITS) {
+ /*short symbol, fully in first table, replicated num times if l < FIRSTBITS*/
+ unsigned num = 1u << (FIRSTBITS - l);
+ unsigned j;
+ for(j = 0; j < num; ++j) {
+ /*bit reader will read the l bits of symbol first, the remaining FIRSTBITS - l bits go to the MSB's*/
+ unsigned index = reverse | (j << l);
+ if(tree->table_len[index] != 16) return 55; /*invalid tree: long symbol shares prefix with short symbol*/
+ tree->table_len[index] = l;
+ tree->table_value[index] = i;
+ }
+ } else {
+ /*long symbol, shares prefix with other long symbols in first lookup table, needs second lookup*/
+ /*the FIRSTBITS MSBs of the symbol are the first table index*/
+ unsigned index = reverse & mask;
+ unsigned maxlen = tree->table_len[index];
+ /*log2 of secondary table length, should be >= l - FIRSTBITS*/
+ unsigned tablelen = maxlen - FIRSTBITS;
+ unsigned start = tree->table_value[index]; /*starting index in secondary table*/
+ unsigned num = 1u << (tablelen - (l - FIRSTBITS)); /*amount of entries of this symbol in secondary table*/
+ unsigned j;
+ if(maxlen < l) return 55; /*invalid tree: long symbol shares prefix with short symbol*/
+ for(j = 0; j < num; ++j) {
+ unsigned reverse2 = reverse >> FIRSTBITS; /* l - FIRSTBITS bits */
+ unsigned index2 = start + (reverse2 | (j << (l - FIRSTBITS)));
+ tree->table_len[index2] = l;
+ tree->table_value[index2] = i;
+ }
+ }
+ }
+
+ if(numpresent < 2) {
+ /* In case of exactly 1 symbol, in theory the huffman symbol needs 0 bits,
+ but deflate uses 1 bit instead. In case of 0 symbols, no symbols can
+ appear at all, but such huffman tree could still exist (e.g. if distance
+ codes are never used). In both cases, not all symbols of the table will be
+ filled in. Fill them in with an invalid symbol value so returning them from
+ huffmanDecodeSymbol will cause error. */
+ for(i = 0; i < size; ++i) {
+ if(tree->table_len[i] == 16) {
+ /* As length, use a value smaller than FIRSTBITS for the head table,
+ and a value larger than FIRSTBITS for the secondary table, to ensure
+ valid behavior for advanceBits when reading this symbol. */
+ tree->table_len[i] = (i < headsize) ? 1 : (FIRSTBITS + 1);
+ tree->table_value[i] = INVALIDSYMBOL;
+ }
+ }
+ } else {
+ /* A good huffman tree has N * 2 - 1 nodes, of which N - 1 are internal nodes.
+ If that is not the case (due to too long length codes), the table will not
+ have been fully used, and this is an error (not all bit combinations can be
+ decoded): an oversubscribed huffman tree, indicated by error 55. */
+ for(i = 0; i < size; ++i) {
+ if(tree->table_len[i] == 16) return 55;
+ }
+ }
+
+ return 0;
+}
+
+/*
+Second step for the ...makeFromLengths and ...makeFromFrequencies functions.
+numcodes, lengths and maxbitlen must already be filled in correctly. return
+value is error.
+*/
+static unsigned HuffmanTree_makeFromLengths2(HuffmanTree* tree) {
+ unsigned* blcount;
+ unsigned* nextcode;
+ unsigned error = 0;
+ unsigned bits, n;
+
+ tree->codes = (unsigned*)lodepng_malloc(tree->numcodes * sizeof(unsigned));
+ blcount = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned));
+ nextcode = (unsigned*)lodepng_malloc((tree->maxbitlen + 1) * sizeof(unsigned));
+ if(!tree->codes || !blcount || !nextcode) error = 83; /*alloc fail*/
+
+ if(!error) {
+ for(n = 0; n != tree->maxbitlen + 1; n++) blcount[n] = nextcode[n] = 0;
+ /*step 1: count number of instances of each code length*/
+ for(bits = 0; bits != tree->numcodes; ++bits) ++blcount[tree->lengths[bits]];
+ /*step 2: generate the nextcode values*/
+ for(bits = 1; bits <= tree->maxbitlen; ++bits) {
+ nextcode[bits] = (nextcode[bits - 1] + blcount[bits - 1]) << 1u;
+ }
+ /*step 3: generate all the codes*/
+ for(n = 0; n != tree->numcodes; ++n) {
+ if(tree->lengths[n] != 0) {
+ tree->codes[n] = nextcode[tree->lengths[n]]++;
+ /*remove superfluous bits from the code*/
+ tree->codes[n] &= ((1u << tree->lengths[n]) - 1u);
+ }
+ }
+ }
+
+ lodepng_free(blcount);
+ lodepng_free(nextcode);
+
+ if(!error) error = HuffmanTree_makeTable(tree);
+ return error;
+}
+
+/*
+given the code lengths (as stored in the PNG file), generate the tree as defined
+by Deflate. maxbitlen is the maximum bits that a code in the tree can have.
+return value is error.
+*/
+static unsigned HuffmanTree_makeFromLengths(HuffmanTree* tree, const unsigned* bitlen,
+ size_t numcodes, unsigned maxbitlen) {
+ unsigned i;
+ tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned));
+ if(!tree->lengths) return 83; /*alloc fail*/
+ for(i = 0; i != numcodes; ++i) tree->lengths[i] = bitlen[i];
+ tree->numcodes = (unsigned)numcodes; /*number of symbols*/
+ tree->maxbitlen = maxbitlen;
+ return HuffmanTree_makeFromLengths2(tree);
+}
+
+#ifdef LODEPNG_COMPILE_ENCODER
+
+/*BPM: Boundary Package Merge, see "A Fast and Space-Economical Algorithm for Length-Limited Coding",
+Jyrki Katajainen, Alistair Moffat, Andrew Turpin, 1995.*/
+
+/*chain node for boundary package merge*/
+typedef struct BPMNode {
+ int weight; /*the sum of all weights in this chain*/
+ unsigned index; /*index of this leaf node (called "count" in the paper)*/
+ struct BPMNode* tail; /*the next nodes in this chain (null if last)*/
+ int in_use;
+} BPMNode;
+
+/*lists of chains*/
+typedef struct BPMLists {
+ /*memory pool*/
+ unsigned memsize;
+ BPMNode* memory;
+ unsigned numfree;
+ unsigned nextfree;
+ BPMNode** freelist;
+ /*two heads of lookahead chains per list*/
+ unsigned listsize;
+ BPMNode** chains0;
+ BPMNode** chains1;
+} BPMLists;
+
+/*creates a new chain node with the given parameters, from the memory in the lists */
+static BPMNode* bpmnode_create(BPMLists* lists, int weight, unsigned index, BPMNode* tail) {
+ unsigned i;
+ BPMNode* result;
+
+ /*memory full, so garbage collect*/
+ if(lists->nextfree >= lists->numfree) {
+ /*mark only those that are in use*/
+ for(i = 0; i != lists->memsize; ++i) lists->memory[i].in_use = 0;
+ for(i = 0; i != lists->listsize; ++i) {
+ BPMNode* node;
+ for(node = lists->chains0[i]; node != 0; node = node->tail) node->in_use = 1;
+ for(node = lists->chains1[i]; node != 0; node = node->tail) node->in_use = 1;
+ }
+ /*collect those that are free*/
+ lists->numfree = 0;
+ for(i = 0; i != lists->memsize; ++i) {
+ if(!lists->memory[i].in_use) lists->freelist[lists->numfree++] = &lists->memory[i];
+ }
+ lists->nextfree = 0;
+ }
+
+ result = lists->freelist[lists->nextfree++];
+ result->weight = weight;
+ result->index = index;
+ result->tail = tail;
+ return result;
+}
+
+/*sort the leaves with stable mergesort*/
+static void bpmnode_sort(BPMNode* leaves, size_t num) {
+ BPMNode* mem = (BPMNode*)lodepng_malloc(sizeof(*leaves) * num);
+ size_t width, counter = 0;
+ for(width = 1; width < num; width *= 2) {
+ BPMNode* a = (counter & 1) ? mem : leaves;
+ BPMNode* b = (counter & 1) ? leaves : mem;
+ size_t p;
+ for(p = 0; p < num; p += 2 * width) {
+ size_t q = (p + width > num) ? num : (p + width);
+ size_t r = (p + 2 * width > num) ? num : (p + 2 * width);
+ size_t i = p, j = q, k;
+ for(k = p; k < r; k++) {
+ if(i < q && (j >= r || a[i].weight <= a[j].weight)) b[k] = a[i++];
+ else b[k] = a[j++];
+ }
+ }
+ counter++;
+ }
+ if(counter & 1) lodepng_memcpy(leaves, mem, sizeof(*leaves) * num);
+ lodepng_free(mem);
+}
+
+/*Boundary Package Merge step, numpresent is the amount of leaves, and c is the current chain.*/
+static void boundaryPM(BPMLists* lists, BPMNode* leaves, size_t numpresent, int c, int num) {
+ unsigned lastindex = lists->chains1[c]->index;
+
+ if(c == 0) {
+ if(lastindex >= numpresent) return;
+ lists->chains0[c] = lists->chains1[c];
+ lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, 0);
+ } else {
+ /*sum of the weights of the head nodes of the previous lookahead chains.*/
+ int sum = lists->chains0[c - 1]->weight + lists->chains1[c - 1]->weight;
+ lists->chains0[c] = lists->chains1[c];
+ if(lastindex < numpresent && sum > leaves[lastindex].weight) {
+ lists->chains1[c] = bpmnode_create(lists, leaves[lastindex].weight, lastindex + 1, lists->chains1[c]->tail);
+ return;
+ }
+ lists->chains1[c] = bpmnode_create(lists, sum, lastindex, lists->chains1[c - 1]);
+ /*in the end we are only interested in the chain of the last list, so no
+ need to recurse if we're at the last one (this gives measurable speedup)*/
+ if(num + 1 < (int)(2 * numpresent - 2)) {
+ boundaryPM(lists, leaves, numpresent, c - 1, num);
+ boundaryPM(lists, leaves, numpresent, c - 1, num);
+ }
+ }
+}
+
+unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies,
+ size_t numcodes, unsigned maxbitlen) {
+ unsigned error = 0;
+ unsigned i;
+ size_t numpresent = 0; /*number of symbols with non-zero frequency*/
+ BPMNode* leaves; /*the symbols, only those with > 0 frequency*/
+
+ if(numcodes == 0) return 80; /*error: a tree of 0 symbols is not supposed to be made*/
+ if((1u << maxbitlen) < (unsigned)numcodes) return 80; /*error: represent all symbols*/
+
+ leaves = (BPMNode*)lodepng_malloc(numcodes * sizeof(*leaves));
+ if(!leaves) return 83; /*alloc fail*/
+
+ for(i = 0; i != numcodes; ++i) {
+ if(frequencies[i] > 0) {
+ leaves[numpresent].weight = (int)frequencies[i];
+ leaves[numpresent].index = i;
+ ++numpresent;
+ }
+ }
+
+ lodepng_memset(lengths, 0, numcodes * sizeof(*lengths));
+
+ /*ensure at least two present symbols. There should be at least one symbol
+ according to RFC 1951 section 3.2.7. Some decoders incorrectly require two. To
+ make these work as well ensure there are at least two symbols. The
+ Package-Merge code below also doesn't work correctly if there's only one
+ symbol, it'd give it the theoretical 0 bits but in practice zlib wants 1 bit*/
+ if(numpresent == 0) {
+ lengths[0] = lengths[1] = 1; /*note that for RFC 1951 section 3.2.7, only lengths[0] = 1 is needed*/
+ } else if(numpresent == 1) {
+ lengths[leaves[0].index] = 1;
+ lengths[leaves[0].index == 0 ? 1 : 0] = 1;
+ } else {
+ BPMLists lists;
+ BPMNode* node;
+
+ bpmnode_sort(leaves, numpresent);
+
+ lists.listsize = maxbitlen;
+ lists.memsize = 2 * maxbitlen * (maxbitlen + 1);
+ lists.nextfree = 0;
+ lists.numfree = lists.memsize;
+ lists.memory = (BPMNode*)lodepng_malloc(lists.memsize * sizeof(*lists.memory));
+ lists.freelist = (BPMNode**)lodepng_malloc(lists.memsize * sizeof(BPMNode*));
+ lists.chains0 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*));
+ lists.chains1 = (BPMNode**)lodepng_malloc(lists.listsize * sizeof(BPMNode*));
+ if(!lists.memory || !lists.freelist || !lists.chains0 || !lists.chains1) error = 83; /*alloc fail*/
+
+ if(!error) {
+ for(i = 0; i != lists.memsize; ++i) lists.freelist[i] = &lists.memory[i];
+
+ bpmnode_create(&lists, leaves[0].weight, 1, 0);
+ bpmnode_create(&lists, leaves[1].weight, 2, 0);
+
+ for(i = 0; i != lists.listsize; ++i) {
+ lists.chains0[i] = &lists.memory[0];
+ lists.chains1[i] = &lists.memory[1];
+ }
+
+ /*each boundaryPM call adds one chain to the last list, and we need 2 * numpresent - 2 chains.*/
+ for(i = 2; i != 2 * numpresent - 2; ++i) boundaryPM(&lists, leaves, numpresent, (int)maxbitlen - 1, (int)i);
+
+ for(node = lists.chains1[maxbitlen - 1]; node; node = node->tail) {
+ for(i = 0; i != node->index; ++i) ++lengths[leaves[i].index];
+ }
+ }
+
+ lodepng_free(lists.memory);
+ lodepng_free(lists.freelist);
+ lodepng_free(lists.chains0);
+ lodepng_free(lists.chains1);
+ }
+
+ lodepng_free(leaves);
+ return error;
+}
+
+/*Create the Huffman tree given the symbol frequencies*/
+static unsigned HuffmanTree_makeFromFrequencies(HuffmanTree* tree, const unsigned* frequencies,
+ size_t mincodes, size_t numcodes, unsigned maxbitlen) {
+ unsigned error = 0;
+ while(!frequencies[numcodes - 1] && numcodes > mincodes) --numcodes; /*trim zeroes*/
+ tree->lengths = (unsigned*)lodepng_malloc(numcodes * sizeof(unsigned));
+ if(!tree->lengths) return 83; /*alloc fail*/
+ tree->maxbitlen = maxbitlen;
+ tree->numcodes = (unsigned)numcodes; /*number of symbols*/
+
+ error = lodepng_huffman_code_lengths(tree->lengths, frequencies, numcodes, maxbitlen);
+ if(!error) error = HuffmanTree_makeFromLengths2(tree);
+ return error;
+}
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+/*get the literal and length code tree of a deflated block with fixed tree, as per the deflate specification*/
+static unsigned generateFixedLitLenTree(HuffmanTree* tree) {
+ unsigned i, error = 0;
+ unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned));
+ if(!bitlen) return 83; /*alloc fail*/
+
+ /*288 possible codes: 0-255=literals, 256=endcode, 257-285=lengthcodes, 286-287=unused*/
+ for(i = 0; i <= 143; ++i) bitlen[i] = 8;
+ for(i = 144; i <= 255; ++i) bitlen[i] = 9;
+ for(i = 256; i <= 279; ++i) bitlen[i] = 7;
+ for(i = 280; i <= 287; ++i) bitlen[i] = 8;
+
+ error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DEFLATE_CODE_SYMBOLS, 15);
+
+ lodepng_free(bitlen);
+ return error;
+}
+
+/*get the distance code tree of a deflated block with fixed tree, as specified in the deflate specification*/
+static unsigned generateFixedDistanceTree(HuffmanTree* tree) {
+ unsigned i, error = 0;
+ unsigned* bitlen = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned));
+ if(!bitlen) return 83; /*alloc fail*/
+
+ /*there are 32 distance codes, but 30-31 are unused*/
+ for(i = 0; i != NUM_DISTANCE_SYMBOLS; ++i) bitlen[i] = 5;
+ error = HuffmanTree_makeFromLengths(tree, bitlen, NUM_DISTANCE_SYMBOLS, 15);
+
+ lodepng_free(bitlen);
+ return error;
+}
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+/*
+returns the code. The bit reader must already have been ensured at least 15 bits
+*/
+static unsigned huffmanDecodeSymbol(LodePNGBitReader* reader, const HuffmanTree* codetree) {
+ unsigned short code = peekBits(reader, FIRSTBITS);
+ unsigned short l = codetree->table_len[code];
+ unsigned short value = codetree->table_value[code];
+ if(l <= FIRSTBITS) {
+ advanceBits(reader, l);
+ return value;
+ } else {
+ unsigned index2;
+ advanceBits(reader, FIRSTBITS);
+ index2 = value + peekBits(reader, l - FIRSTBITS);
+ advanceBits(reader, codetree->table_len[index2] - FIRSTBITS);
+ return codetree->table_value[index2];
+ }
+}
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Inflator (Decompressor) / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/*get the tree of a deflated block with fixed tree, as specified in the deflate specification
+Returns error code.*/
+static unsigned getTreeInflateFixed(HuffmanTree* tree_ll, HuffmanTree* tree_d) {
+ unsigned error = generateFixedLitLenTree(tree_ll);
+ if(error) return error;
+ return generateFixedDistanceTree(tree_d);
+}
+
+/*get the tree of a deflated block with dynamic tree, the tree itself is also Huffman compressed with a known tree*/
+static unsigned getTreeInflateDynamic(HuffmanTree* tree_ll, HuffmanTree* tree_d,
+ LodePNGBitReader* reader) {
+ /*make sure that length values that aren't filled in will be 0, or a wrong tree will be generated*/
+ unsigned error = 0;
+ unsigned n, HLIT, HDIST, HCLEN, i;
+
+ /*see comments in deflateDynamic for explanation of the context and these variables, it is analogous*/
+ unsigned* bitlen_ll = 0; /*lit,len code lengths*/
+ unsigned* bitlen_d = 0; /*dist code lengths*/
+ /*code length code lengths ("clcl"), the bit lengths of the huffman tree used to compress bitlen_ll and bitlen_d*/
+ unsigned* bitlen_cl = 0;
+ HuffmanTree tree_cl; /*the code tree for code length codes (the huffman tree for compressed huffman trees)*/
+
+ if(!ensureBits17(reader, 14)) return 49; /*error: the bit pointer is or will go past the memory*/
+
+ /*number of literal/length codes + 257. Unlike the spec, the value 257 is added to it here already*/
+ HLIT = readBits(reader, 5) + 257;
+ /*number of distance codes. Unlike the spec, the value 1 is added to it here already*/
+ HDIST = readBits(reader, 5) + 1;
+ /*number of code length codes. Unlike the spec, the value 4 is added to it here already*/
+ HCLEN = readBits(reader, 4) + 4;
+
+ bitlen_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(unsigned));
+ if(!bitlen_cl) return 83 /*alloc fail*/;
+
+ HuffmanTree_init(&tree_cl);
+
+ while(!error) {
+ /*read the code length codes out of 3 * (amount of code length codes) bits*/
+ if(lodepng_gtofl(reader->bp, HCLEN * 3, reader->bitsize)) {
+ ERROR_BREAK(50); /*error: the bit pointer is or will go past the memory*/
+ }
+ for(i = 0; i != HCLEN; ++i) {
+ ensureBits9(reader, 3); /*out of bounds already checked above */
+ bitlen_cl[CLCL_ORDER[i]] = readBits(reader, 3);
+ }
+ for(i = HCLEN; i != NUM_CODE_LENGTH_CODES; ++i) {
+ bitlen_cl[CLCL_ORDER[i]] = 0;
+ }
+
+ error = HuffmanTree_makeFromLengths(&tree_cl, bitlen_cl, NUM_CODE_LENGTH_CODES, 7);
+ if(error) break;
+
+ /*now we can use this tree to read the lengths for the tree that this function will return*/
+ bitlen_ll = (unsigned*)lodepng_malloc(NUM_DEFLATE_CODE_SYMBOLS * sizeof(unsigned));
+ bitlen_d = (unsigned*)lodepng_malloc(NUM_DISTANCE_SYMBOLS * sizeof(unsigned));
+ if(!bitlen_ll || !bitlen_d) ERROR_BREAK(83 /*alloc fail*/);
+ lodepng_memset(bitlen_ll, 0, NUM_DEFLATE_CODE_SYMBOLS * sizeof(*bitlen_ll));
+ lodepng_memset(bitlen_d, 0, NUM_DISTANCE_SYMBOLS * sizeof(*bitlen_d));
+
+ /*i is the current symbol we're reading in the part that contains the code lengths of lit/len and dist codes*/
+ i = 0;
+ while(i < HLIT + HDIST) {
+ unsigned code;
+ ensureBits25(reader, 22); /* up to 15 bits for huffman code, up to 7 extra bits below*/
+ code = huffmanDecodeSymbol(reader, &tree_cl);
+ if(code <= 15) /*a length code*/ {
+ if(i < HLIT) bitlen_ll[i] = code;
+ else bitlen_d[i - HLIT] = code;
+ ++i;
+ } else if(code == 16) /*repeat previous*/ {
+ unsigned replength = 3; /*read in the 2 bits that indicate repeat length (3-6)*/
+ unsigned value; /*set value to the previous code*/
+
+ if(i == 0) ERROR_BREAK(54); /*can't repeat previous if i is 0*/
+
+ replength += readBits(reader, 2);
+
+ if(i < HLIT + 1) value = bitlen_ll[i - 1];
+ else value = bitlen_d[i - HLIT - 1];
+ /*repeat this value in the next lengths*/
+ for(n = 0; n < replength; ++n) {
+ if(i >= HLIT + HDIST) ERROR_BREAK(13); /*error: i is larger than the amount of codes*/
+ if(i < HLIT) bitlen_ll[i] = value;
+ else bitlen_d[i - HLIT] = value;
+ ++i;
+ }
+ } else if(code == 17) /*repeat "0" 3-10 times*/ {
+ unsigned replength = 3; /*read in the bits that indicate repeat length*/
+ replength += readBits(reader, 3);
+
+ /*repeat this value in the next lengths*/
+ for(n = 0; n < replength; ++n) {
+ if(i >= HLIT + HDIST) ERROR_BREAK(14); /*error: i is larger than the amount of codes*/
+
+ if(i < HLIT) bitlen_ll[i] = 0;
+ else bitlen_d[i - HLIT] = 0;
+ ++i;
+ }
+ } else if(code == 18) /*repeat "0" 11-138 times*/ {
+ unsigned replength = 11; /*read in the bits that indicate repeat length*/
+ replength += readBits(reader, 7);
+
+ /*repeat this value in the next lengths*/
+ for(n = 0; n < replength; ++n) {
+ if(i >= HLIT + HDIST) ERROR_BREAK(15); /*error: i is larger than the amount of codes*/
+
+ if(i < HLIT) bitlen_ll[i] = 0;
+ else bitlen_d[i - HLIT] = 0;
+ ++i;
+ }
+ } else /*if(code == INVALIDSYMBOL)*/ {
+ ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/
+ }
+ /*check if any of the ensureBits above went out of bounds*/
+ if(reader->bp > reader->bitsize) {
+ /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol
+ (10=no endcode, 11=wrong jump outside of tree)*/
+ /* TODO: revise error codes 10,11,50: the above comment is no longer valid */
+ ERROR_BREAK(50); /*error, bit pointer jumps past memory*/
+ }
+ }
+ if(error) break;
+
+ if(bitlen_ll[256] == 0) ERROR_BREAK(64); /*the length of the end code 256 must be larger than 0*/
+
+ /*now we've finally got HLIT and HDIST, so generate the code trees, and the function is done*/
+ error = HuffmanTree_makeFromLengths(tree_ll, bitlen_ll, NUM_DEFLATE_CODE_SYMBOLS, 15);
+ if(error) break;
+ error = HuffmanTree_makeFromLengths(tree_d, bitlen_d, NUM_DISTANCE_SYMBOLS, 15);
+
+ break; /*end of error-while*/
+ }
+
+ lodepng_free(bitlen_cl);
+ lodepng_free(bitlen_ll);
+ lodepng_free(bitlen_d);
+ HuffmanTree_cleanup(&tree_cl);
+
+ return error;
+}
+
+/*inflate a block with dynamic of fixed Huffman tree. btype must be 1 or 2.*/
+static unsigned inflateHuffmanBlock(ucvector* out, LodePNGBitReader* reader,
+ unsigned btype) {
+ unsigned error = 0;
+ HuffmanTree tree_ll; /*the huffman tree for literal and length codes*/
+ HuffmanTree tree_d; /*the huffman tree for distance codes*/
+
+ HuffmanTree_init(&tree_ll);
+ HuffmanTree_init(&tree_d);
+
+ if(btype == 1) error = getTreeInflateFixed(&tree_ll, &tree_d);
+ else /*if(btype == 2)*/ error = getTreeInflateDynamic(&tree_ll, &tree_d, reader);
+
+ while(!error) /*decode all symbols until end reached, breaks at end code*/ {
+ /*code_ll is literal, length or end code*/
+ unsigned code_ll;
+ ensureBits25(reader, 20); /* up to 15 for the huffman symbol, up to 5 for the length extra bits */
+ code_ll = huffmanDecodeSymbol(reader, &tree_ll);
+ if(code_ll <= 255) /*literal symbol*/ {
+ if(!ucvector_resize(out, out->size + 1)) ERROR_BREAK(83 /*alloc fail*/);
+ out->data[out->size - 1] = (unsigned char)code_ll;
+ } else if(code_ll >= FIRST_LENGTH_CODE_INDEX && code_ll <= LAST_LENGTH_CODE_INDEX) /*length code*/ {
+ unsigned code_d, distance;
+ unsigned numextrabits_l, numextrabits_d; /*extra bits for length and distance*/
+ size_t start, backward, length;
+
+ /*part 1: get length base*/
+ length = LENGTHBASE[code_ll - FIRST_LENGTH_CODE_INDEX];
+
+ /*part 2: get extra bits and add the value of that to length*/
+ numextrabits_l = LENGTHEXTRA[code_ll - FIRST_LENGTH_CODE_INDEX];
+ if(numextrabits_l != 0) {
+ /* bits already ensured above */
+ length += readBits(reader, numextrabits_l);
+ }
+
+ /*part 3: get distance code*/
+ ensureBits32(reader, 28); /* up to 15 for the huffman symbol, up to 13 for the extra bits */
+ code_d = huffmanDecodeSymbol(reader, &tree_d);
+ if(code_d > 29) {
+ if(code_d <= 31) {
+ ERROR_BREAK(18); /*error: invalid distance code (30-31 are never used)*/
+ } else /* if(code_d == INVALIDSYMBOL) */{
+ ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/
+ }
+ }
+ distance = DISTANCEBASE[code_d];
+
+ /*part 4: get extra bits from distance*/
+ numextrabits_d = DISTANCEEXTRA[code_d];
+ if(numextrabits_d != 0) {
+ /* bits already ensured above */
+ distance += readBits(reader, numextrabits_d);
+ }
+
+ /*part 5: fill in all the out[n] values based on the length and dist*/
+ start = out->size;
+ if(distance > start) ERROR_BREAK(52); /*too long backward distance*/
+ backward = start - distance;
+
+ if(!ucvector_resize(out, out->size + length)) ERROR_BREAK(83 /*alloc fail*/);
+ if(distance < length) {
+ size_t forward;
+ lodepng_memcpy(out->data + start, out->data + backward, distance);
+ start += distance;
+ for(forward = distance; forward < length; ++forward) {
+ out->data[start++] = out->data[backward++];
+ }
+ } else {
+ lodepng_memcpy(out->data + start, out->data + backward, length);
+ }
+ } else if(code_ll == 256) {
+ break; /*end code, break the loop*/
+ } else /*if(code_ll == INVALIDSYMBOL)*/ {
+ ERROR_BREAK(16); /*error: tried to read disallowed huffman symbol*/
+ }
+ /*check if any of the ensureBits above went out of bounds*/
+ if(reader->bp > reader->bitsize) {
+ /*return error code 10 or 11 depending on the situation that happened in huffmanDecodeSymbol
+ (10=no endcode, 11=wrong jump outside of tree)*/
+ /* TODO: revise error codes 10,11,50: the above comment is no longer valid */
+ ERROR_BREAK(51); /*error, bit pointer jumps past memory*/
+ }
+ }
+
+ HuffmanTree_cleanup(&tree_ll);
+ HuffmanTree_cleanup(&tree_d);
+
+ return error;
+}
+
+static unsigned inflateNoCompression(ucvector* out, LodePNGBitReader* reader,
+ const LodePNGDecompressSettings* settings) {
+ size_t bytepos;
+ size_t size = reader->size;
+ unsigned LEN, NLEN, error = 0;
+
+ /*go to first boundary of byte*/
+ bytepos = (reader->bp + 7u) >> 3u;
+
+ /*read LEN (2 bytes) and NLEN (2 bytes)*/
+ if(bytepos + 4 >= size) return 52; /*error, bit pointer will jump past memory*/
+ LEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2;
+ NLEN = (unsigned)reader->data[bytepos] + ((unsigned)reader->data[bytepos + 1] << 8u); bytepos += 2;
+
+ /*check if 16-bit NLEN is really the one's complement of LEN*/
+ if(!settings->ignore_nlen && LEN + NLEN != 65535) {
+ return 21; /*error: NLEN is not one's complement of LEN*/
+ }
+
+ if(!ucvector_resize(out, out->size + LEN)) return 83; /*alloc fail*/
+
+ /*read the literal data: LEN bytes are now stored in the out buffer*/
+ if(bytepos + LEN > size) return 23; /*error: reading outside of in buffer*/
+
+ lodepng_memcpy(out->data + out->size - LEN, reader->data + bytepos, LEN);
+ bytepos += LEN;
+
+ reader->bp = bytepos << 3u;
+
+ return error;
+}
+
+static unsigned lodepng_inflatev(ucvector* out,
+ const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings* settings) {
+ unsigned BFINAL = 0;
+ LodePNGBitReader reader;
+ unsigned error = LodePNGBitReader_init(&reader, in, insize);
+
+ if(error) return error;
+
+ while(!BFINAL) {
+ unsigned BTYPE;
+ if(!ensureBits9(&reader, 3)) return 52; /*error, bit pointer will jump past memory*/
+ BFINAL = readBits(&reader, 1);
+ BTYPE = readBits(&reader, 2);
+
+ if(BTYPE == 3) return 20; /*error: invalid BTYPE*/
+ else if(BTYPE == 0) error = inflateNoCompression(out, &reader, settings); /*no compression*/
+ else error = inflateHuffmanBlock(out, &reader, BTYPE); /*compression, BTYPE 01 or 10*/
+
+ if(error) return error;
+ }
+
+ return error;
+}
+
+unsigned lodepng_inflate(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings* settings) {
+ ucvector v = ucvector_init(*out, *outsize);
+ unsigned error = lodepng_inflatev(&v, in, insize, settings);
+ *out = v.data;
+ *outsize = v.size;
+ return error;
+}
+
+static unsigned inflatev(ucvector* out, const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings* settings) {
+ if(settings->custom_inflate) {
+ unsigned error = settings->custom_inflate(&out->data, &out->size, in, insize, settings);
+ out->allocsize = out->size;
+ return error;
+ } else {
+ return lodepng_inflatev(out, in, insize, settings);
+ }
+}
+
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_ENCODER
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Deflator (Compressor) / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+static const size_t MAX_SUPPORTED_DEFLATE_LENGTH = 258;
+
+/*search the index in the array, that has the largest value smaller than or equal to the given value,
+given array must be sorted (if no value is smaller, it returns the size of the given array)*/
+static size_t searchCodeIndex(const unsigned* array, size_t array_size, size_t value) {
+ /*binary search (only small gain over linear). TODO: use CPU log2 instruction for getting symbols instead*/
+ size_t left = 1;
+ size_t right = array_size - 1;
+
+ while(left <= right) {
+ size_t mid = (left + right) >> 1;
+ if(array[mid] >= value) right = mid - 1;
+ else left = mid + 1;
+ }
+ if(left >= array_size || array[left] > value) left--;
+ return left;
+}
+
+static void addLengthDistance(uivector* values, size_t length, size_t distance) {
+ /*values in encoded vector are those used by deflate:
+ 0-255: literal bytes
+ 256: end
+ 257-285: length/distance pair (length code, followed by extra length bits, distance code, extra distance bits)
+ 286-287: invalid*/
+
+ unsigned length_code = (unsigned)searchCodeIndex(LENGTHBASE, 29, length);
+ unsigned extra_length = (unsigned)(length - LENGTHBASE[length_code]);
+ unsigned dist_code = (unsigned)searchCodeIndex(DISTANCEBASE, 30, distance);
+ unsigned extra_distance = (unsigned)(distance - DISTANCEBASE[dist_code]);
+
+ size_t pos = values->size;
+ /*TODO: return error when this fails (out of memory)*/
+ unsigned ok = uivector_resize(values, values->size + 4);
+ if(ok) {
+ values->data[pos + 0] = length_code + FIRST_LENGTH_CODE_INDEX;
+ values->data[pos + 1] = extra_length;
+ values->data[pos + 2] = dist_code;
+ values->data[pos + 3] = extra_distance;
+ }
+}
+
+/*3 bytes of data get encoded into two bytes. The hash cannot use more than 3
+bytes as input because 3 is the minimum match length for deflate*/
+static const unsigned HASH_NUM_VALUES = 65536;
+static const unsigned HASH_BIT_MASK = 65535; /*HASH_NUM_VALUES - 1, but C90 does not like that as initializer*/
+
+typedef struct Hash {
+ int* head; /*hash value to head circular pos - can be outdated if went around window*/
+ /*circular pos to prev circular pos*/
+ unsigned short* chain;
+ int* val; /*circular pos to hash value*/
+
+ /*TODO: do this not only for zeros but for any repeated byte. However for PNG
+ it's always going to be the zeros that dominate, so not important for PNG*/
+ int* headz; /*similar to head, but for chainz*/
+ unsigned short* chainz; /*those with same amount of zeros*/
+ unsigned short* zeros; /*length of zeros streak, used as a second hash chain*/
+} Hash;
+
+static unsigned hash_init(Hash* hash, unsigned windowsize) {
+ unsigned i;
+ hash->head = (int*)lodepng_malloc(sizeof(int) * HASH_NUM_VALUES);
+ hash->val = (int*)lodepng_malloc(sizeof(int) * windowsize);
+ hash->chain = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize);
+
+ hash->zeros = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize);
+ hash->headz = (int*)lodepng_malloc(sizeof(int) * (MAX_SUPPORTED_DEFLATE_LENGTH + 1));
+ hash->chainz = (unsigned short*)lodepng_malloc(sizeof(unsigned short) * windowsize);
+
+ if(!hash->head || !hash->chain || !hash->val || !hash->headz|| !hash->chainz || !hash->zeros) {
+ return 83; /*alloc fail*/
+ }
+
+ /*initialize hash table*/
+ for(i = 0; i != HASH_NUM_VALUES; ++i) hash->head[i] = -1;
+ for(i = 0; i != windowsize; ++i) hash->val[i] = -1;
+ for(i = 0; i != windowsize; ++i) hash->chain[i] = i; /*same value as index indicates uninitialized*/
+
+ for(i = 0; i <= MAX_SUPPORTED_DEFLATE_LENGTH; ++i) hash->headz[i] = -1;
+ for(i = 0; i != windowsize; ++i) hash->chainz[i] = i; /*same value as index indicates uninitialized*/
+
+ return 0;
+}
+
+static void hash_cleanup(Hash* hash) {
+ lodepng_free(hash->head);
+ lodepng_free(hash->val);
+ lodepng_free(hash->chain);
+
+ lodepng_free(hash->zeros);
+ lodepng_free(hash->headz);
+ lodepng_free(hash->chainz);
+}
+
+
+
+static unsigned getHash(const unsigned char* data, size_t size, size_t pos) {
+ unsigned result = 0;
+ if(pos + 2 < size) {
+ /*A simple shift and xor hash is used. Since the data of PNGs is dominated
+ by zeroes due to the filters, a better hash does not have a significant
+ effect on speed in traversing the chain, and causes more time spend on
+ calculating the hash.*/
+ result ^= ((unsigned)data[pos + 0] << 0u);
+ result ^= ((unsigned)data[pos + 1] << 4u);
+ result ^= ((unsigned)data[pos + 2] << 8u);
+ } else {
+ size_t amount, i;
+ if(pos >= size) return 0;
+ amount = size - pos;
+ for(i = 0; i != amount; ++i) result ^= ((unsigned)data[pos + i] << (i * 8u));
+ }
+ return result & HASH_BIT_MASK;
+}
+
+static unsigned countZeros(const unsigned char* data, size_t size, size_t pos) {
+ const unsigned char* start = data + pos;
+ const unsigned char* end = start + MAX_SUPPORTED_DEFLATE_LENGTH;
+ if(end > data + size) end = data + size;
+ data = start;
+ while(data != end && *data == 0) ++data;
+ /*subtracting two addresses returned as 32-bit number (max value is MAX_SUPPORTED_DEFLATE_LENGTH)*/
+ return (unsigned)(data - start);
+}
+
+/*wpos = pos & (windowsize - 1)*/
+static void updateHashChain(Hash* hash, size_t wpos, unsigned hashval, unsigned short numzeros) {
+ hash->val[wpos] = (int)hashval;
+ if(hash->head[hashval] != -1) hash->chain[wpos] = hash->head[hashval];
+ hash->head[hashval] = (int)wpos;
+
+ hash->zeros[wpos] = numzeros;
+ if(hash->headz[numzeros] != -1) hash->chainz[wpos] = hash->headz[numzeros];
+ hash->headz[numzeros] = (int)wpos;
+}
+
+/*
+LZ77-encode the data. Return value is error code. The input are raw bytes, the output
+is in the form of unsigned integers with codes representing for example literal bytes, or
+length/distance pairs.
+It uses a hash table technique to let it encode faster. When doing LZ77 encoding, a
+sliding window (of windowsize) is used, and all past bytes in that window can be used as
+the "dictionary". A brute force search through all possible distances would be slow, and
+this hash technique is one out of several ways to speed this up.
+*/
+static unsigned encodeLZ77(uivector* out, Hash* hash,
+ const unsigned char* in, size_t inpos, size_t insize, unsigned windowsize,
+ unsigned minmatch, unsigned nicematch, unsigned lazymatching) {
+ size_t pos;
+ unsigned i, error = 0;
+ /*for large window lengths, assume the user wants no compression loss. Otherwise, max hash chain length speedup.*/
+ unsigned maxchainlength = windowsize >= 8192 ? windowsize : windowsize / 8u;
+ unsigned maxlazymatch = windowsize >= 8192 ? MAX_SUPPORTED_DEFLATE_LENGTH : 64;
+
+ unsigned usezeros = 1; /*not sure if setting it to false for windowsize < 8192 is better or worse*/
+ unsigned numzeros = 0;
+
+ unsigned offset; /*the offset represents the distance in LZ77 terminology*/
+ unsigned length;
+ unsigned lazy = 0;
+ unsigned lazylength = 0, lazyoffset = 0;
+ unsigned hashval;
+ unsigned current_offset, current_length;
+ unsigned prev_offset;
+ const unsigned char *lastptr, *foreptr, *backptr;
+ unsigned hashpos;
+
+ if(windowsize == 0 || windowsize > 32768) return 60; /*error: windowsize smaller/larger than allowed*/
+ if((windowsize & (windowsize - 1)) != 0) return 90; /*error: must be power of two*/
+
+ if(nicematch > MAX_SUPPORTED_DEFLATE_LENGTH) nicematch = MAX_SUPPORTED_DEFLATE_LENGTH;
+
+ for(pos = inpos; pos < insize; ++pos) {
+ size_t wpos = pos & (windowsize - 1); /*position for in 'circular' hash buffers*/
+ unsigned chainlength = 0;
+
+ hashval = getHash(in, insize, pos);
+
+ if(usezeros && hashval == 0) {
+ if(numzeros == 0) numzeros = countZeros(in, insize, pos);
+ else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros;
+ } else {
+ numzeros = 0;
+ }
+
+ updateHashChain(hash, wpos, hashval, numzeros);
+
+ /*the length and offset found for the current position*/
+ length = 0;
+ offset = 0;
+
+ hashpos = hash->chain[wpos];
+
+ lastptr = &in[insize < pos + MAX_SUPPORTED_DEFLATE_LENGTH ? insize : pos + MAX_SUPPORTED_DEFLATE_LENGTH];
+
+ /*search for the longest string*/
+ prev_offset = 0;
+ for(;;) {
+ if(chainlength++ >= maxchainlength) break;
+ current_offset = (unsigned)(hashpos <= wpos ? wpos - hashpos : wpos - hashpos + windowsize);
+
+ if(current_offset < prev_offset) break; /*stop when went completely around the circular buffer*/
+ prev_offset = current_offset;
+ if(current_offset > 0) {
+ /*test the next characters*/
+ foreptr = &in[pos];
+ backptr = &in[pos - current_offset];
+
+ /*common case in PNGs is lots of zeros. Quickly skip over them as a speedup*/
+ if(numzeros >= 3) {
+ unsigned skip = hash->zeros[hashpos];
+ if(skip > numzeros) skip = numzeros;
+ backptr += skip;
+ foreptr += skip;
+ }
+
+ while(foreptr != lastptr && *backptr == *foreptr) /*maximum supported length by deflate is max length*/ {
+ ++backptr;
+ ++foreptr;
+ }
+ current_length = (unsigned)(foreptr - &in[pos]);
+
+ if(current_length > length) {
+ length = current_length; /*the longest length*/
+ offset = current_offset; /*the offset that is related to this longest length*/
+ /*jump out once a length of max length is found (speed gain). This also jumps
+ out if length is MAX_SUPPORTED_DEFLATE_LENGTH*/
+ if(current_length >= nicematch) break;
+ }
+ }
+
+ if(hashpos == hash->chain[hashpos]) break;
+
+ if(numzeros >= 3 && length > numzeros) {
+ hashpos = hash->chainz[hashpos];
+ if(hash->zeros[hashpos] != numzeros) break;
+ } else {
+ hashpos = hash->chain[hashpos];
+ /*outdated hash value, happens if particular value was not encountered in whole last window*/
+ if(hash->val[hashpos] != (int)hashval) break;
+ }
+ }
+
+ if(lazymatching) {
+ if(!lazy && length >= 3 && length <= maxlazymatch && length < MAX_SUPPORTED_DEFLATE_LENGTH) {
+ lazy = 1;
+ lazylength = length;
+ lazyoffset = offset;
+ continue; /*try the next byte*/
+ }
+ if(lazy) {
+ lazy = 0;
+ if(pos == 0) ERROR_BREAK(81);
+ if(length > lazylength + 1) {
+ /*push the previous character as literal*/
+ if(!uivector_push_back(out, in[pos - 1])) ERROR_BREAK(83 /*alloc fail*/);
+ } else {
+ length = lazylength;
+ offset = lazyoffset;
+ hash->head[hashval] = -1; /*the same hashchain update will be done, this ensures no wrong alteration*/
+ hash->headz[numzeros] = -1; /*idem*/
+ --pos;
+ }
+ }
+ }
+ if(length >= 3 && offset > windowsize) ERROR_BREAK(86 /*too big (or overflown negative) offset*/);
+
+ /*encode it as length/distance pair or literal value*/
+ if(length < 3) /*only lengths of 3 or higher are supported as length/distance pair*/ {
+ if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/);
+ } else if(length < minmatch || (length == 3 && offset > 4096)) {
+ /*compensate for the fact that longer offsets have more extra bits, a
+ length of only 3 may be not worth it then*/
+ if(!uivector_push_back(out, in[pos])) ERROR_BREAK(83 /*alloc fail*/);
+ } else {
+ addLengthDistance(out, length, offset);
+ for(i = 1; i < length; ++i) {
+ ++pos;
+ wpos = pos & (windowsize - 1);
+ hashval = getHash(in, insize, pos);
+ if(usezeros && hashval == 0) {
+ if(numzeros == 0) numzeros = countZeros(in, insize, pos);
+ else if(pos + numzeros > insize || in[pos + numzeros - 1] != 0) --numzeros;
+ } else {
+ numzeros = 0;
+ }
+ updateHashChain(hash, wpos, hashval, numzeros);
+ }
+ }
+ } /*end of the loop through each character of input*/
+
+ return error;
+}
+
+/* /////////////////////////////////////////////////////////////////////////// */
+
+static unsigned deflateNoCompression(ucvector* out, const unsigned char* data, size_t datasize) {
+ /*non compressed deflate block data: 1 bit BFINAL,2 bits BTYPE,(5 bits): it jumps to start of next byte,
+ 2 bytes LEN, 2 bytes NLEN, LEN bytes literal DATA*/
+
+ size_t i, numdeflateblocks = (datasize + 65534u) / 65535u;
+ unsigned datapos = 0;
+ for(i = 0; i != numdeflateblocks; ++i) {
+ unsigned BFINAL, BTYPE, LEN, NLEN;
+ unsigned char firstbyte;
+ size_t pos = out->size;
+
+ BFINAL = (i == numdeflateblocks - 1);
+ BTYPE = 0;
+
+ LEN = 65535;
+ if(datasize - datapos < 65535u) LEN = (unsigned)datasize - datapos;
+ NLEN = 65535 - LEN;
+
+ if(!ucvector_resize(out, out->size + LEN + 5)) return 83; /*alloc fail*/
+
+ firstbyte = (unsigned char)(BFINAL + ((BTYPE & 1u) << 1u) + ((BTYPE & 2u) << 1u));
+ out->data[pos + 0] = firstbyte;
+ out->data[pos + 1] = (unsigned char)(LEN & 255);
+ out->data[pos + 2] = (unsigned char)(LEN >> 8u);
+ out->data[pos + 3] = (unsigned char)(NLEN & 255);
+ out->data[pos + 4] = (unsigned char)(NLEN >> 8u);
+ lodepng_memcpy(out->data + pos + 5, data + datapos, LEN);
+ datapos += LEN;
+ }
+
+ return 0;
+}
+
+/*
+write the lz77-encoded data, which has lit, len and dist codes, to compressed stream using huffman trees.
+tree_ll: the tree for lit and len codes.
+tree_d: the tree for distance codes.
+*/
+static void writeLZ77data(LodePNGBitWriter* writer, const uivector* lz77_encoded,
+ const HuffmanTree* tree_ll, const HuffmanTree* tree_d) {
+ size_t i = 0;
+ for(i = 0; i != lz77_encoded->size; ++i) {
+ unsigned val = lz77_encoded->data[i];
+ writeBitsReversed(writer, tree_ll->codes[val], tree_ll->lengths[val]);
+ if(val > 256) /*for a length code, 3 more things have to be added*/ {
+ unsigned length_index = val - FIRST_LENGTH_CODE_INDEX;
+ unsigned n_length_extra_bits = LENGTHEXTRA[length_index];
+ unsigned length_extra_bits = lz77_encoded->data[++i];
+
+ unsigned distance_code = lz77_encoded->data[++i];
+
+ unsigned distance_index = distance_code;
+ unsigned n_distance_extra_bits = DISTANCEEXTRA[distance_index];
+ unsigned distance_extra_bits = lz77_encoded->data[++i];
+
+ writeBits(writer, length_extra_bits, n_length_extra_bits);
+ writeBitsReversed(writer, tree_d->codes[distance_code], tree_d->lengths[distance_code]);
+ writeBits(writer, distance_extra_bits, n_distance_extra_bits);
+ }
+ }
+}
+
+/*Deflate for a block of type "dynamic", that is, with freely, optimally, created huffman trees*/
+static unsigned deflateDynamic(LodePNGBitWriter* writer, Hash* hash,
+ const unsigned char* data, size_t datapos, size_t dataend,
+ const LodePNGCompressSettings* settings, unsigned final) {
+ unsigned error = 0;
+
+ /*
+ A block is compressed as follows: The PNG data is lz77 encoded, resulting in
+ literal bytes and length/distance pairs. This is then huffman compressed with
+ two huffman trees. One huffman tree is used for the lit and len values ("ll"),
+ another huffman tree is used for the dist values ("d"). These two trees are
+ stored using their code lengths, and to compress even more these code lengths
+ are also run-length encoded and huffman compressed. This gives a huffman tree
+ of code lengths "cl". The code lengths used to describe this third tree are
+ the code length code lengths ("clcl").
+ */
+
+ /*The lz77 encoded data, represented with integers since there will also be length and distance codes in it*/
+ uivector lz77_encoded;
+ HuffmanTree tree_ll; /*tree for lit,len values*/
+ HuffmanTree tree_d; /*tree for distance codes*/
+ HuffmanTree tree_cl; /*tree for encoding the code lengths representing tree_ll and tree_d*/
+ unsigned* frequencies_ll = 0; /*frequency of lit,len codes*/
+ unsigned* frequencies_d = 0; /*frequency of dist codes*/
+ unsigned* frequencies_cl = 0; /*frequency of code length codes*/
+ unsigned* bitlen_lld = 0; /*lit,len,dist code lengths (int bits), literally (without repeat codes).*/
+ unsigned* bitlen_lld_e = 0; /*bitlen_lld encoded with repeat codes (this is a rudimentary run length compression)*/
+ size_t datasize = dataend - datapos;
+
+ /*
+ If we could call "bitlen_cl" the the code length code lengths ("clcl"), that is the bit lengths of codes to represent
+ tree_cl in CLCL_ORDER, then due to the huffman compression of huffman tree representations ("two levels"), there are
+ some analogies:
+ bitlen_lld is to tree_cl what data is to tree_ll and tree_d.
+ bitlen_lld_e is to bitlen_lld what lz77_encoded is to data.
+ bitlen_cl is to bitlen_lld_e what bitlen_lld is to lz77_encoded.
+ */
+
+ unsigned BFINAL = final;
+ size_t i;
+ size_t numcodes_ll, numcodes_d, numcodes_lld, numcodes_lld_e, numcodes_cl;
+ unsigned HLIT, HDIST, HCLEN;
+
+ uivector_init(&lz77_encoded);
+ HuffmanTree_init(&tree_ll);
+ HuffmanTree_init(&tree_d);
+ HuffmanTree_init(&tree_cl);
+ /* could fit on stack, but >1KB is on the larger side so allocate instead */
+ frequencies_ll = (unsigned*)lodepng_malloc(286 * sizeof(*frequencies_ll));
+ frequencies_d = (unsigned*)lodepng_malloc(30 * sizeof(*frequencies_d));
+ frequencies_cl = (unsigned*)lodepng_malloc(NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl));
+
+ if(!frequencies_ll || !frequencies_d || !frequencies_cl) error = 83; /*alloc fail*/
+
+ /*This while loop never loops due to a break at the end, it is here to
+ allow breaking out of it to the cleanup phase on error conditions.*/
+ while(!error) {
+ lodepng_memset(frequencies_ll, 0, 286 * sizeof(*frequencies_ll));
+ lodepng_memset(frequencies_d, 0, 30 * sizeof(*frequencies_d));
+ lodepng_memset(frequencies_cl, 0, NUM_CODE_LENGTH_CODES * sizeof(*frequencies_cl));
+
+ if(settings->use_lz77) {
+ error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize,
+ settings->minmatch, settings->nicematch, settings->lazymatching);
+ if(error) break;
+ } else {
+ if(!uivector_resize(&lz77_encoded, datasize)) ERROR_BREAK(83 /*alloc fail*/);
+ for(i = datapos; i < dataend; ++i) lz77_encoded.data[i - datapos] = data[i]; /*no LZ77, but still will be Huffman compressed*/
+ }
+
+ /*Count the frequencies of lit, len and dist codes*/
+ for(i = 0; i != lz77_encoded.size; ++i) {
+ unsigned symbol = lz77_encoded.data[i];
+ ++frequencies_ll[symbol];
+ if(symbol > 256) {
+ unsigned dist = lz77_encoded.data[i + 2];
+ ++frequencies_d[dist];
+ i += 3;
+ }
+ }
+ frequencies_ll[256] = 1; /*there will be exactly 1 end code, at the end of the block*/
+
+ /*Make both huffman trees, one for the lit and len codes, one for the dist codes*/
+ error = HuffmanTree_makeFromFrequencies(&tree_ll, frequencies_ll, 257, 286, 15);
+ if(error) break;
+ /*2, not 1, is chosen for mincodes: some buggy PNG decoders require at least 2 symbols in the dist tree*/
+ error = HuffmanTree_makeFromFrequencies(&tree_d, frequencies_d, 2, 30, 15);
+ if(error) break;
+
+ numcodes_ll = LODEPNG_MIN(tree_ll.numcodes, 286);
+ numcodes_d = LODEPNG_MIN(tree_d.numcodes, 30);
+ /*store the code lengths of both generated trees in bitlen_lld*/
+ numcodes_lld = numcodes_ll + numcodes_d;
+ bitlen_lld = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld));
+ /*numcodes_lld_e never needs more size than bitlen_lld*/
+ bitlen_lld_e = (unsigned*)lodepng_malloc(numcodes_lld * sizeof(*bitlen_lld_e));
+ if(!bitlen_lld || !bitlen_lld_e) ERROR_BREAK(83); /*alloc fail*/
+ numcodes_lld_e = 0;
+
+ for(i = 0; i != numcodes_ll; ++i) bitlen_lld[i] = tree_ll.lengths[i];
+ for(i = 0; i != numcodes_d; ++i) bitlen_lld[numcodes_ll + i] = tree_d.lengths[i];
+
+ /*run-length compress bitlen_ldd into bitlen_lld_e by using repeat codes 16 (copy length 3-6 times),
+ 17 (3-10 zeroes), 18 (11-138 zeroes)*/
+ for(i = 0; i != numcodes_lld; ++i) {
+ unsigned j = 0; /*amount of repetitions*/
+ while(i + j + 1 < numcodes_lld && bitlen_lld[i + j + 1] == bitlen_lld[i]) ++j;
+
+ if(bitlen_lld[i] == 0 && j >= 2) /*repeat code for zeroes*/ {
+ ++j; /*include the first zero*/
+ if(j <= 10) /*repeat code 17 supports max 10 zeroes*/ {
+ bitlen_lld_e[numcodes_lld_e++] = 17;
+ bitlen_lld_e[numcodes_lld_e++] = j - 3;
+ } else /*repeat code 18 supports max 138 zeroes*/ {
+ if(j > 138) j = 138;
+ bitlen_lld_e[numcodes_lld_e++] = 18;
+ bitlen_lld_e[numcodes_lld_e++] = j - 11;
+ }
+ i += (j - 1);
+ } else if(j >= 3) /*repeat code for value other than zero*/ {
+ size_t k;
+ unsigned num = j / 6u, rest = j % 6u;
+ bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i];
+ for(k = 0; k < num; ++k) {
+ bitlen_lld_e[numcodes_lld_e++] = 16;
+ bitlen_lld_e[numcodes_lld_e++] = 6 - 3;
+ }
+ if(rest >= 3) {
+ bitlen_lld_e[numcodes_lld_e++] = 16;
+ bitlen_lld_e[numcodes_lld_e++] = rest - 3;
+ }
+ else j -= rest;
+ i += j;
+ } else /*too short to benefit from repeat code*/ {
+ bitlen_lld_e[numcodes_lld_e++] = bitlen_lld[i];
+ }
+ }
+
+ /*generate tree_cl, the huffmantree of huffmantrees*/
+ for(i = 0; i != numcodes_lld_e; ++i) {
+ ++frequencies_cl[bitlen_lld_e[i]];
+ /*after a repeat code come the bits that specify the number of repetitions,
+ those don't need to be in the frequencies_cl calculation*/
+ if(bitlen_lld_e[i] >= 16) ++i;
+ }
+
+ error = HuffmanTree_makeFromFrequencies(&tree_cl, frequencies_cl,
+ NUM_CODE_LENGTH_CODES, NUM_CODE_LENGTH_CODES, 7);
+ if(error) break;
+
+ /*compute amount of code-length-code-lengths to output*/
+ numcodes_cl = NUM_CODE_LENGTH_CODES;
+ /*trim zeros at the end (using CLCL_ORDER), but minimum size must be 4 (see HCLEN below)*/
+ while(numcodes_cl > 4u && tree_cl.lengths[CLCL_ORDER[numcodes_cl - 1u]] == 0) {
+ numcodes_cl--;
+ }
+
+ /*
+ Write everything into the output
+
+ After the BFINAL and BTYPE, the dynamic block consists out of the following:
+ - 5 bits HLIT, 5 bits HDIST, 4 bits HCLEN
+ - (HCLEN+4)*3 bits code lengths of code length alphabet
+ - HLIT + 257 code lengths of lit/length alphabet (encoded using the code length
+ alphabet, + possible repetition codes 16, 17, 18)
+ - HDIST + 1 code lengths of distance alphabet (encoded using the code length
+ alphabet, + possible repetition codes 16, 17, 18)
+ - compressed data
+ - 256 (end code)
+ */
+
+ /*Write block type*/
+ writeBits(writer, BFINAL, 1);
+ writeBits(writer, 0, 1); /*first bit of BTYPE "dynamic"*/
+ writeBits(writer, 1, 1); /*second bit of BTYPE "dynamic"*/
+
+ /*write the HLIT, HDIST and HCLEN values*/
+ /*all three sizes take trimmed ending zeroes into account, done either by HuffmanTree_makeFromFrequencies
+ or in the loop for numcodes_cl above, which saves space. */
+ HLIT = (unsigned)(numcodes_ll - 257);
+ HDIST = (unsigned)(numcodes_d - 1);
+ HCLEN = (unsigned)(numcodes_cl - 4);
+ writeBits(writer, HLIT, 5);
+ writeBits(writer, HDIST, 5);
+ writeBits(writer, HCLEN, 4);
+
+ /*write the code lengths of the code length alphabet ("bitlen_cl")*/
+ for(i = 0; i != numcodes_cl; ++i) writeBits(writer, tree_cl.lengths[CLCL_ORDER[i]], 3);
+
+ /*write the lengths of the lit/len AND the dist alphabet*/
+ for(i = 0; i != numcodes_lld_e; ++i) {
+ writeBitsReversed(writer, tree_cl.codes[bitlen_lld_e[i]], tree_cl.lengths[bitlen_lld_e[i]]);
+ /*extra bits of repeat codes*/
+ if(bitlen_lld_e[i] == 16) writeBits(writer, bitlen_lld_e[++i], 2);
+ else if(bitlen_lld_e[i] == 17) writeBits(writer, bitlen_lld_e[++i], 3);
+ else if(bitlen_lld_e[i] == 18) writeBits(writer, bitlen_lld_e[++i], 7);
+ }
+
+ /*write the compressed data symbols*/
+ writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d);
+ /*error: the length of the end code 256 must be larger than 0*/
+ if(tree_ll.lengths[256] == 0) ERROR_BREAK(64);
+
+ /*write the end code*/
+ writeBitsReversed(writer, tree_ll.codes[256], tree_ll.lengths[256]);
+
+ break; /*end of error-while*/
+ }
+
+ /*cleanup*/
+ uivector_cleanup(&lz77_encoded);
+ HuffmanTree_cleanup(&tree_ll);
+ HuffmanTree_cleanup(&tree_d);
+ HuffmanTree_cleanup(&tree_cl);
+ lodepng_free(frequencies_ll);
+ lodepng_free(frequencies_d);
+ lodepng_free(frequencies_cl);
+ lodepng_free(bitlen_lld);
+ lodepng_free(bitlen_lld_e);
+
+ return error;
+}
+
+static unsigned deflateFixed(LodePNGBitWriter* writer, Hash* hash,
+ const unsigned char* data,
+ size_t datapos, size_t dataend,
+ const LodePNGCompressSettings* settings, unsigned final) {
+ HuffmanTree tree_ll; /*tree for literal values and length codes*/
+ HuffmanTree tree_d; /*tree for distance codes*/
+
+ unsigned BFINAL = final;
+ unsigned error = 0;
+ size_t i;
+
+ HuffmanTree_init(&tree_ll);
+ HuffmanTree_init(&tree_d);
+
+ error = generateFixedLitLenTree(&tree_ll);
+ if(!error) error = generateFixedDistanceTree(&tree_d);
+
+ if(!error) {
+ writeBits(writer, BFINAL, 1);
+ writeBits(writer, 1, 1); /*first bit of BTYPE*/
+ writeBits(writer, 0, 1); /*second bit of BTYPE*/
+
+ if(settings->use_lz77) /*LZ77 encoded*/ {
+ uivector lz77_encoded;
+ uivector_init(&lz77_encoded);
+ error = encodeLZ77(&lz77_encoded, hash, data, datapos, dataend, settings->windowsize,
+ settings->minmatch, settings->nicematch, settings->lazymatching);
+ if(!error) writeLZ77data(writer, &lz77_encoded, &tree_ll, &tree_d);
+ uivector_cleanup(&lz77_encoded);
+ } else /*no LZ77, but still will be Huffman compressed*/ {
+ for(i = datapos; i < dataend; ++i) {
+ writeBitsReversed(writer, tree_ll.codes[data[i]], tree_ll.lengths[data[i]]);
+ }
+ }
+ /*add END code*/
+ if(!error) writeBitsReversed(writer,tree_ll.codes[256], tree_ll.lengths[256]);
+ }
+
+ /*cleanup*/
+ HuffmanTree_cleanup(&tree_ll);
+ HuffmanTree_cleanup(&tree_d);
+
+ return error;
+}
+
+static unsigned lodepng_deflatev(ucvector* out, const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings* settings) {
+ unsigned error = 0;
+ size_t i, blocksize, numdeflateblocks;
+ Hash hash;
+ LodePNGBitWriter writer;
+
+ LodePNGBitWriter_init(&writer, out);
+
+ if(settings->btype > 2) return 61;
+ else if(settings->btype == 0) return deflateNoCompression(out, in, insize);
+ else if(settings->btype == 1) blocksize = insize;
+ else /*if(settings->btype == 2)*/ {
+ /*on PNGs, deflate blocks of 65-262k seem to give most dense encoding*/
+ blocksize = insize / 8u + 8;
+ if(blocksize < 65536) blocksize = 65536;
+ if(blocksize > 262144) blocksize = 262144;
+ }
+
+ numdeflateblocks = (insize + blocksize - 1) / blocksize;
+ if(numdeflateblocks == 0) numdeflateblocks = 1;
+
+ error = hash_init(&hash, settings->windowsize);
+
+ if(!error) {
+ for(i = 0; i != numdeflateblocks && !error; ++i) {
+ unsigned final = (i == numdeflateblocks - 1);
+ size_t start = i * blocksize;
+ size_t end = start + blocksize;
+ if(end > insize) end = insize;
+
+ if(settings->btype == 1) error = deflateFixed(&writer, &hash, in, start, end, settings, final);
+ else if(settings->btype == 2) error = deflateDynamic(&writer, &hash, in, start, end, settings, final);
+ }
+ }
+
+ hash_cleanup(&hash);
+
+ return error;
+}
+
+unsigned lodepng_deflate(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings* settings) {
+ ucvector v = ucvector_init(*out, *outsize);
+ unsigned error = lodepng_deflatev(&v, in, insize, settings);
+ *out = v.data;
+ *outsize = v.size;
+ return error;
+}
+
+static unsigned deflate(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings* settings) {
+ if(settings->custom_deflate) {
+ return settings->custom_deflate(out, outsize, in, insize, settings);
+ } else {
+ return lodepng_deflate(out, outsize, in, insize, settings);
+ }
+}
+
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Adler32 / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+static unsigned update_adler32(unsigned adler, const unsigned char* data, unsigned len) {
+ unsigned s1 = adler & 0xffffu;
+ unsigned s2 = (adler >> 16u) & 0xffffu;
+
+ while(len != 0u) {
+ unsigned i;
+ /*at least 5552 sums can be done before the sums overflow, saving a lot of module divisions*/
+ unsigned amount = len > 5552u ? 5552u : len;
+ len -= amount;
+ for(i = 0; i != amount; ++i) {
+ s1 += (*data++);
+ s2 += s1;
+ }
+ s1 %= 65521u;
+ s2 %= 65521u;
+ }
+
+ return (s2 << 16u) | s1;
+}
+
+/*Return the adler32 of the bytes data[0..len-1]*/
+static unsigned adler32(const unsigned char* data, unsigned len) {
+ return update_adler32(1u, data, len);
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Zlib / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+static unsigned lodepng_zlib_decompressv(ucvector* out,
+ const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings* settings) {
+ unsigned error = 0;
+ unsigned CM, CINFO, FDICT;
+
+ if(insize < 2) return 53; /*error, size of zlib data too small*/
+ /*read information from zlib header*/
+ if((in[0] * 256 + in[1]) % 31 != 0) {
+ /*error: 256 * in[0] + in[1] must be a multiple of 31, the FCHECK value is supposed to be made that way*/
+ return 24;
+ }
+
+ CM = in[0] & 15;
+ CINFO = (in[0] >> 4) & 15;
+ /*FCHECK = in[1] & 31;*/ /*FCHECK is already tested above*/
+ FDICT = (in[1] >> 5) & 1;
+ /*FLEVEL = (in[1] >> 6) & 3;*/ /*FLEVEL is not used here*/
+
+ if(CM != 8 || CINFO > 7) {
+ /*error: only compression method 8: inflate with sliding window of 32k is supported by the PNG spec*/
+ return 25;
+ }
+ if(FDICT != 0) {
+ /*error: the specification of PNG says about the zlib stream:
+ "The additional flags shall not specify a preset dictionary."*/
+ return 26;
+ }
+
+ error = inflatev(out, in + 2, insize - 2, settings);
+ if(error) return error;
+
+ if(!settings->ignore_adler32) {
+ unsigned ADLER32 = lodepng_read32bitInt(&in[insize - 4]);
+ unsigned checksum = adler32(out->data, (unsigned)(out->size));
+ if(checksum != ADLER32) return 58; /*error, adler checksum not correct, data must be corrupted*/
+ }
+
+ return 0; /*no error*/
+}
+
+
+unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize, const unsigned char* in,
+ size_t insize, const LodePNGDecompressSettings* settings) {
+ ucvector v = ucvector_init(*out, *outsize);
+ unsigned error = lodepng_zlib_decompressv(&v, in, insize, settings);
+ *out = v.data;
+ *outsize = v.size;
+ return error;
+}
+
+/*expected_size is expected output size, to avoid intermediate allocations. Set to 0 if not known. */
+static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size,
+ const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) {
+ if(settings->custom_zlib) {
+ return settings->custom_zlib(out, outsize, in, insize, settings);
+ } else {
+ unsigned error;
+ ucvector v = ucvector_init(*out, *outsize);
+ if(expected_size) {
+ /*reserve the memory to avoid intermediate reallocations*/
+ ucvector_resize(&v, *outsize + expected_size);
+ v.size = *outsize;
+ }
+ error = lodepng_zlib_decompressv(&v, in, insize, settings);
+ *out = v.data;
+ *outsize = v.size;
+ return error;
+ }
+}
+
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_ENCODER
+
+unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in,
+ size_t insize, const LodePNGCompressSettings* settings) {
+ size_t i;
+ unsigned error;
+ unsigned char* deflatedata = 0;
+ size_t deflatesize = 0;
+
+ error = deflate(&deflatedata, &deflatesize, in, insize, settings);
+
+ *out = NULL;
+ *outsize = 0;
+ if(!error) {
+ *outsize = deflatesize + 6;
+ *out = (unsigned char*)lodepng_malloc(*outsize);
+ if(!*out) error = 83; /*alloc fail*/
+ }
+
+ if(!error) {
+ unsigned ADLER32 = adler32(in, (unsigned)insize);
+ /*zlib data: 1 byte CMF (CM+CINFO), 1 byte FLG, deflate data, 4 byte ADLER32 checksum of the Decompressed data*/
+ unsigned CMF = 120; /*0b01111000: CM 8, CINFO 7. With CINFO 7, any window size up to 32768 can be used.*/
+ unsigned FLEVEL = 0;
+ unsigned FDICT = 0;
+ unsigned CMFFLG = 256 * CMF + FDICT * 32 + FLEVEL * 64;
+ unsigned FCHECK = 31 - CMFFLG % 31;
+ CMFFLG += FCHECK;
+
+ (*out)[0] = (unsigned char)(CMFFLG >> 8);
+ (*out)[1] = (unsigned char)(CMFFLG & 255);
+ for(i = 0; i != deflatesize; ++i) (*out)[i + 2] = deflatedata[i];
+ lodepng_set32bitInt(&(*out)[*outsize - 4], ADLER32);
+ }
+
+ lodepng_free(deflatedata);
+ return error;
+}
+
+/* compress using the default or custom zlib function */
+static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in,
+ size_t insize, const LodePNGCompressSettings* settings) {
+ if(settings->custom_zlib) {
+ return settings->custom_zlib(out, outsize, in, insize, settings);
+ } else {
+ return lodepng_zlib_compress(out, outsize, in, insize, settings);
+ }
+}
+
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+#else /*no LODEPNG_COMPILE_ZLIB*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+static unsigned zlib_decompress(unsigned char** out, size_t* outsize, size_t expected_size,
+ const unsigned char* in, size_t insize, const LodePNGDecompressSettings* settings) {
+ if(!settings->custom_zlib) return 87; /*no custom zlib function provided */
+ (void)expected_size;
+ return settings->custom_zlib(out, outsize, in, insize, settings);
+}
+#endif /*LODEPNG_COMPILE_DECODER*/
+#ifdef LODEPNG_COMPILE_ENCODER
+static unsigned zlib_compress(unsigned char** out, size_t* outsize, const unsigned char* in,
+ size_t insize, const LodePNGCompressSettings* settings) {
+ if(!settings->custom_zlib) return 87; /*no custom zlib function provided */
+ return settings->custom_zlib(out, outsize, in, insize, settings);
+}
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+#endif /*LODEPNG_COMPILE_ZLIB*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_ENCODER
+
+/*this is a good tradeoff between speed and compression ratio*/
+#define DEFAULT_WINDOWSIZE 2048
+
+void lodepng_compress_settings_init(LodePNGCompressSettings* settings) {
+ /*compress with dynamic huffman tree (not in the mathematical sense, just not the predefined one)*/
+ settings->btype = 2;
+ settings->use_lz77 = 1;
+ settings->windowsize = DEFAULT_WINDOWSIZE;
+ settings->minmatch = 3;
+ settings->nicematch = 128;
+ settings->lazymatching = 1;
+
+ settings->custom_zlib = 0;
+ settings->custom_deflate = 0;
+ settings->custom_context = 0;
+}
+
+const LodePNGCompressSettings lodepng_default_compress_settings = {2, 1, DEFAULT_WINDOWSIZE, 3, 128, 1, 0, 0, 0};
+
+
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings) {
+ settings->ignore_adler32 = 0;
+ settings->ignore_nlen = 0;
+
+ settings->custom_zlib = 0;
+ settings->custom_inflate = 0;
+ settings->custom_context = 0;
+}
+
+const LodePNGDecompressSettings lodepng_default_decompress_settings = {0, 0, 0, 0, 0};
+
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* // End of Zlib related code. Begin of PNG related code. // */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_PNG
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / CRC32 / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+
+#ifndef LODEPNG_NO_COMPILE_CRC
+/* CRC polynomial: 0xedb88320 */
+static unsigned lodepng_crc32_table[256] = {
+ 0u, 1996959894u, 3993919788u, 2567524794u, 124634137u, 1886057615u, 3915621685u, 2657392035u,
+ 249268274u, 2044508324u, 3772115230u, 2547177864u, 162941995u, 2125561021u, 3887607047u, 2428444049u,
+ 498536548u, 1789927666u, 4089016648u, 2227061214u, 450548861u, 1843258603u, 4107580753u, 2211677639u,
+ 325883990u, 1684777152u, 4251122042u, 2321926636u, 335633487u, 1661365465u, 4195302755u, 2366115317u,
+ 997073096u, 1281953886u, 3579855332u, 2724688242u, 1006888145u, 1258607687u, 3524101629u, 2768942443u,
+ 901097722u, 1119000684u, 3686517206u, 2898065728u, 853044451u, 1172266101u, 3705015759u, 2882616665u,
+ 651767980u, 1373503546u, 3369554304u, 3218104598u, 565507253u, 1454621731u, 3485111705u, 3099436303u,
+ 671266974u, 1594198024u, 3322730930u, 2970347812u, 795835527u, 1483230225u, 3244367275u, 3060149565u,
+ 1994146192u, 31158534u, 2563907772u, 4023717930u, 1907459465u, 112637215u, 2680153253u, 3904427059u,
+ 2013776290u, 251722036u, 2517215374u, 3775830040u, 2137656763u, 141376813u, 2439277719u, 3865271297u,
+ 1802195444u, 476864866u, 2238001368u, 4066508878u, 1812370925u, 453092731u, 2181625025u, 4111451223u,
+ 1706088902u, 314042704u, 2344532202u, 4240017532u, 1658658271u, 366619977u, 2362670323u, 4224994405u,
+ 1303535960u, 984961486u, 2747007092u, 3569037538u, 1256170817u, 1037604311u, 2765210733u, 3554079995u,
+ 1131014506u, 879679996u, 2909243462u, 3663771856u, 1141124467u, 855842277u, 2852801631u, 3708648649u,
+ 1342533948u, 654459306u, 3188396048u, 3373015174u, 1466479909u, 544179635u, 3110523913u, 3462522015u,
+ 1591671054u, 702138776u, 2966460450u, 3352799412u, 1504918807u, 783551873u, 3082640443u, 3233442989u,
+ 3988292384u, 2596254646u, 62317068u, 1957810842u, 3939845945u, 2647816111u, 81470997u, 1943803523u,
+ 3814918930u, 2489596804u, 225274430u, 2053790376u, 3826175755u, 2466906013u, 167816743u, 2097651377u,
+ 4027552580u, 2265490386u, 503444072u, 1762050814u, 4150417245u, 2154129355u, 426522225u, 1852507879u,
+ 4275313526u, 2312317920u, 282753626u, 1742555852u, 4189708143u, 2394877945u, 397917763u, 1622183637u,
+ 3604390888u, 2714866558u, 953729732u, 1340076626u, 3518719985u, 2797360999u, 1068828381u, 1219638859u,
+ 3624741850u, 2936675148u, 906185462u, 1090812512u, 3747672003u, 2825379669u, 829329135u, 1181335161u,
+ 3412177804u, 3160834842u, 628085408u, 1382605366u, 3423369109u, 3138078467u, 570562233u, 1426400815u,
+ 3317316542u, 2998733608u, 733239954u, 1555261956u, 3268935591u, 3050360625u, 752459403u, 1541320221u,
+ 2607071920u, 3965973030u, 1969922972u, 40735498u, 2617837225u, 3943577151u, 1913087877u, 83908371u,
+ 2512341634u, 3803740692u, 2075208622u, 213261112u, 2463272603u, 3855990285u, 2094854071u, 198958881u,
+ 2262029012u, 4057260610u, 1759359992u, 534414190u, 2176718541u, 4139329115u, 1873836001u, 414664567u,
+ 2282248934u, 4279200368u, 1711684554u, 285281116u, 2405801727u, 4167216745u, 1634467795u, 376229701u,
+ 2685067896u, 3608007406u, 1308918612u, 956543938u, 2808555105u, 3495958263u, 1231636301u, 1047427035u,
+ 2932959818u, 3654703836u, 1088359270u, 936918000u, 2847714899u, 3736837829u, 1202900863u, 817233897u,
+ 3183342108u, 3401237130u, 1404277552u, 615818150u, 3134207493u, 3453421203u, 1423857449u, 601450431u,
+ 3009837614u, 3294710456u, 1567103746u, 711928724u, 3020668471u, 3272380065u, 1510334235u, 755167117u
+};
+
+/*Return the CRC of the bytes buf[0..len-1].*/
+unsigned lodepng_crc32(const unsigned char* data, size_t length) {
+ unsigned r = 0xffffffffu;
+ size_t i;
+ for(i = 0; i < length; ++i) {
+ r = lodepng_crc32_table[(r ^ data[i]) & 0xffu] ^ (r >> 8u);
+ }
+ return r ^ 0xffffffffu;
+}
+#else /* !LODEPNG_NO_COMPILE_CRC */
+unsigned lodepng_crc32(const unsigned char* data, size_t length);
+#endif /* !LODEPNG_NO_COMPILE_CRC */
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Reading and writing PNG color channel bits / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/* The color channel bits of less-than-8-bit pixels are read with the MSB of bytes first,
+so LodePNGBitWriter and LodePNGBitReader can't be used for those. */
+
+static unsigned char readBitFromReversedStream(size_t* bitpointer, const unsigned char* bitstream) {
+ unsigned char result = (unsigned char)((bitstream[(*bitpointer) >> 3] >> (7 - ((*bitpointer) & 0x7))) & 1);
+ ++(*bitpointer);
+ return result;
+}
+
+/* TODO: make this faster */
+static unsigned readBitsFromReversedStream(size_t* bitpointer, const unsigned char* bitstream, size_t nbits) {
+ unsigned result = 0;
+ size_t i;
+ for(i = 0 ; i < nbits; ++i) {
+ result <<= 1u;
+ result |= (unsigned)readBitFromReversedStream(bitpointer, bitstream);
+ }
+ return result;
+}
+
+static void setBitOfReversedStream(size_t* bitpointer, unsigned char* bitstream, unsigned char bit) {
+ /*the current bit in bitstream may be 0 or 1 for this to work*/
+ if(bit == 0) bitstream[(*bitpointer) >> 3u] &= (unsigned char)(~(1u << (7u - ((*bitpointer) & 7u))));
+ else bitstream[(*bitpointer) >> 3u] |= (1u << (7u - ((*bitpointer) & 7u)));
+ ++(*bitpointer);
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / PNG chunks / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+unsigned lodepng_chunk_length(const unsigned char* chunk) {
+ return lodepng_read32bitInt(&chunk[0]);
+}
+
+void lodepng_chunk_type(char type[5], const unsigned char* chunk) {
+ unsigned i;
+ for(i = 0; i != 4; ++i) type[i] = (char)chunk[4 + i];
+ type[4] = 0; /*null termination char*/
+}
+
+unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type) {
+ if(lodepng_strlen(type) != 4) return 0;
+ return (chunk[4] == type[0] && chunk[5] == type[1] && chunk[6] == type[2] && chunk[7] == type[3]);
+}
+
+unsigned char lodepng_chunk_ancillary(const unsigned char* chunk) {
+ return((chunk[4] & 32) != 0);
+}
+
+unsigned char lodepng_chunk_private(const unsigned char* chunk) {
+ return((chunk[6] & 32) != 0);
+}
+
+unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk) {
+ return((chunk[7] & 32) != 0);
+}
+
+unsigned char* lodepng_chunk_data(unsigned char* chunk) {
+ return &chunk[8];
+}
+
+const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk) {
+ return &chunk[8];
+}
+
+unsigned lodepng_chunk_check_crc(const unsigned char* chunk) {
+ unsigned length = lodepng_chunk_length(chunk);
+ unsigned CRC = lodepng_read32bitInt(&chunk[length + 8]);
+ /*the CRC is taken of the data and the 4 chunk type letters, not the length*/
+ unsigned checksum = lodepng_crc32(&chunk[4], length + 4);
+ if(CRC != checksum) return 1;
+ else return 0;
+}
+
+void lodepng_chunk_generate_crc(unsigned char* chunk) {
+ unsigned length = lodepng_chunk_length(chunk);
+ unsigned CRC = lodepng_crc32(&chunk[4], length + 4);
+ lodepng_set32bitInt(chunk + 8 + length, CRC);
+}
+
+unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end) {
+ if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/
+ if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47
+ && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) {
+ /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */
+ return chunk + 8;
+ } else {
+ size_t total_chunk_length;
+ unsigned char* result;
+ if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end;
+ result = chunk + total_chunk_length;
+ if(result < chunk) return end; /*pointer overflow*/
+ return result;
+ }
+}
+
+const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end) {
+ if(chunk >= end || end - chunk < 12) return end; /*too small to contain a chunk*/
+ if(chunk[0] == 0x89 && chunk[1] == 0x50 && chunk[2] == 0x4e && chunk[3] == 0x47
+ && chunk[4] == 0x0d && chunk[5] == 0x0a && chunk[6] == 0x1a && chunk[7] == 0x0a) {
+ /* Is PNG magic header at start of PNG file. Jump to first actual chunk. */
+ return chunk + 8;
+ } else {
+ size_t total_chunk_length;
+ const unsigned char* result;
+ if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return end;
+ result = chunk + total_chunk_length;
+ if(result < chunk) return end; /*pointer overflow*/
+ return result;
+ }
+}
+
+unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]) {
+ for(;;) {
+ if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */
+ if(lodepng_chunk_type_equals(chunk, type)) return chunk;
+ chunk = lodepng_chunk_next(chunk, end);
+ }
+}
+
+const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]) {
+ for(;;) {
+ if(chunk >= end || end - chunk < 12) return 0; /* past file end: chunk + 12 > end */
+ if(lodepng_chunk_type_equals(chunk, type)) return chunk;
+ chunk = lodepng_chunk_next_const(chunk, end);
+ }
+}
+
+unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk) {
+ unsigned i;
+ size_t total_chunk_length, new_length;
+ unsigned char *chunk_start, *new_buffer;
+
+ if(lodepng_addofl(lodepng_chunk_length(chunk), 12, &total_chunk_length)) return 77;
+ if(lodepng_addofl(*outsize, total_chunk_length, &new_length)) return 77;
+
+ new_buffer = (unsigned char*)lodepng_realloc(*out, new_length);
+ if(!new_buffer) return 83; /*alloc fail*/
+ (*out) = new_buffer;
+ (*outsize) = new_length;
+ chunk_start = &(*out)[new_length - total_chunk_length];
+
+ for(i = 0; i != total_chunk_length; ++i) chunk_start[i] = chunk[i];
+
+ return 0;
+}
+
+/*Sets length and name and allocates the space for data and crc but does not
+set data or crc yet. Returns the start of the chunk in chunk. The start of
+the data is at chunk + 8. To finalize chunk, add the data, then use
+lodepng_chunk_generate_crc */
+static unsigned lodepng_chunk_init(unsigned char** chunk,
+ ucvector* out,
+ unsigned length, const char* type) {
+ size_t new_length = out->size;
+ if(lodepng_addofl(new_length, length, &new_length)) return 77;
+ if(lodepng_addofl(new_length, 12, &new_length)) return 77;
+ if(!ucvector_resize(out, new_length)) return 83; /*alloc fail*/
+ *chunk = out->data + new_length - length - 12u;
+
+ /*1: length*/
+ lodepng_set32bitInt(*chunk, length);
+
+ /*2: chunk name (4 letters)*/
+ lodepng_memcpy(*chunk + 4, type, 4);
+
+ return 0;
+}
+
+/* like lodepng_chunk_create but with custom allocsize */
+static unsigned lodepng_chunk_createv(ucvector* out,
+ unsigned length, const char* type, const unsigned char* data) {
+ unsigned char* chunk;
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, length, type));
+
+ /*3: the data*/
+ lodepng_memcpy(chunk + 8, data, length);
+
+ /*4: CRC (of the chunkname characters and the data)*/
+ lodepng_chunk_generate_crc(chunk);
+
+ return 0;
+}
+
+unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize,
+ unsigned length, const char* type, const unsigned char* data) {
+ ucvector v = ucvector_init(*out, *outsize);
+ unsigned error = lodepng_chunk_createv(&v, length, type, data);
+ *out = v.data;
+ *outsize = v.size;
+ return error;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / Color types, channels, bits / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/*checks if the colortype is valid and the bitdepth bd is allowed for this colortype.
+Return value is a LodePNG error code.*/
+static unsigned checkColorValidity(LodePNGColorType colortype, unsigned bd) {
+ switch(colortype) {
+ case LCT_GREY: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 || bd == 16)) return 37; break;
+ case LCT_RGB: if(!( bd == 8 || bd == 16)) return 37; break;
+ case LCT_PALETTE: if(!(bd == 1 || bd == 2 || bd == 4 || bd == 8 )) return 37; break;
+ case LCT_GREY_ALPHA: if(!( bd == 8 || bd == 16)) return 37; break;
+ case LCT_RGBA: if(!( bd == 8 || bd == 16)) return 37; break;
+ case LCT_MAX_OCTET_VALUE: return 31; /* invalid color type */
+ default: return 31; /* invalid color type */
+ }
+ return 0; /*allowed color type / bits combination*/
+}
+
+static unsigned getNumColorChannels(LodePNGColorType colortype) {
+ switch(colortype) {
+ case LCT_GREY: return 1;
+ case LCT_RGB: return 3;
+ case LCT_PALETTE: return 1;
+ case LCT_GREY_ALPHA: return 2;
+ case LCT_RGBA: return 4;
+ case LCT_MAX_OCTET_VALUE: return 0; /* invalid color type */
+ default: return 0; /*invalid color type*/
+ }
+}
+
+static unsigned lodepng_get_bpp_lct(LodePNGColorType colortype, unsigned bitdepth) {
+ /*bits per pixel is amount of channels * bits per channel*/
+ return getNumColorChannels(colortype) * bitdepth;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+
+void lodepng_color_mode_init(LodePNGColorMode* info) {
+ info->key_defined = 0;
+ info->key_r = info->key_g = info->key_b = 0;
+ info->colortype = LCT_RGBA;
+ info->bitdepth = 8;
+ info->palette = 0;
+ info->palettesize = 0;
+}
+
+/*allocates palette memory if needed, and initializes all colors to black*/
+static void lodepng_color_mode_alloc_palette(LodePNGColorMode* info) {
+ size_t i;
+ /*if the palette is already allocated, it will have size 1024 so no reallocation needed in that case*/
+ /*the palette must have room for up to 256 colors with 4 bytes each.*/
+ if(!info->palette) info->palette = (unsigned char*)lodepng_malloc(1024);
+ if(!info->palette) return; /*alloc fail*/
+ for(i = 0; i != 256; ++i) {
+ /*Initialize all unused colors with black, the value used for invalid palette indices.
+ This is an error according to the PNG spec, but common PNG decoders make it black instead.
+ That makes color conversion slightly faster due to no error handling needed.*/
+ info->palette[i * 4 + 0] = 0;
+ info->palette[i * 4 + 1] = 0;
+ info->palette[i * 4 + 2] = 0;
+ info->palette[i * 4 + 3] = 255;
+ }
+}
+
+void lodepng_color_mode_cleanup(LodePNGColorMode* info) {
+ lodepng_palette_clear(info);
+}
+
+unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source) {
+ lodepng_color_mode_cleanup(dest);
+ lodepng_memcpy(dest, source, sizeof(LodePNGColorMode));
+ if(source->palette) {
+ dest->palette = (unsigned char*)lodepng_malloc(1024);
+ if(!dest->palette && source->palettesize) return 83; /*alloc fail*/
+ lodepng_memcpy(dest->palette, source->palette, source->palettesize * 4);
+ }
+ return 0;
+}
+
+LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth) {
+ LodePNGColorMode result;
+ lodepng_color_mode_init(&result);
+ result.colortype = colortype;
+ result.bitdepth = bitdepth;
+ return result;
+}
+
+static int lodepng_color_mode_equal(const LodePNGColorMode* a, const LodePNGColorMode* b) {
+ size_t i;
+ if(a->colortype != b->colortype) return 0;
+ if(a->bitdepth != b->bitdepth) return 0;
+ if(a->key_defined != b->key_defined) return 0;
+ if(a->key_defined) {
+ if(a->key_r != b->key_r) return 0;
+ if(a->key_g != b->key_g) return 0;
+ if(a->key_b != b->key_b) return 0;
+ }
+ if(a->palettesize != b->palettesize) return 0;
+ for(i = 0; i != a->palettesize * 4; ++i) {
+ if(a->palette[i] != b->palette[i]) return 0;
+ }
+ return 1;
+}
+
+void lodepng_palette_clear(LodePNGColorMode* info) {
+ if(info->palette) lodepng_free(info->palette);
+ info->palette = 0;
+ info->palettesize = 0;
+}
+
+unsigned lodepng_palette_add(LodePNGColorMode* info,
+ unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
+ if(!info->palette) /*allocate palette if empty*/ {
+ lodepng_color_mode_alloc_palette(info);
+ if(!info->palette) return 83; /*alloc fail*/
+ }
+ if(info->palettesize >= 256) {
+ return 108; /*too many palette values*/
+ }
+ info->palette[4 * info->palettesize + 0] = r;
+ info->palette[4 * info->palettesize + 1] = g;
+ info->palette[4 * info->palettesize + 2] = b;
+ info->palette[4 * info->palettesize + 3] = a;
+ ++info->palettesize;
+ return 0;
+}
+
+/*calculate bits per pixel out of colortype and bitdepth*/
+unsigned lodepng_get_bpp(const LodePNGColorMode* info) {
+ return lodepng_get_bpp_lct(info->colortype, info->bitdepth);
+}
+
+unsigned lodepng_get_channels(const LodePNGColorMode* info) {
+ return getNumColorChannels(info->colortype);
+}
+
+unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info) {
+ return info->colortype == LCT_GREY || info->colortype == LCT_GREY_ALPHA;
+}
+
+unsigned lodepng_is_alpha_type(const LodePNGColorMode* info) {
+ return (info->colortype & 4) != 0; /*4 or 6*/
+}
+
+unsigned lodepng_is_palette_type(const LodePNGColorMode* info) {
+ return info->colortype == LCT_PALETTE;
+}
+
+unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info) {
+ size_t i;
+ for(i = 0; i != info->palettesize; ++i) {
+ if(info->palette[i * 4 + 3] < 255) return 1;
+ }
+ return 0;
+}
+
+unsigned lodepng_can_have_alpha(const LodePNGColorMode* info) {
+ return info->key_defined
+ || lodepng_is_alpha_type(info)
+ || lodepng_has_palette_alpha(info);
+}
+
+static size_t lodepng_get_raw_size_lct(unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) {
+ size_t bpp = lodepng_get_bpp_lct(colortype, bitdepth);
+ size_t n = (size_t)w * (size_t)h;
+ return ((n / 8u) * bpp) + ((n & 7u) * bpp + 7u) / 8u;
+}
+
+size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color) {
+ return lodepng_get_raw_size_lct(w, h, color->colortype, color->bitdepth);
+}
+
+
+#ifdef LODEPNG_COMPILE_PNG
+
+/*in an idat chunk, each scanline is a multiple of 8 bits, unlike the lodepng output buffer,
+and in addition has one extra byte per line: the filter byte. So this gives a larger
+result than lodepng_get_raw_size. Set h to 1 to get the size of 1 row including filter byte. */
+static size_t lodepng_get_raw_size_idat(unsigned w, unsigned h, unsigned bpp) {
+ /* + 1 for the filter byte, and possibly plus padding bits per line. */
+ /* Ignoring casts, the expression is equal to (w * bpp + 7) / 8 + 1, but avoids overflow of w * bpp */
+ size_t line = ((size_t)(w / 8u) * bpp) + 1u + ((w & 7u) * bpp + 7u) / 8u;
+ return (size_t)h * line;
+}
+
+#ifdef LODEPNG_COMPILE_DECODER
+/*Safely checks whether size_t overflow can be caused due to amount of pixels.
+This check is overcautious rather than precise. If this check indicates no overflow,
+you can safely compute in a size_t (but not an unsigned):
+-(size_t)w * (size_t)h * 8
+-amount of bytes in IDAT (including filter, padding and Adam7 bytes)
+-amount of bytes in raw color model
+Returns 1 if overflow possible, 0 if not.
+*/
+static int lodepng_pixel_overflow(unsigned w, unsigned h,
+ const LodePNGColorMode* pngcolor, const LodePNGColorMode* rawcolor) {
+ size_t bpp = LODEPNG_MAX(lodepng_get_bpp(pngcolor), lodepng_get_bpp(rawcolor));
+ size_t numpixels, total;
+ size_t line; /* bytes per line in worst case */
+
+ if(lodepng_mulofl((size_t)w, (size_t)h, &numpixels)) return 1;
+ if(lodepng_mulofl(numpixels, 8, &total)) return 1; /* bit pointer with 8-bit color, or 8 bytes per channel color */
+
+ /* Bytes per scanline with the expression "(w / 8u) * bpp) + ((w & 7u) * bpp + 7u) / 8u" */
+ if(lodepng_mulofl((size_t)(w / 8u), bpp, &line)) return 1;
+ if(lodepng_addofl(line, ((w & 7u) * bpp + 7u) / 8u, &line)) return 1;
+
+ if(lodepng_addofl(line, 5, &line)) return 1; /* 5 bytes overhead per line: 1 filterbyte, 4 for Adam7 worst case */
+ if(lodepng_mulofl(line, h, &total)) return 1; /* Total bytes in worst case */
+
+ return 0; /* no overflow */
+}
+#endif /*LODEPNG_COMPILE_DECODER*/
+#endif /*LODEPNG_COMPILE_PNG*/
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+
+static void LodePNGUnknownChunks_init(LodePNGInfo* info) {
+ unsigned i;
+ for(i = 0; i != 3; ++i) info->unknown_chunks_data[i] = 0;
+ for(i = 0; i != 3; ++i) info->unknown_chunks_size[i] = 0;
+}
+
+static void LodePNGUnknownChunks_cleanup(LodePNGInfo* info) {
+ unsigned i;
+ for(i = 0; i != 3; ++i) lodepng_free(info->unknown_chunks_data[i]);
+}
+
+static unsigned LodePNGUnknownChunks_copy(LodePNGInfo* dest, const LodePNGInfo* src) {
+ unsigned i;
+
+ LodePNGUnknownChunks_cleanup(dest);
+
+ for(i = 0; i != 3; ++i) {
+ size_t j;
+ dest->unknown_chunks_size[i] = src->unknown_chunks_size[i];
+ dest->unknown_chunks_data[i] = (unsigned char*)lodepng_malloc(src->unknown_chunks_size[i]);
+ if(!dest->unknown_chunks_data[i] && dest->unknown_chunks_size[i]) return 83; /*alloc fail*/
+ for(j = 0; j < src->unknown_chunks_size[i]; ++j) {
+ dest->unknown_chunks_data[i][j] = src->unknown_chunks_data[i][j];
+ }
+ }
+
+ return 0;
+}
+
+/******************************************************************************/
+
+static void LodePNGText_init(LodePNGInfo* info) {
+ info->text_num = 0;
+ info->text_keys = NULL;
+ info->text_strings = NULL;
+}
+
+static void LodePNGText_cleanup(LodePNGInfo* info) {
+ size_t i;
+ for(i = 0; i != info->text_num; ++i) {
+ string_cleanup(&info->text_keys[i]);
+ string_cleanup(&info->text_strings[i]);
+ }
+ lodepng_free(info->text_keys);
+ lodepng_free(info->text_strings);
+}
+
+static unsigned LodePNGText_copy(LodePNGInfo* dest, const LodePNGInfo* source) {
+ size_t i = 0;
+ dest->text_keys = 0;
+ dest->text_strings = 0;
+ dest->text_num = 0;
+ for(i = 0; i != source->text_num; ++i) {
+ CERROR_TRY_RETURN(lodepng_add_text(dest, source->text_keys[i], source->text_strings[i]));
+ }
+ return 0;
+}
+
+static unsigned lodepng_add_text_sized(LodePNGInfo* info, const char* key, const char* str, size_t size) {
+ char** new_keys = (char**)(lodepng_realloc(info->text_keys, sizeof(char*) * (info->text_num + 1)));
+ char** new_strings = (char**)(lodepng_realloc(info->text_strings, sizeof(char*) * (info->text_num + 1)));
+
+ if(new_keys) info->text_keys = new_keys;
+ if(new_strings) info->text_strings = new_strings;
+
+ if(!new_keys || !new_strings) return 83; /*alloc fail*/
+
+ ++info->text_num;
+ info->text_keys[info->text_num - 1] = alloc_string(key);
+ info->text_strings[info->text_num - 1] = alloc_string_sized(str, size);
+ if(!info->text_keys[info->text_num - 1] || !info->text_strings[info->text_num - 1]) return 83; /*alloc fail*/
+
+ return 0;
+}
+
+unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str) {
+ return lodepng_add_text_sized(info, key, str, lodepng_strlen(str));
+}
+
+void lodepng_clear_text(LodePNGInfo* info) {
+ LodePNGText_cleanup(info);
+}
+
+/******************************************************************************/
+
+static void LodePNGIText_init(LodePNGInfo* info) {
+ info->itext_num = 0;
+ info->itext_keys = NULL;
+ info->itext_langtags = NULL;
+ info->itext_transkeys = NULL;
+ info->itext_strings = NULL;
+}
+
+static void LodePNGIText_cleanup(LodePNGInfo* info) {
+ size_t i;
+ for(i = 0; i != info->itext_num; ++i) {
+ string_cleanup(&info->itext_keys[i]);
+ string_cleanup(&info->itext_langtags[i]);
+ string_cleanup(&info->itext_transkeys[i]);
+ string_cleanup(&info->itext_strings[i]);
+ }
+ lodepng_free(info->itext_keys);
+ lodepng_free(info->itext_langtags);
+ lodepng_free(info->itext_transkeys);
+ lodepng_free(info->itext_strings);
+}
+
+static unsigned LodePNGIText_copy(LodePNGInfo* dest, const LodePNGInfo* source) {
+ size_t i = 0;
+ dest->itext_keys = 0;
+ dest->itext_langtags = 0;
+ dest->itext_transkeys = 0;
+ dest->itext_strings = 0;
+ dest->itext_num = 0;
+ for(i = 0; i != source->itext_num; ++i) {
+ CERROR_TRY_RETURN(lodepng_add_itext(dest, source->itext_keys[i], source->itext_langtags[i],
+ source->itext_transkeys[i], source->itext_strings[i]));
+ }
+ return 0;
+}
+
+void lodepng_clear_itext(LodePNGInfo* info) {
+ LodePNGIText_cleanup(info);
+}
+
+static unsigned lodepng_add_itext_sized(LodePNGInfo* info, const char* key, const char* langtag,
+ const char* transkey, const char* str, size_t size) {
+ char** new_keys = (char**)(lodepng_realloc(info->itext_keys, sizeof(char*) * (info->itext_num + 1)));
+ char** new_langtags = (char**)(lodepng_realloc(info->itext_langtags, sizeof(char*) * (info->itext_num + 1)));
+ char** new_transkeys = (char**)(lodepng_realloc(info->itext_transkeys, sizeof(char*) * (info->itext_num + 1)));
+ char** new_strings = (char**)(lodepng_realloc(info->itext_strings, sizeof(char*) * (info->itext_num + 1)));
+
+ if(new_keys) info->itext_keys = new_keys;
+ if(new_langtags) info->itext_langtags = new_langtags;
+ if(new_transkeys) info->itext_transkeys = new_transkeys;
+ if(new_strings) info->itext_strings = new_strings;
+
+ if(!new_keys || !new_langtags || !new_transkeys || !new_strings) return 83; /*alloc fail*/
+
+ ++info->itext_num;
+
+ info->itext_keys[info->itext_num - 1] = alloc_string(key);
+ info->itext_langtags[info->itext_num - 1] = alloc_string(langtag);
+ info->itext_transkeys[info->itext_num - 1] = alloc_string(transkey);
+ info->itext_strings[info->itext_num - 1] = alloc_string_sized(str, size);
+
+ return 0;
+}
+
+unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag,
+ const char* transkey, const char* str) {
+ return lodepng_add_itext_sized(info, key, langtag, transkey, str, lodepng_strlen(str));
+}
+
+/* same as set but does not delete */
+static unsigned lodepng_assign_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) {
+ if(profile_size == 0) return 100; /*invalid ICC profile size*/
+
+ info->iccp_name = alloc_string(name);
+ info->iccp_profile = (unsigned char*)lodepng_malloc(profile_size);
+
+ if(!info->iccp_name || !info->iccp_profile) return 83; /*alloc fail*/
+
+ lodepng_memcpy(info->iccp_profile, profile, profile_size);
+ info->iccp_profile_size = profile_size;
+
+ return 0; /*ok*/
+}
+
+unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size) {
+ if(info->iccp_name) lodepng_clear_icc(info);
+ info->iccp_defined = 1;
+
+ return lodepng_assign_icc(info, name, profile, profile_size);
+}
+
+void lodepng_clear_icc(LodePNGInfo* info) {
+ string_cleanup(&info->iccp_name);
+ lodepng_free(info->iccp_profile);
+ info->iccp_profile = NULL;
+ info->iccp_profile_size = 0;
+ info->iccp_defined = 0;
+}
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+void lodepng_info_init(LodePNGInfo* info) {
+ lodepng_color_mode_init(&info->color);
+ info->interlace_method = 0;
+ info->compression_method = 0;
+ info->filter_method = 0;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ info->background_defined = 0;
+ info->background_r = info->background_g = info->background_b = 0;
+
+ LodePNGText_init(info);
+ LodePNGIText_init(info);
+
+ info->time_defined = 0;
+ info->phys_defined = 0;
+
+ info->gama_defined = 0;
+ info->chrm_defined = 0;
+ info->srgb_defined = 0;
+ info->iccp_defined = 0;
+ info->iccp_name = NULL;
+ info->iccp_profile = NULL;
+
+ LodePNGUnknownChunks_init(info);
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+}
+
+void lodepng_info_cleanup(LodePNGInfo* info) {
+ lodepng_color_mode_cleanup(&info->color);
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ LodePNGText_cleanup(info);
+ LodePNGIText_cleanup(info);
+
+ lodepng_clear_icc(info);
+
+ LodePNGUnknownChunks_cleanup(info);
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+}
+
+unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source) {
+ lodepng_info_cleanup(dest);
+ lodepng_memcpy(dest, source, sizeof(LodePNGInfo));
+ lodepng_color_mode_init(&dest->color);
+ CERROR_TRY_RETURN(lodepng_color_mode_copy(&dest->color, &source->color));
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ CERROR_TRY_RETURN(LodePNGText_copy(dest, source));
+ CERROR_TRY_RETURN(LodePNGIText_copy(dest, source));
+ if(source->iccp_defined) {
+ CERROR_TRY_RETURN(lodepng_assign_icc(dest, source->iccp_name, source->iccp_profile, source->iccp_profile_size));
+ }
+
+ LodePNGUnknownChunks_init(dest);
+ CERROR_TRY_RETURN(LodePNGUnknownChunks_copy(dest, source));
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ return 0;
+}
+
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/*index: bitgroup index, bits: bitgroup size(1, 2 or 4), in: bitgroup value, out: octet array to add bits to*/
+static void addColorBits(unsigned char* out, size_t index, unsigned bits, unsigned in) {
+ unsigned m = bits == 1 ? 7 : bits == 2 ? 3 : 1; /*8 / bits - 1*/
+ /*p = the partial index in the byte, e.g. with 4 palettebits it is 0 for first half or 1 for second half*/
+ unsigned p = index & m;
+ in &= (1u << bits) - 1u; /*filter out any other bits of the input value*/
+ in = in << (bits * (m - p));
+ if(p == 0) out[index * bits / 8u] = in;
+ else out[index * bits / 8u] |= in;
+}
+
+typedef struct ColorTree ColorTree;
+
+/*
+One node of a color tree
+This is the data structure used to count the number of unique colors and to get a palette
+index for a color. It's like an octree, but because the alpha channel is used too, each
+node has 16 instead of 8 children.
+*/
+struct ColorTree {
+ ColorTree* children[16]; /*up to 16 pointers to ColorTree of next level*/
+ int index; /*the payload. Only has a meaningful value if this is in the last level*/
+};
+
+static void color_tree_init(ColorTree* tree) {
+ lodepng_memset(tree->children, 0, 16 * sizeof(*tree->children));
+ tree->index = -1;
+}
+
+static void color_tree_cleanup(ColorTree* tree) {
+ int i;
+ for(i = 0; i != 16; ++i) {
+ if(tree->children[i]) {
+ color_tree_cleanup(tree->children[i]);
+ lodepng_free(tree->children[i]);
+ }
+ }
+}
+
+/*returns -1 if color not present, its index otherwise*/
+static int color_tree_get(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
+ int bit = 0;
+ for(bit = 0; bit < 8; ++bit) {
+ int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1);
+ if(!tree->children[i]) return -1;
+ else tree = tree->children[i];
+ }
+ return tree ? tree->index : -1;
+}
+
+#ifdef LODEPNG_COMPILE_ENCODER
+static int color_tree_has(ColorTree* tree, unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
+ return color_tree_get(tree, r, g, b, a) >= 0;
+}
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+/*color is not allowed to already exist.
+Index should be >= 0 (it's signed to be compatible with using -1 for "doesn't exist")
+Returns error code, or 0 if ok*/
+static unsigned color_tree_add(ColorTree* tree,
+ unsigned char r, unsigned char g, unsigned char b, unsigned char a, unsigned index) {
+ int bit;
+ for(bit = 0; bit < 8; ++bit) {
+ int i = 8 * ((r >> bit) & 1) + 4 * ((g >> bit) & 1) + 2 * ((b >> bit) & 1) + 1 * ((a >> bit) & 1);
+ if(!tree->children[i]) {
+ tree->children[i] = (ColorTree*)lodepng_malloc(sizeof(ColorTree));
+ if(!tree->children[i]) return 83; /*alloc fail*/
+ color_tree_init(tree->children[i]);
+ }
+ tree = tree->children[i];
+ }
+ tree->index = (int)index;
+ return 0;
+}
+
+/*put a pixel, given its RGBA color, into image of any color type*/
+static unsigned rgba8ToPixel(unsigned char* out, size_t i,
+ const LodePNGColorMode* mode, ColorTree* tree /*for palette*/,
+ unsigned char r, unsigned char g, unsigned char b, unsigned char a) {
+ if(mode->colortype == LCT_GREY) {
+ unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/
+ if(mode->bitdepth == 8) out[i] = gray;
+ else if(mode->bitdepth == 16) out[i * 2 + 0] = out[i * 2 + 1] = gray;
+ else {
+ /*take the most significant bits of gray*/
+ gray = ((unsigned)gray >> (8u - mode->bitdepth)) & ((1u << mode->bitdepth) - 1u);
+ addColorBits(out, i, mode->bitdepth, gray);
+ }
+ } else if(mode->colortype == LCT_RGB) {
+ if(mode->bitdepth == 8) {
+ out[i * 3 + 0] = r;
+ out[i * 3 + 1] = g;
+ out[i * 3 + 2] = b;
+ } else {
+ out[i * 6 + 0] = out[i * 6 + 1] = r;
+ out[i * 6 + 2] = out[i * 6 + 3] = g;
+ out[i * 6 + 4] = out[i * 6 + 5] = b;
+ }
+ } else if(mode->colortype == LCT_PALETTE) {
+ int index = color_tree_get(tree, r, g, b, a);
+ if(index < 0) return 82; /*color not in palette*/
+ if(mode->bitdepth == 8) out[i] = index;
+ else addColorBits(out, i, mode->bitdepth, (unsigned)index);
+ } else if(mode->colortype == LCT_GREY_ALPHA) {
+ unsigned char gray = r; /*((unsigned short)r + g + b) / 3u;*/
+ if(mode->bitdepth == 8) {
+ out[i * 2 + 0] = gray;
+ out[i * 2 + 1] = a;
+ } else if(mode->bitdepth == 16) {
+ out[i * 4 + 0] = out[i * 4 + 1] = gray;
+ out[i * 4 + 2] = out[i * 4 + 3] = a;
+ }
+ } else if(mode->colortype == LCT_RGBA) {
+ if(mode->bitdepth == 8) {
+ out[i * 4 + 0] = r;
+ out[i * 4 + 1] = g;
+ out[i * 4 + 2] = b;
+ out[i * 4 + 3] = a;
+ } else {
+ out[i * 8 + 0] = out[i * 8 + 1] = r;
+ out[i * 8 + 2] = out[i * 8 + 3] = g;
+ out[i * 8 + 4] = out[i * 8 + 5] = b;
+ out[i * 8 + 6] = out[i * 8 + 7] = a;
+ }
+ }
+
+ return 0; /*no error*/
+}
+
+/*put a pixel, given its RGBA16 color, into image of any color 16-bitdepth type*/
+static void rgba16ToPixel(unsigned char* out, size_t i,
+ const LodePNGColorMode* mode,
+ unsigned short r, unsigned short g, unsigned short b, unsigned short a) {
+ if(mode->colortype == LCT_GREY) {
+ unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/
+ out[i * 2 + 0] = (gray >> 8) & 255;
+ out[i * 2 + 1] = gray & 255;
+ } else if(mode->colortype == LCT_RGB) {
+ out[i * 6 + 0] = (r >> 8) & 255;
+ out[i * 6 + 1] = r & 255;
+ out[i * 6 + 2] = (g >> 8) & 255;
+ out[i * 6 + 3] = g & 255;
+ out[i * 6 + 4] = (b >> 8) & 255;
+ out[i * 6 + 5] = b & 255;
+ } else if(mode->colortype == LCT_GREY_ALPHA) {
+ unsigned short gray = r; /*((unsigned)r + g + b) / 3u;*/
+ out[i * 4 + 0] = (gray >> 8) & 255;
+ out[i * 4 + 1] = gray & 255;
+ out[i * 4 + 2] = (a >> 8) & 255;
+ out[i * 4 + 3] = a & 255;
+ } else if(mode->colortype == LCT_RGBA) {
+ out[i * 8 + 0] = (r >> 8) & 255;
+ out[i * 8 + 1] = r & 255;
+ out[i * 8 + 2] = (g >> 8) & 255;
+ out[i * 8 + 3] = g & 255;
+ out[i * 8 + 4] = (b >> 8) & 255;
+ out[i * 8 + 5] = b & 255;
+ out[i * 8 + 6] = (a >> 8) & 255;
+ out[i * 8 + 7] = a & 255;
+ }
+}
+
+/*Get RGBA8 color of pixel with index i (y * width + x) from the raw image with given color type.*/
+static void getPixelColorRGBA8(unsigned char* r, unsigned char* g,
+ unsigned char* b, unsigned char* a,
+ const unsigned char* in, size_t i,
+ const LodePNGColorMode* mode) {
+ if(mode->colortype == LCT_GREY) {
+ if(mode->bitdepth == 8) {
+ *r = *g = *b = in[i];
+ if(mode->key_defined && *r == mode->key_r) *a = 0;
+ else *a = 255;
+ } else if(mode->bitdepth == 16) {
+ *r = *g = *b = in[i * 2 + 0];
+ if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0;
+ else *a = 255;
+ } else {
+ unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/
+ size_t j = i * mode->bitdepth;
+ unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth);
+ *r = *g = *b = (value * 255) / highest;
+ if(mode->key_defined && value == mode->key_r) *a = 0;
+ else *a = 255;
+ }
+ } else if(mode->colortype == LCT_RGB) {
+ if(mode->bitdepth == 8) {
+ *r = in[i * 3 + 0]; *g = in[i * 3 + 1]; *b = in[i * 3 + 2];
+ if(mode->key_defined && *r == mode->key_r && *g == mode->key_g && *b == mode->key_b) *a = 0;
+ else *a = 255;
+ } else {
+ *r = in[i * 6 + 0];
+ *g = in[i * 6 + 2];
+ *b = in[i * 6 + 4];
+ if(mode->key_defined && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r
+ && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g
+ && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0;
+ else *a = 255;
+ }
+ } else if(mode->colortype == LCT_PALETTE) {
+ unsigned index;
+ if(mode->bitdepth == 8) index = in[i];
+ else {
+ size_t j = i * mode->bitdepth;
+ index = readBitsFromReversedStream(&j, in, mode->bitdepth);
+ }
+ /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/
+ *r = mode->palette[index * 4 + 0];
+ *g = mode->palette[index * 4 + 1];
+ *b = mode->palette[index * 4 + 2];
+ *a = mode->palette[index * 4 + 3];
+ } else if(mode->colortype == LCT_GREY_ALPHA) {
+ if(mode->bitdepth == 8) {
+ *r = *g = *b = in[i * 2 + 0];
+ *a = in[i * 2 + 1];
+ } else {
+ *r = *g = *b = in[i * 4 + 0];
+ *a = in[i * 4 + 2];
+ }
+ } else if(mode->colortype == LCT_RGBA) {
+ if(mode->bitdepth == 8) {
+ *r = in[i * 4 + 0];
+ *g = in[i * 4 + 1];
+ *b = in[i * 4 + 2];
+ *a = in[i * 4 + 3];
+ } else {
+ *r = in[i * 8 + 0];
+ *g = in[i * 8 + 2];
+ *b = in[i * 8 + 4];
+ *a = in[i * 8 + 6];
+ }
+ }
+}
+
+/*Similar to getPixelColorRGBA8, but with all the for loops inside of the color
+mode test cases, optimized to convert the colors much faster, when converting
+to the common case of RGBA with 8 bit per channel. buffer must be RGBA with
+enough memory.*/
+static void getPixelColorsRGBA8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels,
+ const unsigned char* LODEPNG_RESTRICT in,
+ const LodePNGColorMode* mode) {
+ unsigned num_channels = 4;
+ size_t i;
+ if(mode->colortype == LCT_GREY) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i];
+ buffer[3] = 255;
+ }
+ if(mode->key_defined) {
+ buffer -= numpixels * num_channels;
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ if(buffer[0] == mode->key_r) buffer[3] = 0;
+ }
+ }
+ } else if(mode->bitdepth == 16) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i * 2];
+ buffer[3] = mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r ? 0 : 255;
+ }
+ } else {
+ unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/
+ size_t j = 0;
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth);
+ buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest;
+ buffer[3] = mode->key_defined && value == mode->key_r ? 0 : 255;
+ }
+ }
+ } else if(mode->colortype == LCT_RGB) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ lodepng_memcpy(buffer, &in[i * 3], 3);
+ buffer[3] = 255;
+ }
+ if(mode->key_defined) {
+ buffer -= numpixels * num_channels;
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ if(buffer[0] == mode->key_r && buffer[1]== mode->key_g && buffer[2] == mode->key_b) buffer[3] = 0;
+ }
+ }
+ } else {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = in[i * 6 + 0];
+ buffer[1] = in[i * 6 + 2];
+ buffer[2] = in[i * 6 + 4];
+ buffer[3] = mode->key_defined
+ && 256U * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r
+ && 256U * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g
+ && 256U * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b ? 0 : 255;
+ }
+ }
+ } else if(mode->colortype == LCT_PALETTE) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ unsigned index = in[i];
+ /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/
+ lodepng_memcpy(buffer, &mode->palette[index * 4], 4);
+ }
+ } else {
+ size_t j = 0;
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth);
+ /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/
+ lodepng_memcpy(buffer, &mode->palette[index * 4], 4);
+ }
+ }
+ } else if(mode->colortype == LCT_GREY_ALPHA) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0];
+ buffer[3] = in[i * 2 + 1];
+ }
+ } else {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0];
+ buffer[3] = in[i * 4 + 2];
+ }
+ }
+ } else if(mode->colortype == LCT_RGBA) {
+ if(mode->bitdepth == 8) {
+ lodepng_memcpy(buffer, in, numpixels * 4);
+ } else {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = in[i * 8 + 0];
+ buffer[1] = in[i * 8 + 2];
+ buffer[2] = in[i * 8 + 4];
+ buffer[3] = in[i * 8 + 6];
+ }
+ }
+ }
+}
+
+/*Similar to getPixelColorsRGBA8, but with 3-channel RGB output.*/
+static void getPixelColorsRGB8(unsigned char* LODEPNG_RESTRICT buffer, size_t numpixels,
+ const unsigned char* LODEPNG_RESTRICT in,
+ const LodePNGColorMode* mode) {
+ const unsigned num_channels = 3;
+ size_t i;
+ if(mode->colortype == LCT_GREY) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i];
+ }
+ } else if(mode->bitdepth == 16) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i * 2];
+ }
+ } else {
+ unsigned highest = ((1U << mode->bitdepth) - 1U); /*highest possible value for this bit depth*/
+ size_t j = 0;
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ unsigned value = readBitsFromReversedStream(&j, in, mode->bitdepth);
+ buffer[0] = buffer[1] = buffer[2] = (value * 255) / highest;
+ }
+ }
+ } else if(mode->colortype == LCT_RGB) {
+ if(mode->bitdepth == 8) {
+ lodepng_memcpy(buffer, in, numpixels * 3);
+ } else {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = in[i * 6 + 0];
+ buffer[1] = in[i * 6 + 2];
+ buffer[2] = in[i * 6 + 4];
+ }
+ }
+ } else if(mode->colortype == LCT_PALETTE) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ unsigned index = in[i];
+ /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/
+ lodepng_memcpy(buffer, &mode->palette[index * 4], 3);
+ }
+ } else {
+ size_t j = 0;
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ unsigned index = readBitsFromReversedStream(&j, in, mode->bitdepth);
+ /*out of bounds of palette not checked: see lodepng_color_mode_alloc_palette.*/
+ lodepng_memcpy(buffer, &mode->palette[index * 4], 3);
+ }
+ }
+ } else if(mode->colortype == LCT_GREY_ALPHA) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i * 2 + 0];
+ }
+ } else {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = buffer[1] = buffer[2] = in[i * 4 + 0];
+ }
+ }
+ } else if(mode->colortype == LCT_RGBA) {
+ if(mode->bitdepth == 8) {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ lodepng_memcpy(buffer, &in[i * 4], 3);
+ }
+ } else {
+ for(i = 0; i != numpixels; ++i, buffer += num_channels) {
+ buffer[0] = in[i * 8 + 0];
+ buffer[1] = in[i * 8 + 2];
+ buffer[2] = in[i * 8 + 4];
+ }
+ }
+ }
+}
+
+/*Get RGBA16 color of pixel with index i (y * width + x) from the raw image with
+given color type, but the given color type must be 16-bit itself.*/
+static void getPixelColorRGBA16(unsigned short* r, unsigned short* g, unsigned short* b, unsigned short* a,
+ const unsigned char* in, size_t i, const LodePNGColorMode* mode) {
+ if(mode->colortype == LCT_GREY) {
+ *r = *g = *b = 256 * in[i * 2 + 0] + in[i * 2 + 1];
+ if(mode->key_defined && 256U * in[i * 2 + 0] + in[i * 2 + 1] == mode->key_r) *a = 0;
+ else *a = 65535;
+ } else if(mode->colortype == LCT_RGB) {
+ *r = 256u * in[i * 6 + 0] + in[i * 6 + 1];
+ *g = 256u * in[i * 6 + 2] + in[i * 6 + 3];
+ *b = 256u * in[i * 6 + 4] + in[i * 6 + 5];
+ if(mode->key_defined
+ && 256u * in[i * 6 + 0] + in[i * 6 + 1] == mode->key_r
+ && 256u * in[i * 6 + 2] + in[i * 6 + 3] == mode->key_g
+ && 256u * in[i * 6 + 4] + in[i * 6 + 5] == mode->key_b) *a = 0;
+ else *a = 65535;
+ } else if(mode->colortype == LCT_GREY_ALPHA) {
+ *r = *g = *b = 256u * in[i * 4 + 0] + in[i * 4 + 1];
+ *a = 256u * in[i * 4 + 2] + in[i * 4 + 3];
+ } else if(mode->colortype == LCT_RGBA) {
+ *r = 256u * in[i * 8 + 0] + in[i * 8 + 1];
+ *g = 256u * in[i * 8 + 2] + in[i * 8 + 3];
+ *b = 256u * in[i * 8 + 4] + in[i * 8 + 5];
+ *a = 256u * in[i * 8 + 6] + in[i * 8 + 7];
+ }
+}
+
+unsigned lodepng_convert(unsigned char* out, const unsigned char* in,
+ const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in,
+ unsigned w, unsigned h) {
+ size_t i;
+ ColorTree tree;
+ size_t numpixels = (size_t)w * (size_t)h;
+ unsigned error = 0;
+
+ if(mode_in->colortype == LCT_PALETTE && !mode_in->palette) {
+ return 107; /* error: must provide palette if input mode is palette */
+ }
+
+ if(lodepng_color_mode_equal(mode_out, mode_in)) {
+ size_t numbytes = lodepng_get_raw_size(w, h, mode_in);
+ lodepng_memcpy(out, in, numbytes);
+ return 0;
+ }
+
+ if(mode_out->colortype == LCT_PALETTE) {
+ size_t palettesize = mode_out->palettesize;
+ const unsigned char* palette = mode_out->palette;
+ size_t palsize = (size_t)1u << mode_out->bitdepth;
+ /*if the user specified output palette but did not give the values, assume
+ they want the values of the input color type (assuming that one is palette).
+ Note that we never create a new palette ourselves.*/
+ if(palettesize == 0) {
+ palettesize = mode_in->palettesize;
+ palette = mode_in->palette;
+ /*if the input was also palette with same bitdepth, then the color types are also
+ equal, so copy literally. This to preserve the exact indices that were in the PNG
+ even in case there are duplicate colors in the palette.*/
+ if(mode_in->colortype == LCT_PALETTE && mode_in->bitdepth == mode_out->bitdepth) {
+ size_t numbytes = lodepng_get_raw_size(w, h, mode_in);
+ lodepng_memcpy(out, in, numbytes);
+ return 0;
+ }
+ }
+ if(palettesize < palsize) palsize = palettesize;
+ color_tree_init(&tree);
+ for(i = 0; i != palsize; ++i) {
+ const unsigned char* p = &palette[i * 4];
+ error = color_tree_add(&tree, p[0], p[1], p[2], p[3], (unsigned)i);
+ if(error) break;
+ }
+ }
+
+ if(!error) {
+ if(mode_in->bitdepth == 16 && mode_out->bitdepth == 16) {
+ for(i = 0; i != numpixels; ++i) {
+ unsigned short r = 0, g = 0, b = 0, a = 0;
+ getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in);
+ rgba16ToPixel(out, i, mode_out, r, g, b, a);
+ }
+ } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGBA) {
+ getPixelColorsRGBA8(out, numpixels, in, mode_in);
+ } else if(mode_out->bitdepth == 8 && mode_out->colortype == LCT_RGB) {
+ getPixelColorsRGB8(out, numpixels, in, mode_in);
+ } else {
+ unsigned char r = 0, g = 0, b = 0, a = 0;
+ for(i = 0; i != numpixels; ++i) {
+ getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in);
+ error = rgba8ToPixel(out, i, mode_out, &tree, r, g, b, a);
+ if(error) break;
+ }
+ }
+ }
+
+ if(mode_out->colortype == LCT_PALETTE) {
+ color_tree_cleanup(&tree);
+ }
+
+ return error;
+}
+
+
+/* Converts a single rgb color without alpha from one type to another, color bits truncated to
+their bitdepth. In case of single channel (gray or palette), only the r channel is used. Slow
+function, do not use to process all pixels of an image. Alpha channel not supported on purpose:
+this is for bKGD, supporting alpha may prevent it from finding a color in the palette, from the
+specification it looks like bKGD should ignore the alpha values of the palette since it can use
+any palette index but doesn't have an alpha channel. Idem with ignoring color key. */
+unsigned lodepng_convert_rgb(
+ unsigned* r_out, unsigned* g_out, unsigned* b_out,
+ unsigned r_in, unsigned g_in, unsigned b_in,
+ const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in) {
+ unsigned r = 0, g = 0, b = 0;
+ unsigned mul = 65535 / ((1u << mode_in->bitdepth) - 1u); /*65535, 21845, 4369, 257, 1*/
+ unsigned shift = 16 - mode_out->bitdepth;
+
+ if(mode_in->colortype == LCT_GREY || mode_in->colortype == LCT_GREY_ALPHA) {
+ r = g = b = r_in * mul;
+ } else if(mode_in->colortype == LCT_RGB || mode_in->colortype == LCT_RGBA) {
+ r = r_in * mul;
+ g = g_in * mul;
+ b = b_in * mul;
+ } else if(mode_in->colortype == LCT_PALETTE) {
+ if(r_in >= mode_in->palettesize) return 82;
+ r = mode_in->palette[r_in * 4 + 0] * 257u;
+ g = mode_in->palette[r_in * 4 + 1] * 257u;
+ b = mode_in->palette[r_in * 4 + 2] * 257u;
+ } else {
+ return 31;
+ }
+
+ /* now convert to output format */
+ if(mode_out->colortype == LCT_GREY || mode_out->colortype == LCT_GREY_ALPHA) {
+ *r_out = r >> shift ;
+ } else if(mode_out->colortype == LCT_RGB || mode_out->colortype == LCT_RGBA) {
+ *r_out = r >> shift ;
+ *g_out = g >> shift ;
+ *b_out = b >> shift ;
+ } else if(mode_out->colortype == LCT_PALETTE) {
+ unsigned i;
+ /* a 16-bit color cannot be in the palette */
+ if((r >> 8) != (r & 255) || (g >> 8) != (g & 255) || (b >> 8) != (b & 255)) return 82;
+ for(i = 0; i < mode_out->palettesize; i++) {
+ unsigned j = i * 4;
+ if((r >> 8) == mode_out->palette[j + 0] && (g >> 8) == mode_out->palette[j + 1] &&
+ (b >> 8) == mode_out->palette[j + 2]) {
+ *r_out = i;
+ return 0;
+ }
+ }
+ return 82;
+ } else {
+ return 31;
+ }
+
+ return 0;
+}
+
+#ifdef LODEPNG_COMPILE_ENCODER
+
+void lodepng_color_stats_init(LodePNGColorStats* stats) {
+ /*stats*/
+ stats->colored = 0;
+ stats->key = 0;
+ stats->key_r = stats->key_g = stats->key_b = 0;
+ stats->alpha = 0;
+ stats->numcolors = 0;
+ stats->bits = 1;
+ stats->numpixels = 0;
+ /*settings*/
+ stats->allow_palette = 1;
+ stats->allow_greyscale = 1;
+}
+
+/*function used for debug purposes with C++*/
+/*void printColorStats(LodePNGColorStats* p) {
+ std::cout << "colored: " << (int)p->colored << ", ";
+ std::cout << "key: " << (int)p->key << ", ";
+ std::cout << "key_r: " << (int)p->key_r << ", ";
+ std::cout << "key_g: " << (int)p->key_g << ", ";
+ std::cout << "key_b: " << (int)p->key_b << ", ";
+ std::cout << "alpha: " << (int)p->alpha << ", ";
+ std::cout << "numcolors: " << (int)p->numcolors << ", ";
+ std::cout << "bits: " << (int)p->bits << std::endl;
+}*/
+
+/*Returns how many bits needed to represent given value (max 8 bit)*/
+static unsigned getValueRequiredBits(unsigned char value) {
+ if(value == 0 || value == 255) return 1;
+ /*The scaling of 2-bit and 4-bit values uses multiples of 85 and 17*/
+ if(value % 17 == 0) return value % 85 == 0 ? 2 : 4;
+ return 8;
+}
+
+/*stats must already have been inited. */
+unsigned lodepng_compute_color_stats(LodePNGColorStats* stats,
+ const unsigned char* in, unsigned w, unsigned h,
+ const LodePNGColorMode* mode_in) {
+ size_t i;
+ ColorTree tree;
+ size_t numpixels = (size_t)w * (size_t)h;
+ unsigned error = 0;
+
+ /* mark things as done already if it would be impossible to have a more expensive case */
+ unsigned colored_done = lodepng_is_greyscale_type(mode_in) ? 1 : 0;
+ unsigned alpha_done = lodepng_can_have_alpha(mode_in) ? 0 : 1;
+ unsigned numcolors_done = 0;
+ unsigned bpp = lodepng_get_bpp(mode_in);
+ unsigned bits_done = (stats->bits == 1 && bpp == 1) ? 1 : 0;
+ unsigned sixteen = 0; /* whether the input image is 16 bit */
+ unsigned maxnumcolors = 257;
+ if(bpp <= 8) maxnumcolors = LODEPNG_MIN(257, stats->numcolors + (1u << bpp));
+
+ stats->numpixels += numpixels;
+
+ /*if palette not allowed, no need to compute numcolors*/
+ if(!stats->allow_palette) numcolors_done = 1;
+
+ color_tree_init(&tree);
+
+ /*If the stats was already filled in from previous data, fill its palette in tree
+ and mark things as done already if we know they are the most expensive case already*/
+ if(stats->alpha) alpha_done = 1;
+ if(stats->colored) colored_done = 1;
+ if(stats->bits == 16) numcolors_done = 1;
+ if(stats->bits >= bpp) bits_done = 1;
+ if(stats->numcolors >= maxnumcolors) numcolors_done = 1;
+
+ if(!numcolors_done) {
+ for(i = 0; i < stats->numcolors; i++) {
+ const unsigned char* color = &stats->palette[i * 4];
+ error = color_tree_add(&tree, color[0], color[1], color[2], color[3], i);
+ if(error) goto cleanup;
+ }
+ }
+
+ /*Check if the 16-bit input is truly 16-bit*/
+ if(mode_in->bitdepth == 16 && !sixteen) {
+ unsigned short r = 0, g = 0, b = 0, a = 0;
+ for(i = 0; i != numpixels; ++i) {
+ getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in);
+ if((r & 255) != ((r >> 8) & 255) || (g & 255) != ((g >> 8) & 255) ||
+ (b & 255) != ((b >> 8) & 255) || (a & 255) != ((a >> 8) & 255)) /*first and second byte differ*/ {
+ stats->bits = 16;
+ sixteen = 1;
+ bits_done = 1;
+ numcolors_done = 1; /*counting colors no longer useful, palette doesn't support 16-bit*/
+ break;
+ }
+ }
+ }
+
+ if(sixteen) {
+ unsigned short r = 0, g = 0, b = 0, a = 0;
+
+ for(i = 0; i != numpixels; ++i) {
+ getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in);
+
+ if(!colored_done && (r != g || r != b)) {
+ stats->colored = 1;
+ colored_done = 1;
+ }
+
+ if(!alpha_done) {
+ unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b);
+ if(a != 65535 && (a != 0 || (stats->key && !matchkey))) {
+ stats->alpha = 1;
+ stats->key = 0;
+ alpha_done = 1;
+ } else if(a == 0 && !stats->alpha && !stats->key) {
+ stats->key = 1;
+ stats->key_r = r;
+ stats->key_g = g;
+ stats->key_b = b;
+ } else if(a == 65535 && stats->key && matchkey) {
+ /* Color key cannot be used if an opaque pixel also has that RGB color. */
+ stats->alpha = 1;
+ stats->key = 0;
+ alpha_done = 1;
+ }
+ }
+ if(alpha_done && numcolors_done && colored_done && bits_done) break;
+ }
+
+ if(stats->key && !stats->alpha) {
+ for(i = 0; i != numpixels; ++i) {
+ getPixelColorRGBA16(&r, &g, &b, &a, in, i, mode_in);
+ if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) {
+ /* Color key cannot be used if an opaque pixel also has that RGB color. */
+ stats->alpha = 1;
+ stats->key = 0;
+ alpha_done = 1;
+ }
+ }
+ }
+ } else /* < 16-bit */ {
+ unsigned char r = 0, g = 0, b = 0, a = 0;
+ for(i = 0; i != numpixels; ++i) {
+ getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in);
+
+ if(!bits_done && stats->bits < 8) {
+ /*only r is checked, < 8 bits is only relevant for grayscale*/
+ unsigned bits = getValueRequiredBits(r);
+ if(bits > stats->bits) stats->bits = bits;
+ }
+ bits_done = (stats->bits >= bpp);
+
+ if(!colored_done && (r != g || r != b)) {
+ stats->colored = 1;
+ colored_done = 1;
+ if(stats->bits < 8) stats->bits = 8; /*PNG has no colored modes with less than 8-bit per channel*/
+ }
+
+ if(!alpha_done) {
+ unsigned matchkey = (r == stats->key_r && g == stats->key_g && b == stats->key_b);
+ if(a != 255 && (a != 0 || (stats->key && !matchkey))) {
+ stats->alpha = 1;
+ stats->key = 0;
+ alpha_done = 1;
+ if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/
+ } else if(a == 0 && !stats->alpha && !stats->key) {
+ stats->key = 1;
+ stats->key_r = r;
+ stats->key_g = g;
+ stats->key_b = b;
+ } else if(a == 255 && stats->key && matchkey) {
+ /* Color key cannot be used if an opaque pixel also has that RGB color. */
+ stats->alpha = 1;
+ stats->key = 0;
+ alpha_done = 1;
+ if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/
+ }
+ }
+
+ if(!numcolors_done) {
+ if(!color_tree_has(&tree, r, g, b, a)) {
+ error = color_tree_add(&tree, r, g, b, a, stats->numcolors);
+ if(error) goto cleanup;
+ if(stats->numcolors < 256) {
+ unsigned char* p = stats->palette;
+ unsigned n = stats->numcolors;
+ p[n * 4 + 0] = r;
+ p[n * 4 + 1] = g;
+ p[n * 4 + 2] = b;
+ p[n * 4 + 3] = a;
+ }
+ ++stats->numcolors;
+ numcolors_done = stats->numcolors >= maxnumcolors;
+ }
+ }
+
+ if(alpha_done && numcolors_done && colored_done && bits_done) break;
+ }
+
+ if(stats->key && !stats->alpha) {
+ for(i = 0; i != numpixels; ++i) {
+ getPixelColorRGBA8(&r, &g, &b, &a, in, i, mode_in);
+ if(a != 0 && r == stats->key_r && g == stats->key_g && b == stats->key_b) {
+ /* Color key cannot be used if an opaque pixel also has that RGB color. */
+ stats->alpha = 1;
+ stats->key = 0;
+ alpha_done = 1;
+ if(stats->bits < 8) stats->bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/
+ }
+ }
+ }
+
+ /*make the stats's key always 16-bit for consistency - repeat each byte twice*/
+ stats->key_r += (stats->key_r << 8);
+ stats->key_g += (stats->key_g << 8);
+ stats->key_b += (stats->key_b << 8);
+ }
+
+cleanup:
+ color_tree_cleanup(&tree);
+ return error;
+}
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+/*Adds a single color to the color stats. The stats must already have been inited. The color must be given as 16-bit
+(with 2 bytes repeating for 8-bit and 65535 for opaque alpha channel). This function is expensive, do not call it for
+all pixels of an image but only for a few additional values. */
+static unsigned lodepng_color_stats_add(LodePNGColorStats* stats,
+ unsigned r, unsigned g, unsigned b, unsigned a) {
+ unsigned error = 0;
+ unsigned char image[8];
+ LodePNGColorMode mode;
+ lodepng_color_mode_init(&mode);
+ image[0] = r >> 8; image[1] = r; image[2] = g >> 8; image[3] = g;
+ image[4] = b >> 8; image[5] = b; image[6] = a >> 8; image[7] = a;
+ mode.bitdepth = 16;
+ mode.colortype = LCT_RGBA;
+ error = lodepng_compute_color_stats(stats, image, 1, 1, &mode);
+ lodepng_color_mode_cleanup(&mode);
+ return error;
+}
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+/*Computes a minimal PNG color model that can contain all colors as indicated by the stats.
+The stats should be computed with lodepng_compute_color_stats.
+mode_in is raw color profile of the image the stats were computed on, to copy palette order from when relevant.
+Minimal PNG color model means the color type and bit depth that gives smallest amount of bits in the output image,
+e.g. gray if only grayscale pixels, palette if less than 256 colors, color key if only single transparent color, ...
+This is used if auto_convert is enabled (it is by default).
+*/
+static unsigned auto_choose_color(LodePNGColorMode* mode_out,
+ const LodePNGColorMode* mode_in,
+ const LodePNGColorStats* stats) {
+ unsigned error = 0;
+ unsigned palettebits;
+ size_t i, n;
+ size_t numpixels = stats->numpixels;
+ unsigned palette_ok, gray_ok;
+
+ unsigned alpha = stats->alpha;
+ unsigned key = stats->key;
+ unsigned bits = stats->bits;
+
+ mode_out->key_defined = 0;
+
+ if(key && numpixels <= 16) {
+ alpha = 1; /*too few pixels to justify tRNS chunk overhead*/
+ key = 0;
+ if(bits < 8) bits = 8; /*PNG has no alphachannel modes with less than 8-bit per channel*/
+ }
+
+ gray_ok = !stats->colored;
+ if(!stats->allow_greyscale) gray_ok = 0;
+ if(!gray_ok && bits < 8) bits = 8;
+
+ n = stats->numcolors;
+ palettebits = n <= 2 ? 1 : (n <= 4 ? 2 : (n <= 16 ? 4 : 8));
+ palette_ok = n <= 256 && bits <= 8 && n != 0; /*n==0 means likely numcolors wasn't computed*/
+ if(numpixels < n * 2) palette_ok = 0; /*don't add palette overhead if image has only a few pixels*/
+ if(gray_ok && !alpha && bits <= palettebits) palette_ok = 0; /*gray is less overhead*/
+ if(!stats->allow_palette) palette_ok = 0;
+
+ if(palette_ok) {
+ const unsigned char* p = stats->palette;
+ lodepng_palette_clear(mode_out); /*remove potential earlier palette*/
+ for(i = 0; i != stats->numcolors; ++i) {
+ error = lodepng_palette_add(mode_out, p[i * 4 + 0], p[i * 4 + 1], p[i * 4 + 2], p[i * 4 + 3]);
+ if(error) break;
+ }
+
+ mode_out->colortype = LCT_PALETTE;
+ mode_out->bitdepth = palettebits;
+
+ if(mode_in->colortype == LCT_PALETTE && mode_in->palettesize >= mode_out->palettesize
+ && mode_in->bitdepth == mode_out->bitdepth) {
+ /*If input should have same palette colors, keep original to preserve its order and prevent conversion*/
+ lodepng_color_mode_cleanup(mode_out);
+ lodepng_color_mode_copy(mode_out, mode_in);
+ }
+ } else /*8-bit or 16-bit per channel*/ {
+ mode_out->bitdepth = bits;
+ mode_out->colortype = alpha ? (gray_ok ? LCT_GREY_ALPHA : LCT_RGBA)
+ : (gray_ok ? LCT_GREY : LCT_RGB);
+ if(key) {
+ unsigned mask = (1u << mode_out->bitdepth) - 1u; /*stats always uses 16-bit, mask converts it*/
+ mode_out->key_r = stats->key_r & mask;
+ mode_out->key_g = stats->key_g & mask;
+ mode_out->key_b = stats->key_b & mask;
+ mode_out->key_defined = 1;
+ }
+ }
+
+ return error;
+}
+
+#endif /* #ifdef LODEPNG_COMPILE_ENCODER */
+
+/*
+Paeth predictor, used by PNG filter type 4
+The parameters are of type short, but should come from unsigned chars, the shorts
+are only needed to make the paeth calculation correct.
+*/
+static unsigned char paethPredictor(short a, short b, short c) {
+ short pa = LODEPNG_ABS(b - c);
+ short pb = LODEPNG_ABS(a - c);
+ short pc = LODEPNG_ABS(a + b - c - c);
+ /* return input value associated with smallest of pa, pb, pc (with certain priority if equal) */
+ if(pb < pa) { a = b; pa = pb; }
+ return (pc < pa) ? c : a;
+}
+
+/*shared values used by multiple Adam7 related functions*/
+
+static const unsigned ADAM7_IX[7] = { 0, 4, 0, 2, 0, 1, 0 }; /*x start values*/
+static const unsigned ADAM7_IY[7] = { 0, 0, 4, 0, 2, 0, 1 }; /*y start values*/
+static const unsigned ADAM7_DX[7] = { 8, 8, 4, 4, 2, 2, 1 }; /*x delta values*/
+static const unsigned ADAM7_DY[7] = { 8, 8, 8, 4, 4, 2, 2 }; /*y delta values*/
+
+/*
+Outputs various dimensions and positions in the image related to the Adam7 reduced images.
+passw: output containing the width of the 7 passes
+passh: output containing the height of the 7 passes
+filter_passstart: output containing the index of the start and end of each
+ reduced image with filter bytes
+padded_passstart output containing the index of the start and end of each
+ reduced image when without filter bytes but with padded scanlines
+passstart: output containing the index of the start and end of each reduced
+ image without padding between scanlines, but still padding between the images
+w, h: width and height of non-interlaced image
+bpp: bits per pixel
+"padded" is only relevant if bpp is less than 8 and a scanline or image does not
+ end at a full byte
+*/
+static void Adam7_getpassvalues(unsigned passw[7], unsigned passh[7], size_t filter_passstart[8],
+ size_t padded_passstart[8], size_t passstart[8], unsigned w, unsigned h, unsigned bpp) {
+ /*the passstart values have 8 values: the 8th one indicates the byte after the end of the 7th (= last) pass*/
+ unsigned i;
+
+ /*calculate width and height in pixels of each pass*/
+ for(i = 0; i != 7; ++i) {
+ passw[i] = (w + ADAM7_DX[i] - ADAM7_IX[i] - 1) / ADAM7_DX[i];
+ passh[i] = (h + ADAM7_DY[i] - ADAM7_IY[i] - 1) / ADAM7_DY[i];
+ if(passw[i] == 0) passh[i] = 0;
+ if(passh[i] == 0) passw[i] = 0;
+ }
+
+ filter_passstart[0] = padded_passstart[0] = passstart[0] = 0;
+ for(i = 0; i != 7; ++i) {
+ /*if passw[i] is 0, it's 0 bytes, not 1 (no filtertype-byte)*/
+ filter_passstart[i + 1] = filter_passstart[i]
+ + ((passw[i] && passh[i]) ? passh[i] * (1u + (passw[i] * bpp + 7u) / 8u) : 0);
+ /*bits padded if needed to fill full byte at end of each scanline*/
+ padded_passstart[i + 1] = padded_passstart[i] + passh[i] * ((passw[i] * bpp + 7u) / 8u);
+ /*only padded at end of reduced image*/
+ passstart[i + 1] = passstart[i] + (passh[i] * passw[i] * bpp + 7u) / 8u;
+ }
+}
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / PNG Decoder / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+/*read the information from the header and store it in the LodePNGInfo. return value is error*/
+unsigned lodepng_inspect(unsigned* w, unsigned* h, LodePNGState* state,
+ const unsigned char* in, size_t insize) {
+ unsigned width, height;
+ LodePNGInfo* info = &state->info_png;
+ if(insize == 0 || in == 0) {
+ CERROR_RETURN_ERROR(state->error, 48); /*error: the given data is empty*/
+ }
+ if(insize < 33) {
+ CERROR_RETURN_ERROR(state->error, 27); /*error: the data length is smaller than the length of a PNG header*/
+ }
+
+ /*when decoding a new PNG image, make sure all parameters created after previous decoding are reset*/
+ /* TODO: remove this. One should use a new LodePNGState for new sessions */
+ lodepng_info_cleanup(info);
+ lodepng_info_init(info);
+
+ if(in[0] != 137 || in[1] != 80 || in[2] != 78 || in[3] != 71
+ || in[4] != 13 || in[5] != 10 || in[6] != 26 || in[7] != 10) {
+ CERROR_RETURN_ERROR(state->error, 28); /*error: the first 8 bytes are not the correct PNG signature*/
+ }
+ if(lodepng_chunk_length(in + 8) != 13) {
+ CERROR_RETURN_ERROR(state->error, 94); /*error: header size must be 13 bytes*/
+ }
+ if(!lodepng_chunk_type_equals(in + 8, "IHDR")) {
+ CERROR_RETURN_ERROR(state->error, 29); /*error: it doesn't start with a IHDR chunk!*/
+ }
+
+ /*read the values given in the header*/
+ width = lodepng_read32bitInt(&in[16]);
+ height = lodepng_read32bitInt(&in[20]);
+ /*TODO: remove the undocumented feature that allows to give null pointers to width or height*/
+ if(w) *w = width;
+ if(h) *h = height;
+ info->color.bitdepth = in[24];
+ info->color.colortype = (LodePNGColorType)in[25];
+ info->compression_method = in[26];
+ info->filter_method = in[27];
+ info->interlace_method = in[28];
+
+ /*errors returned only after the parsing so other values are still output*/
+
+ /*error: invalid image size*/
+ if(width == 0 || height == 0) CERROR_RETURN_ERROR(state->error, 93);
+ /*error: invalid colortype or bitdepth combination*/
+ state->error = checkColorValidity(info->color.colortype, info->color.bitdepth);
+ if(state->error) return state->error;
+ /*error: only compression method 0 is allowed in the specification*/
+ if(info->compression_method != 0) CERROR_RETURN_ERROR(state->error, 32);
+ /*error: only filter method 0 is allowed in the specification*/
+ if(info->filter_method != 0) CERROR_RETURN_ERROR(state->error, 33);
+ /*error: only interlace methods 0 and 1 exist in the specification*/
+ if(info->interlace_method > 1) CERROR_RETURN_ERROR(state->error, 34);
+
+ if(!state->decoder.ignore_crc) {
+ unsigned CRC = lodepng_read32bitInt(&in[29]);
+ unsigned checksum = lodepng_crc32(&in[12], 17);
+ if(CRC != checksum) {
+ CERROR_RETURN_ERROR(state->error, 57); /*invalid CRC*/
+ }
+ }
+
+ return state->error;
+}
+
+static unsigned unfilterScanline(unsigned char* recon, const unsigned char* scanline, const unsigned char* precon,
+ size_t bytewidth, unsigned char filterType, size_t length) {
+ /*
+ For PNG filter method 0
+ unfilter a PNG image scanline by scanline. when the pixels are smaller than 1 byte,
+ the filter works byte per byte (bytewidth = 1)
+ precon is the previous unfiltered scanline, recon the result, scanline the current one
+ the incoming scanlines do NOT include the filtertype byte, that one is given in the parameter filterType instead
+ recon and scanline MAY be the same memory address! precon must be disjoint.
+ */
+
+ size_t i;
+ switch(filterType) {
+ case 0:
+ for(i = 0; i != length; ++i) recon[i] = scanline[i];
+ break;
+ case 1:
+ for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i];
+ for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + recon[i - bytewidth];
+ break;
+ case 2:
+ if(precon) {
+ for(i = 0; i != length; ++i) recon[i] = scanline[i] + precon[i];
+ } else {
+ for(i = 0; i != length; ++i) recon[i] = scanline[i];
+ }
+ break;
+ case 3:
+ if(precon) {
+ for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i] + (precon[i] >> 1u);
+ for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + ((recon[i - bytewidth] + precon[i]) >> 1u);
+ } else {
+ for(i = 0; i != bytewidth; ++i) recon[i] = scanline[i];
+ for(i = bytewidth; i < length; ++i) recon[i] = scanline[i] + (recon[i - bytewidth] >> 1u);
+ }
+ break;
+ case 4:
+ if(precon) {
+ for(i = 0; i != bytewidth; ++i) {
+ recon[i] = (scanline[i] + precon[i]); /*paethPredictor(0, precon[i], 0) is always precon[i]*/
+ }
+
+ /* Unroll independent paths of the paeth predictor. A 6x and 8x version would also be possible but that
+ adds too much code. Whether this actually speeds anything up at all depends on compiler and settings. */
+ if(bytewidth >= 4) {
+ for(; i + 3 < length; i += 4) {
+ size_t j = i - bytewidth;
+ unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2], s3 = scanline[i + 3];
+ unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2], r3 = recon[j + 3];
+ unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2], p3 = precon[i + 3];
+ unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2], q3 = precon[j + 3];
+ recon[i + 0] = s0 + paethPredictor(r0, p0, q0);
+ recon[i + 1] = s1 + paethPredictor(r1, p1, q1);
+ recon[i + 2] = s2 + paethPredictor(r2, p2, q2);
+ recon[i + 3] = s3 + paethPredictor(r3, p3, q3);
+ }
+ } else if(bytewidth >= 3) {
+ for(; i + 2 < length; i += 3) {
+ size_t j = i - bytewidth;
+ unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1], s2 = scanline[i + 2];
+ unsigned char r0 = recon[j + 0], r1 = recon[j + 1], r2 = recon[j + 2];
+ unsigned char p0 = precon[i + 0], p1 = precon[i + 1], p2 = precon[i + 2];
+ unsigned char q0 = precon[j + 0], q1 = precon[j + 1], q2 = precon[j + 2];
+ recon[i + 0] = s0 + paethPredictor(r0, p0, q0);
+ recon[i + 1] = s1 + paethPredictor(r1, p1, q1);
+ recon[i + 2] = s2 + paethPredictor(r2, p2, q2);
+ }
+ } else if(bytewidth >= 2) {
+ for(; i + 1 < length; i += 2) {
+ size_t j = i - bytewidth;
+ unsigned char s0 = scanline[i + 0], s1 = scanline[i + 1];
+ unsigned char r0 = recon[j + 0], r1 = recon[j + 1];
+ unsigned char p0 = precon[i + 0], p1 = precon[i + 1];
+ unsigned char q0 = precon[j + 0], q1 = precon[j + 1];
+ recon[i + 0] = s0 + paethPredictor(r0, p0, q0);
+ recon[i + 1] = s1 + paethPredictor(r1, p1, q1);
+ }
+ }
+
+ for(; i != length; ++i) {
+ recon[i] = (scanline[i] + paethPredictor(recon[i - bytewidth], precon[i], precon[i - bytewidth]));
+ }
+ } else {
+ for(i = 0; i != bytewidth; ++i) {
+ recon[i] = scanline[i];
+ }
+ for(i = bytewidth; i < length; ++i) {
+ /*paethPredictor(recon[i - bytewidth], 0, 0) is always recon[i - bytewidth]*/
+ recon[i] = (scanline[i] + recon[i - bytewidth]);
+ }
+ }
+ break;
+ default: return 36; /*error: invalid filter type given*/
+ }
+ return 0;
+}
+
+static unsigned unfilter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) {
+ /*
+ For PNG filter method 0
+ this function unfilters a single image (e.g. without interlacing this is called once, with Adam7 seven times)
+ out must have enough bytes allocated already, in must have the scanlines + 1 filtertype byte per scanline
+ w and h are image dimensions or dimensions of reduced image, bpp is bits per pixel
+ in and out are allowed to be the same memory address (but aren't the same size since in has the extra filter bytes)
+ */
+
+ unsigned y;
+ unsigned char* prevline = 0;
+
+ /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/
+ size_t bytewidth = (bpp + 7u) / 8u;
+ /*the width of a scanline in bytes, not including the filter type*/
+ size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u;
+
+ for(y = 0; y < h; ++y) {
+ size_t outindex = linebytes * y;
+ size_t inindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/
+ unsigned char filterType = in[inindex];
+
+ CERROR_TRY_RETURN(unfilterScanline(&out[outindex], &in[inindex + 1], prevline, bytewidth, filterType, linebytes));
+
+ prevline = &out[outindex];
+ }
+
+ return 0;
+}
+
+/*
+in: Adam7 interlaced image, with no padding bits between scanlines, but between
+ reduced images so that each reduced image starts at a byte.
+out: the same pixels, but re-ordered so that they're now a non-interlaced image with size w*h
+bpp: bits per pixel
+out has the following size in bits: w * h * bpp.
+in is possibly bigger due to padding bits between reduced images.
+out must be big enough AND must be 0 everywhere if bpp < 8 in the current implementation
+(because that's likely a little bit faster)
+NOTE: comments about padding bits are only relevant if bpp < 8
+*/
+static void Adam7_deinterlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) {
+ unsigned passw[7], passh[7];
+ size_t filter_passstart[8], padded_passstart[8], passstart[8];
+ unsigned i;
+
+ Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp);
+
+ if(bpp >= 8) {
+ for(i = 0; i != 7; ++i) {
+ unsigned x, y, b;
+ size_t bytewidth = bpp / 8u;
+ for(y = 0; y < passh[i]; ++y)
+ for(x = 0; x < passw[i]; ++x) {
+ size_t pixelinstart = passstart[i] + (y * passw[i] + x) * bytewidth;
+ size_t pixeloutstart = ((ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * (size_t)w
+ + ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bytewidth;
+ for(b = 0; b < bytewidth; ++b) {
+ out[pixeloutstart + b] = in[pixelinstart + b];
+ }
+ }
+ }
+ } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ {
+ for(i = 0; i != 7; ++i) {
+ unsigned x, y, b;
+ unsigned ilinebits = bpp * passw[i];
+ unsigned olinebits = bpp * w;
+ size_t obp, ibp; /*bit pointers (for out and in buffer)*/
+ for(y = 0; y < passh[i]; ++y)
+ for(x = 0; x < passw[i]; ++x) {
+ ibp = (8 * passstart[i]) + (y * ilinebits + x * bpp);
+ obp = (ADAM7_IY[i] + (size_t)y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + (size_t)x * ADAM7_DX[i]) * bpp;
+ for(b = 0; b < bpp; ++b) {
+ unsigned char bit = readBitFromReversedStream(&ibp, in);
+ setBitOfReversedStream(&obp, out, bit);
+ }
+ }
+ }
+ }
+}
+
+static void removePaddingBits(unsigned char* out, const unsigned char* in,
+ size_t olinebits, size_t ilinebits, unsigned h) {
+ /*
+ After filtering there are still padding bits if scanlines have non multiple of 8 bit amounts. They need
+ to be removed (except at last scanline of (Adam7-reduced) image) before working with pure image buffers
+ for the Adam7 code, the color convert code and the output to the user.
+ in and out are allowed to be the same buffer, in may also be higher but still overlapping; in must
+ have >= ilinebits*h bits, out must have >= olinebits*h bits, olinebits must be <= ilinebits
+ also used to move bits after earlier such operations happened, e.g. in a sequence of reduced images from Adam7
+ only useful if (ilinebits - olinebits) is a value in the range 1..7
+ */
+ unsigned y;
+ size_t diff = ilinebits - olinebits;
+ size_t ibp = 0, obp = 0; /*input and output bit pointers*/
+ for(y = 0; y < h; ++y) {
+ size_t x;
+ for(x = 0; x < olinebits; ++x) {
+ unsigned char bit = readBitFromReversedStream(&ibp, in);
+ setBitOfReversedStream(&obp, out, bit);
+ }
+ ibp += diff;
+ }
+}
+
+/*out must be buffer big enough to contain full image, and in must contain the full decompressed data from
+the IDAT chunks (with filter index bytes and possible padding bits)
+return value is error*/
+static unsigned postProcessScanlines(unsigned char* out, unsigned char* in,
+ unsigned w, unsigned h, const LodePNGInfo* info_png) {
+ /*
+ This function converts the filtered-padded-interlaced data into pure 2D image buffer with the PNG's colortype.
+ Steps:
+ *) if no Adam7: 1) unfilter 2) remove padding bits (= possible extra bits per scanline if bpp < 8)
+ *) if adam7: 1) 7x unfilter 2) 7x remove padding bits 3) Adam7_deinterlace
+ NOTE: the in buffer will be overwritten with intermediate data!
+ */
+ unsigned bpp = lodepng_get_bpp(&info_png->color);
+ if(bpp == 0) return 31; /*error: invalid colortype*/
+
+ if(info_png->interlace_method == 0) {
+ if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) {
+ CERROR_TRY_RETURN(unfilter(in, in, w, h, bpp));
+ removePaddingBits(out, in, w * bpp, ((w * bpp + 7u) / 8u) * 8u, h);
+ }
+ /*we can immediately filter into the out buffer, no other steps needed*/
+ else CERROR_TRY_RETURN(unfilter(out, in, w, h, bpp));
+ } else /*interlace_method is 1 (Adam7)*/ {
+ unsigned passw[7], passh[7]; size_t filter_passstart[8], padded_passstart[8], passstart[8];
+ unsigned i;
+
+ Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp);
+
+ for(i = 0; i != 7; ++i) {
+ CERROR_TRY_RETURN(unfilter(&in[padded_passstart[i]], &in[filter_passstart[i]], passw[i], passh[i], bpp));
+ /*TODO: possible efficiency improvement: if in this reduced image the bits fit nicely in 1 scanline,
+ move bytes instead of bits or move not at all*/
+ if(bpp < 8) {
+ /*remove padding bits in scanlines; after this there still may be padding
+ bits between the different reduced images: each reduced image still starts nicely at a byte*/
+ removePaddingBits(&in[passstart[i]], &in[padded_passstart[i]], passw[i] * bpp,
+ ((passw[i] * bpp + 7u) / 8u) * 8u, passh[i]);
+ }
+ }
+
+ Adam7_deinterlace(out, in, w, h, bpp);
+ }
+
+ return 0;
+}
+
+static unsigned readChunk_PLTE(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) {
+ unsigned pos = 0, i;
+ color->palettesize = chunkLength / 3u;
+ if(color->palettesize == 0 || color->palettesize > 256) return 38; /*error: palette too small or big*/
+ lodepng_color_mode_alloc_palette(color);
+ if(!color->palette && color->palettesize) {
+ color->palettesize = 0;
+ return 83; /*alloc fail*/
+ }
+
+ for(i = 0; i != color->palettesize; ++i) {
+ color->palette[4 * i + 0] = data[pos++]; /*R*/
+ color->palette[4 * i + 1] = data[pos++]; /*G*/
+ color->palette[4 * i + 2] = data[pos++]; /*B*/
+ color->palette[4 * i + 3] = 255; /*alpha*/
+ }
+
+ return 0; /* OK */
+}
+
+static unsigned readChunk_tRNS(LodePNGColorMode* color, const unsigned char* data, size_t chunkLength) {
+ unsigned i;
+ if(color->colortype == LCT_PALETTE) {
+ /*error: more alpha values given than there are palette entries*/
+ if(chunkLength > color->palettesize) return 39;
+
+ for(i = 0; i != chunkLength; ++i) color->palette[4 * i + 3] = data[i];
+ } else if(color->colortype == LCT_GREY) {
+ /*error: this chunk must be 2 bytes for grayscale image*/
+ if(chunkLength != 2) return 30;
+
+ color->key_defined = 1;
+ color->key_r = color->key_g = color->key_b = 256u * data[0] + data[1];
+ } else if(color->colortype == LCT_RGB) {
+ /*error: this chunk must be 6 bytes for RGB image*/
+ if(chunkLength != 6) return 41;
+
+ color->key_defined = 1;
+ color->key_r = 256u * data[0] + data[1];
+ color->key_g = 256u * data[2] + data[3];
+ color->key_b = 256u * data[4] + data[5];
+ }
+ else return 42; /*error: tRNS chunk not allowed for other color models*/
+
+ return 0; /* OK */
+}
+
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+/*background color chunk (bKGD)*/
+static unsigned readChunk_bKGD(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ if(info->color.colortype == LCT_PALETTE) {
+ /*error: this chunk must be 1 byte for indexed color image*/
+ if(chunkLength != 1) return 43;
+
+ /*error: invalid palette index, or maybe this chunk appeared before PLTE*/
+ if(data[0] >= info->color.palettesize) return 103;
+
+ info->background_defined = 1;
+ info->background_r = info->background_g = info->background_b = data[0];
+ } else if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) {
+ /*error: this chunk must be 2 bytes for grayscale image*/
+ if(chunkLength != 2) return 44;
+
+ /*the values are truncated to bitdepth in the PNG file*/
+ info->background_defined = 1;
+ info->background_r = info->background_g = info->background_b = 256u * data[0] + data[1];
+ } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) {
+ /*error: this chunk must be 6 bytes for grayscale image*/
+ if(chunkLength != 6) return 45;
+
+ /*the values are truncated to bitdepth in the PNG file*/
+ info->background_defined = 1;
+ info->background_r = 256u * data[0] + data[1];
+ info->background_g = 256u * data[2] + data[3];
+ info->background_b = 256u * data[4] + data[5];
+ }
+
+ return 0; /* OK */
+}
+
+/*text chunk (tEXt)*/
+static unsigned readChunk_tEXt(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ unsigned error = 0;
+ char *key = 0, *str = 0;
+
+ while(!error) /*not really a while loop, only used to break on error*/ {
+ unsigned length, string2_begin;
+
+ length = 0;
+ while(length < chunkLength && data[length] != 0) ++length;
+ /*even though it's not allowed by the standard, no error is thrown if
+ there's no null termination char, if the text is empty*/
+ if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/
+
+ key = (char*)lodepng_malloc(length + 1);
+ if(!key) CERROR_BREAK(error, 83); /*alloc fail*/
+
+ lodepng_memcpy(key, data, length);
+ key[length] = 0;
+
+ string2_begin = length + 1; /*skip keyword null terminator*/
+
+ length = (unsigned)(chunkLength < string2_begin ? 0 : chunkLength - string2_begin);
+ str = (char*)lodepng_malloc(length + 1);
+ if(!str) CERROR_BREAK(error, 83); /*alloc fail*/
+
+ lodepng_memcpy(str, data + string2_begin, length);
+ str[length] = 0;
+
+ error = lodepng_add_text(info, key, str);
+
+ break;
+ }
+
+ lodepng_free(key);
+ lodepng_free(str);
+
+ return error;
+}
+
+/*compressed text chunk (zTXt)*/
+static unsigned readChunk_zTXt(LodePNGInfo* info, const LodePNGDecompressSettings* zlibsettings,
+ const unsigned char* data, size_t chunkLength) {
+ unsigned error = 0;
+
+ unsigned length, string2_begin;
+ char *key = 0;
+ unsigned char* str = 0;
+ size_t size = 0;
+
+ while(!error) /*not really a while loop, only used to break on error*/ {
+ for(length = 0; length < chunkLength && data[length] != 0; ++length) ;
+ if(length + 2 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/
+ if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/
+
+ key = (char*)lodepng_malloc(length + 1);
+ if(!key) CERROR_BREAK(error, 83); /*alloc fail*/
+
+ lodepng_memcpy(key, data, length);
+ key[length] = 0;
+
+ if(data[length + 1] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/
+
+ string2_begin = length + 2;
+ if(string2_begin > chunkLength) CERROR_BREAK(error, 75); /*no null termination, corrupt?*/
+
+ length = (unsigned)chunkLength - string2_begin;
+ /*will fail if zlib error, e.g. if length is too small*/
+ error = zlib_decompress(&str, &size, 0, &data[string2_begin],
+ length, zlibsettings);
+ if(error) break;
+ error = lodepng_add_text_sized(info, key, (char*)str, size);
+
+ break;
+ }
+
+ lodepng_free(key);
+ lodepng_free(str);
+
+ return error;
+}
+
+/*international text chunk (iTXt)*/
+static unsigned readChunk_iTXt(LodePNGInfo* info, const LodePNGDecompressSettings* zlibsettings,
+ const unsigned char* data, size_t chunkLength) {
+ unsigned error = 0;
+ unsigned i;
+
+ unsigned length, begin, compressed;
+ char *key = 0, *langtag = 0, *transkey = 0;
+
+ while(!error) /*not really a while loop, only used to break on error*/ {
+ /*Quick check if the chunk length isn't too small. Even without check
+ it'd still fail with other error checks below if it's too short. This just gives a different error code.*/
+ if(chunkLength < 5) CERROR_BREAK(error, 30); /*iTXt chunk too short*/
+
+ /*read the key*/
+ for(length = 0; length < chunkLength && data[length] != 0; ++length) ;
+ if(length + 3 >= chunkLength) CERROR_BREAK(error, 75); /*no null termination char, corrupt?*/
+ if(length < 1 || length > 79) CERROR_BREAK(error, 89); /*keyword too short or long*/
+
+ key = (char*)lodepng_malloc(length + 1);
+ if(!key) CERROR_BREAK(error, 83); /*alloc fail*/
+
+ lodepng_memcpy(key, data, length);
+ key[length] = 0;
+
+ /*read the compression method*/
+ compressed = data[length + 1];
+ if(data[length + 2] != 0) CERROR_BREAK(error, 72); /*the 0 byte indicating compression must be 0*/
+
+ /*even though it's not allowed by the standard, no error is thrown if
+ there's no null termination char, if the text is empty for the next 3 texts*/
+
+ /*read the langtag*/
+ begin = length + 3;
+ length = 0;
+ for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length;
+
+ langtag = (char*)lodepng_malloc(length + 1);
+ if(!langtag) CERROR_BREAK(error, 83); /*alloc fail*/
+
+ lodepng_memcpy(langtag, data + begin, length);
+ langtag[length] = 0;
+
+ /*read the transkey*/
+ begin += length + 1;
+ length = 0;
+ for(i = begin; i < chunkLength && data[i] != 0; ++i) ++length;
+
+ transkey = (char*)lodepng_malloc(length + 1);
+ if(!transkey) CERROR_BREAK(error, 83); /*alloc fail*/
+
+ lodepng_memcpy(transkey, data + begin, length);
+ transkey[length] = 0;
+
+ /*read the actual text*/
+ begin += length + 1;
+
+ length = (unsigned)chunkLength < begin ? 0 : (unsigned)chunkLength - begin;
+
+ if(compressed) {
+ unsigned char* str = 0;
+ size_t size = 0;
+ /*will fail if zlib error, e.g. if length is too small*/
+ error = zlib_decompress(&str, &size, 0, &data[begin],
+ length, zlibsettings);
+ if(!error) error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)str, size);
+ lodepng_free(str);
+ } else {
+ error = lodepng_add_itext_sized(info, key, langtag, transkey, (char*)(data + begin), length);
+ }
+
+ break;
+ }
+
+ lodepng_free(key);
+ lodepng_free(langtag);
+ lodepng_free(transkey);
+
+ return error;
+}
+
+static unsigned readChunk_tIME(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ if(chunkLength != 7) return 73; /*invalid tIME chunk size*/
+
+ info->time_defined = 1;
+ info->time.year = 256u * data[0] + data[1];
+ info->time.month = data[2];
+ info->time.day = data[3];
+ info->time.hour = data[4];
+ info->time.minute = data[5];
+ info->time.second = data[6];
+
+ return 0; /* OK */
+}
+
+static unsigned readChunk_pHYs(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ if(chunkLength != 9) return 74; /*invalid pHYs chunk size*/
+
+ info->phys_defined = 1;
+ info->phys_x = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3];
+ info->phys_y = 16777216u * data[4] + 65536u * data[5] + 256u * data[6] + data[7];
+ info->phys_unit = data[8];
+
+ return 0; /* OK */
+}
+
+static unsigned readChunk_gAMA(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ if(chunkLength != 4) return 96; /*invalid gAMA chunk size*/
+
+ info->gama_defined = 1;
+ info->gama_gamma = 16777216u * data[0] + 65536u * data[1] + 256u * data[2] + data[3];
+
+ return 0; /* OK */
+}
+
+static unsigned readChunk_cHRM(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ if(chunkLength != 32) return 97; /*invalid cHRM chunk size*/
+
+ info->chrm_defined = 1;
+ info->chrm_white_x = 16777216u * data[ 0] + 65536u * data[ 1] + 256u * data[ 2] + data[ 3];
+ info->chrm_white_y = 16777216u * data[ 4] + 65536u * data[ 5] + 256u * data[ 6] + data[ 7];
+ info->chrm_red_x = 16777216u * data[ 8] + 65536u * data[ 9] + 256u * data[10] + data[11];
+ info->chrm_red_y = 16777216u * data[12] + 65536u * data[13] + 256u * data[14] + data[15];
+ info->chrm_green_x = 16777216u * data[16] + 65536u * data[17] + 256u * data[18] + data[19];
+ info->chrm_green_y = 16777216u * data[20] + 65536u * data[21] + 256u * data[22] + data[23];
+ info->chrm_blue_x = 16777216u * data[24] + 65536u * data[25] + 256u * data[26] + data[27];
+ info->chrm_blue_y = 16777216u * data[28] + 65536u * data[29] + 256u * data[30] + data[31];
+
+ return 0; /* OK */
+}
+
+static unsigned readChunk_sRGB(LodePNGInfo* info, const unsigned char* data, size_t chunkLength) {
+ if(chunkLength != 1) return 98; /*invalid sRGB chunk size (this one is never ignored)*/
+
+ info->srgb_defined = 1;
+ info->srgb_intent = data[0];
+
+ return 0; /* OK */
+}
+
+static unsigned readChunk_iCCP(LodePNGInfo* info, const LodePNGDecompressSettings* zlibsettings,
+ const unsigned char* data, size_t chunkLength) {
+ unsigned error = 0;
+ unsigned i;
+ size_t size = 0;
+
+ unsigned length, string2_begin;
+
+ info->iccp_defined = 1;
+ if(info->iccp_name) lodepng_clear_icc(info);
+
+ for(length = 0; length < chunkLength && data[length] != 0; ++length) ;
+ if(length + 2 >= chunkLength) return 75; /*no null termination, corrupt?*/
+ if(length < 1 || length > 79) return 89; /*keyword too short or long*/
+
+ info->iccp_name = (char*)lodepng_malloc(length + 1);
+ if(!info->iccp_name) return 83; /*alloc fail*/
+
+ info->iccp_name[length] = 0;
+ for(i = 0; i != length; ++i) info->iccp_name[i] = (char)data[i];
+
+ if(data[length + 1] != 0) return 72; /*the 0 byte indicating compression must be 0*/
+
+ string2_begin = length + 2;
+ if(string2_begin > chunkLength) return 75; /*no null termination, corrupt?*/
+
+ length = (unsigned)chunkLength - string2_begin;
+ error = zlib_decompress(&info->iccp_profile, &size, 0,
+ &data[string2_begin],
+ length, zlibsettings);
+ info->iccp_profile_size = size;
+ if(!error && !info->iccp_profile_size) error = 100; /*invalid ICC profile size*/
+ return error;
+}
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos,
+ const unsigned char* in, size_t insize) {
+ const unsigned char* chunk = in + pos;
+ unsigned chunkLength;
+ const unsigned char* data;
+ unsigned unhandled = 0;
+ unsigned error = 0;
+
+ if(pos + 4 > insize) return 30;
+ chunkLength = lodepng_chunk_length(chunk);
+ if(chunkLength > 2147483647) return 63;
+ data = lodepng_chunk_data_const(chunk);
+ if(data + chunkLength + 4 > in + insize) return 30;
+
+ if(lodepng_chunk_type_equals(chunk, "PLTE")) {
+ error = readChunk_PLTE(&state->info_png.color, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "tRNS")) {
+ error = readChunk_tRNS(&state->info_png.color, data, chunkLength);
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ } else if(lodepng_chunk_type_equals(chunk, "bKGD")) {
+ error = readChunk_bKGD(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "tEXt")) {
+ error = readChunk_tEXt(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "zTXt")) {
+ error = readChunk_zTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "iTXt")) {
+ error = readChunk_iTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "tIME")) {
+ error = readChunk_tIME(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "pHYs")) {
+ error = readChunk_pHYs(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "gAMA")) {
+ error = readChunk_gAMA(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "cHRM")) {
+ error = readChunk_cHRM(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "sRGB")) {
+ error = readChunk_sRGB(&state->info_png, data, chunkLength);
+ } else if(lodepng_chunk_type_equals(chunk, "iCCP")) {
+ error = readChunk_iCCP(&state->info_png, &state->decoder.zlibsettings, data, chunkLength);
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ } else {
+ /* unhandled chunk is ok (is not an error) */
+ unhandled = 1;
+ }
+
+ if(!error && !unhandled && !state->decoder.ignore_crc) {
+ if(lodepng_chunk_check_crc(chunk)) return 57; /*invalid CRC*/
+ }
+
+ return error;
+}
+
+/*read a PNG, the result will be in the same color type as the PNG (hence "generic")*/
+static void decodeGeneric(unsigned char** out, unsigned* w, unsigned* h,
+ LodePNGState* state,
+ const unsigned char* in, size_t insize) {
+ unsigned char IEND = 0;
+ const unsigned char* chunk;
+ unsigned char* idat; /*the data from idat chunks, zlib compressed*/
+ size_t idatsize = 0;
+ unsigned char* scanlines = 0;
+ size_t scanlines_size = 0, expected_size = 0;
+ size_t outsize = 0;
+
+ /*for unknown chunk order*/
+ unsigned unknown = 0;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ unsigned critical_pos = 1; /*1 = after IHDR, 2 = after PLTE, 3 = after IDAT*/
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+
+ /* safe output values in case error happens */
+ *out = 0;
+ *w = *h = 0;
+
+ state->error = lodepng_inspect(w, h, state, in, insize); /*reads header and resets other parameters in state->info_png*/
+ if(state->error) return;
+
+ if(lodepng_pixel_overflow(*w, *h, &state->info_png.color, &state->info_raw)) {
+ CERROR_RETURN(state->error, 92); /*overflow possible due to amount of pixels*/
+ }
+
+ /*the input filesize is a safe upper bound for the sum of idat chunks size*/
+ idat = (unsigned char*)lodepng_malloc(insize);
+ if(!idat) CERROR_RETURN(state->error, 83); /*alloc fail*/
+
+ chunk = &in[33]; /*first byte of the first chunk after the header*/
+
+ /*loop through the chunks, ignoring unknown chunks and stopping at IEND chunk.
+ IDAT data is put at the start of the in buffer*/
+ while(!IEND && !state->error) {
+ unsigned chunkLength;
+ const unsigned char* data; /*the data in the chunk*/
+
+ /*error: size of the in buffer too small to contain next chunk*/
+ if((size_t)((chunk - in) + 12) > insize || chunk < in) {
+ if(state->decoder.ignore_end) break; /*other errors may still happen though*/
+ CERROR_BREAK(state->error, 30);
+ }
+
+ /*length of the data of the chunk, excluding the length bytes, chunk type and CRC bytes*/
+ chunkLength = lodepng_chunk_length(chunk);
+ /*error: chunk length larger than the max PNG chunk size*/
+ if(chunkLength > 2147483647) {
+ if(state->decoder.ignore_end) break; /*other errors may still happen though*/
+ CERROR_BREAK(state->error, 63);
+ }
+
+ if((size_t)((chunk - in) + chunkLength + 12) > insize || (chunk + chunkLength + 12) < in) {
+ CERROR_BREAK(state->error, 64); /*error: size of the in buffer too small to contain next chunk*/
+ }
+
+ data = lodepng_chunk_data_const(chunk);
+
+ unknown = 0;
+
+ /*IDAT chunk, containing compressed image data*/
+ if(lodepng_chunk_type_equals(chunk, "IDAT")) {
+ size_t newsize;
+ if(lodepng_addofl(idatsize, chunkLength, &newsize)) CERROR_BREAK(state->error, 95);
+ if(newsize > insize) CERROR_BREAK(state->error, 95);
+ lodepng_memcpy(idat + idatsize, data, chunkLength);
+ idatsize += chunkLength;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ critical_pos = 3;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ } else if(lodepng_chunk_type_equals(chunk, "IEND")) {
+ /*IEND chunk*/
+ IEND = 1;
+ } else if(lodepng_chunk_type_equals(chunk, "PLTE")) {
+ /*palette chunk (PLTE)*/
+ state->error = readChunk_PLTE(&state->info_png.color, data, chunkLength);
+ if(state->error) break;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ critical_pos = 2;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ } else if(lodepng_chunk_type_equals(chunk, "tRNS")) {
+ /*palette transparency chunk (tRNS). Even though this one is an ancillary chunk , it is still compiled
+ in without 'LODEPNG_COMPILE_ANCILLARY_CHUNKS' because it contains essential color information that
+ affects the alpha channel of pixels. */
+ state->error = readChunk_tRNS(&state->info_png.color, data, chunkLength);
+ if(state->error) break;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*background color chunk (bKGD)*/
+ } else if(lodepng_chunk_type_equals(chunk, "bKGD")) {
+ state->error = readChunk_bKGD(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ } else if(lodepng_chunk_type_equals(chunk, "tEXt")) {
+ /*text chunk (tEXt)*/
+ if(state->decoder.read_text_chunks) {
+ state->error = readChunk_tEXt(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ }
+ } else if(lodepng_chunk_type_equals(chunk, "zTXt")) {
+ /*compressed text chunk (zTXt)*/
+ if(state->decoder.read_text_chunks) {
+ state->error = readChunk_zTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength);
+ if(state->error) break;
+ }
+ } else if(lodepng_chunk_type_equals(chunk, "iTXt")) {
+ /*international text chunk (iTXt)*/
+ if(state->decoder.read_text_chunks) {
+ state->error = readChunk_iTXt(&state->info_png, &state->decoder.zlibsettings, data, chunkLength);
+ if(state->error) break;
+ }
+ } else if(lodepng_chunk_type_equals(chunk, "tIME")) {
+ state->error = readChunk_tIME(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ } else if(lodepng_chunk_type_equals(chunk, "pHYs")) {
+ state->error = readChunk_pHYs(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ } else if(lodepng_chunk_type_equals(chunk, "gAMA")) {
+ state->error = readChunk_gAMA(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ } else if(lodepng_chunk_type_equals(chunk, "cHRM")) {
+ state->error = readChunk_cHRM(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ } else if(lodepng_chunk_type_equals(chunk, "sRGB")) {
+ state->error = readChunk_sRGB(&state->info_png, data, chunkLength);
+ if(state->error) break;
+ } else if(lodepng_chunk_type_equals(chunk, "iCCP")) {
+ state->error = readChunk_iCCP(&state->info_png, &state->decoder.zlibsettings, data, chunkLength);
+ if(state->error) break;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ } else /*it's not an implemented chunk type, so ignore it: skip over the data*/ {
+ /*error: unknown critical chunk (5th bit of first byte of chunk type is 0)*/
+ if(!state->decoder.ignore_critical && !lodepng_chunk_ancillary(chunk)) {
+ CERROR_BREAK(state->error, 69);
+ }
+
+ unknown = 1;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ if(state->decoder.remember_unknown_chunks) {
+ state->error = lodepng_chunk_append(&state->info_png.unknown_chunks_data[critical_pos - 1],
+ &state->info_png.unknown_chunks_size[critical_pos - 1], chunk);
+ if(state->error) break;
+ }
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ }
+
+ if(!state->decoder.ignore_crc && !unknown) /*check CRC if wanted, only on known chunk types*/ {
+ if(lodepng_chunk_check_crc(chunk)) CERROR_BREAK(state->error, 57); /*invalid CRC*/
+ }
+
+ if(!IEND) chunk = lodepng_chunk_next_const(chunk, in + insize);
+ }
+
+ if(state->info_png.color.colortype == LCT_PALETTE && !state->info_png.color.palette) {
+ state->error = 106; /* error: PNG file must have PLTE chunk if color type is palette */
+ }
+
+ if(!state->error) {
+ /*predict output size, to allocate exact size for output buffer to avoid more dynamic allocation.
+ If the decompressed size does not match the prediction, the image must be corrupt.*/
+ if(state->info_png.interlace_method == 0) {
+ size_t bpp = lodepng_get_bpp(&state->info_png.color);
+ expected_size = lodepng_get_raw_size_idat(*w, *h, bpp);
+ } else {
+ size_t bpp = lodepng_get_bpp(&state->info_png.color);
+ /*Adam-7 interlaced: expected size is the sum of the 7 sub-images sizes*/
+ expected_size = 0;
+ expected_size += lodepng_get_raw_size_idat((*w + 7) >> 3, (*h + 7) >> 3, bpp);
+ if(*w > 4) expected_size += lodepng_get_raw_size_idat((*w + 3) >> 3, (*h + 7) >> 3, bpp);
+ expected_size += lodepng_get_raw_size_idat((*w + 3) >> 2, (*h + 3) >> 3, bpp);
+ if(*w > 2) expected_size += lodepng_get_raw_size_idat((*w + 1) >> 2, (*h + 3) >> 2, bpp);
+ expected_size += lodepng_get_raw_size_idat((*w + 1) >> 1, (*h + 1) >> 2, bpp);
+ if(*w > 1) expected_size += lodepng_get_raw_size_idat((*w + 0) >> 1, (*h + 1) >> 1, bpp);
+ expected_size += lodepng_get_raw_size_idat((*w + 0), (*h + 0) >> 1, bpp);
+ }
+
+ state->error = zlib_decompress(&scanlines, &scanlines_size, expected_size, idat, idatsize, &state->decoder.zlibsettings);
+ }
+ if(!state->error && scanlines_size != expected_size) state->error = 91; /*decompressed size doesn't match prediction*/
+ lodepng_free(idat);
+
+ if(!state->error) {
+ outsize = lodepng_get_raw_size(*w, *h, &state->info_png.color);
+ *out = (unsigned char*)lodepng_malloc(outsize);
+ if(!*out) state->error = 83; /*alloc fail*/
+ }
+ if(!state->error) {
+ lodepng_memset(*out, 0, outsize);
+ state->error = postProcessScanlines(*out, scanlines, *w, *h, &state->info_png);
+ }
+ lodepng_free(scanlines);
+}
+
+unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h,
+ LodePNGState* state,
+ const unsigned char* in, size_t insize) {
+ *out = 0;
+ decodeGeneric(out, w, h, state, in, insize);
+ if(state->error) return state->error;
+ if(!state->decoder.color_convert || lodepng_color_mode_equal(&state->info_raw, &state->info_png.color)) {
+ /*same color type, no copying or converting of data needed*/
+ /*store the info_png color settings on the info_raw so that the info_raw still reflects what colortype
+ the raw image has to the end user*/
+ if(!state->decoder.color_convert) {
+ state->error = lodepng_color_mode_copy(&state->info_raw, &state->info_png.color);
+ if(state->error) return state->error;
+ }
+ } else { /*color conversion needed*/
+ unsigned char* data = *out;
+ size_t outsize;
+
+ /*TODO: check if this works according to the statement in the documentation: "The converter can convert
+ from grayscale input color type, to 8-bit grayscale or grayscale with alpha"*/
+ if(!(state->info_raw.colortype == LCT_RGB || state->info_raw.colortype == LCT_RGBA)
+ && !(state->info_raw.bitdepth == 8)) {
+ return 56; /*unsupported color mode conversion*/
+ }
+
+ outsize = lodepng_get_raw_size(*w, *h, &state->info_raw);
+ *out = (unsigned char*)lodepng_malloc(outsize);
+ if(!(*out)) {
+ state->error = 83; /*alloc fail*/
+ }
+ else state->error = lodepng_convert(*out, data, &state->info_raw,
+ &state->info_png.color, *w, *h);
+ lodepng_free(data);
+ }
+ return state->error;
+}
+
+unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in,
+ size_t insize, LodePNGColorType colortype, unsigned bitdepth) {
+ unsigned error;
+ LodePNGState state;
+ lodepng_state_init(&state);
+ state.info_raw.colortype = colortype;
+ state.info_raw.bitdepth = bitdepth;
+ error = lodepng_decode(out, w, h, &state, in, insize);
+ lodepng_state_cleanup(&state);
+ return error;
+}
+
+unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) {
+ return lodepng_decode_memory(out, w, h, in, insize, LCT_RGBA, 8);
+}
+
+unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h, const unsigned char* in, size_t insize) {
+ return lodepng_decode_memory(out, w, h, in, insize, LCT_RGB, 8);
+}
+
+#ifdef LODEPNG_COMPILE_DISK
+unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ unsigned char* buffer = 0;
+ size_t buffersize;
+ unsigned error;
+ /* safe output values in case error happens */
+ *out = 0;
+ *w = *h = 0;
+ error = lodepng_load_file(&buffer, &buffersize, filename);
+ if(!error) error = lodepng_decode_memory(out, w, h, buffer, buffersize, colortype, bitdepth);
+ lodepng_free(buffer);
+ return error;
+}
+
+unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) {
+ return lodepng_decode_file(out, w, h, filename, LCT_RGBA, 8);
+}
+
+unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h, const char* filename) {
+ return lodepng_decode_file(out, w, h, filename, LCT_RGB, 8);
+}
+#endif /*LODEPNG_COMPILE_DISK*/
+
+void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings) {
+ settings->color_convert = 1;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ settings->read_text_chunks = 1;
+ settings->remember_unknown_chunks = 0;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ settings->ignore_crc = 0;
+ settings->ignore_critical = 0;
+ settings->ignore_end = 0;
+ lodepng_decompress_settings_init(&settings->zlibsettings);
+}
+
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER)
+
+void lodepng_state_init(LodePNGState* state) {
+#ifdef LODEPNG_COMPILE_DECODER
+ lodepng_decoder_settings_init(&state->decoder);
+#endif /*LODEPNG_COMPILE_DECODER*/
+#ifdef LODEPNG_COMPILE_ENCODER
+ lodepng_encoder_settings_init(&state->encoder);
+#endif /*LODEPNG_COMPILE_ENCODER*/
+ lodepng_color_mode_init(&state->info_raw);
+ lodepng_info_init(&state->info_png);
+ state->error = 1;
+}
+
+void lodepng_state_cleanup(LodePNGState* state) {
+ lodepng_color_mode_cleanup(&state->info_raw);
+ lodepng_info_cleanup(&state->info_png);
+}
+
+void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source) {
+ lodepng_state_cleanup(dest);
+ *dest = *source;
+ lodepng_color_mode_init(&dest->info_raw);
+ lodepng_info_init(&dest->info_png);
+ dest->error = lodepng_color_mode_copy(&dest->info_raw, &source->info_raw); if(dest->error) return;
+ dest->error = lodepng_info_copy(&dest->info_png, &source->info_png); if(dest->error) return;
+}
+
+#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */
+
+#ifdef LODEPNG_COMPILE_ENCODER
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* / PNG Encoder / */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+
+static unsigned writeSignature(ucvector* out) {
+ size_t pos = out->size;
+ const unsigned char signature[] = {137, 80, 78, 71, 13, 10, 26, 10};
+ /*8 bytes PNG signature, aka the magic bytes*/
+ if(!ucvector_resize(out, out->size + 8)) return 83; /*alloc fail*/
+ lodepng_memcpy(out->data + pos, signature, 8);
+ return 0;
+}
+
+static unsigned addChunk_IHDR(ucvector* out, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth, unsigned interlace_method) {
+ unsigned char *chunk, *data;
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 13, "IHDR"));
+ data = chunk + 8;
+
+ lodepng_set32bitInt(data + 0, w); /*width*/
+ lodepng_set32bitInt(data + 4, h); /*height*/
+ data[8] = (unsigned char)bitdepth; /*bit depth*/
+ data[9] = (unsigned char)colortype; /*color type*/
+ data[10] = 0; /*compression method*/
+ data[11] = 0; /*filter method*/
+ data[12] = interlace_method; /*interlace method*/
+
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+/* only adds the chunk if needed (there is a key or palette with alpha) */
+static unsigned addChunk_PLTE(ucvector* out, const LodePNGColorMode* info) {
+ unsigned char* chunk;
+ size_t i, j = 8;
+
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, info->palettesize * 3, "PLTE"));
+
+ for(i = 0; i != info->palettesize; ++i) {
+ /*add all channels except alpha channel*/
+ chunk[j++] = info->palette[i * 4 + 0];
+ chunk[j++] = info->palette[i * 4 + 1];
+ chunk[j++] = info->palette[i * 4 + 2];
+ }
+
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_tRNS(ucvector* out, const LodePNGColorMode* info) {
+ unsigned char* chunk = 0;
+
+ if(info->colortype == LCT_PALETTE) {
+ size_t i, amount = info->palettesize;
+ /*the tail of palette values that all have 255 as alpha, does not have to be encoded*/
+ for(i = info->palettesize; i != 0; --i) {
+ if(info->palette[4 * (i - 1) + 3] != 255) break;
+ --amount;
+ }
+ if(amount) {
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, amount, "tRNS"));
+ /*add the alpha channel values from the palette*/
+ for(i = 0; i != amount; ++i) chunk[8 + i] = info->palette[4 * i + 3];
+ }
+ } else if(info->colortype == LCT_GREY) {
+ if(info->key_defined) {
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "tRNS"));
+ chunk[8] = (unsigned char)(info->key_r >> 8);
+ chunk[9] = (unsigned char)(info->key_r & 255);
+ }
+ } else if(info->colortype == LCT_RGB) {
+ if(info->key_defined) {
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "tRNS"));
+ chunk[8] = (unsigned char)(info->key_r >> 8);
+ chunk[9] = (unsigned char)(info->key_r & 255);
+ chunk[10] = (unsigned char)(info->key_g >> 8);
+ chunk[11] = (unsigned char)(info->key_g & 255);
+ chunk[12] = (unsigned char)(info->key_b >> 8);
+ chunk[13] = (unsigned char)(info->key_b & 255);
+ }
+ }
+
+ if(chunk) lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_IDAT(ucvector* out, const unsigned char* data, size_t datasize,
+ LodePNGCompressSettings* zlibsettings) {
+ unsigned error = 0;
+ unsigned char* zlib = 0;
+ size_t zlibsize = 0;
+
+ error = zlib_compress(&zlib, &zlibsize, data, datasize, zlibsettings);
+ if(!error) {
+ error = lodepng_chunk_createv(out, zlibsize, "IDAT", zlib);
+ }
+ lodepng_free(zlib);
+ return error;
+}
+
+static unsigned addChunk_IEND(ucvector* out) {
+ return lodepng_chunk_createv(out, 0, "IEND", 0);
+}
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+
+static unsigned addChunk_tEXt(ucvector* out, const char* keyword, const char* textstring) {
+ unsigned char* chunk = 0;
+ size_t keysize = lodepng_strlen(keyword), textsize = lodepng_strlen(textstring);
+ size_t size = keysize + 1 + textsize;
+ if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, size, "tEXt"));
+ lodepng_memcpy(chunk + 8, keyword, keysize);
+ chunk[8 + keysize] = 0; /*null termination char*/
+ lodepng_memcpy(chunk + 9 + keysize, textstring, textsize);
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_zTXt(ucvector* out, const char* keyword, const char* textstring,
+ LodePNGCompressSettings* zlibsettings) {
+ unsigned error = 0;
+ unsigned char* chunk = 0;
+ unsigned char* compressed = 0;
+ size_t compressedsize = 0;
+ size_t textsize = lodepng_strlen(textstring);
+ size_t keysize = lodepng_strlen(keyword);
+ if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/
+
+ error = zlib_compress(&compressed, &compressedsize,
+ (const unsigned char*)textstring, textsize, zlibsettings);
+ if(!error) {
+ size_t size = keysize + 2 + compressedsize;
+ error = lodepng_chunk_init(&chunk, out, size, "zTXt");
+ }
+ if(!error) {
+ lodepng_memcpy(chunk + 8, keyword, keysize);
+ chunk[8 + keysize] = 0; /*null termination char*/
+ chunk[9 + keysize] = 0; /*compression method: 0*/
+ lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize);
+ lodepng_chunk_generate_crc(chunk);
+ }
+
+ lodepng_free(compressed);
+ return error;
+}
+
+static unsigned addChunk_iTXt(ucvector* out, unsigned compress, const char* keyword, const char* langtag,
+ const char* transkey, const char* textstring, LodePNGCompressSettings* zlibsettings) {
+ unsigned error = 0;
+ unsigned char* chunk = 0;
+ unsigned char* compressed = 0;
+ size_t compressedsize = 0;
+ size_t textsize = lodepng_strlen(textstring);
+ size_t keysize = lodepng_strlen(keyword), langsize = lodepng_strlen(langtag), transsize = lodepng_strlen(transkey);
+
+ if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/
+
+ if(compress) {
+ error = zlib_compress(&compressed, &compressedsize,
+ (const unsigned char*)textstring, textsize, zlibsettings);
+ }
+ if(!error) {
+ size_t size = keysize + 3 + langsize + 1 + transsize + 1 + (compress ? compressedsize : textsize);
+ error = lodepng_chunk_init(&chunk, out, size, "iTXt");
+ }
+ if(!error) {
+ size_t pos = 8;
+ lodepng_memcpy(chunk + pos, keyword, keysize);
+ pos += keysize;
+ chunk[pos++] = 0; /*null termination char*/
+ chunk[pos++] = (compress ? 1 : 0); /*compression flag*/
+ chunk[pos++] = 0; /*compression method: 0*/
+ lodepng_memcpy(chunk + pos, langtag, langsize);
+ pos += langsize;
+ chunk[pos++] = 0; /*null termination char*/
+ lodepng_memcpy(chunk + pos, transkey, transsize);
+ pos += transsize;
+ chunk[pos++] = 0; /*null termination char*/
+ if(compress) {
+ lodepng_memcpy(chunk + pos, compressed, compressedsize);
+ } else {
+ lodepng_memcpy(chunk + pos, textstring, textsize);
+ }
+ lodepng_chunk_generate_crc(chunk);
+ }
+
+ lodepng_free(compressed);
+ return error;
+}
+
+static unsigned addChunk_bKGD(ucvector* out, const LodePNGInfo* info) {
+ unsigned char* chunk = 0;
+ if(info->color.colortype == LCT_GREY || info->color.colortype == LCT_GREY_ALPHA) {
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 2, "bKGD"));
+ chunk[8] = (unsigned char)(info->background_r >> 8);
+ chunk[9] = (unsigned char)(info->background_r & 255);
+ } else if(info->color.colortype == LCT_RGB || info->color.colortype == LCT_RGBA) {
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 6, "bKGD"));
+ chunk[8] = (unsigned char)(info->background_r >> 8);
+ chunk[9] = (unsigned char)(info->background_r & 255);
+ chunk[10] = (unsigned char)(info->background_g >> 8);
+ chunk[11] = (unsigned char)(info->background_g & 255);
+ chunk[12] = (unsigned char)(info->background_b >> 8);
+ chunk[13] = (unsigned char)(info->background_b & 255);
+ } else if(info->color.colortype == LCT_PALETTE) {
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 1, "bKGD"));
+ chunk[8] = (unsigned char)(info->background_r & 255); /*palette index*/
+ }
+ if(chunk) lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_tIME(ucvector* out, const LodePNGTime* time) {
+ unsigned char* chunk;
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 7, "tIME"));
+ chunk[8] = (unsigned char)(time->year >> 8);
+ chunk[9] = (unsigned char)(time->year & 255);
+ chunk[10] = (unsigned char)time->month;
+ chunk[11] = (unsigned char)time->day;
+ chunk[12] = (unsigned char)time->hour;
+ chunk[13] = (unsigned char)time->minute;
+ chunk[14] = (unsigned char)time->second;
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_pHYs(ucvector* out, const LodePNGInfo* info) {
+ unsigned char* chunk;
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 9, "pHYs"));
+ lodepng_set32bitInt(chunk + 8, info->phys_x);
+ lodepng_set32bitInt(chunk + 12, info->phys_y);
+ chunk[16] = info->phys_unit;
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_gAMA(ucvector* out, const LodePNGInfo* info) {
+ unsigned char* chunk;
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 4, "gAMA"));
+ lodepng_set32bitInt(chunk + 8, info->gama_gamma);
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_cHRM(ucvector* out, const LodePNGInfo* info) {
+ unsigned char* chunk;
+ CERROR_TRY_RETURN(lodepng_chunk_init(&chunk, out, 32, "cHRM"));
+ lodepng_set32bitInt(chunk + 8, info->chrm_white_x);
+ lodepng_set32bitInt(chunk + 12, info->chrm_white_y);
+ lodepng_set32bitInt(chunk + 16, info->chrm_red_x);
+ lodepng_set32bitInt(chunk + 20, info->chrm_red_y);
+ lodepng_set32bitInt(chunk + 24, info->chrm_green_x);
+ lodepng_set32bitInt(chunk + 28, info->chrm_green_y);
+ lodepng_set32bitInt(chunk + 32, info->chrm_blue_x);
+ lodepng_set32bitInt(chunk + 36, info->chrm_blue_y);
+ lodepng_chunk_generate_crc(chunk);
+ return 0;
+}
+
+static unsigned addChunk_sRGB(ucvector* out, const LodePNGInfo* info) {
+ unsigned char data = info->srgb_intent;
+ return lodepng_chunk_createv(out, 1, "sRGB", &data);
+}
+
+static unsigned addChunk_iCCP(ucvector* out, const LodePNGInfo* info, LodePNGCompressSettings* zlibsettings) {
+ unsigned error = 0;
+ unsigned char* chunk = 0;
+ unsigned char* compressed = 0;
+ size_t compressedsize = 0;
+ size_t keysize = lodepng_strlen(info->iccp_name);
+
+ if(keysize < 1 || keysize > 79) return 89; /*error: invalid keyword size*/
+ error = zlib_compress(&compressed, &compressedsize,
+ info->iccp_profile, info->iccp_profile_size, zlibsettings);
+ if(!error) {
+ size_t size = keysize + 2 + compressedsize;
+ error = lodepng_chunk_init(&chunk, out, size, "iCCP");
+ }
+ if(!error) {
+ lodepng_memcpy(chunk + 8, info->iccp_name, keysize);
+ chunk[8 + keysize] = 0; /*null termination char*/
+ chunk[9 + keysize] = 0; /*compression method: 0*/
+ lodepng_memcpy(chunk + 10 + keysize, compressed, compressedsize);
+ lodepng_chunk_generate_crc(chunk);
+ }
+
+ lodepng_free(compressed);
+ return error;
+}
+
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+static void filterScanline(unsigned char* out, const unsigned char* scanline, const unsigned char* prevline,
+ size_t length, size_t bytewidth, unsigned char filterType) {
+ size_t i;
+ switch(filterType) {
+ case 0: /*None*/
+ for(i = 0; i != length; ++i) out[i] = scanline[i];
+ break;
+ case 1: /*Sub*/
+ for(i = 0; i != bytewidth; ++i) out[i] = scanline[i];
+ for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - scanline[i - bytewidth];
+ break;
+ case 2: /*Up*/
+ if(prevline) {
+ for(i = 0; i != length; ++i) out[i] = scanline[i] - prevline[i];
+ } else {
+ for(i = 0; i != length; ++i) out[i] = scanline[i];
+ }
+ break;
+ case 3: /*Average*/
+ if(prevline) {
+ for(i = 0; i != bytewidth; ++i) out[i] = scanline[i] - (prevline[i] >> 1);
+ for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - ((scanline[i - bytewidth] + prevline[i]) >> 1);
+ } else {
+ for(i = 0; i != bytewidth; ++i) out[i] = scanline[i];
+ for(i = bytewidth; i < length; ++i) out[i] = scanline[i] - (scanline[i - bytewidth] >> 1);
+ }
+ break;
+ case 4: /*Paeth*/
+ if(prevline) {
+ /*paethPredictor(0, prevline[i], 0) is always prevline[i]*/
+ for(i = 0; i != bytewidth; ++i) out[i] = (scanline[i] - prevline[i]);
+ for(i = bytewidth; i < length; ++i) {
+ out[i] = (scanline[i] - paethPredictor(scanline[i - bytewidth], prevline[i], prevline[i - bytewidth]));
+ }
+ } else {
+ for(i = 0; i != bytewidth; ++i) out[i] = scanline[i];
+ /*paethPredictor(scanline[i - bytewidth], 0, 0) is always scanline[i - bytewidth]*/
+ for(i = bytewidth; i < length; ++i) out[i] = (scanline[i] - scanline[i - bytewidth]);
+ }
+ break;
+ default: return; /*invalid filter type given*/
+ }
+}
+
+/* integer binary logarithm, max return value is 31 */
+static size_t ilog2(size_t i) {
+ size_t result = 0;
+ if(i >= 65536) { result += 16; i >>= 16; }
+ if(i >= 256) { result += 8; i >>= 8; }
+ if(i >= 16) { result += 4; i >>= 4; }
+ if(i >= 4) { result += 2; i >>= 2; }
+ if(i >= 2) { result += 1; /*i >>= 1;*/ }
+ return result;
+}
+
+/* integer approximation for i * log2(i), helper function for LFS_ENTROPY */
+static size_t ilog2i(size_t i) {
+ size_t l;
+ if(i == 0) return 0;
+ l = ilog2(i);
+ /* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u)
+ linearly approximates the missing fractional part multiplied by i */
+ return i * l + ((i - (1u << l)) << 1u);
+}
+
+static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h,
+ const LodePNGColorMode* color, const LodePNGEncoderSettings* settings) {
+ /*
+ For PNG filter method 0
+ out must be a buffer with as size: h + (w * h * bpp + 7u) / 8u, because there are
+ the scanlines with 1 extra byte per scanline
+ */
+
+ unsigned bpp = lodepng_get_bpp(color);
+ /*the width of a scanline in bytes, not including the filter type*/
+ size_t linebytes = lodepng_get_raw_size_idat(w, 1, bpp) - 1u;
+
+ /*bytewidth is used for filtering, is 1 when bpp < 8, number of bytes per pixel otherwise*/
+ size_t bytewidth = (bpp + 7u) / 8u;
+ const unsigned char* prevline = 0;
+ unsigned x, y;
+ unsigned error = 0;
+ LodePNGFilterStrategy strategy = settings->filter_strategy;
+
+ /*
+ There is a heuristic called the minimum sum of absolute differences heuristic, suggested by the PNG standard:
+ * If the image type is Palette, or the bit depth is smaller than 8, then do not filter the image (i.e.
+ use fixed filtering, with the filter None).
+ * (The other case) If the image type is Grayscale or RGB (with or without Alpha), and the bit depth is
+ not smaller than 8, then use adaptive filtering heuristic as follows: independently for each row, apply
+ all five filters and select the filter that produces the smallest sum of absolute values per row.
+ This heuristic is used if filter strategy is LFS_MINSUM and filter_palette_zero is true.
+
+ If filter_palette_zero is true and filter_strategy is not LFS_MINSUM, the above heuristic is followed,
+ but for "the other case", whatever strategy filter_strategy is set to instead of the minimum sum
+ heuristic is used.
+ */
+ if(settings->filter_palette_zero &&
+ (color->colortype == LCT_PALETTE || color->bitdepth < 8)) strategy = LFS_ZERO;
+
+ if(bpp == 0) return 31; /*error: invalid color type*/
+
+ if(strategy >= LFS_ZERO && strategy <= LFS_FOUR) {
+ unsigned char type = (unsigned char)strategy;
+ for(y = 0; y != h; ++y) {
+ size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/
+ size_t inindex = linebytes * y;
+ out[outindex] = type; /*filter type byte*/
+ filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type);
+ prevline = &in[inindex];
+ }
+ } else if(strategy == LFS_MINSUM) {
+ /*adaptive filtering*/
+ unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/
+ size_t smallest = 0;
+ unsigned char type, bestType = 0;
+
+ for(type = 0; type != 5; ++type) {
+ attempt[type] = (unsigned char*)lodepng_malloc(linebytes);
+ if(!attempt[type]) error = 83; /*alloc fail*/
+ }
+
+ if(!error) {
+ for(y = 0; y != h; ++y) {
+ /*try the 5 filter types*/
+ for(type = 0; type != 5; ++type) {
+ size_t sum = 0;
+ filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type);
+
+ /*calculate the sum of the result*/
+ if(type == 0) {
+ for(x = 0; x != linebytes; ++x) sum += (unsigned char)(attempt[type][x]);
+ } else {
+ for(x = 0; x != linebytes; ++x) {
+ /*For differences, each byte should be treated as signed, values above 127 are negative
+ (converted to signed char). Filtertype 0 isn't a difference though, so use unsigned there.
+ This means filtertype 0 is almost never chosen, but that is justified.*/
+ unsigned char s = attempt[type][x];
+ sum += s < 128 ? s : (255U - s);
+ }
+ }
+
+ /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/
+ if(type == 0 || sum < smallest) {
+ bestType = type;
+ smallest = sum;
+ }
+ }
+
+ prevline = &in[y * linebytes];
+
+ /*now fill the out values*/
+ out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/
+ for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x];
+ }
+ }
+
+ for(type = 0; type != 5; ++type) lodepng_free(attempt[type]);
+ } else if(strategy == LFS_ENTROPY) {
+ unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/
+ size_t bestSum = 0;
+ unsigned type, bestType = 0;
+ unsigned count[256];
+
+ for(type = 0; type != 5; ++type) {
+ attempt[type] = (unsigned char*)lodepng_malloc(linebytes);
+ if(!attempt[type]) error = 83; /*alloc fail*/
+ }
+
+ if(!error) {
+ for(y = 0; y != h; ++y) {
+ /*try the 5 filter types*/
+ for(type = 0; type != 5; ++type) {
+ size_t sum = 0;
+ filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type);
+ lodepng_memset(count, 0, 256 * sizeof(*count));
+ for(x = 0; x != linebytes; ++x) ++count[attempt[type][x]];
+ ++count[type]; /*the filter type itself is part of the scanline*/
+ for(x = 0; x != 256; ++x) {
+ sum += ilog2i(count[x]);
+ }
+ /*check if this is smallest sum (or if type == 0 it's the first case so always store the values)*/
+ if(type == 0 || sum > bestSum) {
+ bestType = type;
+ bestSum = sum;
+ }
+ }
+
+ prevline = &in[y * linebytes];
+
+ /*now fill the out values*/
+ out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/
+ for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x];
+ }
+ }
+
+ for(type = 0; type != 5; ++type) lodepng_free(attempt[type]);
+ } else if(strategy == LFS_PREDEFINED) {
+ for(y = 0; y != h; ++y) {
+ size_t outindex = (1 + linebytes) * y; /*the extra filterbyte added to each row*/
+ size_t inindex = linebytes * y;
+ unsigned char type = settings->predefined_filters[y];
+ out[outindex] = type; /*filter type byte*/
+ filterScanline(&out[outindex + 1], &in[inindex], prevline, linebytes, bytewidth, type);
+ prevline = &in[inindex];
+ }
+ } else if(strategy == LFS_BRUTE_FORCE) {
+ /*brute force filter chooser.
+ deflate the scanline after every filter attempt to see which one deflates best.
+ This is very slow and gives only slightly smaller, sometimes even larger, result*/
+ size_t size[5];
+ unsigned char* attempt[5]; /*five filtering attempts, one for each filter type*/
+ size_t smallest = 0;
+ unsigned type = 0, bestType = 0;
+ unsigned char* dummy;
+ LodePNGCompressSettings zlibsettings;
+ lodepng_memcpy(&zlibsettings, &settings->zlibsettings, sizeof(LodePNGCompressSettings));
+ /*use fixed tree on the attempts so that the tree is not adapted to the filtertype on purpose,
+ to simulate the true case where the tree is the same for the whole image. Sometimes it gives
+ better result with dynamic tree anyway. Using the fixed tree sometimes gives worse, but in rare
+ cases better compression. It does make this a bit less slow, so it's worth doing this.*/
+ zlibsettings.btype = 1;
+ /*a custom encoder likely doesn't read the btype setting and is optimized for complete PNG
+ images only, so disable it*/
+ zlibsettings.custom_zlib = 0;
+ zlibsettings.custom_deflate = 0;
+ for(type = 0; type != 5; ++type) {
+ attempt[type] = (unsigned char*)lodepng_malloc(linebytes);
+ if(!attempt[type]) error = 83; /*alloc fail*/
+ }
+ if(!error) {
+ for(y = 0; y != h; ++y) /*try the 5 filter types*/ {
+ for(type = 0; type != 5; ++type) {
+ unsigned testsize = (unsigned)linebytes;
+ /*if(testsize > 8) testsize /= 8;*/ /*it already works good enough by testing a part of the row*/
+
+ filterScanline(attempt[type], &in[y * linebytes], prevline, linebytes, bytewidth, type);
+ size[type] = 0;
+ dummy = 0;
+ zlib_compress(&dummy, &size[type], attempt[type], testsize, &zlibsettings);
+ lodepng_free(dummy);
+ /*check if this is smallest size (or if type == 0 it's the first case so always store the values)*/
+ if(type == 0 || size[type] < smallest) {
+ bestType = type;
+ smallest = size[type];
+ }
+ }
+ prevline = &in[y * linebytes];
+ out[y * (linebytes + 1)] = bestType; /*the first byte of a scanline will be the filter type*/
+ for(x = 0; x != linebytes; ++x) out[y * (linebytes + 1) + 1 + x] = attempt[bestType][x];
+ }
+ }
+ for(type = 0; type != 5; ++type) lodepng_free(attempt[type]);
+ }
+ else return 88; /* unknown filter strategy */
+
+ return error;
+}
+
+static void addPaddingBits(unsigned char* out, const unsigned char* in,
+ size_t olinebits, size_t ilinebits, unsigned h) {
+ /*The opposite of the removePaddingBits function
+ olinebits must be >= ilinebits*/
+ unsigned y;
+ size_t diff = olinebits - ilinebits;
+ size_t obp = 0, ibp = 0; /*bit pointers*/
+ for(y = 0; y != h; ++y) {
+ size_t x;
+ for(x = 0; x < ilinebits; ++x) {
+ unsigned char bit = readBitFromReversedStream(&ibp, in);
+ setBitOfReversedStream(&obp, out, bit);
+ }
+ /*obp += diff; --> no, fill in some value in the padding bits too, to avoid
+ "Use of uninitialised value of size ###" warning from valgrind*/
+ for(x = 0; x != diff; ++x) setBitOfReversedStream(&obp, out, 0);
+ }
+}
+
+/*
+in: non-interlaced image with size w*h
+out: the same pixels, but re-ordered according to PNG's Adam7 interlacing, with
+ no padding bits between scanlines, but between reduced images so that each
+ reduced image starts at a byte.
+bpp: bits per pixel
+there are no padding bits, not between scanlines, not between reduced images
+in has the following size in bits: w * h * bpp.
+out is possibly bigger due to padding bits between reduced images
+NOTE: comments about padding bits are only relevant if bpp < 8
+*/
+static void Adam7_interlace(unsigned char* out, const unsigned char* in, unsigned w, unsigned h, unsigned bpp) {
+ unsigned passw[7], passh[7];
+ size_t filter_passstart[8], padded_passstart[8], passstart[8];
+ unsigned i;
+
+ Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp);
+
+ if(bpp >= 8) {
+ for(i = 0; i != 7; ++i) {
+ unsigned x, y, b;
+ size_t bytewidth = bpp / 8u;
+ for(y = 0; y < passh[i]; ++y)
+ for(x = 0; x < passw[i]; ++x) {
+ size_t pixelinstart = ((ADAM7_IY[i] + y * ADAM7_DY[i]) * w + ADAM7_IX[i] + x * ADAM7_DX[i]) * bytewidth;
+ size_t pixeloutstart = passstart[i] + (y * passw[i] + x) * bytewidth;
+ for(b = 0; b < bytewidth; ++b) {
+ out[pixeloutstart + b] = in[pixelinstart + b];
+ }
+ }
+ }
+ } else /*bpp < 8: Adam7 with pixels < 8 bit is a bit trickier: with bit pointers*/ {
+ for(i = 0; i != 7; ++i) {
+ unsigned x, y, b;
+ unsigned ilinebits = bpp * passw[i];
+ unsigned olinebits = bpp * w;
+ size_t obp, ibp; /*bit pointers (for out and in buffer)*/
+ for(y = 0; y < passh[i]; ++y)
+ for(x = 0; x < passw[i]; ++x) {
+ ibp = (ADAM7_IY[i] + y * ADAM7_DY[i]) * olinebits + (ADAM7_IX[i] + x * ADAM7_DX[i]) * bpp;
+ obp = (8 * passstart[i]) + (y * ilinebits + x * bpp);
+ for(b = 0; b < bpp; ++b) {
+ unsigned char bit = readBitFromReversedStream(&ibp, in);
+ setBitOfReversedStream(&obp, out, bit);
+ }
+ }
+ }
+ }
+}
+
+/*out must be buffer big enough to contain uncompressed IDAT chunk data, and in must contain the full image.
+return value is error**/
+static unsigned preProcessScanlines(unsigned char** out, size_t* outsize, const unsigned char* in,
+ unsigned w, unsigned h,
+ const LodePNGInfo* info_png, const LodePNGEncoderSettings* settings) {
+ /*
+ This function converts the pure 2D image with the PNG's colortype, into filtered-padded-interlaced data. Steps:
+ *) if no Adam7: 1) add padding bits (= possible extra bits per scanline if bpp < 8) 2) filter
+ *) if adam7: 1) Adam7_interlace 2) 7x add padding bits 3) 7x filter
+ */
+ unsigned bpp = lodepng_get_bpp(&info_png->color);
+ unsigned error = 0;
+
+ if(info_png->interlace_method == 0) {
+ *outsize = h + (h * ((w * bpp + 7u) / 8u)); /*image size plus an extra byte per scanline + possible padding bits*/
+ *out = (unsigned char*)lodepng_malloc(*outsize);
+ if(!(*out) && (*outsize)) error = 83; /*alloc fail*/
+
+ if(!error) {
+ /*non multiple of 8 bits per scanline, padding bits needed per scanline*/
+ if(bpp < 8 && w * bpp != ((w * bpp + 7u) / 8u) * 8u) {
+ unsigned char* padded = (unsigned char*)lodepng_malloc(h * ((w * bpp + 7u) / 8u));
+ if(!padded) error = 83; /*alloc fail*/
+ if(!error) {
+ addPaddingBits(padded, in, ((w * bpp + 7u) / 8u) * 8u, w * bpp, h);
+ error = filter(*out, padded, w, h, &info_png->color, settings);
+ }
+ lodepng_free(padded);
+ } else {
+ /*we can immediately filter into the out buffer, no other steps needed*/
+ error = filter(*out, in, w, h, &info_png->color, settings);
+ }
+ }
+ } else /*interlace_method is 1 (Adam7)*/ {
+ unsigned passw[7], passh[7];
+ size_t filter_passstart[8], padded_passstart[8], passstart[8];
+ unsigned char* adam7;
+
+ Adam7_getpassvalues(passw, passh, filter_passstart, padded_passstart, passstart, w, h, bpp);
+
+ *outsize = filter_passstart[7]; /*image size plus an extra byte per scanline + possible padding bits*/
+ *out = (unsigned char*)lodepng_malloc(*outsize);
+ if(!(*out)) error = 83; /*alloc fail*/
+
+ adam7 = (unsigned char*)lodepng_malloc(passstart[7]);
+ if(!adam7 && passstart[7]) error = 83; /*alloc fail*/
+
+ if(!error) {
+ unsigned i;
+
+ Adam7_interlace(adam7, in, w, h, bpp);
+ for(i = 0; i != 7; ++i) {
+ if(bpp < 8) {
+ unsigned char* padded = (unsigned char*)lodepng_malloc(padded_passstart[i + 1] - padded_passstart[i]);
+ if(!padded) ERROR_BREAK(83); /*alloc fail*/
+ addPaddingBits(padded, &adam7[passstart[i]],
+ ((passw[i] * bpp + 7u) / 8u) * 8u, passw[i] * bpp, passh[i]);
+ error = filter(&(*out)[filter_passstart[i]], padded,
+ passw[i], passh[i], &info_png->color, settings);
+ lodepng_free(padded);
+ } else {
+ error = filter(&(*out)[filter_passstart[i]], &adam7[padded_passstart[i]],
+ passw[i], passh[i], &info_png->color, settings);
+ }
+
+ if(error) break;
+ }
+ }
+
+ lodepng_free(adam7);
+ }
+
+ return error;
+}
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+static unsigned addUnknownChunks(ucvector* out, unsigned char* data, size_t datasize) {
+ unsigned char* inchunk = data;
+ while((size_t)(inchunk - data) < datasize) {
+ CERROR_TRY_RETURN(lodepng_chunk_append(&out->data, &out->size, inchunk));
+ out->allocsize = out->size; /*fix the allocsize again*/
+ inchunk = lodepng_chunk_next(inchunk, data + datasize);
+ }
+ return 0;
+}
+
+static unsigned isGrayICCProfile(const unsigned char* profile, unsigned size) {
+ /*
+ It is a gray profile if bytes 16-19 are "GRAY", rgb profile if bytes 16-19
+ are "RGB ". We do not perform any full parsing of the ICC profile here, other
+ than check those 4 bytes to grayscale profile. Other than that, validity of
+ the profile is not checked. This is needed only because the PNG specification
+ requires using a non-gray color model if there is an ICC profile with "RGB "
+ (sadly limiting compression opportunities if the input data is grayscale RGB
+ data), and requires using a gray color model if it is "GRAY".
+ */
+ if(size < 20) return 0;
+ return profile[16] == 'G' && profile[17] == 'R' && profile[18] == 'A' && profile[19] == 'Y';
+}
+
+static unsigned isRGBICCProfile(const unsigned char* profile, unsigned size) {
+ /* See comment in isGrayICCProfile*/
+ if(size < 20) return 0;
+ return profile[16] == 'R' && profile[17] == 'G' && profile[18] == 'B' && profile[19] == ' ';
+}
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+unsigned lodepng_encode(unsigned char** out, size_t* outsize,
+ const unsigned char* image, unsigned w, unsigned h,
+ LodePNGState* state) {
+ unsigned char* data = 0; /*uncompressed version of the IDAT chunk data*/
+ size_t datasize = 0;
+ ucvector outv = ucvector_init(NULL, 0);
+ LodePNGInfo info;
+ const LodePNGInfo* info_png = &state->info_png;
+
+ lodepng_info_init(&info);
+
+ /*provide some proper output values if error will happen*/
+ *out = 0;
+ *outsize = 0;
+ state->error = 0;
+
+ /*check input values validity*/
+ if((info_png->color.colortype == LCT_PALETTE || state->encoder.force_palette)
+ && (info_png->color.palettesize == 0 || info_png->color.palettesize > 256)) {
+ state->error = 68; /*invalid palette size, it is only allowed to be 1-256*/
+ goto cleanup;
+ }
+ if(state->encoder.zlibsettings.btype > 2) {
+ state->error = 61; /*error: invalid btype*/
+ goto cleanup;
+ }
+ if(info_png->interlace_method > 1) {
+ state->error = 71; /*error: invalid interlace mode*/
+ goto cleanup;
+ }
+ state->error = checkColorValidity(info_png->color.colortype, info_png->color.bitdepth);
+ if(state->error) goto cleanup; /*error: invalid color type given*/
+ state->error = checkColorValidity(state->info_raw.colortype, state->info_raw.bitdepth);
+ if(state->error) goto cleanup; /*error: invalid color type given*/
+
+ /* color convert and compute scanline filter types */
+ lodepng_info_copy(&info, &state->info_png);
+ if(state->encoder.auto_convert) {
+ LodePNGColorStats stats;
+ lodepng_color_stats_init(&stats);
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ if(info_png->iccp_defined &&
+ isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) {
+ /*the PNG specification does not allow to use palette with a GRAY ICC profile, even
+ if the palette has only gray colors, so disallow it.*/
+ stats.allow_palette = 0;
+ }
+ if(info_png->iccp_defined &&
+ isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size)) {
+ /*the PNG specification does not allow to use grayscale color with RGB ICC profile, so disallow gray.*/
+ stats.allow_greyscale = 0;
+ }
+#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */
+ state->error = lodepng_compute_color_stats(&stats, image, w, h, &state->info_raw);
+ if(state->error) goto cleanup;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ if(info_png->background_defined) {
+ /*the background chunk's color must be taken into account as well*/
+ unsigned r = 0, g = 0, b = 0;
+ LodePNGColorMode mode16 = lodepng_color_mode_make(LCT_RGB, 16);
+ lodepng_convert_rgb(&r, &g, &b, info_png->background_r, info_png->background_g, info_png->background_b, &mode16, &info_png->color);
+ state->error = lodepng_color_stats_add(&stats, r, g, b, 65535);
+ if(state->error) goto cleanup;
+ }
+#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */
+ state->error = auto_choose_color(&info.color, &state->info_raw, &stats);
+ if(state->error) goto cleanup;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*also convert the background chunk*/
+ if(info_png->background_defined) {
+ if(lodepng_convert_rgb(&info.background_r, &info.background_g, &info.background_b,
+ info_png->background_r, info_png->background_g, info_png->background_b, &info.color, &info_png->color)) {
+ state->error = 104;
+ goto cleanup;
+ }
+ }
+#endif /* LODEPNG_COMPILE_ANCILLARY_CHUNKS */
+ }
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ if(info_png->iccp_defined) {
+ unsigned gray_icc = isGrayICCProfile(info_png->iccp_profile, info_png->iccp_profile_size);
+ unsigned rgb_icc = isRGBICCProfile(info_png->iccp_profile, info_png->iccp_profile_size);
+ unsigned gray_png = info.color.colortype == LCT_GREY || info.color.colortype == LCT_GREY_ALPHA;
+ if(!gray_icc && !rgb_icc) {
+ state->error = 100; /* Disallowed profile color type for PNG */
+ goto cleanup;
+ }
+ if(gray_icc != gray_png) {
+ /*Not allowed to use RGB/RGBA/palette with GRAY ICC profile or vice versa,
+ or in case of auto_convert, it wasn't possible to find appropriate model*/
+ state->error = state->encoder.auto_convert ? 102 : 101;
+ goto cleanup;
+ }
+ }
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ if(!lodepng_color_mode_equal(&state->info_raw, &info.color)) {
+ unsigned char* converted;
+ size_t size = ((size_t)w * (size_t)h * (size_t)lodepng_get_bpp(&info.color) + 7u) / 8u;
+
+ converted = (unsigned char*)lodepng_malloc(size);
+ if(!converted && size) state->error = 83; /*alloc fail*/
+ if(!state->error) {
+ state->error = lodepng_convert(converted, image, &info.color, &state->info_raw, w, h);
+ }
+ if(!state->error) {
+ state->error = preProcessScanlines(&data, &datasize, converted, w, h, &info, &state->encoder);
+ }
+ lodepng_free(converted);
+ if(state->error) goto cleanup;
+ } else {
+ state->error = preProcessScanlines(&data, &datasize, image, w, h, &info, &state->encoder);
+ if(state->error) goto cleanup;
+ }
+
+ /* output all PNG chunks */ {
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ size_t i;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ /*write signature and chunks*/
+ state->error = writeSignature(&outv);
+ if(state->error) goto cleanup;
+ /*IHDR*/
+ state->error = addChunk_IHDR(&outv, w, h, info.color.colortype, info.color.bitdepth, info.interlace_method);
+ if(state->error) goto cleanup;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*unknown chunks between IHDR and PLTE*/
+ if(info.unknown_chunks_data[0]) {
+ state->error = addUnknownChunks(&outv, info.unknown_chunks_data[0], info.unknown_chunks_size[0]);
+ if(state->error) goto cleanup;
+ }
+ /*color profile chunks must come before PLTE */
+ if(info.iccp_defined) {
+ state->error = addChunk_iCCP(&outv, &info, &state->encoder.zlibsettings);
+ if(state->error) goto cleanup;
+ }
+ if(info.srgb_defined) {
+ state->error = addChunk_sRGB(&outv, &info);
+ if(state->error) goto cleanup;
+ }
+ if(info.gama_defined) {
+ state->error = addChunk_gAMA(&outv, &info);
+ if(state->error) goto cleanup;
+ }
+ if(info.chrm_defined) {
+ state->error = addChunk_cHRM(&outv, &info);
+ if(state->error) goto cleanup;
+ }
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ /*PLTE*/
+ if(info.color.colortype == LCT_PALETTE) {
+ state->error = addChunk_PLTE(&outv, &info.color);
+ if(state->error) goto cleanup;
+ }
+ if(state->encoder.force_palette && (info.color.colortype == LCT_RGB || info.color.colortype == LCT_RGBA)) {
+ /*force_palette means: write suggested palette for truecolor in PLTE chunk*/
+ state->error = addChunk_PLTE(&outv, &info.color);
+ if(state->error) goto cleanup;
+ }
+ /*tRNS (this will only add if when necessary) */
+ state->error = addChunk_tRNS(&outv, &info.color);
+ if(state->error) goto cleanup;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*bKGD (must come between PLTE and the IDAt chunks*/
+ if(info.background_defined) {
+ state->error = addChunk_bKGD(&outv, &info);
+ if(state->error) goto cleanup;
+ }
+ /*pHYs (must come before the IDAT chunks)*/
+ if(info.phys_defined) {
+ state->error = addChunk_pHYs(&outv, &info);
+ if(state->error) goto cleanup;
+ }
+
+ /*unknown chunks between PLTE and IDAT*/
+ if(info.unknown_chunks_data[1]) {
+ state->error = addUnknownChunks(&outv, info.unknown_chunks_data[1], info.unknown_chunks_size[1]);
+ if(state->error) goto cleanup;
+ }
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ /*IDAT (multiple IDAT chunks must be consecutive)*/
+ state->error = addChunk_IDAT(&outv, data, datasize, &state->encoder.zlibsettings);
+ if(state->error) goto cleanup;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*tIME*/
+ if(info.time_defined) {
+ state->error = addChunk_tIME(&outv, &info.time);
+ if(state->error) goto cleanup;
+ }
+ /*tEXt and/or zTXt*/
+ for(i = 0; i != info.text_num; ++i) {
+ if(lodepng_strlen(info.text_keys[i]) > 79) {
+ state->error = 66; /*text chunk too large*/
+ goto cleanup;
+ }
+ if(lodepng_strlen(info.text_keys[i]) < 1) {
+ state->error = 67; /*text chunk too small*/
+ goto cleanup;
+ }
+ if(state->encoder.text_compression) {
+ state->error = addChunk_zTXt(&outv, info.text_keys[i], info.text_strings[i], &state->encoder.zlibsettings);
+ if(state->error) goto cleanup;
+ } else {
+ state->error = addChunk_tEXt(&outv, info.text_keys[i], info.text_strings[i]);
+ if(state->error) goto cleanup;
+ }
+ }
+ /*LodePNG version id in text chunk*/
+ if(state->encoder.add_id) {
+ unsigned already_added_id_text = 0;
+ for(i = 0; i != info.text_num; ++i) {
+ const char* k = info.text_keys[i];
+ /* Could use strcmp, but we're not calling or reimplementing this C library function for this use only */
+ if(k[0] == 'L' && k[1] == 'o' && k[2] == 'd' && k[3] == 'e' &&
+ k[4] == 'P' && k[5] == 'N' && k[6] == 'G' && k[7] == '\0') {
+ already_added_id_text = 1;
+ break;
+ }
+ }
+ if(already_added_id_text == 0) {
+ state->error = addChunk_tEXt(&outv, "LodePNG", LODEPNG_VERSION_STRING); /*it's shorter as tEXt than as zTXt chunk*/
+ if(state->error) goto cleanup;
+ }
+ }
+ /*iTXt*/
+ for(i = 0; i != info.itext_num; ++i) {
+ if(lodepng_strlen(info.itext_keys[i]) > 79) {
+ state->error = 66; /*text chunk too large*/
+ goto cleanup;
+ }
+ if(lodepng_strlen(info.itext_keys[i]) < 1) {
+ state->error = 67; /*text chunk too small*/
+ goto cleanup;
+ }
+ state->error = addChunk_iTXt(
+ &outv, state->encoder.text_compression,
+ info.itext_keys[i], info.itext_langtags[i], info.itext_transkeys[i], info.itext_strings[i],
+ &state->encoder.zlibsettings);
+ if(state->error) goto cleanup;
+ }
+
+ /*unknown chunks between IDAT and IEND*/
+ if(info.unknown_chunks_data[2]) {
+ state->error = addUnknownChunks(&outv, info.unknown_chunks_data[2], info.unknown_chunks_size[2]);
+ if(state->error) goto cleanup;
+ }
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+ state->error = addChunk_IEND(&outv);
+ if(state->error) goto cleanup;
+ }
+
+cleanup:
+ lodepng_info_cleanup(&info);
+ lodepng_free(data);
+
+ /*instead of cleaning the vector up, give it to the output*/
+ *out = outv.data;
+ *outsize = outv.size;
+
+ return state->error;
+}
+
+unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize, const unsigned char* image,
+ unsigned w, unsigned h, LodePNGColorType colortype, unsigned bitdepth) {
+ unsigned error;
+ LodePNGState state;
+ lodepng_state_init(&state);
+ state.info_raw.colortype = colortype;
+ state.info_raw.bitdepth = bitdepth;
+ state.info_png.color.colortype = colortype;
+ state.info_png.color.bitdepth = bitdepth;
+ lodepng_encode(out, outsize, image, w, h, &state);
+ error = state.error;
+ lodepng_state_cleanup(&state);
+ return error;
+}
+
+unsigned lodepng_encode32(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) {
+ return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGBA, 8);
+}
+
+unsigned lodepng_encode24(unsigned char** out, size_t* outsize, const unsigned char* image, unsigned w, unsigned h) {
+ return lodepng_encode_memory(out, outsize, image, w, h, LCT_RGB, 8);
+}
+
+#ifdef LODEPNG_COMPILE_DISK
+unsigned lodepng_encode_file(const char* filename, const unsigned char* image, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ unsigned char* buffer;
+ size_t buffersize;
+ unsigned error = lodepng_encode_memory(&buffer, &buffersize, image, w, h, colortype, bitdepth);
+ if(!error) error = lodepng_save_file(buffer, buffersize, filename);
+ lodepng_free(buffer);
+ return error;
+}
+
+unsigned lodepng_encode32_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) {
+ return lodepng_encode_file(filename, image, w, h, LCT_RGBA, 8);
+}
+
+unsigned lodepng_encode24_file(const char* filename, const unsigned char* image, unsigned w, unsigned h) {
+ return lodepng_encode_file(filename, image, w, h, LCT_RGB, 8);
+}
+#endif /*LODEPNG_COMPILE_DISK*/
+
+void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings) {
+ lodepng_compress_settings_init(&settings->zlibsettings);
+ settings->filter_palette_zero = 1;
+ settings->filter_strategy = LFS_MINSUM;
+ settings->auto_convert = 1;
+ settings->force_palette = 0;
+ settings->predefined_filters = 0;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ settings->add_id = 0;
+ settings->text_compression = 1;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+}
+
+#endif /*LODEPNG_COMPILE_ENCODER*/
+#endif /*LODEPNG_COMPILE_PNG*/
+
+#ifdef LODEPNG_COMPILE_ERROR_TEXT
+/*
+This returns the description of a numerical error code in English. This is also
+the documentation of all the error codes.
+*/
+const char* lodepng_error_text(unsigned code) {
+ switch(code) {
+ case 0: return "no error, everything went ok";
+ case 1: return "nothing done yet"; /*the Encoder/Decoder has done nothing yet, error checking makes no sense yet*/
+ case 10: return "end of input memory reached without huffman end code"; /*while huffman decoding*/
+ case 11: return "error in code tree made it jump outside of huffman tree"; /*while huffman decoding*/
+ case 13: return "problem while processing dynamic deflate block";
+ case 14: return "problem while processing dynamic deflate block";
+ case 15: return "problem while processing dynamic deflate block";
+ /*this error could happen if there are only 0 or 1 symbols present in the huffman code:*/
+ case 16: return "invalid code while processing dynamic deflate block";
+ case 17: return "end of out buffer memory reached while inflating";
+ case 18: return "invalid distance code while inflating";
+ case 19: return "end of out buffer memory reached while inflating";
+ case 20: return "invalid deflate block BTYPE encountered while decoding";
+ case 21: return "NLEN is not ones complement of LEN in a deflate block";
+
+ /*end of out buffer memory reached while inflating:
+ This can happen if the inflated deflate data is longer than the amount of bytes required to fill up
+ all the pixels of the image, given the color depth and image dimensions. Something that doesn't
+ happen in a normal, well encoded, PNG image.*/
+ case 22: return "end of out buffer memory reached while inflating";
+ case 23: return "end of in buffer memory reached while inflating";
+ case 24: return "invalid FCHECK in zlib header";
+ case 25: return "invalid compression method in zlib header";
+ case 26: return "FDICT encountered in zlib header while it's not used for PNG";
+ case 27: return "PNG file is smaller than a PNG header";
+ /*Checks the magic file header, the first 8 bytes of the PNG file*/
+ case 28: return "incorrect PNG signature, it's no PNG or corrupted";
+ case 29: return "first chunk is not the header chunk";
+ case 30: return "chunk length too large, chunk broken off at end of file";
+ case 31: return "illegal PNG color type or bpp";
+ case 32: return "illegal PNG compression method";
+ case 33: return "illegal PNG filter method";
+ case 34: return "illegal PNG interlace method";
+ case 35: return "chunk length of a chunk is too large or the chunk too small";
+ case 36: return "illegal PNG filter type encountered";
+ case 37: return "illegal bit depth for this color type given";
+ case 38: return "the palette is too small or too big"; /*0, or more than 256 colors*/
+ case 39: return "tRNS chunk before PLTE or has more entries than palette size";
+ case 40: return "tRNS chunk has wrong size for grayscale image";
+ case 41: return "tRNS chunk has wrong size for RGB image";
+ case 42: return "tRNS chunk appeared while it was not allowed for this color type";
+ case 43: return "bKGD chunk has wrong size for palette image";
+ case 44: return "bKGD chunk has wrong size for grayscale image";
+ case 45: return "bKGD chunk has wrong size for RGB image";
+ case 48: return "empty input buffer given to decoder. Maybe caused by non-existing file?";
+ case 49: return "jumped past memory while generating dynamic huffman tree";
+ case 50: return "jumped past memory while generating dynamic huffman tree";
+ case 51: return "jumped past memory while inflating huffman block";
+ case 52: return "jumped past memory while inflating";
+ case 53: return "size of zlib data too small";
+ case 54: return "repeat symbol in tree while there was no value symbol yet";
+ /*jumped past tree while generating huffman tree, this could be when the
+ tree will have more leaves than symbols after generating it out of the
+ given lengths. They call this an oversubscribed dynamic bit lengths tree in zlib.*/
+ case 55: return "jumped past tree while generating huffman tree";
+ case 56: return "given output image colortype or bitdepth not supported for color conversion";
+ case 57: return "invalid CRC encountered (checking CRC can be disabled)";
+ case 58: return "invalid ADLER32 encountered (checking ADLER32 can be disabled)";
+ case 59: return "requested color conversion not supported";
+ case 60: return "invalid window size given in the settings of the encoder (must be 0-32768)";
+ case 61: return "invalid BTYPE given in the settings of the encoder (only 0, 1 and 2 are allowed)";
+ /*LodePNG leaves the choice of RGB to grayscale conversion formula to the user.*/
+ case 62: return "conversion from color to grayscale not supported";
+ /*(2^31-1)*/
+ case 63: return "length of a chunk too long, max allowed for PNG is 2147483647 bytes per chunk";
+ /*this would result in the inability of a deflated block to ever contain an end code. It must be at least 1.*/
+ case 64: return "the length of the END symbol 256 in the Huffman tree is 0";
+ case 66: return "the length of a text chunk keyword given to the encoder is longer than the maximum of 79 bytes";
+ case 67: return "the length of a text chunk keyword given to the encoder is smaller than the minimum of 1 byte";
+ case 68: return "tried to encode a PLTE chunk with a palette that has less than 1 or more than 256 colors";
+ case 69: return "unknown chunk type with 'critical' flag encountered by the decoder";
+ case 71: return "invalid interlace mode given to encoder (must be 0 or 1)";
+ case 72: return "while decoding, invalid compression method encountering in zTXt or iTXt chunk (it must be 0)";
+ case 73: return "invalid tIME chunk size";
+ case 74: return "invalid pHYs chunk size";
+ /*length could be wrong, or data chopped off*/
+ case 75: return "no null termination char found while decoding text chunk";
+ case 76: return "iTXt chunk too short to contain required bytes";
+ case 77: return "integer overflow in buffer size";
+ case 78: return "failed to open file for reading"; /*file doesn't exist or couldn't be opened for reading*/
+ case 79: return "failed to open file for writing";
+ case 80: return "tried creating a tree of 0 symbols";
+ case 81: return "lazy matching at pos 0 is impossible";
+ case 82: return "color conversion to palette requested while a color isn't in palette, or index out of bounds";
+ case 83: return "memory allocation failed";
+ case 84: return "given image too small to contain all pixels to be encoded";
+ case 86: return "impossible offset in lz77 encoding (internal bug)";
+ case 87: return "must provide custom zlib function pointer if LODEPNG_COMPILE_ZLIB is not defined";
+ case 88: return "invalid filter strategy given for LodePNGEncoderSettings.filter_strategy";
+ case 89: return "text chunk keyword too short or long: must have size 1-79";
+ /*the windowsize in the LodePNGCompressSettings. Requiring POT(==> & instead of %) makes encoding 12% faster.*/
+ case 90: return "windowsize must be a power of two";
+ case 91: return "invalid decompressed idat size";
+ case 92: return "integer overflow due to too many pixels";
+ case 93: return "zero width or height is invalid";
+ case 94: return "header chunk must have a size of 13 bytes";
+ case 95: return "integer overflow with combined idat chunk size";
+ case 96: return "invalid gAMA chunk size";
+ case 97: return "invalid cHRM chunk size";
+ case 98: return "invalid sRGB chunk size";
+ case 99: return "invalid sRGB rendering intent";
+ case 100: return "invalid ICC profile color type, the PNG specification only allows RGB or GRAY";
+ case 101: return "PNG specification does not allow RGB ICC profile on gray color types and vice versa";
+ case 102: return "not allowed to set grayscale ICC profile with colored pixels by PNG specification";
+ case 103: return "invalid palette index in bKGD chunk. Maybe it came before PLTE chunk?";
+ case 104: return "invalid bKGD color while encoding (e.g. palette index out of range)";
+ case 105: return "integer overflow of bitsize";
+ case 106: return "PNG file must have PLTE chunk if color type is palette";
+ case 107: return "color convert from palette mode requested without setting the palette data in it";
+ case 108: return "tried to add more than 256 values to a palette";
+ }
+ return "unknown error code";
+}
+#endif /*LODEPNG_COMPILE_ERROR_TEXT*/
+
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* // C++ Wrapper // */
+/* ////////////////////////////////////////////////////////////////////////// */
+/* ////////////////////////////////////////////////////////////////////////// */
+
+#ifdef LODEPNG_COMPILE_CPP
+namespace lodepng {
+
+#ifdef LODEPNG_COMPILE_DISK
+unsigned load_file(std::vector& buffer, const std::string& filename) {
+ long size = lodepng_filesize(filename.c_str());
+ if(size < 0) return 78;
+ buffer.resize((size_t)size);
+ return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str());
+}
+
+/*write given buffer to the file, overwriting the file, it doesn't append to it.*/
+unsigned save_file(const std::vector& buffer, const std::string& filename) {
+ return lodepng_save_file(buffer.empty() ? 0 : &buffer[0], buffer.size(), filename.c_str());
+}
+#endif /* LODEPNG_COMPILE_DISK */
+
+#ifdef LODEPNG_COMPILE_ZLIB
+#ifdef LODEPNG_COMPILE_DECODER
+unsigned decompress(std::vector& out, const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings& settings) {
+ unsigned char* buffer = 0;
+ size_t buffersize = 0;
+ unsigned error = zlib_decompress(&buffer, &buffersize, 0, in, insize, &settings);
+ if(buffer) {
+ out.insert(out.end(), &buffer[0], &buffer[buffersize]);
+ lodepng_free(buffer);
+ }
+ return error;
+}
+
+unsigned decompress(std::vector& out, const std::vector& in,
+ const LodePNGDecompressSettings& settings) {
+ return decompress(out, in.empty() ? 0 : &in[0], in.size(), settings);
+}
+#endif /* LODEPNG_COMPILE_DECODER */
+
+#ifdef LODEPNG_COMPILE_ENCODER
+unsigned compress(std::vector& out, const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings& settings) {
+ unsigned char* buffer = 0;
+ size_t buffersize = 0;
+ unsigned error = zlib_compress(&buffer, &buffersize, in, insize, &settings);
+ if(buffer) {
+ out.insert(out.end(), &buffer[0], &buffer[buffersize]);
+ lodepng_free(buffer);
+ }
+ return error;
+}
+
+unsigned compress(std::vector& out, const std::vector& in,
+ const LodePNGCompressSettings& settings) {
+ return compress(out, in.empty() ? 0 : &in[0], in.size(), settings);
+}
+#endif /* LODEPNG_COMPILE_ENCODER */
+#endif /* LODEPNG_COMPILE_ZLIB */
+
+
+#ifdef LODEPNG_COMPILE_PNG
+
+State::State() {
+ lodepng_state_init(this);
+}
+
+State::State(const State& other) {
+ lodepng_state_init(this);
+ lodepng_state_copy(this, &other);
+}
+
+State::~State() {
+ lodepng_state_cleanup(this);
+}
+
+State& State::operator=(const State& other) {
+ lodepng_state_copy(this, &other);
+ return *this;
+}
+
+#ifdef LODEPNG_COMPILE_DECODER
+
+unsigned decode(std::vector& out, unsigned& w, unsigned& h, const unsigned char* in,
+ size_t insize, LodePNGColorType colortype, unsigned bitdepth) {
+ unsigned char* buffer = 0;
+ unsigned error = lodepng_decode_memory(&buffer, &w, &h, in, insize, colortype, bitdepth);
+ if(buffer && !error) {
+ State state;
+ state.info_raw.colortype = colortype;
+ state.info_raw.bitdepth = bitdepth;
+ size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw);
+ out.insert(out.end(), &buffer[0], &buffer[buffersize]);
+ }
+ lodepng_free(buffer);
+ return error;
+}
+
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ const std::vector& in, LodePNGColorType colortype, unsigned bitdepth) {
+ return decode(out, w, h, in.empty() ? 0 : &in[0], (unsigned)in.size(), colortype, bitdepth);
+}
+
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ State& state,
+ const unsigned char* in, size_t insize) {
+ unsigned char* buffer = NULL;
+ unsigned error = lodepng_decode(&buffer, &w, &h, &state, in, insize);
+ if(buffer && !error) {
+ size_t buffersize = lodepng_get_raw_size(w, h, &state.info_raw);
+ out.insert(out.end(), &buffer[0], &buffer[buffersize]);
+ }
+ lodepng_free(buffer);
+ return error;
+}
+
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ State& state,
+ const std::vector& in) {
+ return decode(out, w, h, state, in.empty() ? 0 : &in[0], in.size());
+}
+
+#ifdef LODEPNG_COMPILE_DISK
+unsigned decode(std::vector& out, unsigned& w, unsigned& h, const std::string& filename,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ std::vector buffer;
+ /* safe output values in case error happens */
+ w = h = 0;
+ unsigned error = load_file(buffer, filename);
+ if(error) return error;
+ return decode(out, w, h, buffer, colortype, bitdepth);
+}
+#endif /* LODEPNG_COMPILE_DECODER */
+#endif /* LODEPNG_COMPILE_DISK */
+
+#ifdef LODEPNG_COMPILE_ENCODER
+unsigned encode(std::vector& out, const unsigned char* in, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ unsigned char* buffer;
+ size_t buffersize;
+ unsigned error = lodepng_encode_memory(&buffer, &buffersize, in, w, h, colortype, bitdepth);
+ if(buffer) {
+ out.insert(out.end(), &buffer[0], &buffer[buffersize]);
+ lodepng_free(buffer);
+ }
+ return error;
+}
+
+unsigned encode(std::vector& out,
+ const std::vector& in, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84;
+ return encode(out, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth);
+}
+
+unsigned encode(std::vector& out,
+ const unsigned char* in, unsigned w, unsigned h,
+ State& state) {
+ unsigned char* buffer;
+ size_t buffersize;
+ unsigned error = lodepng_encode(&buffer, &buffersize, in, w, h, &state);
+ if(buffer) {
+ out.insert(out.end(), &buffer[0], &buffer[buffersize]);
+ lodepng_free(buffer);
+ }
+ return error;
+}
+
+unsigned encode(std::vector& out,
+ const std::vector& in, unsigned w, unsigned h,
+ State& state) {
+ if(lodepng_get_raw_size(w, h, &state.info_raw) > in.size()) return 84;
+ return encode(out, in.empty() ? 0 : &in[0], w, h, state);
+}
+
+#ifdef LODEPNG_COMPILE_DISK
+unsigned encode(const std::string& filename,
+ const unsigned char* in, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ std::vector buffer;
+ unsigned error = encode(buffer, in, w, h, colortype, bitdepth);
+ if(!error) error = save_file(buffer, filename);
+ return error;
+}
+
+unsigned encode(const std::string& filename,
+ const std::vector& in, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth) {
+ if(lodepng_get_raw_size_lct(w, h, colortype, bitdepth) > in.size()) return 84;
+ return encode(filename, in.empty() ? 0 : &in[0], w, h, colortype, bitdepth);
+}
+#endif /* LODEPNG_COMPILE_DISK */
+#endif /* LODEPNG_COMPILE_ENCODER */
+#endif /* LODEPNG_COMPILE_PNG */
+} /* namespace lodepng */
+#endif /*LODEPNG_COMPILE_CPP*/
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/lodepng.h b/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/lodepng.h
new file mode 100644
index 0000000..a386459
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/extras/cabi/lodepng/lodepng.h
@@ -0,0 +1,1945 @@
+/*
+LodePNG version 20200306
+
+Copyright (c) 2005-2020 Lode Vandevenne
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source
+ distribution.
+*/
+
+#ifndef LODEPNG_H
+#define LODEPNG_H
+
+#include /*for size_t*/
+
+extern const char* LODEPNG_VERSION_STRING;
+
+/*
+The following #defines are used to create code sections. They can be disabled
+to disable code sections, which can give faster compile time and smaller binary.
+The "NO_COMPILE" defines are designed to be used to pass as defines to the
+compiler command to disable them without modifying this header, e.g.
+-DLODEPNG_NO_COMPILE_ZLIB for gcc.
+In addition to those below, you can also define LODEPNG_NO_COMPILE_CRC to
+allow implementing a custom lodepng_crc32.
+*/
+/*deflate & zlib. If disabled, you must specify alternative zlib functions in
+the custom_zlib field of the compress and decompress settings*/
+#ifndef LODEPNG_NO_COMPILE_ZLIB
+#define LODEPNG_COMPILE_ZLIB
+#endif
+
+/*png encoder and png decoder*/
+#ifndef LODEPNG_NO_COMPILE_PNG
+#define LODEPNG_COMPILE_PNG
+#endif
+
+/*deflate&zlib decoder and png decoder*/
+#ifndef LODEPNG_NO_COMPILE_DECODER
+#define LODEPNG_COMPILE_DECODER
+#endif
+
+/*deflate&zlib encoder and png encoder*/
+#ifndef LODEPNG_NO_COMPILE_ENCODER
+#define LODEPNG_COMPILE_ENCODER
+#endif
+
+/*the optional built in harddisk file loading and saving functions*/
+#ifndef LODEPNG_NO_COMPILE_DISK
+#define LODEPNG_COMPILE_DISK
+#endif
+
+/*support for chunks other than IHDR, IDAT, PLTE, tRNS, IEND: ancillary and unknown chunks*/
+#ifndef LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS
+#define LODEPNG_COMPILE_ANCILLARY_CHUNKS
+#endif
+
+/*ability to convert error numerical codes to English text string*/
+#ifndef LODEPNG_NO_COMPILE_ERROR_TEXT
+#define LODEPNG_COMPILE_ERROR_TEXT
+#endif
+
+/*Compile the default allocators (C's free, malloc and realloc). If you disable this,
+you can define the functions lodepng_free, lodepng_malloc and lodepng_realloc in your
+source files with custom allocators.*/
+#ifndef LODEPNG_NO_COMPILE_ALLOCATORS
+#define LODEPNG_COMPILE_ALLOCATORS
+#endif
+
+/*compile the C++ version (you can disable the C++ wrapper here even when compiling for C++)*/
+#ifdef __cplusplus
+#ifndef LODEPNG_NO_COMPILE_CPP
+#define LODEPNG_COMPILE_CPP
+#endif
+#endif
+
+#ifdef LODEPNG_COMPILE_CPP
+#include
+#include
+#endif /*LODEPNG_COMPILE_CPP*/
+
+#ifdef LODEPNG_COMPILE_PNG
+/*The PNG color types (also used for raw image).*/
+typedef enum LodePNGColorType {
+ LCT_GREY = 0, /*grayscale: 1,2,4,8,16 bit*/
+ LCT_RGB = 2, /*RGB: 8,16 bit*/
+ LCT_PALETTE = 3, /*palette: 1,2,4,8 bit*/
+ LCT_GREY_ALPHA = 4, /*grayscale with alpha: 8,16 bit*/
+ LCT_RGBA = 6, /*RGB with alpha: 8,16 bit*/
+ /*LCT_MAX_OCTET_VALUE lets the compiler allow this enum to represent any invalid
+ byte value from 0 to 255 that could be present in an invalid PNG file header. Do
+ not use, compare with or set the name LCT_MAX_OCTET_VALUE, instead either use
+ the valid color type names above, or numeric values like 1 or 7 when checking for
+ particular disallowed color type byte values, or cast to integer to print it.*/
+ LCT_MAX_OCTET_VALUE = 255
+} LodePNGColorType;
+
+#ifdef LODEPNG_COMPILE_DECODER
+/*
+Converts PNG data in memory to raw pixel data.
+out: Output parameter. Pointer to buffer that will contain the raw pixel data.
+ After decoding, its size is w * h * (bytes per pixel) bytes larger than
+ initially. Bytes per pixel depends on colortype and bitdepth.
+ Must be freed after usage with free(*out).
+ Note: for 16-bit per channel colors, uses big endian format like PNG does.
+w: Output parameter. Pointer to width of pixel data.
+h: Output parameter. Pointer to height of pixel data.
+in: Memory buffer with the PNG file.
+insize: size of the in buffer.
+colortype: the desired color type for the raw output image. See explanation on PNG color types.
+bitdepth: the desired bit depth for the raw output image. See explanation on PNG color types.
+Return value: LodePNG error code (0 means no error).
+*/
+unsigned lodepng_decode_memory(unsigned char** out, unsigned* w, unsigned* h,
+ const unsigned char* in, size_t insize,
+ LodePNGColorType colortype, unsigned bitdepth);
+
+/*Same as lodepng_decode_memory, but always decodes to 32-bit RGBA raw image*/
+unsigned lodepng_decode32(unsigned char** out, unsigned* w, unsigned* h,
+ const unsigned char* in, size_t insize);
+
+/*Same as lodepng_decode_memory, but always decodes to 24-bit RGB raw image*/
+unsigned lodepng_decode24(unsigned char** out, unsigned* w, unsigned* h,
+ const unsigned char* in, size_t insize);
+
+#ifdef LODEPNG_COMPILE_DISK
+/*
+Load PNG from disk, from file with given name.
+Same as the other decode functions, but instead takes a filename as input.
+*/
+unsigned lodepng_decode_file(unsigned char** out, unsigned* w, unsigned* h,
+ const char* filename,
+ LodePNGColorType colortype, unsigned bitdepth);
+
+/*Same as lodepng_decode_file, but always decodes to 32-bit RGBA raw image.*/
+unsigned lodepng_decode32_file(unsigned char** out, unsigned* w, unsigned* h,
+ const char* filename);
+
+/*Same as lodepng_decode_file, but always decodes to 24-bit RGB raw image.*/
+unsigned lodepng_decode24_file(unsigned char** out, unsigned* w, unsigned* h,
+ const char* filename);
+#endif /*LODEPNG_COMPILE_DISK*/
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/*
+Converts raw pixel data into a PNG image in memory. The colortype and bitdepth
+ of the output PNG image cannot be chosen, they are automatically determined
+ by the colortype, bitdepth and content of the input pixel data.
+ Note: for 16-bit per channel colors, needs big endian format like PNG does.
+out: Output parameter. Pointer to buffer that will contain the PNG image data.
+ Must be freed after usage with free(*out).
+outsize: Output parameter. Pointer to the size in bytes of the out buffer.
+image: The raw pixel data to encode. The size of this buffer should be
+ w * h * (bytes per pixel), bytes per pixel depends on colortype and bitdepth.
+w: width of the raw pixel data in pixels.
+h: height of the raw pixel data in pixels.
+colortype: the color type of the raw input image. See explanation on PNG color types.
+bitdepth: the bit depth of the raw input image. See explanation on PNG color types.
+Return value: LodePNG error code (0 means no error).
+*/
+unsigned lodepng_encode_memory(unsigned char** out, size_t* outsize,
+ const unsigned char* image, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth);
+
+/*Same as lodepng_encode_memory, but always encodes from 32-bit RGBA raw image.*/
+unsigned lodepng_encode32(unsigned char** out, size_t* outsize,
+ const unsigned char* image, unsigned w, unsigned h);
+
+/*Same as lodepng_encode_memory, but always encodes from 24-bit RGB raw image.*/
+unsigned lodepng_encode24(unsigned char** out, size_t* outsize,
+ const unsigned char* image, unsigned w, unsigned h);
+
+#ifdef LODEPNG_COMPILE_DISK
+/*
+Converts raw pixel data into a PNG file on disk.
+Same as the other encode functions, but instead takes a filename as output.
+NOTE: This overwrites existing files without warning!
+*/
+unsigned lodepng_encode_file(const char* filename,
+ const unsigned char* image, unsigned w, unsigned h,
+ LodePNGColorType colortype, unsigned bitdepth);
+
+/*Same as lodepng_encode_file, but always encodes from 32-bit RGBA raw image.*/
+unsigned lodepng_encode32_file(const char* filename,
+ const unsigned char* image, unsigned w, unsigned h);
+
+/*Same as lodepng_encode_file, but always encodes from 24-bit RGB raw image.*/
+unsigned lodepng_encode24_file(const char* filename,
+ const unsigned char* image, unsigned w, unsigned h);
+#endif /*LODEPNG_COMPILE_DISK*/
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+
+#ifdef LODEPNG_COMPILE_CPP
+namespace lodepng {
+#ifdef LODEPNG_COMPILE_DECODER
+/*Same as lodepng_decode_memory, but decodes to an std::vector. The colortype
+is the format to output the pixels to. Default is RGBA 8-bit per channel.*/
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ const unsigned char* in, size_t insize,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ const std::vector& in,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+#ifdef LODEPNG_COMPILE_DISK
+/*
+Converts PNG file from disk to raw pixel data in memory.
+Same as the other decode functions, but instead takes a filename as input.
+*/
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ const std::string& filename,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+#endif /* LODEPNG_COMPILE_DISK */
+#endif /* LODEPNG_COMPILE_DECODER */
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/*Same as lodepng_encode_memory, but encodes to an std::vector. colortype
+is that of the raw input data. The output PNG color type will be auto chosen.*/
+unsigned encode(std::vector& out,
+ const unsigned char* in, unsigned w, unsigned h,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+unsigned encode(std::vector& out,
+ const std::vector& in, unsigned w, unsigned h,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+#ifdef LODEPNG_COMPILE_DISK
+/*
+Converts 32-bit RGBA raw pixel data into a PNG file on disk.
+Same as the other encode functions, but instead takes a filename as output.
+NOTE: This overwrites existing files without warning!
+*/
+unsigned encode(const std::string& filename,
+ const unsigned char* in, unsigned w, unsigned h,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+unsigned encode(const std::string& filename,
+ const std::vector& in, unsigned w, unsigned h,
+ LodePNGColorType colortype = LCT_RGBA, unsigned bitdepth = 8);
+#endif /* LODEPNG_COMPILE_DISK */
+#endif /* LODEPNG_COMPILE_ENCODER */
+} /* namespace lodepng */
+#endif /*LODEPNG_COMPILE_CPP*/
+#endif /*LODEPNG_COMPILE_PNG*/
+
+#ifdef LODEPNG_COMPILE_ERROR_TEXT
+/*Returns an English description of the numerical error code.*/
+const char* lodepng_error_text(unsigned code);
+#endif /*LODEPNG_COMPILE_ERROR_TEXT*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+/*Settings for zlib decompression*/
+typedef struct LodePNGDecompressSettings LodePNGDecompressSettings;
+struct LodePNGDecompressSettings {
+ /* Check LodePNGDecoderSettings for more ignorable errors such as ignore_crc */
+ unsigned ignore_adler32; /*if 1, continue and don't give an error message if the Adler32 checksum is corrupted*/
+ unsigned ignore_nlen; /*ignore complement of len checksum in uncompressed blocks*/
+
+ /*use custom zlib decoder instead of built in one (default: null)*/
+ unsigned (*custom_zlib)(unsigned char**, size_t*,
+ const unsigned char*, size_t,
+ const LodePNGDecompressSettings*);
+ /*use custom deflate decoder instead of built in one (default: null)
+ if custom_zlib is not null, custom_inflate is ignored (the zlib format uses deflate)*/
+ unsigned (*custom_inflate)(unsigned char**, size_t*,
+ const unsigned char*, size_t,
+ const LodePNGDecompressSettings*);
+
+ const void* custom_context; /*optional custom settings for custom functions*/
+};
+
+extern const LodePNGDecompressSettings lodepng_default_decompress_settings;
+void lodepng_decompress_settings_init(LodePNGDecompressSettings* settings);
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/*
+Settings for zlib compression. Tweaking these settings tweaks the balance
+between speed and compression ratio.
+*/
+typedef struct LodePNGCompressSettings LodePNGCompressSettings;
+struct LodePNGCompressSettings /*deflate = compress*/ {
+ /*LZ77 related settings*/
+ unsigned btype; /*the block type for LZ (0, 1, 2 or 3, see zlib standard). Should be 2 for proper compression.*/
+ unsigned use_lz77; /*whether or not to use LZ77. Should be 1 for proper compression.*/
+ unsigned windowsize; /*must be a power of two <= 32768. higher compresses more but is slower. Default value: 2048.*/
+ unsigned minmatch; /*minimum lz77 length. 3 is normally best, 6 can be better for some PNGs. Default: 0*/
+ unsigned nicematch; /*stop searching if >= this length found. Set to 258 for best compression. Default: 128*/
+ unsigned lazymatching; /*use lazy matching: better compression but a bit slower. Default: true*/
+
+ /*use custom zlib encoder instead of built in one (default: null)*/
+ unsigned (*custom_zlib)(unsigned char**, size_t*,
+ const unsigned char*, size_t,
+ const LodePNGCompressSettings*);
+ /*use custom deflate encoder instead of built in one (default: null)
+ if custom_zlib is used, custom_deflate is ignored since only the built in
+ zlib function will call custom_deflate*/
+ unsigned (*custom_deflate)(unsigned char**, size_t*,
+ const unsigned char*, size_t,
+ const LodePNGCompressSettings*);
+
+ const void* custom_context; /*optional custom settings for custom functions*/
+};
+
+extern const LodePNGCompressSettings lodepng_default_compress_settings;
+void lodepng_compress_settings_init(LodePNGCompressSettings* settings);
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+#ifdef LODEPNG_COMPILE_PNG
+/*
+Color mode of an image. Contains all information required to decode the pixel
+bits to RGBA colors. This information is the same as used in the PNG file
+format, and is used both for PNG and raw image data in LodePNG.
+*/
+typedef struct LodePNGColorMode {
+ /*header (IHDR)*/
+ LodePNGColorType colortype; /*color type, see PNG standard or documentation further in this header file*/
+ unsigned bitdepth; /*bits per sample, see PNG standard or documentation further in this header file*/
+
+ /*
+ palette (PLTE and tRNS)
+
+ Dynamically allocated with the colors of the palette, including alpha.
+ This field may not be allocated directly, use lodepng_color_mode_init first,
+ then lodepng_palette_add per color to correctly initialize it (to ensure size
+ of exactly 1024 bytes).
+
+ The alpha channels must be set as well, set them to 255 for opaque images.
+
+ When decoding, by default you can ignore this palette, since LodePNG already
+ fills the palette colors in the pixels of the raw RGBA output.
+
+ The palette is only supported for color type 3.
+ */
+ unsigned char* palette; /*palette in RGBARGBA... order. Must be either 0, or when allocated must have 1024 bytes*/
+ size_t palettesize; /*palette size in number of colors (amount of used bytes is 4 * palettesize)*/
+
+ /*
+ transparent color key (tRNS)
+
+ This color uses the same bit depth as the bitdepth value in this struct, which can be 1-bit to 16-bit.
+ For grayscale PNGs, r, g and b will all 3 be set to the same.
+
+ When decoding, by default you can ignore this information, since LodePNG sets
+ pixels with this key to transparent already in the raw RGBA output.
+
+ The color key is only supported for color types 0 and 2.
+ */
+ unsigned key_defined; /*is a transparent color key given? 0 = false, 1 = true*/
+ unsigned key_r; /*red/grayscale component of color key*/
+ unsigned key_g; /*green component of color key*/
+ unsigned key_b; /*blue component of color key*/
+} LodePNGColorMode;
+
+/*init, cleanup and copy functions to use with this struct*/
+void lodepng_color_mode_init(LodePNGColorMode* info);
+void lodepng_color_mode_cleanup(LodePNGColorMode* info);
+/*return value is error code (0 means no error)*/
+unsigned lodepng_color_mode_copy(LodePNGColorMode* dest, const LodePNGColorMode* source);
+/* Makes a temporary LodePNGColorMode that does not need cleanup (no palette) */
+LodePNGColorMode lodepng_color_mode_make(LodePNGColorType colortype, unsigned bitdepth);
+
+void lodepng_palette_clear(LodePNGColorMode* info);
+/*add 1 color to the palette*/
+unsigned lodepng_palette_add(LodePNGColorMode* info,
+ unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+
+/*get the total amount of bits per pixel, based on colortype and bitdepth in the struct*/
+unsigned lodepng_get_bpp(const LodePNGColorMode* info);
+/*get the amount of color channels used, based on colortype in the struct.
+If a palette is used, it counts as 1 channel.*/
+unsigned lodepng_get_channels(const LodePNGColorMode* info);
+/*is it a grayscale type? (only colortype 0 or 4)*/
+unsigned lodepng_is_greyscale_type(const LodePNGColorMode* info);
+/*has it got an alpha channel? (only colortype 2 or 6)*/
+unsigned lodepng_is_alpha_type(const LodePNGColorMode* info);
+/*has it got a palette? (only colortype 3)*/
+unsigned lodepng_is_palette_type(const LodePNGColorMode* info);
+/*only returns true if there is a palette and there is a value in the palette with alpha < 255.
+Loops through the palette to check this.*/
+unsigned lodepng_has_palette_alpha(const LodePNGColorMode* info);
+/*
+Check if the given color info indicates the possibility of having non-opaque pixels in the PNG image.
+Returns true if the image can have translucent or invisible pixels (it still be opaque if it doesn't use such pixels).
+Returns false if the image can only have opaque pixels.
+In detail, it returns true only if it's a color type with alpha, or has a palette with non-opaque values,
+or if "key_defined" is true.
+*/
+unsigned lodepng_can_have_alpha(const LodePNGColorMode* info);
+/*Returns the byte size of a raw image buffer with given width, height and color mode*/
+size_t lodepng_get_raw_size(unsigned w, unsigned h, const LodePNGColorMode* color);
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+/*The information of a Time chunk in PNG.*/
+typedef struct LodePNGTime {
+ unsigned year; /*2 bytes used (0-65535)*/
+ unsigned month; /*1-12*/
+ unsigned day; /*1-31*/
+ unsigned hour; /*0-23*/
+ unsigned minute; /*0-59*/
+ unsigned second; /*0-60 (to allow for leap seconds)*/
+} LodePNGTime;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+/*Information about the PNG image, except pixels, width and height.*/
+typedef struct LodePNGInfo {
+ /*header (IHDR), palette (PLTE) and transparency (tRNS) chunks*/
+ unsigned compression_method;/*compression method of the original file. Always 0.*/
+ unsigned filter_method; /*filter method of the original file*/
+ unsigned interlace_method; /*interlace method of the original file: 0=none, 1=Adam7*/
+ LodePNGColorMode color; /*color type and bits, palette and transparency of the PNG file*/
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*
+ Suggested background color chunk (bKGD)
+
+ This uses the same color mode and bit depth as the PNG (except no alpha channel),
+ with values truncated to the bit depth in the unsigned integer.
+
+ For grayscale and palette PNGs, the value is stored in background_r. The values
+ in background_g and background_b are then unused.
+
+ So when decoding, you may get these in a different color mode than the one you requested
+ for the raw pixels.
+
+ When encoding with auto_convert, you must use the color model defined in info_png.color for
+ these values. The encoder normally ignores info_png.color when auto_convert is on, but will
+ use it to interpret these values (and convert copies of them to its chosen color model).
+
+ When encoding, avoid setting this to an expensive color, such as a non-gray value
+ when the image is gray, or the compression will be worse since it will be forced to
+ write the PNG with a more expensive color mode (when auto_convert is on).
+
+ The decoder does not use this background color to edit the color of pixels. This is a
+ completely optional metadata feature.
+ */
+ unsigned background_defined; /*is a suggested background color given?*/
+ unsigned background_r; /*red/gray/palette component of suggested background color*/
+ unsigned background_g; /*green component of suggested background color*/
+ unsigned background_b; /*blue component of suggested background color*/
+
+ /*
+ non-international text chunks (tEXt and zTXt)
+
+ The char** arrays each contain num strings. The actual messages are in
+ text_strings, while text_keys are keywords that give a short description what
+ the actual text represents, e.g. Title, Author, Description, or anything else.
+
+ All the string fields below including keys, names and language tags are null terminated.
+ The PNG specification uses null characters for the keys, names and tags, and forbids null
+ characters to appear in the main text which is why we can use null termination everywhere here.
+
+ A keyword is minimum 1 character and maximum 79 characters long. It's
+ discouraged to use a single line length longer than 79 characters for texts.
+
+ Don't allocate these text buffers yourself. Use the init/cleanup functions
+ correctly and use lodepng_add_text and lodepng_clear_text.
+ */
+ size_t text_num; /*the amount of texts in these char** buffers (there may be more texts in itext)*/
+ char** text_keys; /*the keyword of a text chunk (e.g. "Comment")*/
+ char** text_strings; /*the actual text*/
+
+ /*
+ international text chunks (iTXt)
+ Similar to the non-international text chunks, but with additional strings
+ "langtags" and "transkeys".
+ */
+ size_t itext_num; /*the amount of international texts in this PNG*/
+ char** itext_keys; /*the English keyword of the text chunk (e.g. "Comment")*/
+ char** itext_langtags; /*language tag for this text's language, ISO/IEC 646 string, e.g. ISO 639 language tag*/
+ char** itext_transkeys; /*keyword translated to the international language - UTF-8 string*/
+ char** itext_strings; /*the actual international text - UTF-8 string*/
+
+ /*time chunk (tIME)*/
+ unsigned time_defined; /*set to 1 to make the encoder generate a tIME chunk*/
+ LodePNGTime time;
+
+ /*phys chunk (pHYs)*/
+ unsigned phys_defined; /*if 0, there is no pHYs chunk and the values below are undefined, if 1 else there is one*/
+ unsigned phys_x; /*pixels per unit in x direction*/
+ unsigned phys_y; /*pixels per unit in y direction*/
+ unsigned phys_unit; /*may be 0 (unknown unit) or 1 (metre)*/
+
+ /*
+ Color profile related chunks: gAMA, cHRM, sRGB, iCPP
+
+ LodePNG does not apply any color conversions on pixels in the encoder or decoder and does not interpret these color
+ profile values. It merely passes on the information. If you wish to use color profiles and convert colors, please
+ use these values with a color management library.
+
+ See the PNG, ICC and sRGB specifications for more information about the meaning of these values.
+ */
+
+ /* gAMA chunk: optional, overridden by sRGB or iCCP if those are present. */
+ unsigned gama_defined; /* Whether a gAMA chunk is present (0 = not present, 1 = present). */
+ unsigned gama_gamma; /* Gamma exponent times 100000 */
+
+ /* cHRM chunk: optional, overridden by sRGB or iCCP if those are present. */
+ unsigned chrm_defined; /* Whether a cHRM chunk is present (0 = not present, 1 = present). */
+ unsigned chrm_white_x; /* White Point x times 100000 */
+ unsigned chrm_white_y; /* White Point y times 100000 */
+ unsigned chrm_red_x; /* Red x times 100000 */
+ unsigned chrm_red_y; /* Red y times 100000 */
+ unsigned chrm_green_x; /* Green x times 100000 */
+ unsigned chrm_green_y; /* Green y times 100000 */
+ unsigned chrm_blue_x; /* Blue x times 100000 */
+ unsigned chrm_blue_y; /* Blue y times 100000 */
+
+ /*
+ sRGB chunk: optional. May not appear at the same time as iCCP.
+ If gAMA is also present gAMA must contain value 45455.
+ If cHRM is also present cHRM must contain respectively 31270,32900,64000,33000,30000,60000,15000,6000.
+ */
+ unsigned srgb_defined; /* Whether an sRGB chunk is present (0 = not present, 1 = present). */
+ unsigned srgb_intent; /* Rendering intent: 0=perceptual, 1=rel. colorimetric, 2=saturation, 3=abs. colorimetric */
+
+ /*
+ iCCP chunk: optional. May not appear at the same time as sRGB.
+
+ LodePNG does not parse or use the ICC profile (except its color space header field for an edge case), a
+ separate library to handle the ICC data (not included in LodePNG) format is needed to use it for color
+ management and conversions.
+
+ For encoding, if iCCP is present, gAMA and cHRM are recommended to be added as well with values that match the ICC
+ profile as closely as possible, if you wish to do this you should provide the correct values for gAMA and cHRM and
+ enable their '_defined' flags since LodePNG will not automatically compute them from the ICC profile.
+
+ For encoding, the ICC profile is required by the PNG specification to be an "RGB" profile for non-gray
+ PNG color types and a "GRAY" profile for gray PNG color types. If you disable auto_convert, you must ensure
+ the ICC profile type matches your requested color type, else the encoder gives an error. If auto_convert is
+ enabled (the default), and the ICC profile is not a good match for the pixel data, this will result in an encoder
+ error if the pixel data has non-gray pixels for a GRAY profile, or a silent less-optimal compression of the pixel
+ data if the pixels could be encoded as grayscale but the ICC profile is RGB.
+
+ To avoid this do not set an ICC profile in the image unless there is a good reason for it, and when doing so
+ make sure you compute it carefully to avoid the above problems.
+ */
+ unsigned iccp_defined; /* Whether an iCCP chunk is present (0 = not present, 1 = present). */
+ char* iccp_name; /* Null terminated string with profile name, 1-79 bytes */
+ /*
+ The ICC profile in iccp_profile_size bytes.
+ Don't allocate this buffer yourself. Use the init/cleanup functions
+ correctly and use lodepng_set_icc and lodepng_clear_icc.
+ */
+ unsigned char* iccp_profile;
+ unsigned iccp_profile_size; /* The size of iccp_profile in bytes */
+
+ /* End of color profile related chunks */
+
+
+ /*
+ unknown chunks: chunks not known by LodePNG, passed on byte for byte.
+
+ There are 3 buffers, one for each position in the PNG where unknown chunks can appear.
+ Each buffer contains all unknown chunks for that position consecutively.
+ The 3 positions are:
+ 0: between IHDR and PLTE, 1: between PLTE and IDAT, 2: between IDAT and IEND.
+
+ For encoding, do not store critical chunks or known chunks that are enabled with a "_defined" flag
+ above in here, since the encoder will blindly follow this and could then encode an invalid PNG file
+ (such as one with two IHDR chunks or the disallowed combination of sRGB with iCCP). But do use
+ this if you wish to store an ancillary chunk that is not supported by LodePNG (such as sPLT or hIST),
+ or any non-standard PNG chunk.
+
+ Do not allocate or traverse this data yourself. Use the chunk traversing functions declared
+ later, such as lodepng_chunk_next and lodepng_chunk_append, to read/write this struct.
+ */
+ unsigned char* unknown_chunks_data[3];
+ size_t unknown_chunks_size[3]; /*size in bytes of the unknown chunks, given for protection*/
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+} LodePNGInfo;
+
+/*init, cleanup and copy functions to use with this struct*/
+void lodepng_info_init(LodePNGInfo* info);
+void lodepng_info_cleanup(LodePNGInfo* info);
+/*return value is error code (0 means no error)*/
+unsigned lodepng_info_copy(LodePNGInfo* dest, const LodePNGInfo* source);
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+unsigned lodepng_add_text(LodePNGInfo* info, const char* key, const char* str); /*push back both texts at once*/
+void lodepng_clear_text(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/
+
+unsigned lodepng_add_itext(LodePNGInfo* info, const char* key, const char* langtag,
+ const char* transkey, const char* str); /*push back the 4 texts of 1 chunk at once*/
+void lodepng_clear_itext(LodePNGInfo* info); /*use this to clear the itexts again after you filled them in*/
+
+/*replaces if exists*/
+unsigned lodepng_set_icc(LodePNGInfo* info, const char* name, const unsigned char* profile, unsigned profile_size);
+void lodepng_clear_icc(LodePNGInfo* info); /*use this to clear the texts again after you filled them in*/
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+
+/*
+Converts raw buffer from one color type to another color type, based on
+LodePNGColorMode structs to describe the input and output color type.
+See the reference manual at the end of this header file to see which color conversions are supported.
+return value = LodePNG error code (0 if all went ok, an error if the conversion isn't supported)
+The out buffer must have size (w * h * bpp + 7) / 8, where bpp is the bits per pixel
+of the output color type (lodepng_get_bpp).
+For < 8 bpp images, there should not be padding bits at the end of scanlines.
+For 16-bit per channel colors, uses big endian format like PNG does.
+Return value is LodePNG error code
+*/
+unsigned lodepng_convert(unsigned char* out, const unsigned char* in,
+ const LodePNGColorMode* mode_out, const LodePNGColorMode* mode_in,
+ unsigned w, unsigned h);
+
+#ifdef LODEPNG_COMPILE_DECODER
+/*
+Settings for the decoder. This contains settings for the PNG and the Zlib
+decoder, but not the Info settings from the Info structs.
+*/
+typedef struct LodePNGDecoderSettings {
+ LodePNGDecompressSettings zlibsettings; /*in here is the setting to ignore Adler32 checksums*/
+
+ /* Check LodePNGDecompressSettings for more ignorable errors such as ignore_adler32 */
+ unsigned ignore_crc; /*ignore CRC checksums*/
+ unsigned ignore_critical; /*ignore unknown critical chunks*/
+ unsigned ignore_end; /*ignore issues at end of file if possible (missing IEND chunk, too large chunk, ...)*/
+ /* TODO: make a system involving warnings with levels and a strict mode instead. Other potentially recoverable
+ errors: srgb rendering intent value, size of content of ancillary chunks, more than 79 characters for some
+ strings, placement/combination rules for ancillary chunks, crc of unknown chunks, allowed characters
+ in string keys, etc... */
+
+ unsigned color_convert; /*whether to convert the PNG to the color type you want. Default: yes*/
+
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ unsigned read_text_chunks; /*if false but remember_unknown_chunks is true, they're stored in the unknown chunks*/
+ /*store all bytes from unknown chunks in the LodePNGInfo (off by default, useful for a png editor)*/
+ unsigned remember_unknown_chunks;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+} LodePNGDecoderSettings;
+
+void lodepng_decoder_settings_init(LodePNGDecoderSettings* settings);
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/*automatically use color type with less bits per pixel if losslessly possible. Default: AUTO*/
+typedef enum LodePNGFilterStrategy {
+ /*every filter at zero*/
+ LFS_ZERO = 0,
+ /*every filter at 1, 2, 3 or 4 (paeth), unlike LFS_ZERO not a good choice, but for testing*/
+ LFS_ONE = 1,
+ LFS_TWO = 2,
+ LFS_THREE = 3,
+ LFS_FOUR = 4,
+ /*Use filter that gives minimum sum, as described in the official PNG filter heuristic.*/
+ LFS_MINSUM,
+ /*Use the filter type that gives smallest Shannon entropy for this scanline. Depending
+ on the image, this is better or worse than minsum.*/
+ LFS_ENTROPY,
+ /*
+ Brute-force-search PNG filters by compressing each filter for each scanline.
+ Experimental, very slow, and only rarely gives better compression than MINSUM.
+ */
+ LFS_BRUTE_FORCE,
+ /*use predefined_filters buffer: you specify the filter type for each scanline*/
+ LFS_PREDEFINED
+} LodePNGFilterStrategy;
+
+/*Gives characteristics about the integer RGBA colors of the image (count, alpha channel usage, bit depth, ...),
+which helps decide which color model to use for encoding.
+Used internally by default if "auto_convert" is enabled. Public because it's useful for custom algorithms.*/
+typedef struct LodePNGColorStats {
+ unsigned colored; /*not grayscale*/
+ unsigned key; /*image is not opaque and color key is possible instead of full alpha*/
+ unsigned short key_r; /*key values, always as 16-bit, in 8-bit case the byte is duplicated, e.g. 65535 means 255*/
+ unsigned short key_g;
+ unsigned short key_b;
+ unsigned alpha; /*image is not opaque and alpha channel or alpha palette required*/
+ unsigned numcolors; /*amount of colors, up to 257. Not valid if bits == 16 or allow_palette is disabled.*/
+ unsigned char palette[1024]; /*Remembers up to the first 256 RGBA colors, in no particular order, only valid when numcolors is valid*/
+ unsigned bits; /*bits per channel (not for palette). 1,2 or 4 for grayscale only. 16 if 16-bit per channel required.*/
+ size_t numpixels;
+
+ /*user settings for computing/using the stats*/
+ unsigned allow_palette; /*default 1. if 0, disallow choosing palette colortype in auto_choose_color, and don't count numcolors*/
+ unsigned allow_greyscale; /*default 1. if 0, choose RGB or RGBA even if the image only has gray colors*/
+} LodePNGColorStats;
+
+void lodepng_color_stats_init(LodePNGColorStats* stats);
+
+/*Get a LodePNGColorStats of the image. The stats must already have been inited.
+Returns error code (e.g. alloc fail) or 0 if ok.*/
+unsigned lodepng_compute_color_stats(LodePNGColorStats* stats,
+ const unsigned char* image, unsigned w, unsigned h,
+ const LodePNGColorMode* mode_in);
+
+/*Settings for the encoder.*/
+typedef struct LodePNGEncoderSettings {
+ LodePNGCompressSettings zlibsettings; /*settings for the zlib encoder, such as window size, ...*/
+
+ unsigned auto_convert; /*automatically choose output PNG color type. Default: true*/
+
+ /*If true, follows the official PNG heuristic: if the PNG uses a palette or lower than
+ 8 bit depth, set all filters to zero. Otherwise use the filter_strategy. Note that to
+ completely follow the official PNG heuristic, filter_palette_zero must be true and
+ filter_strategy must be LFS_MINSUM*/
+ unsigned filter_palette_zero;
+ /*Which filter strategy to use when not using zeroes due to filter_palette_zero.
+ Set filter_palette_zero to 0 to ensure always using your chosen strategy. Default: LFS_MINSUM*/
+ LodePNGFilterStrategy filter_strategy;
+ /*used if filter_strategy is LFS_PREDEFINED. In that case, this must point to a buffer with
+ the same length as the amount of scanlines in the image, and each value must <= 5. You
+ have to cleanup this buffer, LodePNG will never free it. Don't forget that filter_palette_zero
+ must be set to 0 to ensure this is also used on palette or low bitdepth images.*/
+ const unsigned char* predefined_filters;
+
+ /*force creating a PLTE chunk if colortype is 2 or 6 (= a suggested palette).
+ If colortype is 3, PLTE is _always_ created.*/
+ unsigned force_palette;
+#ifdef LODEPNG_COMPILE_ANCILLARY_CHUNKS
+ /*add LodePNG identifier and version as a text chunk, for debugging*/
+ unsigned add_id;
+ /*encode text chunks as zTXt chunks instead of tEXt chunks, and use compression in iTXt chunks*/
+ unsigned text_compression;
+#endif /*LODEPNG_COMPILE_ANCILLARY_CHUNKS*/
+} LodePNGEncoderSettings;
+
+void lodepng_encoder_settings_init(LodePNGEncoderSettings* settings);
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+
+#if defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER)
+/*The settings, state and information for extended encoding and decoding.*/
+typedef struct LodePNGState {
+#ifdef LODEPNG_COMPILE_DECODER
+ LodePNGDecoderSettings decoder; /*the decoding settings*/
+#endif /*LODEPNG_COMPILE_DECODER*/
+#ifdef LODEPNG_COMPILE_ENCODER
+ LodePNGEncoderSettings encoder; /*the encoding settings*/
+#endif /*LODEPNG_COMPILE_ENCODER*/
+ LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/
+ LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/
+ unsigned error;
+} LodePNGState;
+
+/*init, cleanup and copy functions to use with this struct*/
+void lodepng_state_init(LodePNGState* state);
+void lodepng_state_cleanup(LodePNGState* state);
+void lodepng_state_copy(LodePNGState* dest, const LodePNGState* source);
+#endif /* defined(LODEPNG_COMPILE_DECODER) || defined(LODEPNG_COMPILE_ENCODER) */
+
+#ifdef LODEPNG_COMPILE_DECODER
+/*
+Same as lodepng_decode_memory, but uses a LodePNGState to allow custom settings and
+getting much more information about the PNG image and color mode.
+*/
+unsigned lodepng_decode(unsigned char** out, unsigned* w, unsigned* h,
+ LodePNGState* state,
+ const unsigned char* in, size_t insize);
+
+/*
+Read the PNG header, but not the actual data. This returns only the information
+that is in the IHDR chunk of the PNG, such as width, height and color type. The
+information is placed in the info_png field of the LodePNGState.
+*/
+unsigned lodepng_inspect(unsigned* w, unsigned* h,
+ LodePNGState* state,
+ const unsigned char* in, size_t insize);
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+/*
+Reads one metadata chunk (other than IHDR) of the PNG file and outputs what it
+read in the state. Returns error code on failure.
+Use lodepng_inspect first with a new state, then e.g. lodepng_chunk_find_const
+to find the desired chunk type, and if non null use lodepng_inspect_chunk (with
+chunk_pointer - start_of_file as pos).
+Supports most metadata chunks from the PNG standard (gAMA, bKGD, tEXt, ...).
+Ignores unsupported, unknown, non-metadata or IHDR chunks (without error).
+Requirements: &in[pos] must point to start of a chunk, must use regular
+lodepng_inspect first since format of most other chunks depends on IHDR, and if
+there is a PLTE chunk, that one must be inspected before tRNS or bKGD.
+*/
+unsigned lodepng_inspect_chunk(LodePNGState* state, size_t pos,
+ const unsigned char* in, size_t insize);
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/*This function allocates the out buffer with standard malloc and stores the size in *outsize.*/
+unsigned lodepng_encode(unsigned char** out, size_t* outsize,
+ const unsigned char* image, unsigned w, unsigned h,
+ LodePNGState* state);
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+/*
+The lodepng_chunk functions are normally not needed, except to traverse the
+unknown chunks stored in the LodePNGInfo struct, or add new ones to it.
+It also allows traversing the chunks of an encoded PNG file yourself.
+
+The chunk pointer always points to the beginning of the chunk itself, that is
+the first byte of the 4 length bytes.
+
+In the PNG file format, chunks have the following format:
+-4 bytes length: length of the data of the chunk in bytes (chunk itself is 12 bytes longer)
+-4 bytes chunk type (ASCII a-z,A-Z only, see below)
+-length bytes of data (may be 0 bytes if length was 0)
+-4 bytes of CRC, computed on chunk name + data
+
+The first chunk starts at the 8th byte of the PNG file, the entire rest of the file
+exists out of concatenated chunks with the above format.
+
+PNG standard chunk ASCII naming conventions:
+-First byte: uppercase = critical, lowercase = ancillary
+-Second byte: uppercase = public, lowercase = private
+-Third byte: must be uppercase
+-Fourth byte: uppercase = unsafe to copy, lowercase = safe to copy
+*/
+
+/*
+Gets the length of the data of the chunk. Total chunk length has 12 bytes more.
+There must be at least 4 bytes to read from. If the result value is too large,
+it may be corrupt data.
+*/
+unsigned lodepng_chunk_length(const unsigned char* chunk);
+
+/*puts the 4-byte type in null terminated string*/
+void lodepng_chunk_type(char type[5], const unsigned char* chunk);
+
+/*check if the type is the given type*/
+unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type);
+
+/*0: it's one of the critical chunk types, 1: it's an ancillary chunk (see PNG standard)*/
+unsigned char lodepng_chunk_ancillary(const unsigned char* chunk);
+
+/*0: public, 1: private (see PNG standard)*/
+unsigned char lodepng_chunk_private(const unsigned char* chunk);
+
+/*0: the chunk is unsafe to copy, 1: the chunk is safe to copy (see PNG standard)*/
+unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk);
+
+/*get pointer to the data of the chunk, where the input points to the header of the chunk*/
+unsigned char* lodepng_chunk_data(unsigned char* chunk);
+const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk);
+
+/*returns 0 if the crc is correct, 1 if it's incorrect (0 for OK as usual!)*/
+unsigned lodepng_chunk_check_crc(const unsigned char* chunk);
+
+/*generates the correct CRC from the data and puts it in the last 4 bytes of the chunk*/
+void lodepng_chunk_generate_crc(unsigned char* chunk);
+
+/*
+Iterate to next chunks, allows iterating through all chunks of the PNG file.
+Input must be at the beginning of a chunk (result of a previous lodepng_chunk_next call,
+or the 8th byte of a PNG file which always has the first chunk), or alternatively may
+point to the first byte of the PNG file (which is not a chunk but the magic header, the
+function will then skip over it and return the first real chunk).
+Will output pointer to the start of the next chunk, or at or beyond end of the file if there
+is no more chunk after this or possibly if the chunk is corrupt.
+Start this process at the 8th byte of the PNG file.
+In a non-corrupt PNG file, the last chunk should have name "IEND".
+*/
+unsigned char* lodepng_chunk_next(unsigned char* chunk, unsigned char* end);
+const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk, const unsigned char* end);
+
+/*Finds the first chunk with the given type in the range [chunk, end), or returns NULL if not found.*/
+unsigned char* lodepng_chunk_find(unsigned char* chunk, unsigned char* end, const char type[5]);
+const unsigned char* lodepng_chunk_find_const(const unsigned char* chunk, const unsigned char* end, const char type[5]);
+
+/*
+Appends chunk to the data in out. The given chunk should already have its chunk header.
+The out variable and outsize are updated to reflect the new reallocated buffer.
+Returns error code (0 if it went ok)
+*/
+unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk);
+
+/*
+Appends new chunk to out. The chunk to append is given by giving its length, type
+and data separately. The type is a 4-letter string.
+The out variable and outsize are updated to reflect the new reallocated buffer.
+Returne error code (0 if it went ok)
+*/
+unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length,
+ const char* type, const unsigned char* data);
+
+
+/*Calculate CRC32 of buffer*/
+unsigned lodepng_crc32(const unsigned char* buf, size_t len);
+#endif /*LODEPNG_COMPILE_PNG*/
+
+
+#ifdef LODEPNG_COMPILE_ZLIB
+/*
+This zlib part can be used independently to zlib compress and decompress a
+buffer. It cannot be used to create gzip files however, and it only supports the
+part of zlib that is required for PNG, it does not support dictionaries.
+*/
+
+#ifdef LODEPNG_COMPILE_DECODER
+/*Inflate a buffer. Inflate is the decompression step of deflate. Out buffer must be freed after use.*/
+unsigned lodepng_inflate(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings* settings);
+
+/*
+Decompresses Zlib data. Reallocates the out buffer and appends the data. The
+data must be according to the zlib specification.
+Either, *out must be NULL and *outsize must be 0, or, *out must be a valid
+buffer and *outsize its size in bytes. out must be freed by user after usage.
+*/
+unsigned lodepng_zlib_decompress(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings* settings);
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/*
+Compresses data with Zlib. Reallocates the out buffer and appends the data.
+Zlib adds a small header and trailer around the deflate data.
+The data is output in the format of the zlib specification.
+Either, *out must be NULL and *outsize must be 0, or, *out must be a valid
+buffer and *outsize its size in bytes. out must be freed by user after usage.
+*/
+unsigned lodepng_zlib_compress(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings* settings);
+
+/*
+Find length-limited Huffman code for given frequencies. This function is in the
+public interface only for tests, it's used internally by lodepng_deflate.
+*/
+unsigned lodepng_huffman_code_lengths(unsigned* lengths, const unsigned* frequencies,
+ size_t numcodes, unsigned maxbitlen);
+
+/*Compress a buffer with deflate. See RFC 1951. Out buffer must be freed after use.*/
+unsigned lodepng_deflate(unsigned char** out, size_t* outsize,
+ const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings* settings);
+
+#endif /*LODEPNG_COMPILE_ENCODER*/
+#endif /*LODEPNG_COMPILE_ZLIB*/
+
+#ifdef LODEPNG_COMPILE_DISK
+/*
+Load a file from disk into buffer. The function allocates the out buffer, and
+after usage you should free it.
+out: output parameter, contains pointer to loaded buffer.
+outsize: output parameter, size of the allocated out buffer
+filename: the path to the file to load
+return value: error code (0 means ok)
+*/
+unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* filename);
+
+/*
+Save a file from buffer to disk. Warning, if it exists, this function overwrites
+the file without warning!
+buffer: the buffer to write
+buffersize: size of the buffer to write
+filename: the path to the file to save to
+return value: error code (0 means ok)
+*/
+unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename);
+#endif /*LODEPNG_COMPILE_DISK*/
+
+#ifdef LODEPNG_COMPILE_CPP
+/* The LodePNG C++ wrapper uses std::vectors instead of manually allocated memory buffers. */
+namespace lodepng {
+#ifdef LODEPNG_COMPILE_PNG
+class State : public LodePNGState {
+ public:
+ State();
+ State(const State& other);
+ ~State();
+ State& operator=(const State& other);
+};
+
+#ifdef LODEPNG_COMPILE_DECODER
+/* Same as other lodepng::decode, but using a State for more settings and information. */
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ State& state,
+ const unsigned char* in, size_t insize);
+unsigned decode(std::vector& out, unsigned& w, unsigned& h,
+ State& state,
+ const std::vector& in);
+#endif /*LODEPNG_COMPILE_DECODER*/
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/* Same as other lodepng::encode, but using a State for more settings and information. */
+unsigned encode(std::vector& out,
+ const unsigned char* in, unsigned w, unsigned h,
+ State& state);
+unsigned encode(std::vector& out,
+ const std::vector& in, unsigned w, unsigned h,
+ State& state);
+#endif /*LODEPNG_COMPILE_ENCODER*/
+
+#ifdef LODEPNG_COMPILE_DISK
+/*
+Load a file from disk into an std::vector.
+return value: error code (0 means ok)
+*/
+unsigned load_file(std::vector& buffer, const std::string& filename);
+
+/*
+Save the binary data in an std::vector to a file on disk. The file is overwritten
+without warning.
+*/
+unsigned save_file(const std::vector& buffer, const std::string& filename);
+#endif /* LODEPNG_COMPILE_DISK */
+#endif /* LODEPNG_COMPILE_PNG */
+
+#ifdef LODEPNG_COMPILE_ZLIB
+#ifdef LODEPNG_COMPILE_DECODER
+/* Zlib-decompress an unsigned char buffer */
+unsigned decompress(std::vector& out, const unsigned char* in, size_t insize,
+ const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings);
+
+/* Zlib-decompress an std::vector */
+unsigned decompress(std::vector& out, const std::vector& in,
+ const LodePNGDecompressSettings& settings = lodepng_default_decompress_settings);
+#endif /* LODEPNG_COMPILE_DECODER */
+
+#ifdef LODEPNG_COMPILE_ENCODER
+/* Zlib-compress an unsigned char buffer */
+unsigned compress(std::vector& out, const unsigned char* in, size_t insize,
+ const LodePNGCompressSettings& settings = lodepng_default_compress_settings);
+
+/* Zlib-compress an std::vector */
+unsigned compress(std::vector& out, const std::vector& in,
+ const LodePNGCompressSettings& settings = lodepng_default_compress_settings);
+#endif /* LODEPNG_COMPILE_ENCODER */
+#endif /* LODEPNG_COMPILE_ZLIB */
+} /* namespace lodepng */
+#endif /*LODEPNG_COMPILE_CPP*/
+
+/*
+TODO:
+[.] test if there are no memory leaks or security exploits - done a lot but needs to be checked often
+[.] check compatibility with various compilers - done but needs to be redone for every newer version
+[X] converting color to 16-bit per channel types
+[X] support color profile chunk types (but never let them touch RGB values by default)
+[ ] support all public PNG chunk types (almost done except sBIT, sPLT and hIST)
+[ ] make sure encoder generates no chunks with size > (2^31)-1
+[ ] partial decoding (stream processing)
+[X] let the "isFullyOpaque" function check color keys and transparent palettes too
+[X] better name for the variables "codes", "codesD", "codelengthcodes", "clcl" and "lldl"
+[ ] allow treating some errors like warnings, when image is recoverable (e.g. 69, 57, 58)
+[ ] make warnings like: oob palette, checksum fail, data after iend, wrong/unknown crit chunk, no null terminator in text, ...
+[ ] error messages with line numbers (and version)
+[ ] errors in state instead of as return code?
+[ ] new errors/warnings like suspiciously big decompressed ztxt or iccp chunk
+[ ] let the C++ wrapper catch exceptions coming from the standard library and return LodePNG error codes
+[ ] allow user to provide custom color conversion functions, e.g. for premultiplied alpha, padding bits or not, ...
+[ ] allow user to give data (void*) to custom allocator
+[X] provide alternatives for C library functions not present on some platforms (memcpy, ...)
+*/
+
+#endif /*LODEPNG_H inclusion guard*/
+
+/*
+LodePNG Documentation
+---------------------
+
+0. table of contents
+--------------------
+
+ 1. about
+ 1.1. supported features
+ 1.2. features not supported
+ 2. C and C++ version
+ 3. security
+ 4. decoding
+ 5. encoding
+ 6. color conversions
+ 6.1. PNG color types
+ 6.2. color conversions
+ 6.3. padding bits
+ 6.4. A note about 16-bits per channel and endianness
+ 7. error values
+ 8. chunks and PNG editing
+ 9. compiler support
+ 10. examples
+ 10.1. decoder C++ example
+ 10.2. decoder C example
+ 11. state settings reference
+ 12. changes
+ 13. contact information
+
+
+1. about
+--------
+
+PNG is a file format to store raster images losslessly with good compression,
+supporting different color types and alpha channel.
+
+LodePNG is a PNG codec according to the Portable Network Graphics (PNG)
+Specification (Second Edition) - W3C Recommendation 10 November 2003.
+
+The specifications used are:
+
+*) Portable Network Graphics (PNG) Specification (Second Edition):
+ http://www.w3.org/TR/2003/REC-PNG-20031110
+*) RFC 1950 ZLIB Compressed Data Format version 3.3:
+ http://www.gzip.org/zlib/rfc-zlib.html
+*) RFC 1951 DEFLATE Compressed Data Format Specification ver 1.3:
+ http://www.gzip.org/zlib/rfc-deflate.html
+
+The most recent version of LodePNG can currently be found at
+http://lodev.org/lodepng/
+
+LodePNG works both in C (ISO C90) and C++, with a C++ wrapper that adds
+extra functionality.
+
+LodePNG exists out of two files:
+-lodepng.h: the header file for both C and C++
+-lodepng.c(pp): give it the name lodepng.c or lodepng.cpp (or .cc) depending on your usage
+
+If you want to start using LodePNG right away without reading this doc, get the
+examples from the LodePNG website to see how to use it in code, or check the
+smaller examples in chapter 13 here.
+
+LodePNG is simple but only supports the basic requirements. To achieve
+simplicity, the following design choices were made: There are no dependencies
+on any external library. There are functions to decode and encode a PNG with
+a single function call, and extended versions of these functions taking a
+LodePNGState struct allowing to specify or get more information. By default
+the colors of the raw image are always RGB or RGBA, no matter what color type
+the PNG file uses. To read and write files, there are simple functions to
+convert the files to/from buffers in memory.
+
+This all makes LodePNG suitable for loading textures in games, demos and small
+programs, ... It's less suitable for full fledged image editors, loading PNGs
+over network (it requires all the image data to be available before decoding can
+begin), life-critical systems, ...
+
+1.1. supported features
+-----------------------
+
+The following features are supported by the decoder:
+
+*) decoding of PNGs with any color type, bit depth and interlace mode, to a 24- or 32-bit color raw image,
+ or the same color type as the PNG
+*) encoding of PNGs, from any raw image to 24- or 32-bit color, or the same color type as the raw image
+*) Adam7 interlace and deinterlace for any color type
+*) loading the image from harddisk or decoding it from a buffer from other sources than harddisk
+*) support for alpha channels, including RGBA color model, translucent palettes and color keying
+*) zlib decompression (inflate)
+*) zlib compression (deflate)
+*) CRC32 and ADLER32 checksums
+*) colorimetric color profile conversions: currently experimentally available in lodepng_util.cpp only,
+ plus alternatively ability to pass on chroma/gamma/ICC profile information to other color management system.
+*) handling of unknown chunks, allowing making a PNG editor that stores custom and unknown chunks.
+*) the following chunks are supported by both encoder and decoder:
+ IHDR: header information
+ PLTE: color palette
+ IDAT: pixel data
+ IEND: the final chunk
+ tRNS: transparency for palettized images
+ tEXt: textual information
+ zTXt: compressed textual information
+ iTXt: international textual information
+ bKGD: suggested background color
+ pHYs: physical dimensions
+ tIME: modification time
+ cHRM: RGB chromaticities
+ gAMA: RGB gamma correction
+ iCCP: ICC color profile
+ sRGB: rendering intent
+
+1.2. features not supported
+---------------------------
+
+The following features are _not_ supported:
+
+*) some features needed to make a conformant PNG-Editor might be still missing.
+*) partial loading/stream processing. All data must be available and is processed in one call.
+*) The following public chunks are not (yet) supported but treated as unknown chunks by LodePNG:
+ sBIT
+ hIST
+ sPLT
+
+
+2. C and C++ version
+--------------------
+
+The C version uses buffers allocated with alloc that you need to free()
+yourself. You need to use init and cleanup functions for each struct whenever
+using a struct from the C version to avoid exploits and memory leaks.
+
+The C++ version has extra functions with std::vectors in the interface and the
+lodepng::State class which is a LodePNGState with constructor and destructor.
+
+These files work without modification for both C and C++ compilers because all
+the additional C++ code is in "#ifdef __cplusplus" blocks that make C-compilers
+ignore it, and the C code is made to compile both with strict ISO C90 and C++.
+
+To use the C++ version, you need to rename the source file to lodepng.cpp
+(instead of lodepng.c), and compile it with a C++ compiler.
+
+To use the C version, you need to rename the source file to lodepng.c (instead
+of lodepng.cpp), and compile it with a C compiler.
+
+
+3. Security
+-----------
+
+Even if carefully designed, it's always possible that LodePNG contains possible
+exploits. If you discover one, please let me know, and it will be fixed.
+
+When using LodePNG, care has to be taken with the C version of LodePNG, as well
+as the C-style structs when working with C++. The following conventions are used
+for all C-style structs:
+
+-if a struct has a corresponding init function, always call the init function when making a new one
+-if a struct has a corresponding cleanup function, call it before the struct disappears to avoid memory leaks
+-if a struct has a corresponding copy function, use the copy function instead of "=".
+ The destination must also be inited already.
+
+
+4. Decoding
+-----------
+
+Decoding converts a PNG compressed image to a raw pixel buffer.
+
+Most documentation on using the decoder is at its declarations in the header
+above. For C, simple decoding can be done with functions such as
+lodepng_decode32, and more advanced decoding can be done with the struct
+LodePNGState and lodepng_decode. For C++, all decoding can be done with the
+various lodepng::decode functions, and lodepng::State can be used for advanced
+features.
+
+When using the LodePNGState, it uses the following fields for decoding:
+*) LodePNGInfo info_png: it stores extra information about the PNG (the input) in here
+*) LodePNGColorMode info_raw: here you can say what color mode of the raw image (the output) you want to get
+*) LodePNGDecoderSettings decoder: you can specify a few extra settings for the decoder to use
+
+LodePNGInfo info_png
+--------------------
+
+After decoding, this contains extra information of the PNG image, except the actual
+pixels, width and height because these are already gotten directly from the decoder
+functions.
+
+It contains for example the original color type of the PNG image, text comments,
+suggested background color, etc... More details about the LodePNGInfo struct are
+at its declaration documentation.
+
+LodePNGColorMode info_raw
+-------------------------
+
+When decoding, here you can specify which color type you want
+the resulting raw image to be. If this is different from the colortype of the
+PNG, then the decoder will automatically convert the result. This conversion
+always works, except if you want it to convert a color PNG to grayscale or to
+a palette with missing colors.
+
+By default, 32-bit color is used for the result.
+
+LodePNGDecoderSettings decoder
+------------------------------
+
+The settings can be used to ignore the errors created by invalid CRC and Adler32
+chunks, and to disable the decoding of tEXt chunks.
+
+There's also a setting color_convert, true by default. If false, no conversion
+is done, the resulting data will be as it was in the PNG (after decompression)
+and you'll have to puzzle the colors of the pixels together yourself using the
+color type information in the LodePNGInfo.
+
+
+5. Encoding
+-----------
+
+Encoding converts a raw pixel buffer to a PNG compressed image.
+
+Most documentation on using the encoder is at its declarations in the header
+above. For C, simple encoding can be done with functions such as
+lodepng_encode32, and more advanced decoding can be done with the struct
+LodePNGState and lodepng_encode. For C++, all encoding can be done with the
+various lodepng::encode functions, and lodepng::State can be used for advanced
+features.
+
+Like the decoder, the encoder can also give errors. However it gives less errors
+since the encoder input is trusted, the decoder input (a PNG image that could
+be forged by anyone) is not trusted.
+
+When using the LodePNGState, it uses the following fields for encoding:
+*) LodePNGInfo info_png: here you specify how you want the PNG (the output) to be.
+*) LodePNGColorMode info_raw: here you say what color type of the raw image (the input) has
+*) LodePNGEncoderSettings encoder: you can specify a few settings for the encoder to use
+
+LodePNGInfo info_png
+--------------------
+
+When encoding, you use this the opposite way as when decoding: for encoding,
+you fill in the values you want the PNG to have before encoding. By default it's
+not needed to specify a color type for the PNG since it's automatically chosen,
+but it's possible to choose it yourself given the right settings.
+
+The encoder will not always exactly match the LodePNGInfo struct you give,
+it tries as close as possible. Some things are ignored by the encoder. The
+encoder uses, for example, the following settings from it when applicable:
+colortype and bitdepth, text chunks, time chunk, the color key, the palette, the
+background color, the interlace method, unknown chunks, ...
+
+When encoding to a PNG with colortype 3, the encoder will generate a PLTE chunk.
+If the palette contains any colors for which the alpha channel is not 255 (so
+there are translucent colors in the palette), it'll add a tRNS chunk.
+
+LodePNGColorMode info_raw
+-------------------------
+
+You specify the color type of the raw image that you give to the input here,
+including a possible transparent color key and palette you happen to be using in
+your raw image data.
+
+By default, 32-bit color is assumed, meaning your input has to be in RGBA
+format with 4 bytes (unsigned chars) per pixel.
+
+LodePNGEncoderSettings encoder
+------------------------------
+
+The following settings are supported (some are in sub-structs):
+*) auto_convert: when this option is enabled, the encoder will
+automatically choose the smallest possible color mode (including color key) that
+can encode the colors of all pixels without information loss.
+*) btype: the block type for LZ77. 0 = uncompressed, 1 = fixed huffman tree,
+ 2 = dynamic huffman tree (best compression). Should be 2 for proper
+ compression.
+*) use_lz77: whether or not to use LZ77 for compressed block types. Should be
+ true for proper compression.
+*) windowsize: the window size used by the LZ77 encoder (1 - 32768). Has value
+ 2048 by default, but can be set to 32768 for better, but slow, compression.
+*) force_palette: if colortype is 2 or 6, you can make the encoder write a PLTE
+ chunk if force_palette is true. This can used as suggested palette to convert
+ to by viewers that don't support more than 256 colors (if those still exist)
+*) add_id: add text chunk "Encoder: LodePNG " to the image.
+*) text_compression: default 1. If 1, it'll store texts as zTXt instead of tEXt chunks.
+ zTXt chunks use zlib compression on the text. This gives a smaller result on
+ large texts but a larger result on small texts (such as a single program name).
+ It's all tEXt or all zTXt though, there's no separate setting per text yet.
+
+
+6. color conversions
+--------------------
+
+An important thing to note about LodePNG, is that the color type of the PNG, and
+the color type of the raw image, are completely independent. By default, when
+you decode a PNG, you get the result as a raw image in the color type you want,
+no matter whether the PNG was encoded with a palette, grayscale or RGBA color.
+And if you encode an image, by default LodePNG will automatically choose the PNG
+color type that gives good compression based on the values of colors and amount
+of colors in the image. It can be configured to let you control it instead as
+well, though.
+
+To be able to do this, LodePNG does conversions from one color mode to another.
+It can convert from almost any color type to any other color type, except the
+following conversions: RGB to grayscale is not supported, and converting to a
+palette when the palette doesn't have a required color is not supported. This is
+not supported on purpose: this is information loss which requires a color
+reduction algorithm that is beyond the scope of a PNG encoder (yes, RGB to gray
+is easy, but there are multiple ways if you want to give some channels more
+weight).
+
+By default, when decoding, you get the raw image in 32-bit RGBA or 24-bit RGB
+color, no matter what color type the PNG has. And by default when encoding,
+LodePNG automatically picks the best color model for the output PNG, and expects
+the input image to be 32-bit RGBA or 24-bit RGB. So, unless you want to control
+the color format of the images yourself, you can skip this chapter.
+
+6.1. PNG color types
+--------------------
+
+A PNG image can have many color types, ranging from 1-bit color to 64-bit color,
+as well as palettized color modes. After the zlib decompression and unfiltering
+in the PNG image is done, the raw pixel data will have that color type and thus
+a certain amount of bits per pixel. If you want the output raw image after
+decoding to have another color type, a conversion is done by LodePNG.
+
+The PNG specification gives the following color types:
+
+0: grayscale, bit depths 1, 2, 4, 8, 16
+2: RGB, bit depths 8 and 16
+3: palette, bit depths 1, 2, 4 and 8
+4: grayscale with alpha, bit depths 8 and 16
+6: RGBA, bit depths 8 and 16
+
+Bit depth is the amount of bits per pixel per color channel. So the total amount
+of bits per pixel is: amount of channels * bitdepth.
+
+6.2. color conversions
+----------------------
+
+As explained in the sections about the encoder and decoder, you can specify
+color types and bit depths in info_png and info_raw to change the default
+behaviour.
+
+If, when decoding, you want the raw image to be something else than the default,
+you need to set the color type and bit depth you want in the LodePNGColorMode,
+or the parameters colortype and bitdepth of the simple decoding function.
+
+If, when encoding, you use another color type than the default in the raw input
+image, you need to specify its color type and bit depth in the LodePNGColorMode
+of the raw image, or use the parameters colortype and bitdepth of the simple
+encoding function.
+
+If, when encoding, you don't want LodePNG to choose the output PNG color type
+but control it yourself, you need to set auto_convert in the encoder settings
+to false, and specify the color type you want in the LodePNGInfo of the
+encoder (including palette: it can generate a palette if auto_convert is true,
+otherwise not).
+
+If the input and output color type differ (whether user chosen or auto chosen),
+LodePNG will do a color conversion, which follows the rules below, and may
+sometimes result in an error.
+
+To avoid some confusion:
+-the decoder converts from PNG to raw image
+-the encoder converts from raw image to PNG
+-the colortype and bitdepth in LodePNGColorMode info_raw, are those of the raw image
+-the colortype and bitdepth in the color field of LodePNGInfo info_png, are those of the PNG
+-when encoding, the color type in LodePNGInfo is ignored if auto_convert
+ is enabled, it is automatically generated instead
+-when decoding, the color type in LodePNGInfo is set by the decoder to that of the original
+ PNG image, but it can be ignored since the raw image has the color type you requested instead
+-if the color type of the LodePNGColorMode and PNG image aren't the same, a conversion
+ between the color types is done if the color types are supported. If it is not
+ supported, an error is returned. If the types are the same, no conversion is done.
+-even though some conversions aren't supported, LodePNG supports loading PNGs from any
+ colortype and saving PNGs to any colortype, sometimes it just requires preparing
+ the raw image correctly before encoding.
+-both encoder and decoder use the same color converter.
+
+The function lodepng_convert does the color conversion. It is available in the
+interface but normally isn't needed since the encoder and decoder already call
+it.
+
+Non supported color conversions:
+-color to grayscale when non-gray pixels are present: no error is thrown, but
+the result will look ugly because only the red channel is taken (it assumes all
+three channels are the same in this case so ignores green and blue). The reason
+no error is given is to allow converting from three-channel grayscale images to
+one-channel even if there are numerical imprecisions.
+-anything to palette when the palette does not have an exact match for a from-color
+in it: in this case an error is thrown
+
+Supported color conversions:
+-anything to 8-bit RGB, 8-bit RGBA, 16-bit RGB, 16-bit RGBA
+-any gray or gray+alpha, to gray or gray+alpha
+-anything to a palette, as long as the palette has the requested colors in it
+-removing alpha channel
+-higher to smaller bitdepth, and vice versa
+
+If you want no color conversion to be done (e.g. for speed or control):
+-In the encoder, you can make it save a PNG with any color type by giving the
+raw color mode and LodePNGInfo the same color mode, and setting auto_convert to
+false.
+-In the decoder, you can make it store the pixel data in the same color type
+as the PNG has, by setting the color_convert setting to false. Settings in
+info_raw are then ignored.
+
+6.3. padding bits
+-----------------
+
+In the PNG file format, if a less than 8-bit per pixel color type is used and the scanlines
+have a bit amount that isn't a multiple of 8, then padding bits are used so that each
+scanline starts at a fresh byte. But that is NOT true for the LodePNG raw input and output.
+The raw input image you give to the encoder, and the raw output image you get from the decoder
+will NOT have these padding bits, e.g. in the case of a 1-bit image with a width
+of 7 pixels, the first pixel of the second scanline will the 8th bit of the first byte,
+not the first bit of a new byte.
+
+6.4. A note about 16-bits per channel and endianness
+----------------------------------------------------
+
+LodePNG uses unsigned char arrays for 16-bit per channel colors too, just like
+for any other color format. The 16-bit values are stored in big endian (most
+significant byte first) in these arrays. This is the opposite order of the
+little endian used by x86 CPU's.
+
+LodePNG always uses big endian because the PNG file format does so internally.
+Conversions to other formats than PNG uses internally are not supported by
+LodePNG on purpose, there are myriads of formats, including endianness of 16-bit
+colors, the order in which you store R, G, B and A, and so on. Supporting and
+converting to/from all that is outside the scope of LodePNG.
+
+This may mean that, depending on your use case, you may want to convert the big
+endian output of LodePNG to little endian with a for loop. This is certainly not
+always needed, many applications and libraries support big endian 16-bit colors
+anyway, but it means you cannot simply cast the unsigned char* buffer to an
+unsigned short* buffer on x86 CPUs.
+
+
+7. error values
+---------------
+
+All functions in LodePNG that return an error code, return 0 if everything went
+OK, or a non-zero code if there was an error.
+
+The meaning of the LodePNG error values can be retrieved with the function
+lodepng_error_text: given the numerical error code, it returns a description
+of the error in English as a string.
+
+Check the implementation of lodepng_error_text to see the meaning of each code.
+
+
+8. chunks and PNG editing
+-------------------------
+
+If you want to add extra chunks to a PNG you encode, or use LodePNG for a PNG
+editor that should follow the rules about handling of unknown chunks, or if your
+program is able to read other types of chunks than the ones handled by LodePNG,
+then that's possible with the chunk functions of LodePNG.
+
+A PNG chunk has the following layout:
+
+4 bytes length
+4 bytes type name
+length bytes data
+4 bytes CRC
+
+8.1. iterating through chunks
+-----------------------------
+
+If you have a buffer containing the PNG image data, then the first chunk (the
+IHDR chunk) starts at byte number 8 of that buffer. The first 8 bytes are the
+signature of the PNG and are not part of a chunk. But if you start at byte 8
+then you have a chunk, and can check the following things of it.
+
+NOTE: none of these functions check for memory buffer boundaries. To avoid
+exploits, always make sure the buffer contains all the data of the chunks.
+When using lodepng_chunk_next, make sure the returned value is within the
+allocated memory.
+
+unsigned lodepng_chunk_length(const unsigned char* chunk):
+
+Get the length of the chunk's data. The total chunk length is this length + 12.
+
+void lodepng_chunk_type(char type[5], const unsigned char* chunk):
+unsigned char lodepng_chunk_type_equals(const unsigned char* chunk, const char* type):
+
+Get the type of the chunk or compare if it's a certain type
+
+unsigned char lodepng_chunk_critical(const unsigned char* chunk):
+unsigned char lodepng_chunk_private(const unsigned char* chunk):
+unsigned char lodepng_chunk_safetocopy(const unsigned char* chunk):
+
+Check if the chunk is critical in the PNG standard (only IHDR, PLTE, IDAT and IEND are).
+Check if the chunk is private (public chunks are part of the standard, private ones not).
+Check if the chunk is safe to copy. If it's not, then, when modifying data in a critical
+chunk, unsafe to copy chunks of the old image may NOT be saved in the new one if your
+program doesn't handle that type of unknown chunk.
+
+unsigned char* lodepng_chunk_data(unsigned char* chunk):
+const unsigned char* lodepng_chunk_data_const(const unsigned char* chunk):
+
+Get a pointer to the start of the data of the chunk.
+
+unsigned lodepng_chunk_check_crc(const unsigned char* chunk):
+void lodepng_chunk_generate_crc(unsigned char* chunk):
+
+Check if the crc is correct or generate a correct one.
+
+unsigned char* lodepng_chunk_next(unsigned char* chunk):
+const unsigned char* lodepng_chunk_next_const(const unsigned char* chunk):
+
+Iterate to the next chunk. This works if you have a buffer with consecutive chunks. Note that these
+functions do no boundary checking of the allocated data whatsoever, so make sure there is enough
+data available in the buffer to be able to go to the next chunk.
+
+unsigned lodepng_chunk_append(unsigned char** out, size_t* outsize, const unsigned char* chunk):
+unsigned lodepng_chunk_create(unsigned char** out, size_t* outsize, unsigned length,
+ const char* type, const unsigned char* data):
+
+These functions are used to create new chunks that are appended to the data in *out that has
+length *outsize. The append function appends an existing chunk to the new data. The create
+function creates a new chunk with the given parameters and appends it. Type is the 4-letter
+name of the chunk.
+
+8.2. chunks in info_png
+-----------------------
+
+The LodePNGInfo struct contains fields with the unknown chunk in it. It has 3
+buffers (each with size) to contain 3 types of unknown chunks:
+the ones that come before the PLTE chunk, the ones that come between the PLTE
+and the IDAT chunks, and the ones that come after the IDAT chunks.
+It's necessary to make the distinction between these 3 cases because the PNG
+standard forces to keep the ordering of unknown chunks compared to the critical
+chunks, but does not force any other ordering rules.
+
+info_png.unknown_chunks_data[0] is the chunks before PLTE
+info_png.unknown_chunks_data[1] is the chunks after PLTE, before IDAT
+info_png.unknown_chunks_data[2] is the chunks after IDAT
+
+The chunks in these 3 buffers can be iterated through and read by using the same
+way described in the previous subchapter.
+
+When using the decoder to decode a PNG, you can make it store all unknown chunks
+if you set the option settings.remember_unknown_chunks to 1. By default, this
+option is off (0).
+
+The encoder will always encode unknown chunks that are stored in the info_png.
+If you need it to add a particular chunk that isn't known by LodePNG, you can
+use lodepng_chunk_append or lodepng_chunk_create to the chunk data in
+info_png.unknown_chunks_data[x].
+
+Chunks that are known by LodePNG should not be added in that way. E.g. to make
+LodePNG add a bKGD chunk, set background_defined to true and add the correct
+parameters there instead.
+
+
+9. compiler support
+-------------------
+
+No libraries other than the current standard C library are needed to compile
+LodePNG. For the C++ version, only the standard C++ library is needed on top.
+Add the files lodepng.c(pp) and lodepng.h to your project, include
+lodepng.h where needed, and your program can read/write PNG files.
+
+It is compatible with C90 and up, and C++03 and up.
+
+If performance is important, use optimization when compiling! For both the
+encoder and decoder, this makes a large difference.
+
+Make sure that LodePNG is compiled with the same compiler of the same version
+and with the same settings as the rest of the program, or the interfaces with
+std::vectors and std::strings in C++ can be incompatible.
+
+CHAR_BITS must be 8 or higher, because LodePNG uses unsigned chars for octets.
+
+*) gcc and g++
+
+LodePNG is developed in gcc so this compiler is natively supported. It gives no
+warnings with compiler options "-Wall -Wextra -pedantic -ansi", with gcc and g++
+version 4.7.1 on Linux, 32-bit and 64-bit.
+
+*) Clang
+
+Fully supported and warning-free.
+
+*) Mingw
+
+The Mingw compiler (a port of gcc for Windows) should be fully supported by
+LodePNG.
+
+*) Visual Studio and Visual C++ Express Edition
+
+LodePNG should be warning-free with warning level W4. Two warnings were disabled
+with pragmas though: warning 4244 about implicit conversions, and warning 4996
+where it wants to use a non-standard function fopen_s instead of the standard C
+fopen.
+
+Visual Studio may want "stdafx.h" files to be included in each source file and
+give an error "unexpected end of file while looking for precompiled header".
+This is not standard C++ and will not be added to the stock LodePNG. You can
+disable it for lodepng.cpp only by right clicking it, Properties, C/C++,
+Precompiled Headers, and set it to Not Using Precompiled Headers there.
+
+NOTE: Modern versions of VS should be fully supported, but old versions, e.g.
+VS6, are not guaranteed to work.
+
+*) Compilers on Macintosh
+
+LodePNG has been reported to work both with gcc and LLVM for Macintosh, both for
+C and C++.
+
+*) Other Compilers
+
+If you encounter problems on any compilers, feel free to let me know and I may
+try to fix it if the compiler is modern and standards compliant.
+
+
+10. examples
+------------
+
+This decoder example shows the most basic usage of LodePNG. More complex
+examples can be found on the LodePNG website.
+
+10.1. decoder C++ example
+-------------------------
+
+#include "lodepng.h"
+#include
+
+int main(int argc, char *argv[]) {
+ const char* filename = argc > 1 ? argv[1] : "test.png";
+
+ //load and decode
+ std::vector image;
+ unsigned width, height;
+ unsigned error = lodepng::decode(image, width, height, filename);
+
+ //if there's an error, display it
+ if(error) std::cout << "decoder error " << error << ": " << lodepng_error_text(error) << std::endl;
+
+ //the pixels are now in the vector "image", 4 bytes per pixel, ordered RGBARGBA..., use it as texture, draw it, ...
+}
+
+10.2. decoder C example
+-----------------------
+
+#include "lodepng.h"
+
+int main(int argc, char *argv[]) {
+ unsigned error;
+ unsigned char* image;
+ size_t width, height;
+ const char* filename = argc > 1 ? argv[1] : "test.png";
+
+ error = lodepng_decode32_file(&image, &width, &height, filename);
+
+ if(error) printf("decoder error %u: %s\n", error, lodepng_error_text(error));
+
+ / * use image here * /
+
+ free(image);
+ return 0;
+}
+
+11. state settings reference
+----------------------------
+
+A quick reference of some settings to set on the LodePNGState
+
+For decoding:
+
+state.decoder.zlibsettings.ignore_adler32: ignore ADLER32 checksums
+state.decoder.zlibsettings.custom_...: use custom inflate function
+state.decoder.ignore_crc: ignore CRC checksums
+state.decoder.ignore_critical: ignore unknown critical chunks
+state.decoder.ignore_end: ignore missing IEND chunk. May fail if this corruption causes other errors
+state.decoder.color_convert: convert internal PNG color to chosen one
+state.decoder.read_text_chunks: whether to read in text metadata chunks
+state.decoder.remember_unknown_chunks: whether to read in unknown chunks
+state.info_raw.colortype: desired color type for decoded image
+state.info_raw.bitdepth: desired bit depth for decoded image
+state.info_raw....: more color settings, see struct LodePNGColorMode
+state.info_png....: no settings for decoder but ouput, see struct LodePNGInfo
+
+For encoding:
+
+state.encoder.zlibsettings.btype: disable compression by setting it to 0
+state.encoder.zlibsettings.use_lz77: use LZ77 in compression
+state.encoder.zlibsettings.windowsize: tweak LZ77 windowsize
+state.encoder.zlibsettings.minmatch: tweak min LZ77 length to match
+state.encoder.zlibsettings.nicematch: tweak LZ77 match where to stop searching
+state.encoder.zlibsettings.lazymatching: try one more LZ77 matching
+state.encoder.zlibsettings.custom_...: use custom deflate function
+state.encoder.auto_convert: choose optimal PNG color type, if 0 uses info_png
+state.encoder.filter_palette_zero: PNG filter strategy for palette
+state.encoder.filter_strategy: PNG filter strategy to encode with
+state.encoder.force_palette: add palette even if not encoding to one
+state.encoder.add_id: add LodePNG identifier and version as a text chunk
+state.encoder.text_compression: use compressed text chunks for metadata
+state.info_raw.colortype: color type of raw input image you provide
+state.info_raw.bitdepth: bit depth of raw input image you provide
+state.info_raw: more color settings, see struct LodePNGColorMode
+state.info_png.color.colortype: desired color type if auto_convert is false
+state.info_png.color.bitdepth: desired bit depth if auto_convert is false
+state.info_png.color....: more color settings, see struct LodePNGColorMode
+state.info_png....: more PNG related settings, see struct LodePNGInfo
+
+
+12. changes
+-----------
+
+The version number of LodePNG is the date of the change given in the format
+yyyymmdd.
+
+Some changes aren't backwards compatible. Those are indicated with a (!)
+symbol.
+
+Not all changes are listed here, the commit history in github lists more:
+https://github.com/lvandeve/lodepng
+
+*) 06 mar 2020: simplified some of the dynamic memory allocations.
+*) 12 jan 2020: (!) added 'end' argument to lodepng_chunk_next to allow correct
+ overflow checks.
+*) 14 aug 2019: around 25% faster decoding thanks to huffman lookup tables.
+*) 15 jun 2019: (!) auto_choose_color API changed (for bugfix: don't use palette
+ if gray ICC profile) and non-ICC LodePNGColorProfile renamed to
+ LodePNGColorStats.
+*) 30 dec 2018: code style changes only: removed newlines before opening braces.
+*) 10 sep 2018: added way to inspect metadata chunks without full decoding.
+*) 19 aug 2018: (!) fixed color mode bKGD is encoded with and made it use
+ palette index in case of palette.
+*) 10 aug 2018: (!) added support for gAMA, cHRM, sRGB and iCCP chunks. This
+ change is backwards compatible unless you relied on unknown_chunks for those.
+*) 11 jun 2018: less restrictive check for pixel size integer overflow
+*) 14 jan 2018: allow optionally ignoring a few more recoverable errors
+*) 17 sep 2017: fix memory leak for some encoder input error cases
+*) 27 nov 2016: grey+alpha auto color model detection bugfix
+*) 18 apr 2016: Changed qsort to custom stable sort (for platforms w/o qsort).
+*) 09 apr 2016: Fixed colorkey usage detection, and better file loading (within
+ the limits of pure C90).
+*) 08 dec 2015: Made load_file function return error if file can't be opened.
+*) 24 okt 2015: Bugfix with decoding to palette output.
+*) 18 apr 2015: Boundary PM instead of just package-merge for faster encoding.
+*) 24 aug 2014: Moved to github
+*) 23 aug 2014: Reduced needless memory usage of decoder.
+*) 28 jun 2014: Removed fix_png setting, always support palette OOB for
+ simplicity. Made ColorProfile public.
+*) 09 jun 2014: Faster encoder by fixing hash bug and more zeros optimization.
+*) 22 dec 2013: Power of two windowsize required for optimization.
+*) 15 apr 2013: Fixed bug with LAC_ALPHA and color key.
+*) 25 mar 2013: Added an optional feature to ignore some PNG errors (fix_png).
+*) 11 mar 2013: (!) Bugfix with custom free. Changed from "my" to "lodepng_"
+ prefix for the custom allocators and made it possible with a new #define to
+ use custom ones in your project without needing to change lodepng's code.
+*) 28 jan 2013: Bugfix with color key.
+*) 27 okt 2012: Tweaks in text chunk keyword length error handling.
+*) 8 okt 2012: (!) Added new filter strategy (entropy) and new auto color mode.
+ (no palette). Better deflate tree encoding. New compression tweak settings.
+ Faster color conversions while decoding. Some internal cleanups.
+*) 23 sep 2012: Reduced warnings in Visual Studio a little bit.
+*) 1 sep 2012: (!) Removed #define's for giving custom (de)compression functions
+ and made it work with function pointers instead.
+*) 23 jun 2012: Added more filter strategies. Made it easier to use custom alloc
+ and free functions and toggle #defines from compiler flags. Small fixes.
+*) 6 may 2012: (!) Made plugging in custom zlib/deflate functions more flexible.
+*) 22 apr 2012: (!) Made interface more consistent, renaming a lot. Removed
+ redundant C++ codec classes. Reduced amount of structs. Everything changed,
+ but it is cleaner now imho and functionality remains the same. Also fixed
+ several bugs and shrunk the implementation code. Made new samples.
+*) 6 nov 2011: (!) By default, the encoder now automatically chooses the best
+ PNG color model and bit depth, based on the amount and type of colors of the
+ raw image. For this, autoLeaveOutAlphaChannel replaced by auto_choose_color.
+*) 9 okt 2011: simpler hash chain implementation for the encoder.
+*) 8 sep 2011: lz77 encoder lazy matching instead of greedy matching.
+*) 23 aug 2011: tweaked the zlib compression parameters after benchmarking.
+ A bug with the PNG filtertype heuristic was fixed, so that it chooses much
+ better ones (it's quite significant). A setting to do an experimental, slow,
+ brute force search for PNG filter types is added.
+*) 17 aug 2011: (!) changed some C zlib related function names.
+*) 16 aug 2011: made the code less wide (max 120 characters per line).
+*) 17 apr 2011: code cleanup. Bugfixes. Convert low to 16-bit per sample colors.
+*) 21 feb 2011: fixed compiling for C90. Fixed compiling with sections disabled.
+*) 11 dec 2010: encoding is made faster, based on suggestion by Peter Eastman
+ to optimize long sequences of zeros.
+*) 13 nov 2010: added LodePNG_InfoColor_hasPaletteAlpha and
+ LodePNG_InfoColor_canHaveAlpha functions for convenience.
+*) 7 nov 2010: added LodePNG_error_text function to get error code description.
+*) 30 okt 2010: made decoding slightly faster
+*) 26 okt 2010: (!) changed some C function and struct names (more consistent).
+ Reorganized the documentation and the declaration order in the header.
+*) 08 aug 2010: only changed some comments and external samples.
+*) 05 jul 2010: fixed bug thanks to warnings in the new gcc version.
+*) 14 mar 2010: fixed bug where too much memory was allocated for char buffers.
+*) 02 sep 2008: fixed bug where it could create empty tree that linux apps could
+ read by ignoring the problem but windows apps couldn't.
+*) 06 jun 2008: added more error checks for out of memory cases.
+*) 26 apr 2008: added a few more checks here and there to ensure more safety.
+*) 06 mar 2008: crash with encoding of strings fixed
+*) 02 feb 2008: support for international text chunks added (iTXt)
+*) 23 jan 2008: small cleanups, and #defines to divide code in sections
+*) 20 jan 2008: support for unknown chunks allowing using LodePNG for an editor.
+*) 18 jan 2008: support for tIME and pHYs chunks added to encoder and decoder.
+*) 17 jan 2008: ability to encode and decode compressed zTXt chunks added
+ Also various fixes, such as in the deflate and the padding bits code.
+*) 13 jan 2008: Added ability to encode Adam7-interlaced images. Improved
+ filtering code of encoder.
+*) 07 jan 2008: (!) changed LodePNG to use ISO C90 instead of C++. A
+ C++ wrapper around this provides an interface almost identical to before.
+ Having LodePNG be pure ISO C90 makes it more portable. The C and C++ code
+ are together in these files but it works both for C and C++ compilers.
+*) 29 dec 2007: (!) changed most integer types to unsigned int + other tweaks
+*) 30 aug 2007: bug fixed which makes this Borland C++ compatible
+*) 09 aug 2007: some VS2005 warnings removed again
+*) 21 jul 2007: deflate code placed in new namespace separate from zlib code
+*) 08 jun 2007: fixed bug with 2- and 4-bit color, and small interlaced images
+*) 04 jun 2007: improved support for Visual Studio 2005: crash with accessing
+ invalid std::vector element [0] fixed, and level 3 and 4 warnings removed
+*) 02 jun 2007: made the encoder add a tag with version by default
+*) 27 may 2007: zlib and png code separated (but still in the same file),
+ simple encoder/decoder functions added for more simple usage cases
+*) 19 may 2007: minor fixes, some code cleaning, new error added (error 69),
+ moved some examples from here to lodepng_examples.cpp
+*) 12 may 2007: palette decoding bug fixed
+*) 24 apr 2007: changed the license from BSD to the zlib license
+*) 11 mar 2007: very simple addition: ability to encode bKGD chunks.
+*) 04 mar 2007: (!) tEXt chunk related fixes, and support for encoding
+ palettized PNG images. Plus little interface change with palette and texts.
+*) 03 mar 2007: Made it encode dynamic Huffman shorter with repeat codes.
+ Fixed a bug where the end code of a block had length 0 in the Huffman tree.
+*) 26 feb 2007: Huffman compression with dynamic trees (BTYPE 2) now implemented
+ and supported by the encoder, resulting in smaller PNGs at the output.
+*) 27 jan 2007: Made the Adler-32 test faster so that a timewaste is gone.
+*) 24 jan 2007: gave encoder an error interface. Added color conversion from any
+ greyscale type to 8-bit greyscale with or without alpha.
+*) 21 jan 2007: (!) Totally changed the interface. It allows more color types
+ to convert to and is more uniform. See the manual for how it works now.
+*) 07 jan 2007: Some cleanup & fixes, and a few changes over the last days:
+ encode/decode custom tEXt chunks, separate classes for zlib & deflate, and
+ at last made the decoder give errors for incorrect Adler32 or Crc.
+*) 01 jan 2007: Fixed bug with encoding PNGs with less than 8 bits per channel.
+*) 29 dec 2006: Added support for encoding images without alpha channel, and
+ cleaned out code as well as making certain parts faster.
+*) 28 dec 2006: Added "Settings" to the encoder.
+*) 26 dec 2006: The encoder now does LZ77 encoding and produces much smaller files now.
+ Removed some code duplication in the decoder. Fixed little bug in an example.
+*) 09 dec 2006: (!) Placed output parameters of public functions as first parameter.
+ Fixed a bug of the decoder with 16-bit per color.
+*) 15 okt 2006: Changed documentation structure
+*) 09 okt 2006: Encoder class added. It encodes a valid PNG image from the
+ given image buffer, however for now it's not compressed.
+*) 08 sep 2006: (!) Changed to interface with a Decoder class
+*) 30 jul 2006: (!) LodePNG_InfoPng , width and height are now retrieved in different
+ way. Renamed decodePNG to decodePNGGeneric.
+*) 29 jul 2006: (!) Changed the interface: image info is now returned as a
+ struct of type LodePNG::LodePNG_Info, instead of a vector, which was a bit clumsy.
+*) 28 jul 2006: Cleaned the code and added new error checks.
+ Corrected terminology "deflate" into "inflate".
+*) 23 jun 2006: Added SDL example in the documentation in the header, this
+ example allows easy debugging by displaying the PNG and its transparency.
+*) 22 jun 2006: (!) Changed way to obtain error value. Added
+ loadFile function for convenience. Made decodePNG32 faster.
+*) 21 jun 2006: (!) Changed type of info vector to unsigned.
+ Changed position of palette in info vector. Fixed an important bug that
+ happened on PNGs with an uncompressed block.
+*) 16 jun 2006: Internally changed unsigned into unsigned where
+ needed, and performed some optimizations.
+*) 07 jun 2006: (!) Renamed functions to decodePNG and placed them
+ in LodePNG namespace. Changed the order of the parameters. Rewrote the
+ documentation in the header. Renamed files to lodepng.cpp and lodepng.h
+*) 22 apr 2006: Optimized and improved some code
+*) 07 sep 2005: (!) Changed to std::vector interface
+*) 12 aug 2005: Initial release (C++, decoder only)
+
+
+13. contact information
+-----------------------
+
+Feel free to contact me with suggestions, problems, comments, ... concerning
+LodePNG. If you encounter a PNG image that doesn't work properly with this
+decoder, feel free to send it and I'll use it to find and fix the problem.
+
+My email address is (puzzle the account and domain together with an @ symbol):
+Domain: gmail dot com.
+Account: lode dot vandevenne.
+
+
+Copyright (c) 2005-2020 Lode Vandevenne
+*/
diff --git a/board-package-source/libraries/Arduboy2/extras/cabi/sample.png b/board-package-source/libraries/Arduboy2/extras/cabi/sample.png
new file mode 100644
index 0000000..be58c40
Binary files /dev/null and b/board-package-source/libraries/Arduboy2/extras/cabi/sample.png differ
diff --git a/board-package-source/libraries/Arduboy2/extras/docs/FILE_DESCRIPTIONS.md b/board-package-source/libraries/Arduboy2/extras/docs/FILE_DESCRIPTIONS.md
index 7ef06dc..9d9fcb7 100644
--- a/board-package-source/libraries/Arduboy2/extras/docs/FILE_DESCRIPTIONS.md
+++ b/board-package-source/libraries/Arduboy2/extras/docs/FILE_DESCRIPTIONS.md
@@ -1,6 +1,6 @@
# File Descriptions
-Documentation for files contained in this repository which aren't self explanatory.
+Documentation for files contained in this repository that aren't self explanatory.
### /library.properties
@@ -8,15 +8,15 @@ Provides information so that this library can be installed and updated in the Ar
The value of *version* must be set to the latest stable tagged release. This should be changed and commited just before tagging the new release.
-See the [Arduino IDE 1.5: Library specification](https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification) for details.
+See the [Arduino IDE 1.5: Library specification](https://arduino.github.io/arduino-cli/library-specification/) for details.
### /library.json
-This JSON file is a manifest used by the [PlatformIO IDE](http://platformio.org/) to make this library available in its [Library Manager](http://docs.platformio.org/en/latest/librarymanager/index.html).
+This JSON file is a manifest used by the [PlatformIO IDE](https://platformio.org/) to make this library available in its [Library Manager](https://docs.platformio.org/en/latest/librarymanager/index.html).
The value of *version* must be set to the latest stable tagged release. This should be changed and commited just before tagging the new release.
-See the [PlatformIO library.json](http://docs.platformio.org/en/latest/librarymanager/config.html) documentation for details.
+See the [PlatformIO library.json](https://docs.platformio.org/en/latest/librarymanager/config.html) documentation for details.
### /extras/assets/arduboy_logo.png
/extras/assets/arduboy_screen.png
diff --git a/board-package-source/libraries/Arduboy2/keywords.txt b/board-package-source/libraries/Arduboy2/keywords.txt
index b5caf94..a678665 100644
--- a/board-package-source/libraries/Arduboy2/keywords.txt
+++ b/board-package-source/libraries/Arduboy2/keywords.txt
@@ -20,6 +20,7 @@ SpritesB KEYWORD1
#######################################
allPixelsOn KEYWORD2
+anyPressed KEYWORD2
begin KEYWORD2
blank KEYWORD2
boot KEYWORD2
@@ -96,6 +97,8 @@ readUnitName KEYWORD2
safeMode KEYWORD2
saveOnOff KEYWORD2
setCursor KEYWORD2
+setCursorX KEYWORD2
+setCursorY KEYWORD2
setFrameDuration KEYWORD2
setFrameRate KEYWORD2
setRGBled KEYWORD2
@@ -104,6 +107,7 @@ setTextColor KEYWORD2
setTextSize KEYWORD2
setTextWrap KEYWORD2
SPItransfer KEYWORD2
+SPItransferAndRead KEYWORD2
systemButtons KEYWORD2
toggle KEYWORD2
waitNoButtons KEYWORD2
@@ -134,6 +138,7 @@ drawSelfMasked KEYWORD2
ARDUBOY_LIB_VER LITERAL1
ARDUBOY_UNIT_NAME_LEN LITERAL1
+ARDUBOY_UNIT_NAME_BUFFER_SIZE LITERAL1
EEPROM_STORAGE_SPACE_START LITERAL1
diff --git a/board-package-source/libraries/Arduboy2/library.json b/board-package-source/libraries/Arduboy2/library.json
index fe44581..e7ed819 100644
--- a/board-package-source/libraries/Arduboy2/library.json
+++ b/board-package-source/libraries/Arduboy2/library.json
@@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/MLXXXp/Arduboy2.git"
},
- "version": "5.2.1",
+ "version": "5.3.0",
"export":
{
"exclude": "extras"
diff --git a/board-package-source/libraries/Arduboy2/library.properties b/board-package-source/libraries/Arduboy2/library.properties
index 24ab125..0213f2a 100644
--- a/board-package-source/libraries/Arduboy2/library.properties
+++ b/board-package-source/libraries/Arduboy2/library.properties
@@ -1,5 +1,5 @@
name=Arduboy2
-version=5.2.1
+version=5.3.0
author=Chris J. Martinez, Kevin Bates, Josh Goebel, Scott Allen, Ross O. Shoger
maintainer=Scott Allen
sentence=An alternative library for use with the Arduboy game system.
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2.cpp b/board-package-source/libraries/Arduboy2/src/Arduboy2.cpp
index 3bfc6eb..f1b98bb 100644
--- a/board-package-source/libraries/Arduboy2/src/Arduboy2.cpp
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2.cpp
@@ -5,8 +5,6 @@
*/
#include "Arduboy2.h"
-#include "ab_logo.c"
-#include "glcdfont.c"
//========================================
//========== class Arduboy2Base ==========
@@ -81,7 +79,7 @@ void Arduboy2Base::systemButtons()
digitalWriteRGB(BLUE_LED, RGB_ON); // turn on blue LED
sysCtrlSound(UP_BUTTON + B_BUTTON, GREEN_LED, 0xff);
sysCtrlSound(DOWN_BUTTON + B_BUTTON, RED_LED, 0);
- delayShort(200);
+ delayByte(200);
}
digitalWriteRGB(BLUE_LED, RGB_OFF); // turn off blue LED
@@ -91,9 +89,9 @@ void Arduboy2Base::sysCtrlSound(uint8_t buttons, uint8_t led, uint8_t eeVal)
{
if (pressed(buttons)) {
digitalWriteRGB(BLUE_LED, RGB_OFF); // turn off blue LED
- delayShort(200);
+ delayByte(200);
digitalWriteRGB(led, RGB_ON); // turn on "acknowledge" LED
- EEPROM.update(EEPROM_AUDIO_ON_OFF, eeVal);
+ EEPROM.update(eepromAudioOnOff, eeVal);
delayShort(500);
digitalWriteRGB(led, RGB_OFF); // turn off "acknowledge" LED
@@ -179,7 +177,7 @@ void Arduboy2Base::bootLogoShell(void (*drawLogo)(int16_t))
#endif
}
- for (int16_t y = -16; y <= 24; y++) {
+ for (int16_t y = -15; y <= 24; y++) {
if (pressed(RIGHT_BUTTON)) {
digitalWriteRGB(RGB_OFF, RGB_OFF, RGB_OFF); // all LEDs off
return;
@@ -199,7 +197,7 @@ void Arduboy2Base::bootLogoShell(void (*drawLogo)(int16_t))
display(CLEAR_BUFFER);
(*drawLogo)(y); // call the function that actually draws the logo
display();
- delayShort(15);
+ delayByte(15);
}
if (showLEDs) {
@@ -225,7 +223,7 @@ void Arduboy2Base::bootLogoExtra() { }
// wait for all buttons to be released
void Arduboy2Base::waitNoButtons() {
do {
- delayShort(50); // simple button debounce
+ delayByte(50); // simple button debounce
} while (buttonsState());
}
@@ -248,7 +246,7 @@ bool Arduboy2Base::everyXFrames(uint8_t frames)
bool Arduboy2Base::nextFrame()
{
- uint8_t now = (uint8_t) timer0_millis;
+ uint8_t now = *((uint8_t*)(&timer0_millis));
uint8_t frameDurationMs = now - thisFrameStart;
if (justRendered) {
@@ -269,7 +267,23 @@ bool Arduboy2Base::nextFrame()
// pre-render
justRendered = true;
thisFrameStart = now;
+ #if defined __AVR_ARCH__
+ uint16_t* ptr = &frameCount;
+ asm volatile
+ (
+ "ld r24, z \n"
+ "ldd r25, z+1 \n"
+ "adiw r24, 1 \n"
+ "st z, r24 \n"
+ "std z+1, r25 \n"
+
+ : [ptr] "+z" (ptr)
+ :
+ : "r24", "r25"
+ );
+ #else
frameCount++;
+ #endif
return true;
}
@@ -292,23 +306,6 @@ int Arduboy2Base::cpuLoad()
return lastFrameDurationMs*100 / eachFrameMillis;
}
-unsigned long Arduboy2Base::generateRandomSeed()
-{
- unsigned long seed;
-
- power_adc_enable(); // ADC on
-
- // do an ADC read from an unconnected input pin
- ADCSRA |= _BV(ADSC); // start conversion (ADMUX has been pre-set in boot())
- while (bit_is_set(ADCSRA, ADSC)) { } // wait for conversion complete
-
- seed = ((unsigned long)ADC << 16) + micros();
-
- power_adc_disable(); // ADC off
-
- return seed;
-}
-
void Arduboy2Base::initRandomSeed()
{
randomSeed(generateRandomSeed());
@@ -332,7 +329,7 @@ void Arduboy2Base::drawPixel(int16_t x, int16_t y, uint8_t color)
uint16_t row_offset;
uint8_t bit;
-
+ #if defined __AVR_ARCH__
asm volatile
(
// bit = 1 << (y & 7)
@@ -349,41 +346,33 @@ void Arduboy2Base::drawPixel(int16_t x, int16_t y, uint8_t color)
"movw %[row_offset], r0 \n"
"clr __zero_reg__ \n"
"add %A[row_offset], %[x] \n" //row_offset += x
-#if WIDTH != 128
+ #if WIDTH != 128
"adc %B[row_offset], __zero_reg__ \n" // only non 128 width can overflow
-#endif
+ #endif
+ "subi r26, lo8(-(%[buf])) \n"
+ "sbci r27, hi8(-(%[buf])) \n"
+ "ld r0, X \n"
+ "or r0, %[bit] \n"
+ "sbrs %[col], 0 \n"
+ "eor r0, %[bit] \n"
+ "st X, r0 \n"
: [row_offset] "=&x" (row_offset), // upper register (ANDI)
[bit] "=&d" (bit), // upper register (LDI)
[y] "+d" (y) // upper register (ANDI), must be writable
: [width_offset] "r" ((uint8_t)(WIDTH/8)),
- [x] "r" ((uint8_t)x)
+ [x] "r" ((uint8_t)x),
+ [buf] "" (&sBuffer),
+ [col] "r" (color)
:
);
- uint8_t data = sBuffer[row_offset] | bit;
- if (!(color & _BV(0))) data ^= bit;
- sBuffer[row_offset] = data;
-}
-#if 0
-// For reference, this is the C++ equivalent
-void Arduboy2Base::drawPixel(int16_t x, int16_t y, uint8_t color)
-{
- #ifdef PIXEL_SAFE_MODE
- if (x < 0 || x > (WIDTH-1) || y < 0 || y > (HEIGHT-1))
- {
- return;
- }
- #endif
-
- uint16_t row_offset;
- uint8_t bit;
-
+ #else
bit = 1 << (y & 7);
row_offset = (y & 0xF8) * WIDTH / 8 + x;
uint8_t data = sBuffer[row_offset] | bit;
if (!color) data ^= bit;
sBuffer[row_offset] = data;
+ #endif
}
-#endif
uint8_t Arduboy2Base::getPixel(uint8_t x, uint8_t y)
{
@@ -523,13 +512,13 @@ void Arduboy2Base::drawLine
// bresenham's algorithm - thx wikpedia
bool steep = abs(y1 - y0) > abs(x1 - x0);
if (steep) {
- swap(x0, y0);
- swap(x1, y1);
+ swapInt16(x0, y0);
+ swapInt16(x1, y1);
}
if (x0 > x1) {
- swap(x0, x1);
- swap(y0, y1);
+ swapInt16(x0, x1);
+ swapInt16(y0, y1);
}
int16_t dx, dy;
@@ -744,15 +733,15 @@ void Arduboy2Base::fillTriangle
// Sort coordinates by Y order (y2 >= y1 >= y0)
if (y0 > y1)
{
- swap(y0, y1); swap(x0, x1);
+ swapInt16(y0, y1); swapInt16(x0, x1);
}
if (y1 > y2)
{
- swap(y2, y1); swap(x2, x1);
+ swapInt16(y2, y1); swapInt16(x2, x1);
}
if (y0 > y1)
{
- swap(y0, y1); swap(x0, x1);
+ swapInt16(y0, y1); swapInt16(x0, x1);
}
if(y0 == y2)
@@ -812,7 +801,7 @@ void Arduboy2Base::fillTriangle
if(a > b)
{
- swap(a,b);
+ swapInt16(a,b);
}
drawFastHLine(a, y, b-a+1, color);
@@ -832,7 +821,7 @@ void Arduboy2Base::fillTriangle
if(a > b)
{
- swap(a,b);
+ swapInt16(a,b);
}
drawFastHLine(a, y, b-a+1, color);
@@ -844,7 +833,7 @@ void Arduboy2Base::drawBitmap
uint8_t color)
{
// no need to draw at all if we're offscreen
- if (x+w <= 0 || x > WIDTH-1 || y+h <= 0 || y > HEIGHT-1)
+ if (x + w <= 0 || x > WIDTH - 1 || y + h <= 0 || y > HEIGHT - 1)
return;
int8_t yOffset = y & 7;
@@ -885,7 +874,7 @@ void Arduboy2Base::drawSlowXYBitmap
(int16_t x, int16_t y, const uint8_t *bitmap, uint8_t w, uint8_t h, uint8_t color)
{
// no need to draw at all of we're offscreen
- if (x+w < 0 || x > WIDTH-1 || y+h < 0 || y > HEIGHT-1)
+ if (x + w <= 0 || x > WIDTH - 1 || y + h <= 0 || y > HEIGHT - 1)
return;
int16_t xi, yi, byteWidth = (w + 7) / 8;
@@ -900,7 +889,7 @@ void Arduboy2Base::drawSlowXYBitmap
// Helper for drawCompressed()
-struct BitStreamReader
+struct Arduboy2Base::BitStreamReader
{
const uint8_t *source;
uint16_t sourceIndex;
@@ -944,7 +933,7 @@ void Arduboy2Base::drawCompressed(int16_t sx, int16_t sy, const uint8_t *bitmap,
uint8_t spanColour = (uint8_t)cs.readBits(1); // starting colour
// no need to draw at all if we're offscreen
- if ((sx + width < 0) || (sx > WIDTH - 1) || (sy + height < 0) || (sy > HEIGHT - 1))
+ if ((sx + width <= 0) || (sx > WIDTH - 1) || (sy + height <= 0) || (sy > HEIGHT - 1))
return;
// sy = sy - (frame * height);
@@ -1048,6 +1037,11 @@ bool Arduboy2Base::pressed(uint8_t buttons)
return (buttonsState() & buttons) == buttons;
}
+bool Arduboy2Base::anyPressed(uint8_t buttons)
+{
+ return (buttonsState() & buttons) != 0;
+}
+
bool Arduboy2Base::notPressed(uint8_t buttons)
{
return (buttonsState() & buttons) == 0;
@@ -1085,21 +1079,21 @@ bool Arduboy2Base::collide(Rect rect1, Rect rect2)
uint16_t Arduboy2Base::readUnitID()
{
- return EEPROM.read(EEPROM_UNIT_ID) |
- (((uint16_t)(EEPROM.read(EEPROM_UNIT_ID + 1))) << 8);
+ return EEPROM.read(eepromUnitID) |
+ (((uint16_t)(EEPROM.read(eepromUnitID + 1))) << 8);
}
void Arduboy2Base::writeUnitID(uint16_t id)
{
- EEPROM.update(EEPROM_UNIT_ID, (uint8_t)(id & 0xff));
- EEPROM.update(EEPROM_UNIT_ID + 1, (uint8_t)(id >> 8));
+ EEPROM.update(eepromUnitID, (uint8_t)(id & 0xff));
+ EEPROM.update(eepromUnitID + 1, (uint8_t)(id >> 8));
}
uint8_t Arduboy2Base::readUnitName(char* name)
{
char val;
uint8_t dest;
- uint8_t src = EEPROM_UNIT_NAME;
+ uint8_t src = eepromUnitName;
for (dest = 0; dest < ARDUBOY_UNIT_NAME_LEN; dest++)
{
@@ -1115,10 +1109,10 @@ uint8_t Arduboy2Base::readUnitName(char* name)
return dest;
}
-void Arduboy2Base::writeUnitName(char* name)
+void Arduboy2Base::writeUnitName(const char* name)
{
bool done = false;
- uint8_t dest = EEPROM_UNIT_NAME;
+ uint8_t dest = eepromUnitName;
for (uint8_t src = 0; src < ARDUBOY_UNIT_NAME_LEN; src++)
{
@@ -1133,44 +1127,44 @@ void Arduboy2Base::writeUnitName(char* name)
bool Arduboy2Base::readShowBootLogoFlag()
{
- return (EEPROM.read(EEPROM_SYS_FLAGS) & SYS_FLAG_SHOW_LOGO_MASK);
+ return (EEPROM.read(eepromSysFlags) & sysFlagShowLogoMask);
}
void Arduboy2Base::writeShowBootLogoFlag(bool val)
{
- uint8_t flags = EEPROM.read(EEPROM_SYS_FLAGS);
+ uint8_t flags = EEPROM.read(eepromSysFlags);
- bitWrite(flags, SYS_FLAG_SHOW_LOGO, val);
- EEPROM.update(EEPROM_SYS_FLAGS, flags);
+ bitWrite(flags, sysFlagShowLogoBit, val);
+ EEPROM.update(eepromSysFlags, flags);
}
bool Arduboy2Base::readShowUnitNameFlag()
{
- return (EEPROM.read(EEPROM_SYS_FLAGS) & SYS_FLAG_UNAME_MASK);
+ return (EEPROM.read(eepromSysFlags) & sysFlagUnameMask);
}
void Arduboy2Base::writeShowUnitNameFlag(bool val)
{
- uint8_t flags = EEPROM.read(EEPROM_SYS_FLAGS);
+ uint8_t flags = EEPROM.read(eepromSysFlags);
- bitWrite(flags, SYS_FLAG_UNAME, val);
- EEPROM.update(EEPROM_SYS_FLAGS, flags);
+ bitWrite(flags, sysFlagUnameBit, val);
+ EEPROM.update(eepromSysFlags, flags);
}
bool Arduboy2Base::readShowBootLogoLEDsFlag()
{
- return (EEPROM.read(EEPROM_SYS_FLAGS) & SYS_FLAG_SHOW_LOGO_LEDS_MASK);
+ return (EEPROM.read(eepromSysFlags) & sysFlagShowLogoLEDsMask);
}
void Arduboy2Base::writeShowBootLogoLEDsFlag(bool val)
{
- uint8_t flags = EEPROM.read(EEPROM_SYS_FLAGS);
+ uint8_t flags = EEPROM.read(eepromSysFlags);
- bitWrite(flags, SYS_FLAG_SHOW_LOGO_LEDS, val);
- EEPROM.update(EEPROM_SYS_FLAGS, flags);
+ bitWrite(flags, sysFlagShowLogoLEDsBit, val);
+ EEPROM.update(eepromSysFlags, flags);
}
-void Arduboy2Base::swap(int16_t& a, int16_t& b)
+void Arduboy2Base::swapInt16(int16_t& a, int16_t& b)
{
int16_t temp = a;
a = b;
@@ -1234,7 +1228,7 @@ void Arduboy2::bootLogoText()
print(F("ARDUBOY"));
textSize = 1;
display();
- delayShort(11);
+ delayByte(11);
}
if (showLEDs) {
@@ -1264,11 +1258,11 @@ void Arduboy2::bootLogoExtra()
return;
}
- c = EEPROM.read(EEPROM_UNIT_NAME);
+ c = EEPROM.read(eepromUnitName);
if (c != 0xFF && c != 0x00)
{
- uint8_t i = EEPROM_UNIT_NAME;
+ uint8_t i = eepromUnitName;
cursor_x = 50 - (64 - WIDTH / 2);
cursor_y = 56;
@@ -1277,7 +1271,7 @@ void Arduboy2::bootLogoExtra()
write(c);
c = EEPROM.read(++i);
}
- while (i < EEPROM_UNIT_NAME + ARDUBOY_UNIT_NAME_LEN);
+ while (i < eepromUnitName + ARDUBOY_UNIT_NAME_LEN);
display();
delayShort(1000);
@@ -1314,7 +1308,7 @@ void Arduboy2::drawChar
{
uint8_t line;
bool draw_background = bg != color;
- const unsigned char* bitmap = font + c * 5;
+ const uint8_t* bitmap = font5x7 + c * 5;
if ((x >= WIDTH) || // Clip right
(y >= HEIGHT) || // Clip bottom
@@ -1354,6 +1348,16 @@ void Arduboy2::setCursor(int16_t x, int16_t y)
cursor_y = y;
}
+void Arduboy2::setCursorX(int16_t x)
+{
+ cursor_x = x;
+}
+
+void Arduboy2::setCursorY(int16_t y)
+{
+ cursor_y = y;
+}
+
int16_t Arduboy2::getCursorX()
{
return cursor_x;
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2.h b/board-package-source/libraries/Arduboy2/src/Arduboy2.h
index 7dfd7a1..8449bb2 100644
--- a/board-package-source/libraries/Arduboy2/src/Arduboy2.h
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2.h
@@ -10,6 +10,7 @@
#include
#include
#include "Arduboy2Core.h"
+#include "Arduboy2Audio.h"
#include "Arduboy2Beep.h"
#include "Sprites.h"
#include "SpritesB.h"
@@ -29,30 +30,39 @@
* \code{.cpp}
* // If the library is version 2.1.0 or higher
* #if ARDUBOY_LIB_VER >= 20100
- * // ... code that make use of a new feature added to V2.1.0
+ * // ... code that makes use of a new feature added to V2.1.0
* #endif
* \endcode
*/
-#define ARDUBOY_LIB_VER 50201
+#define ARDUBOY_LIB_VER 50300
// EEPROM settings
-#define ARDUBOY_UNIT_NAME_LEN 6 /**< The maximum length of the unit name string. */
+/** \brief
+ * The maximum number of characters in an unterminated unit name.
+ *
+ * \details
+ * This value represents the maximum number of characters in a unit name
+ * **NOT including** the necessary null character required to store the
+ * unit name as a C-style null-terminated string. To specify the size of a
+ * `char` array large enough to store a null-terminated string holding a
+ * unit name, please use `ARDUBOY_UNIT_NAME_BUFFER_SIZE` instead.
+ *
+ * \see ARDUBOY_UNIT_NAME_BUFFER_SIZE
+ */
+#define ARDUBOY_UNIT_NAME_LEN 6
-#define EEPROM_VERSION 0
-#define EEPROM_SYS_FLAGS 1
-#define EEPROM_AUDIO_ON_OFF 2
-#define EEPROM_UNIT_ID 8 // A uint16_t binary unit ID
-#define EEPROM_UNIT_NAME 10 // An up to 6 character unit name. Cannot contain
- // 0x00 or 0xFF. Lengths less than 6 are padded
- // with 0x00
-
-// EEPROM_SYS_FLAGS values
-#define SYS_FLAG_UNAME 0 // Display the unit name on the logo screen
-#define SYS_FLAG_UNAME_MASK _BV(SYS_FLAG_UNAME)
-#define SYS_FLAG_SHOW_LOGO 1 // Show the logo sequence during boot up
-#define SYS_FLAG_SHOW_LOGO_MASK _BV(SYS_FLAG_SHOW_LOGO)
-#define SYS_FLAG_SHOW_LOGO_LEDS 2 // Flash the RGB led during the boot logo
-#define SYS_FLAG_SHOW_LOGO_LEDS_MASK _BV(SYS_FLAG_SHOW_LOGO_LEDS)
+/** \brief
+ * The mininum number of characters required to store a
+ * null-terminated unit name.
+ *
+ * \details
+ * This value should be used to specify the size of a `char` array large enough
+ * to store a C-style null-terminated string holding a unit name.
+ *
+ * \see Arduboy2Base::readUnitName() Arduboy2Base::writeUnitName()
+ * ARDUBOY_UNIT_NAME_LEN
+ */
+#define ARDUBOY_UNIT_NAME_BUFFER_SIZE (ARDUBOY_UNIT_NAME_LEN + 1)
/** \brief
* Start of EEPROM storage space for sketches.
@@ -64,9 +74,6 @@
*/
#define EEPROM_STORAGE_SPACE_START 16
-// eeprom settings above are neded for audio
-#include "Arduboy2Audio.h"
-
// If defined, it is safe to draw outside of the screen boundaries.
// Pixels that would exceed the display limits will be ignored.
#define PIXEL_SAFE_MODE
@@ -208,6 +215,7 @@ struct Point
class Arduboy2Base : public Arduboy2Core
{
friend class Arduboy2Ex;
+ friend class Arduboy2Audio;
public:
Arduboy2Base();
@@ -386,10 +394,10 @@ class Arduboy2Base : public Arduboy2Core
* developers who wish to quickly start testing, or anyone else who is
* impatient and wants to go straight to the actual sketch.
*
- * If the SYS_FLAG_SHOW_LOGO_LEDS flag in system EEPROM is cleared,
+ * If the "Show LEDs with boot logo" flag in system EEPROM is cleared,
* the RGB LEDs will not be flashed during the logo display sequence.
*
- * If the SYS_FLAG_SHOW_LOGO flag in system EEPROM is cleared, this function
+ * If the "Show Boot Logo" flag in system EEPROM is cleared, this function
* will return without executing the logo display sequence.
*
* The prototype for the function provided to draw the logo is:
@@ -506,10 +514,6 @@ class Arduboy2Base : public Arduboy2Core
*/
void drawCircle(int16_t x0, int16_t y0, uint8_t r, uint8_t color = WHITE);
- // Draw one or more "corners" of a circle.
- // (Not officially part of the API)
- void drawCircleHelper(int16_t x0, int16_t y0, uint8_t r, uint8_t corners, uint8_t color = WHITE);
-
/** \brief
* Draw a filled-in circle of a given radius.
*
@@ -520,11 +524,6 @@ class Arduboy2Base : public Arduboy2Core
*/
void fillCircle(int16_t x0, int16_t y0, uint8_t r, uint8_t color = WHITE);
- // Draw one or both vertical halves of a filled-in circle or
- // rounded rectangle edge.
- // (Not officially part of the API)
- void fillCircleHelper(int16_t x0, int16_t y0, uint8_t r, uint8_t sides, int16_t delta, uint8_t color = WHITE);
-
/** \brief
* Draw a line between two specified points.
*
@@ -701,17 +700,19 @@ class Arduboy2Base : public Arduboy2Core
* (optional; defaults to WHITE).
*
* \details
- * Draw a bitmap starting at the given coordinates from an array that has
- * been compressed using an algorthm implemented by Team A.R.G.
- * For more information see:
- * https://github.com/TEAMarg/drawCompressed
- * https://github.com/TEAMarg/Cabi
+ * Draw a bitmap starting at the given coordinates using an array that has
+ * been compressed using an RLE algorthm implemented by Team A.R.G.
*
- * Bits set to 1 in the provided bitmap array will have their corresponding
- * pixel set to the specified color. For bits set to 0 in the array, the
- * corresponding pixel will be left unchanged.
+ * Bits set to 1 in the provided bitmap array (after decoding) will have
+ * their corresponding pixel set to the specified color. For bits set to 0
+ * in the array, the corresponding pixel will be left unchanged.
*
* The array must be located in program memory by using the PROGMEM modifier.
+ *
+ * \note
+ * C source code for a command line program named `Cabi`, which can convert
+ * a PNG bitmap image file to source code suitable for use with
+ * `drawCompressed()`, is included in the `extras` directory of the library.
*/
static void drawCompressed(int16_t sx, int16_t sy, const uint8_t *bitmap, uint8_t color = WHITE);
@@ -734,43 +735,22 @@ class Arduboy2Base : public Arduboy2Core
*/
uint8_t* getBuffer();
- /** \brief
- * Create a seed suitable for use with a random number generator.
- *
- * \return A random value that can be used to seed a random number generator.
- *
- * \details
- * The returned value will be a random value derived from entropy from an
- * ADC reading of a floating pin combined with the microseconds since boot.
- *
- * This method is still most effective when called after a semi-random time,
- * such as after a user hits a button to start a game or other semi-random
- * event.
- *
- * \see initRandomSeed()
- */
- unsigned long generateRandomSeed();
-
/** \brief
* Seed the random number generator with a random value.
*
* \details
- * The Arduino random number generator is seeded with a random value
- * derived from entropy from an ADC reading of a floating pin combined with
- * the microseconds since boot. The seed value is provided by calling the
- * `generateRandomSeed()` function.
+ * The Arduino pseudorandom number generator is seeded with the random value
+ * returned from a call to `generateRandomSeed()`.
*
- * This method is still most effective when called after a semi-random time,
- * such as after a user hits a button to start a game or other semi-random
- * event.
+ * \note
+ * This function will be more effective if called after a semi-random time,
+ * such as after waiting for the user to press a button to start a game, or
+ * another event that takes a variable amount of time after boot.
*
* \see generateRandomSeed()
*/
void initRandomSeed();
- // Swap the values of two int16_t variables passed by reference.
- void swap(int16_t& a, int16_t& b);
-
/** \brief
* Set the frame rate used by the frame control functions.
*
@@ -924,7 +904,7 @@ class Arduboy2Base : public Arduboy2Core
int cpuLoad();
/** \brief
- * Test if the specified buttons are pressed.
+ * Test if the all of the specified buttons are pressed.
*
* \param buttons A bit mask indicating which buttons to test.
* (Can be a single button)
@@ -932,16 +912,40 @@ class Arduboy2Base : public Arduboy2Core
* \return `true` if *all* buttons in the provided mask are currently pressed.
*
* \details
- * Read the state of the buttons and return `true` if all the buttons in the
- * specified mask are being pressed.
+ * Read the state of the buttons and return `true` if all of the buttons in
+ * the specified mask are being pressed.
*
- * Example: `if (pressed(LEFT_BUTTON + A_BUTTON))`
+ * Example: `if (pressed(LEFT_BUTTON | A_BUTTON))`
*
* \note
* This function does not perform any button debouncing.
+ *
+ * \see anyPressed() notPressed()
*/
bool pressed(uint8_t buttons);
+ /** \brief
+ * Test if any of the specified buttons are pressed.
+ *
+ * \param buttons A bit mask indicating which buttons to test.
+ * (Can be a single button)
+ *
+ * \return `true` if *one or more* of the buttons in the provided mask are
+ * currently pressed.
+ *
+ * \details
+ * Read the state of the buttons and return `true` if one or more of the
+ * buttons in the specified mask are being pressed.
+ *
+ * Example: `if (anyPressed(RIGHT_BUTTON | LEFT_BUTTON))`
+ *
+ * \note
+ * This function does not perform any button debouncing.
+ *
+ * \see pressed() notPressed()
+ */
+ bool anyPressed(uint8_t buttons);
+
/** \brief
* Test if the specified buttons are not pressed.
*
@@ -959,6 +963,8 @@ class Arduboy2Base : public Arduboy2Core
*
* \note
* This function does not perform any button debouncing.
+ *
+ * \see pressed() anyPressed()
*/
bool notPressed(uint8_t buttons);
@@ -1111,16 +1117,24 @@ class Arduboy2Base : public Arduboy2Core
/** \brief
* Read the unit name from system EEPROM.
*
- * \param name A pointer to a string array variable where the unit name will
- * be placed. The string will be up to 6 characters and terminated with a
- * null (0x00) character, so the provided array must be at least 7 bytes long.
+ * \param name A pointer to the first element of a `char` array in which the
+ * unit name will be written. The name will be up to `ARDUBOY_UNIT_NAME_LEN`
+ * characters in length and additionally terminated with a null (0x00)
+ * character, so **the provided array MUST be at least
+ * `ARDUBOY_UNIT_NAME_BUFFER_SIZE` characters long**.
+ * Using `ARDUBOY_UNIT_NAME_BUFFER_SIZE` to specify the array length is the
+ * proper way to do this, although any array larger than
+ * `ARDUBOY_UNIT_NAME_BUFFER_SIZE` is also acceptable.
*
- * \return The length of the string (0-6).
+ * \return The length of the string (between 0 and
+ * `ARDUBOY_UNIT_NAME_LEN` *inclusive*).
*
* \details
- * This function reads the unit name that has been set in system EEPROM. The
- * name is in ASCII and can contain any values except 0xFF and the
- * null (0x00) terminator value.
+ * This function reads the unit name that has been set in system EEPROM.
+ * The name represents characters in the library's `font5x7` font. It can
+ * contain any values except 0xFF and the null (0x00) terminator value, plus
+ * the ASCII newline/line feed character (`\n`, 0x0A, inverse white circle)
+ * and ASCII carriage return character (`\r`, 0x0D, musical eighth note).
*
* The name can be used for any purpose. It could identify the owner or
* give the unit itself a nickname. A sketch could use it to automatically
@@ -1128,35 +1142,39 @@ class Arduboy2Base : public Arduboy2Core
* "player" when the opponent is the computer.
*
* \note
- * Sketches can use the defined value `ARDUBOY_UNIT_NAME_LEN` instead of
- * hard coding a 6 when working with the unit name. For example, to allocate
- * a buffer and read the unit name into it:
+ * The defined value `ARDUBOY_UNIT_NAME_BUFFER_SIZE` should be used to
+ * allocate an array to hold the unit name string, instead of using a
+ * hard coded value for the size.
+ * For example, to allocate a buffer and read the unit name into it:
* \code{.cpp}
- * // Buffer for maximum name length plus the terminator
- * char unitName[ARDUBOY_UNIT_NAME_LEN + 1];
+ * // Buffer large enough to hold the unit name and a null terminator
+ * char unitName[ARDUBOY_UNIT_NAME_BUFFER_SIZE];
*
- * // The actual name length
- * byte unitNameLength;
- *
- * unitNameLength = arduboy.readUnitName(unitName);
+ * // After the call, unitNameLength will contain the actual name length,
+ * // not including the null terminator.
+ * uint8_t unitNameLength = arduboy.readUnitName(unitName);
* \endcode
*
* \see writeUnitName() readUnitID() Arduboy2::bootLogoExtra()
+ * ARDUBOY_UNIT_NAME_BUFFER_SIZE ARDUBOY_UNIT_NAME_LEN Arduboy2::font5x7
*/
uint8_t readUnitName(char* name);
/** \brief
* Write a unit name to system EEPROM.
*
- * \param name A pointer to a string array variable containing the unit name
- * to be saved. The string can be up to 6 characters and must be terminated
- * with a null (0x00) character. It can contain any values except 0xFF.
+ * \param name A pointer to the first element of a C-style null-terminated
+ * string containing the unit name to be saved. The name can be up to
+ * `ARDUBOY_UNIT_NAME_LEN` characters long and must be terminated with a
+ * null (0x00) character.
*
* \details
* This function writes a unit name to a reserved area in system EEPROM.
- * The name is in ASCII and can contain any values except 0xFF and the
- * null (0x00) terminator value. The newline character (LF, \\n, 0x0A) and
- * carriage return character (CR, \\r, 0x0D) should also be avoided.
+ * The name represents characters in the library's `font5x7` font. It can
+ * contain any values except 0xFF and the null (0x00) terminator value, plus
+ * the ASCII newline/line feed character (`\n`, 0x0A, inverse white circle)
+ * and ASCII carriage return character (`\r`, 0x0D, musical eighth note)
+ * because of their special use by the library's text handling functions.
*
* The name can be used for any purpose. It could identify the owner or
* give the unit itself a nickname. A sketch could use it to automatically
@@ -1164,12 +1182,14 @@ class Arduboy2Base : public Arduboy2Core
* "player" when the opponent is the computer.
*
* \note
- * Sketches can use the defined value `ARDUBOY_UNIT_NAME_LEN` instead of
- * hard coding a 6 when working with the unit name.
+ * The defined value `ARDUBOY_UNIT_NAME_BUFFER_SIZE` should be used to
+ * allocate an array to hold the unit name string, instead of using a
+ * hard coded value for the size.
*
* \see readUnitName() writeUnitID() Arduboy2::bootLogoExtra()
+ * ARDUBOY_UNIT_NAME_BUFFER_SIZE ARDUBOY_UNIT_NAME_LEN Arduboy2::font5x7
*/
- void writeUnitName(char* name);
+ void writeUnitName(const char* name);
/** \brief
* Read the "Show Boot Logo" flag in system EEPROM.
@@ -1315,6 +1335,29 @@ class Arduboy2Base : public Arduboy2Core
*/
static uint8_t sBuffer[(HEIGHT*WIDTH)/8];
+ /** \brief
+ * The bitmap for the ARDUBOY logo in `drawBitmap()` format.
+ *
+ * \see bootLogo() drawBitmap()
+ */
+ static const PROGMEM uint8_t arduboy_logo[];
+
+ /** \brief
+ * The bitmap for the ARDUBOY logo in `drawCompressed()` format.
+ *
+ * \see bootLogoCompressed() drawCompressed()
+ */
+ static const PROGMEM uint8_t arduboy_logo_compressed[];
+
+ /** \brief
+ * The bitmap for the ARDUBOY logo in `Sprites` class
+ * `drawSelfMasked()` or `drawOverwrite()` format.
+ *
+ * \see bootLogoSpritesSelfMasked() bootLogoSpritesOverwrite()
+ * bootLogoSpritesBSelfMasked() bootLogoSpritesBOverwrite()
+ */
+ static const PROGMEM uint8_t arduboy_logo_sprite[];
+
protected:
// helper function for sound enable/disable system control
void sysCtrlSound(uint8_t buttons, uint8_t led, uint8_t eeVal);
@@ -1327,15 +1370,59 @@ class Arduboy2Base : public Arduboy2Core
static void drawLogoSpritesBSelfMasked(int16_t y);
static void drawLogoSpritesBOverwrite(int16_t y);
+ // draw one or more "corners" of a circle
+ void drawCircleHelper(int16_t x0, int16_t y0, uint8_t r, uint8_t corners,
+ uint8_t color = WHITE);
+
+ // draw one or both vertical halves of a filled-in circle or
+ // rounded rectangle edge
+ void fillCircleHelper(int16_t x0, int16_t y0, uint8_t r,
+ uint8_t sides, int16_t delta, uint8_t color = WHITE);
+
+ // helper for drawCompressed()
+ struct BitStreamReader;
+
+ // swap the values of two int16_t variables passed by reference
+ void swapInt16(int16_t& a, int16_t& b);
+
// For button handling
uint8_t currentButtonState;
uint8_t previousButtonState;
- // For frame funcions
+ // For frame functions
uint8_t eachFrameMillis;
uint8_t thisFrameStart;
bool justRendered;
uint8_t lastFrameDurationMs;
+
+ // ----- Map of EEPROM addresses for system use-----
+
+ // EEPROM address 0 is reserved for bootloader use
+ // This library will not touch it
+
+ // Control flags
+ static constexpr uint16_t eepromSysFlags = 1;
+ // Audio mute control. 0 = audio off, non-zero = audio on
+ static constexpr uint16_t eepromAudioOnOff = 2;
+ // -- Addresses 3-7 are currently reserved for future use --
+ // A uint16_t binary unit ID
+ static constexpr uint16_t eepromUnitID = 8; // A uint16_t binary unit ID
+ // An up to 6 character unit name
+ // The name cannot contain 0x00, 0xFF, 0x0A, 0x0D
+ // Lengths less than 6 are padded with 0x00
+ static constexpr uint16_t eepromUnitName = 10;
+ // -- User EEPROM space starts at address 16 --
+
+ // --- map of the bits in the eepromSysFlags byte --
+ // Display the unit name on the logo screen
+ static constexpr uint8_t sysFlagUnameBit = 0;
+ static constexpr uint8_t sysFlagUnameMask = _BV(sysFlagUnameBit);
+ // Show the logo sequence during boot up
+ static constexpr uint8_t sysFlagShowLogoBit = 1;
+ static constexpr uint8_t sysFlagShowLogoMask = _BV(sysFlagShowLogoBit);
+ // Flash the RGB led during the boot logo
+ static constexpr uint8_t sysFlagShowLogoLEDsBit = 2;
+ static constexpr uint8_t sysFlagShowLogoLEDsMask = _BV(sysFlagShowLogoLEDsBit);
};
@@ -1378,10 +1465,18 @@ class Arduboy2 : public Print, public Arduboy2Base
* as the Arduino `Serial.print()`, etc., functions.
*
* Print will use the `write()` function to actually draw each character
- * in the screen buffer.
+ * in the screen buffer, using the library's `font5x7` font.
+ * Two character values are handled specially (and thus the font symbols that
+ * they represent can't be displayed):
+ *
+ * - ASCII newline or line feed (`\n`, 0x0A, inverse white circle).
+ * This will move the text cursor position to the start of the next line,
+ * based on the current text size.
+ * - ASCII carriage return (`\r`, 0x0D, musical eighth note).
+ * This character will be ignored.
*
* See:
- * https://www.arduino.cc/en/Serial/Print
+ * https://www.arduino.cc/reference/en/language/functions/communication/serial/print/
*
* Example:
* \code{.cpp}
@@ -1389,12 +1484,13 @@ class Arduboy2 : public Print, public Arduboy2Base
*
* arduboy.println("Hello World"); // Prints "Hello World" and then moves the
* // text cursor to the start of the next line
- * arduboy.print(value); // Prints "42"
- * arduboy.print('\n'); // Moves the text cursor to the start of the next line
- * arduboy.print(78, HEX) // Prints "4E" (78 in hexadecimal)
+ * arduboy.print(value); // Prints "42"
+ * arduboy.print('\n'); // Moves the text cursor to the start of the next line
+ * arduboy.print(78, HEX); // Prints "4E" (78 in hexadecimal)
+ * arduboy.print("\x03\xEA"); // Prints a heart symbol and a Greek uppercase omega
* \endcode
*
- * \see Arduboy2::write()
+ * \see Arduboy2::write() Arduboy2::font5x7
*/
using Print::write;
@@ -1419,10 +1515,10 @@ class Arduboy2 : public Print, public Arduboy2Base
* developers who wish to quickly start testing, or anyone else who is
* impatient and wants to go straight to the actual sketch.
*
- * If the SYS_FLAG_SHOW_LOGO_LEDS flag in system EEPROM is cleared,
+ * If the "Show LEDs with boot logo" flag in system EEPROM is cleared,
* the RGB LEDs will not be flashed during the logo display sequence.
*
- * If the SYS_FLAG_SHOW_LOGO flag in system EEPROM is cleared, this function
+ * If the "Show Boot Logo" flag in system EEPROM is cleared, this function
* will return without executing the logo display sequence.
*
* \see bootLogo() boot() Arduboy2::bootLogoExtra()
@@ -1439,7 +1535,7 @@ class Arduboy2 : public Print, public Arduboy2Base
* the bottom of the screen. This function pauses for a short time to allow
* the name to be seen.
*
- * If the SYS_FLAG_UNAME flag in system EEPROM is cleared, this function
+ * If the "Show Unit Name" flag in system EEPROM is cleared, this function
* will return without showing the unit name or pausing.
*
* \note
@@ -1452,50 +1548,55 @@ class Arduboy2 : public Print, public Arduboy2Base
virtual void bootLogoExtra();
/** \brief
- * Write a single ASCII character at the current text cursor location.
+ * Write a single character at the current text cursor position.
*
- * \param c The ASCII value of the character to be written.
+ * \param c The value of the character to be written.
*
* \return The number of characters written (will always be 1).
*
* \details
* This is the Arduboy implemetation of the Arduino virtual `write()`
- * function. The single ASCII character specified is written to the
- * the screen buffer at the current text cursor. The text cursor is then
+ * function. The single character specified is written to the the screen
+ * buffer at the current text cursor position. The text cursor is then
* moved to the next character position in the screen buffer. This new cursor
* position will depend on the current text size and possibly the current
* wrap mode.
*
- * Two special characters are handled:
+ * Characters are rendered using the library's `font5x7` font.
+ * Two character values are handled specially (and thus the font symbols that
+ * they represent can't be displayed):
*
- * - The newline character `\n`. This will move the text cursor to the start
- * of the next line based on the current text size.
- * - The carriage return character `\r`. This character will be ignored.
+ * - ASCII newline or line feed (`\n`, 0x0A, inverse white circle).
+ * This will move the text cursor position to the start of the next line,
+ * based on the current text size.
+ * - ASCII carriage return (`\r`, 0x0D, musical eighth note).
+ * This character will be ignored.
*
* \note
* This function is rather low level and, although it's available as a public
* function, it wouldn't normally be used. In most cases the Arduino Print
* class should be used for writing text.
*
- * \see Print setTextSize() setTextWrap()
+ * \see Print setTextSize() setTextWrap() drawChar()
*/
virtual size_t write(uint8_t);
/** \brief
- * Draw a single ASCII character at the specified location in the screen
+ * Draw a single character at the specified location in the screen
* buffer.
*
* \param x The X coordinate, in pixels, for where to draw the character.
* \param y The Y coordinate, in pixels, for where to draw the character.
- * \param c The ASCII value of the character to be drawn.
+ * \param c The value of the character to be drawn.
* \param color the forground color of the character.
* \param bg the background color of the character.
* \param size The size of the character to draw.
*
* \details
- * The specified ASCII character is drawn starting at the provided
+ * The specified character is drawn starting at the provided
* coordinate. The point specified by the X and Y coordinates will be the
- * top left corner of the character.
+ * top left corner of the character. The character will be rendered using the
+ * library's `font5x7` font.
*
* \note
* This is a low level function used by the `write()` function to draw a
@@ -1504,27 +1605,60 @@ class Arduboy2 : public Print, public Arduboy2Base
* writing text.
*
* \see Print write() setTextColor() setTextBackground() setTextSize()
+ * font5x7
*/
void drawChar(int16_t x, int16_t y, unsigned char c, uint8_t color, uint8_t bg, uint8_t size);
/** \brief
* Set the location of the text cursor.
*
- * \param x The X coordinate, in pixels, for the new location of the text cursor.
- * \param y The Y coordinate, in pixels, for the new location of the text cursor.
+ * \param x The X (horizontal) coordinate, in pixels, for the new location of
+ * the text cursor.
+ * \param y The Y (vertical) coordinate, in pixels, for the new location of
+ * the text cursor.
*
* \details
* The location of the text cursor is set the the specified coordinates.
* The coordinates are in pixels. Since the coordinates can specify any pixel
* location, the text does not have to be placed on specific rows.
* As with all drawing functions, location 0, 0 is the top left corner of
- * the display. The cursor location will be the top left corner of the next
- * character written.
+ * the display. The cursor location represents the top left corner of the
+ * next character written.
*
- * \see getCursorX() getCursorY()
+ * \see setCursorX() setCursorY() getCursorX() getCursorY()
*/
void setCursor(int16_t x, int16_t y);
+ /** \brief
+ * Set the X coordinate of the text cursor location.
+ *
+ * \param x The X (horizontal) coordinate, in pixels, for the new location of
+ * the text cursor.
+ *
+ * \details
+ * The X coordinate for the location of the text cursor is set to the
+ * specified value, leaving the Y coordinate unchanged. For more details
+ * about the text cursor, see the `setCursor()` function.
+ *
+ * \see setCursor() setCursorY() getCursorX() getCursorY()
+ */
+ void setCursorX(int16_t x);
+
+ /** \brief
+ * Set the Y coordinate of the text cursor location.
+ *
+ * \param y The Y (vertical) coordinate, in pixels, for the new location of
+ * the text cursor.
+ *
+ * \details
+ * The Y coordinate for the location of the text cursor is set to the
+ * specified value, leaving the X coordinate unchanged. For more details
+ * about the text cursor, see the `setCursor()` function.
+ *
+ * \see setCursor() setCursorX() getCursorX() getCursorY()
+ */
+ void setCursorY(int16_t y);
+
/** \brief
* Get the X coordinate of the current text cursor position.
*
@@ -1534,7 +1668,7 @@ class Arduboy2 : public Print, public Arduboy2Base
* The X coordinate returned is a pixel location with 0 indicating the
* leftmost column.
*
- * \see getCursorY() setCursor()
+ * \see getCursorY() setCursor() setCursorX() setCursorY()
*/
int16_t getCursorX();
@@ -1547,7 +1681,7 @@ class Arduboy2 : public Print, public Arduboy2Base
* The Y coordinate returned is a pixel location with 0 indicating the
* topmost row.
*
- * \see getCursorX() setCursor()
+ * \see getCursorX() setCursor() setCursorX() setCursorY()
*/
int16_t getCursorY();
@@ -1624,7 +1758,7 @@ class Arduboy2 : public Print, public Arduboy2Base
* cursor will be moved to the start of the next line (based on the current
* text size) if the following character wouldn't fit entirely at the end of
* the current line.
-
+ *
* If wrap mode is disabled, characters will continue to be written to the
* same line. A character at the right edge of the screen may only be
* partially displayed and additional characters will be off screen.
@@ -1647,6 +1781,48 @@ class Arduboy2 : public Print, public Arduboy2Base
*/
void clear();
+ /** \brief
+ * The font used for text functions.
+ *
+ * \details
+ * This is a 5 pixel by 7 pixel font. Each character is actually coded as
+ * 8 pixels high to allow a 1 pixel descender below the baseline.
+ * Many symbols also use the 8th pixel. The library functions add a 1 pixel
+ * space after each character to separate them, so characters written at
+ * size 1 will occupy a 6 x 8 pixel area when drawn.
+ *
+ * The character set represented is code page 437, also known as OEM 437,
+ * OEM-US, PC-8 or DOS Latin US. This is an 8 bit set which includes all
+ * printable ASCII characters plus many accented characters, symbols and
+ * line drawing characters.
+ *
+ * The data for this font is from file `glcdfont.c` in the
+ * [Adafruit GFX graphics library](https://github.com/adafruit/Adafruit-GFX-Library).
+ *
+ * \note
+ * \parblock
+ * With the library's text functions, the line drawing characters in the font
+ * won't touch on the left and right sides, as originally intended, because
+ * of the extra blank pixel added to the right of each character.
+ * \endparblock
+ *
+ * \note
+ * \parblock
+ * The library's text functions, except `drawChar()`, handle two character
+ * values specially (and thus the font symbols that they represent can't be
+ * displayed using these functions):
+ *
+ * - ASCII newline or line feed (`\n`, 0x0A, inverse white circle).
+ * This will move the text cursor position to the start of the next line,
+ * based on the current text size.
+ * - ASCII carriage return (`\r`, 0x0D, musical eighth note).
+ * This character will be ignored.
+ * \endparblock
+ *
+ * \see Print write() readUnitName() writeUnitName()
+ */
+ static const PROGMEM uint8_t font5x7[];
+
protected:
int16_t cursor_x;
int16_t cursor_y;
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.cpp b/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.cpp
index 701f806..ed23248 100644
--- a/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.cpp
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.cpp
@@ -5,7 +5,6 @@
*/
#include "Arduboy2.h"
-#include "Arduboy2Audio.h"
bool Arduboy2Audio::audio_enabled = false;
@@ -43,12 +42,12 @@ void Arduboy2Audio::toggle()
void Arduboy2Audio::saveOnOff()
{
- EEPROM.update(EEPROM_AUDIO_ON_OFF, audio_enabled);
+ EEPROM.update(Arduboy2Base::eepromAudioOnOff, audio_enabled);
}
void Arduboy2Audio::begin()
{
- if (EEPROM.read(EEPROM_AUDIO_ON_OFF))
+ if (EEPROM.read(Arduboy2Base::eepromAudioOnOff))
on();
else
off();
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.h b/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.h
index 0b68ff4..c7c8035 100644
--- a/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.h
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2Audio.h
@@ -85,7 +85,7 @@ class Arduboy2Audio
* `Arduboy2Core::boot()` is used instead of `Arduboy2Base::begin()` and the
* sketch includes sound, then this function should be called after `boot()`.
*/
- void static begin();
+ static void begin();
/** \brief
* Turn sound on.
@@ -97,7 +97,7 @@ class Arduboy2Audio
*
* \see off() toggle() saveOnOff()
*/
- void static on();
+ static void on();
/** \brief
* Turn sound off (mute).
@@ -109,7 +109,7 @@ class Arduboy2Audio
*
* \see on() toggle() saveOnOff()
*/
- void static off();
+ static void off();
/** \brief
* Toggle the sound on/off state.
@@ -122,7 +122,7 @@ class Arduboy2Audio
*
* \see on() off() saveOnOff()
*/
- void static toggle();
+ static void toggle();
/** \brief
* Save the current sound state in EEPROM.
@@ -138,7 +138,7 @@ class Arduboy2Audio
*
* \see on() off() toggle()
*/
- void static saveOnOff();
+ static void saveOnOff();
/** \brief
* Get the current sound state.
@@ -152,10 +152,10 @@ class Arduboy2Audio
*
* \see on() off() toggle()
*/
- bool static enabled();
+ static bool enabled();
protected:
- bool static audio_enabled;
+ static bool audio_enabled;
};
#endif
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2Core.cpp b/board-package-source/libraries/Arduboy2/src/Arduboy2Core.cpp
index 8701fb2..588337e 100644
--- a/board-package-source/libraries/Arduboy2/src/Arduboy2Core.cpp
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2Core.cpp
@@ -8,7 +8,15 @@
#include
-const uint8_t PROGMEM lcdBootProgram[] = {
+
+//========================================
+//========== class Arduboy2Core ==========
+//========================================
+
+Arduboy2Core::Arduboy2Core() { }
+
+// Commands sent to the OLED display to initialize it
+const PROGMEM uint8_t Arduboy2Core::lcdBootProgram[] = {
// boot defaults are commented out but left here in case they
// might prove useful for reference
//
@@ -145,9 +153,6 @@ const uint8_t PROGMEM lcdBootProgram[] = {
#endif
};
-
-Arduboy2Core::Arduboy2Core() { }
-
void Arduboy2Core::boot()
{
#ifdef ARDUBOY_SET_CPU_8MHZ
@@ -155,7 +160,7 @@ void Arduboy2Core::boot()
setCPUSpeed8MHz();
#endif
- // Select the ADC input here so a delay isn't required in initRandomSeed()
+ // Select the ADC input here so a delay isn't required in generateRandomSeed()
ADMUX = RAND_SEED_IN_ADMUX;
bootPins();
@@ -328,7 +333,7 @@ void Arduboy2Core::bootOLED()
{
#if defined(GU12864_800B)
bitSet(RST_PORT,RST_BIT);
- delayShort(10);
+ delayByte(10);
displayEnable();
for (uint8_t i = 0; i < sizeof(lcdBootProgram) + 8; i++)
{
@@ -350,49 +355,44 @@ void Arduboy2Core::bootOLED()
i2c_sendByte(pgm_read_byte(lcdBootProgram + i));
i2c_stop();
#else
- // reset the display
- uint8_t cmd;
- const void* ptr = lcdBootProgram;
- asm volatile(
- "1: \n\t" //assembly loop for 2nd delayShort(5)
- );
- delayShort(5); //for a short active low reset pulse
- #if !(defined(AB_ALTERNATE_WIRING) && defined(CART_CS_SDA))
- asm volatile(
- " sbic %[rst_port], %[rst_bit] \n\t" //continue if reset is active
- " rjmp 2f \n\t" //else break
- " sbi %[rst_port], %[rst_bit] \n\t" //deactivate reset
- " rjmp 1b \n\t" //loop for a recover from reset delay
- "2: \n\t"
- :
- : [rst_port] "I" (_SFR_IO_ADDR(RST_PORT)),
- [rst_bit] "I" (RST_BIT)
- :
- );
- #endif
+ // reset the display
+ uint8_t cmd;
+ const uint8_t* ptr = lcdBootProgram;
+ delayByte(5); //for a short active low reset pulse
+ #if !(defined(AB_ALTERNATE_WIRING) && defined(CART_CS_SDA))
+ bitSet(RST_PORT, RST_BIT); //deactivate reset
+ #endif
+ delayByte(5);
#if defined(OLED_128X64_ON_96X96) || defined(OLED_128X64_ON_128X96) || defined(OLED_128X64_ON_128X128)|| defined(OLED_128X96_ON_128X128) || defined(OLED_96X96_ON_128X128) || defined(OLED_64X128_ON_128X128)
for (uint16_t i = 0; i < 8192; i++) SPItransfer(0); //make sure all display ram is cleared
#endif
//bitClear(CS_PORT, CS_BIT); // select the display as default SPI device, already cleared by boot pins)
LCDCommandMode();
- asm volatile(
- " ldi r25, %[size] \n\t" // for (uint8_t i = 0; i < sizeof(lcdBootProgram); i++)
- "3: \n\t" // {
- " lpm %[cmd], Z+ \n\t" // cmd = pgm_read_byte(lcdBootProgram + i));
+ #if defined __AVR_ARCH__
+ asm volatile
+ (
+ "3: lpm %[cmd], Z+ \n"
: [ptr] "+z" (ptr),
[cmd] "=r" (cmd)
- : [size] "I" (sizeof(lcdBootProgram))
- : "r25"
+ :
+ :
);
- SPItransfer(cmd); // transfer display command
+ SPItransfer(cmd);
asm volatile(
- " dec r25 \n\t" // }
- " brne 3b \n\t"
+ " cpi r30, lo8(%[lbp_end]) \n" // check only LSB cause size < 256
+ " brne 3b \n"
+ :
+ : [lbp_end] "" (lcdBootProgram + sizeof(lcdBootProgram))
:
- :
- : "r25"
);
LCDDataMode();
+ #else
+ for (uint8_t i = 0; i < sizeof(lcdBootProgram); i++)
+ {
+ cmd = pgm_read_byte(lcdBootProgram + i));
+ SPItransfer(cmd);
+ }
+ #endif
#endif
}
@@ -405,18 +405,17 @@ void Arduboy2Core::bootSPI()
}
// Write to the SPI bus (MOSI pin)
-uint8_t Arduboy2Core::SPItransfer(uint8_t data)
+void Arduboy2Core::SPItransfer(uint8_t data)
{
SPDR = data;
/*
* The following NOP introduces a small delay that can prevent the wait
- * loop form iterating when running at the maximum speed. This gives
+ * loop from iterating when running at the maximum speed. This gives
* about 10% more speed, even if it seems counter-intuitive. At lower
* speeds it is unnoticed.
*/
asm volatile("nop");
while (!(SPSR & _BV(SPIF))) { } // wait
- return SPDR;
}
#if defined(OLED_SSD1306_I2C) || (OLED_SSD1306_I2CX)
@@ -550,10 +549,6 @@ void Arduboy2Core::displayOn()
bootOLED();
}
-uint8_t Arduboy2Core::width() { return WIDTH; }
-
-uint8_t Arduboy2Core::height() { return HEIGHT; }
-
/* Drawing */
@@ -1048,7 +1043,7 @@ void Arduboy2Core::sendLCDCommand(uint8_t command)
i2c_start(SSD1306_I2C_CMD);
i2c_sendByte(command);
i2c_stop();
-#else if !defined GU12864_800B
+#elif !defined GU12864_800B
LCDCommandMode();
SPItransfer(command);
LCDDataMode();
@@ -1349,21 +1344,46 @@ uint8_t Arduboy2Core::buttonsState()
return buttons;
}
+unsigned long Arduboy2Core::generateRandomSeed()
+{
+ unsigned long seed;
+
+ power_adc_enable(); // ADC on
+
+ // do an ADC read from an unconnected input pin
+ ADCSRA |= _BV(ADSC); // start conversion (ADMUX has been pre-set in boot())
+ while (bit_is_set(ADCSRA, ADSC)) { } // wait for conversion complete
+
+ seed = ((unsigned long)ADC << 16) + micros();
+
+ power_adc_disable(); // ADC off
+
+ return seed;
+}
+
// delay in ms with 16 bit duration
void Arduboy2Core::delayShort(uint16_t ms)
{
- #ifndef ARDUBOY_CORE
- delay((unsigned long) ms);
- #else
+ #ifndef ARDUBOY_CORE
+ delay((unsigned long) ms);
+ #else
::delayShort(ms);
- #endif
+ #endif
+}
+
+void Arduboy2Core::delayByte(uint8_t ms)
+{
+ delayShort(ms);
}
void Arduboy2Core::exitToBootloader()
{
cli();
#ifdef ARDUBOY_CORE
- asm volatile ("jmp exit_to_bootloader");
+ asm volatile
+ (
+ "jmp exit_to_bootloader \n" // resuse ISR exit to bootloader code
+ );
#else
// set bootloader magic key
// storing two uint8_t instead of one uint16_t saves an instruction
@@ -1382,7 +1402,11 @@ void Arduboy2Core::exitToBootloader()
// Used by the ARDUBOY_NO_USB macro. This should not be called
// directly from a sketch.
-void Arduboy2Core::mainNoUSB()
+//=========================================
+//========== class Arduboy2NoUSB ==========
+//=========================================
+
+void Arduboy2NoUSB::mainNoUSB()
{
// disable USB
UDCON = _BV(DETACH);
@@ -1402,11 +1426,11 @@ void Arduboy2Core::mainNoUSB()
bitClear(DOWN_BUTTON_DDR, DOWN_BUTTON_BIT);
// Delay to give time for the pin to be pulled high if it was floating
- delayShort(10);
+ Arduboy2Core::delayByte(10);
// if the DOWN button is pressed
if (bitRead(DOWN_BUTTON_PORTIN, DOWN_BUTTON_BIT) == 0) {
- exitToBootloader();
+ Arduboy2Core::exitToBootloader();
}
// The remainder is a copy of the Arduino main() function with the
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2Core.h b/board-package-source/libraries/Arduboy2/src/Arduboy2Core.h
index cdfb31e..217662a 100644
--- a/board-package-source/libraries/Arduboy2/src/Arduboy2Core.h
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2Core.h
@@ -356,9 +356,9 @@ extern volatile unsigned char bootloader_timer;
/** \brief
* Eliminate the USB stack to free up code space.
*
- * \note
- * **WARNING:** Removing the USB code will make it impossible for sketch
- * uploader programs to automatically force a reset into the bootloader!
+ * \warning
+ * Removing the USB code will make it impossible for sketch uploader
+ * programs to automatically force a reset into the bootloader!
* This means that a user will manually have to invoke a reset in order to
* upload a new sketch, after one without USB has be been installed.
* Be aware that the timing for the point that a reset must be initiated can
@@ -411,10 +411,20 @@ extern volatile unsigned char bootloader_timer;
*/
#define ARDUBOY_NO_USB int main() __attribute__ ((OS_main)); \
int main() { \
- Arduboy2Core::mainNoUSB(); \
+ Arduboy2NoUSB::mainNoUSB(); \
return 0; \
}
+// A replacement for the Arduino main() function that eliminates the USB code.
+// Used by the ARDUBOY_NO_USB macro.
+class Arduboy2NoUSB
+{
+ friend int main();
+
+ private:
+ static void mainNoUSB();
+};
+
/** \brief
* Lower level functions generally dealing directly with the hardware.
@@ -430,7 +440,7 @@ int main() { \
* that this may eliminate the need to create an entire local copy of the
* library, in order to extend the functionality, in most circumstances.
*/
-class Arduboy2Core
+class Arduboy2Core : public Arduboy2NoUSB
{
friend class Arduboy2Ex;
@@ -447,7 +457,7 @@ class Arduboy2Core
* app should be able to sleep maybe half the time in between rendering
* it's own frames.
*/
- void static idle();
+ static void idle();
/** \brief
* Put the display into data mode.
@@ -514,7 +524,29 @@ class Arduboy2Core
*
* \see LCDDataMode() LCDCommandMode() sendLCDCommand()
*/
- uint8_t static SPItransfer(uint8_t data);
+ static void SPItransfer(uint8_t data);
+
+ /** \brief
+ * Transfer a byte to, and read a byte from, the SPI bus.
+ *
+ * \param data The byte to be sent.
+ *
+ * \return The byte that was received.
+ *
+ * \details
+ * This function does the same as the `SPItransfer()` function but also
+ * reads and returns the byte of data that was received during the
+ * transfer.
+ *
+ * This function is of no use for a standard Arduboy, since only the
+ * display is connected to the SPI bus and data cannot be received from
+ * the display. It has been provided for use with homemade or expanded
+ * units that have had additional peripherals added to the SPI bus that
+ * are capable of sending data.
+ *
+ * \see SPItransfer()
+ */
+ static uint8_t SPItransferAndRead(uint8_t data);
#if defined (OLED_SSD1306_I2C) || (OLED_SSD1306_I2CX)
void static i2c_start(uint8_t mode);
@@ -542,7 +574,7 @@ class Arduboy2Core
*
* \see displayOn()
*/
- void static displayOff();
+ static void displayOff();
/** \brief
* Turn the display on.
@@ -558,29 +590,21 @@ class Arduboy2Core
*
* \see displayOff()
*/
- void static displayOn();
+ static void displayOn();
/** \brief
* Get the width of the display in pixels.
*
* \return The width of the display in pixels.
- *
- * \note
- * In most cases, the defined value `WIDTH` would be better to use instead
- * of this function.
*/
- uint8_t static width();
+ static constexpr uint8_t width() { return WIDTH; }
/** \brief
* Get the height of the display in pixels.
*
* \return The height of the display in pixels.
- *
- * \note
- * In most cases, the defined value `HEIGHT` would be better to use instead
- * of this function.
*/
- uint8_t static height();
+ static constexpr uint8_t height() { return HEIGHT; }
/** \brief
* Get the current state of all buttons as a bitmask.
@@ -595,7 +619,7 @@ class Arduboy2Core
*
* LEFT_BUTTON, RIGHT_BUTTON, UP_BUTTON, DOWN_BUTTON, A_BUTTON, B_BUTTON
*/
- uint8_t static buttonsState();
+ static uint8_t buttonsState();
/** \brief
* Paint 8 pixels vertically to the display.
@@ -627,7 +651,7 @@ class Arduboy2Core
* . . . . . . . . (end of page 1) X . X . . . . . (end of page 1)
* . . . . . . . . (page 2) . . . . . . . . (page 2)
*/
- void static paint8Pixels(uint8_t pixels);
+ static void paint8Pixels(uint8_t pixels);
/** \brief
* Paints an entire image directly to the display from program memory.
@@ -645,7 +669,7 @@ class Arduboy2Core
*
* \see paint8Pixels()
*/
- void static paintScreen(const uint8_t *image);
+ static void paintScreen(const uint8_t *image);
/** \brief
* Paints an entire image directly to the display from an array in RAM.
@@ -669,7 +693,7 @@ class Arduboy2Core
*
* \see paint8Pixels()
*/
- void static paintScreen(uint8_t image[], bool clear = false);
+ static void paintScreen(uint8_t image[], bool clear = false);
/** \brief
* Blank the display screen by setting all pixels off.
@@ -678,7 +702,7 @@ class Arduboy2Core
* All pixels on the screen will be written with a value of 0 to turn
* them off.
*/
- void static blank();
+ static void blank();
/** \brief
* Invert the entire display or set it back to normal.
@@ -695,7 +719,7 @@ class Arduboy2Core
* until it is set back to non-inverted mode by calling this function with
* `false`.
*/
- void static invert(bool inverse);
+ static void invert(bool inverse);
/** \brief
* Turn all display pixels on or display the buffer contents.
@@ -716,7 +740,7 @@ class Arduboy2Core
*
* \see invert()
*/
- void static allPixelsOn(bool on);
+ static void allPixelsOn(bool on);
/** \brief
* Flip the display vertically or set it back to normal.
@@ -734,7 +758,7 @@ class Arduboy2Core
*
* \see flipHorizontal()
*/
- void static flipVertical(bool flipped);
+ static void flipVertical(bool flipped);
/** \brief
* Flip the display horizontally or set it back to normal.
@@ -752,7 +776,7 @@ class Arduboy2Core
*
* \see flipVertical()
*/
- void static flipHorizontal(bool flipped);
+ static void flipHorizontal(bool flipped);
/** \brief
* Send a single command byte to the display.
@@ -768,7 +792,7 @@ class Arduboy2Core
* Sending improper commands to the display can place it into invalid or
* unexpected states, possibly even causing physical damage.
*/
- void static sendLCDCommand(uint8_t command);
+ static void sendLCDCommand(uint8_t command);
/** \brief
* Set the light output of the RGB LED.
@@ -802,7 +826,7 @@ class Arduboy2Core
*
* \see setRGBled(uint8_t, uint8_t) digitalWriteRGB() freeRGBled()
*/
- void static setRGBled(uint8_t red, uint8_t green, uint8_t blue);
+ static void setRGBled(uint8_t red, uint8_t green, uint8_t blue);
/** \brief
* Set the brightness of one of the RGB LEDs without affecting the others.
@@ -824,7 +848,7 @@ class Arduboy2Core
*
* \see setRGBled(uint8_t, uint8_t, uint8_t) digitalWriteRGB() freeRGBled()
*/
- void static setRGBled(uint8_t color, uint8_t val);
+ static void setRGBled(uint8_t color, uint8_t val);
/** \brief
@@ -837,7 +861,7 @@ class Arduboy2Core
*
* \see digitalWriteRGB() setRGBled()
*/
- void static freeRGBled();
+ static void freeRGBled();
/** \brief
* Set the RGB LEDs digitally, to either fully on or fully off.
@@ -852,16 +876,16 @@ class Arduboy2Core
*
* The colors are as follows:
*
- * RED LED GREEN_LED BLUE_LED COLOR
- * ------- --------- -------- -----
- * RGB_OFF RGB_OFF RGB_OFF OFF
- * RGB_OFF RGB_OFF RGB_ON Blue
- * RGB_OFF RGB_ON RGB_OFF Green
- * RGB_OFF RGB_ON RGB_ON Cyan
- * RGB_ON RGB_OFF RGB_OFF Red
- * RGB_ON RGB_OFF RGB_ON Magenta
- * RGB_ON RGB_ON RGB_OFF Yellow
- * RGB_ON RGB_ON RGB_ON White
+ * | RED LED | GREEN LED | BLUE LED | COLOR |
+ * | ------- | --------- | -------- | :-----: |
+ * | RGB_OFF | RGB_OFF | RGB_OFF | OFF |
+ * | RGB_OFF | RGB_OFF | RGB_ON | Blue |
+ * | RGB_OFF | RGB_ON | RGB_OFF | Green |
+ * | RGB_OFF | RGB_ON | RGB_ON | Cyan |
+ * | RGB_ON | RGB_OFF | RGB_OFF | Red |
+ * | RGB_ON | RGB_OFF | RGB_ON | Magenta |
+ * | RGB_ON | RGB_ON | RGB_OFF | Yellow |
+ * | RGB_ON | RGB_ON | RGB_ON | White |
*
* \note
* \parblock
@@ -882,7 +906,7 @@ class Arduboy2Core
*
* \see digitalWriteRGB(uint8_t, uint8_t) setRGBled() freeRGBled()
*/
- void static digitalWriteRGB(uint8_t red, uint8_t green, uint8_t blue);
+ static void digitalWriteRGB(uint8_t red, uint8_t green, uint8_t blue);
/** \brief
* Set one of the RGB LEDs digitally, to either fully on or fully off.
@@ -900,7 +924,7 @@ class Arduboy2Core
*
* \see digitalWriteRGB(uint8_t, uint8_t, uint8_t) setRGBled() freeRGBled()
*/
- void static digitalWriteRGB(uint8_t color, uint8_t val);
+ static void digitalWriteRGB(uint8_t color, uint8_t val);
/** \brief
* Initialize the Arduboy's hardware.
@@ -917,7 +941,7 @@ class Arduboy2Core
*
* \see Arduboy2Base::begin()
*/
- void static boot();
+ static void boot();
/** \brief
* Allow upload when the bootloader "magic number" could be corrupted.
@@ -938,7 +962,26 @@ class Arduboy2Core
*
* \see Arduboy2Base::flashlight() boot()
*/
- void static safeMode();
+ static void safeMode();
+
+ /** \brief
+ * Create a seed suitable for use with a pseudorandom number generator.
+ *
+ * \return A random value that can be used to seed a
+ * pseudorandom number generator.
+ *
+ * \details
+ * The returned value will be a random value derived from entropy from an
+ * ADC reading of a floating pin combined with the microseconds since boot.
+ *
+ * \note
+ * This function will be more effective if called after a semi-random time,
+ * such as after waiting for the user to press a button to start a game, or
+ * another event that takes a variable amount of time after boot.
+ *
+ * \see Arduboy2Base::initRandomSeed()
+ */
+ static unsigned long generateRandomSeed();
/** \brief
* Delay for the number of milliseconds, specified as a 16 bit value.
@@ -951,7 +994,12 @@ class Arduboy2Core
* 65535 milliseconds (about 65.5 seconds). Using this function instead
* of Arduino `delay()` will save a few bytes of code.
*/
+ #ifndef ARDUBOY_CORE
void static delayShort(uint16_t ms) __attribute__ ((noinline));
+ #else
+ void static delayShort(uint16_t ms);
+ #endif
+ void static delayByte(uint8_t ms) __attribute__ ((noinline));
/** \brief
* Exit the sketch and start the bootloader
@@ -969,26 +1017,22 @@ class Arduboy2Core
*
* \see ARDUBOY_NO_USB
*/
- void static exitToBootloader();
-
- // Replacement main() that eliminates the USB stack code.
- // Used by the ARDUBOY_NO_USB macro. This should not be called
- // directly from a sketch.
- void static mainNoUSB();
+ static void exitToBootloader();
protected:
// internals
- void static setCPUSpeed8MHz();
- void static bootSPI();
- void static bootOLED();
- void static bootPins();
- void static bootPowerSaving();
+ static void setCPUSpeed8MHz();
+ static void bootSPI();
+ static void bootOLED();
+ static void bootPins();
+ static void bootPowerSaving();
+
+ static const PROGMEM uint8_t lcdBootProgram[];
#if defined(GU12864_800B)
void static displayWrite(uint8_t d);
void static displayEnable();
void static displayDisable();
#endif
-
};
#endif
diff --git a/board-package-source/libraries/Arduboy2/src/Arduboy2Data.cpp b/board-package-source/libraries/Arduboy2/src/Arduboy2Data.cpp
new file mode 100644
index 0000000..c264eab
--- /dev/null
+++ b/board-package-source/libraries/Arduboy2/src/Arduboy2Data.cpp
@@ -0,0 +1,341 @@
+/**
+ * @file Arduboy2Data.cpp
+ * \brief
+ * Constant data definintions for the Arduboy2 and Arduboy2Base classes.
+ */
+
+#include "Arduboy2.h"
+#include
+
+// arduboy_logo.png
+// drawBitmap() format
+// 88x16
+const PROGMEM uint8_t Arduboy2Base::arduboy_logo[] = {
+ 0xF0, 0xF8, 0x9C, 0x8E, 0x87, 0x83, 0x87, 0x8E, 0x9C, 0xF8,
+ 0xF0, 0x00, 0x00, 0xFE, 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03,
+ 0x07, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0xFE, 0xFF, 0x03, 0x03,
+ 0x03, 0x03, 0x03, 0x07, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0xFF,
+ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+ 0x00, 0x00, 0xFE, 0xFF, 0x83, 0x83, 0x83, 0x83, 0x83, 0xC7,
+ 0xEE, 0x7C, 0x38, 0x00, 0x00, 0xF8, 0xFC, 0x0E, 0x07, 0x03,
+ 0x03, 0x03, 0x07, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0x3F, 0x7F,
+ 0xE0, 0xC0, 0x80, 0x80, 0xC0, 0xE0, 0x7F, 0x3F, 0xFF, 0xFF,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xFF, 0xFF, 0x00,
+ 0x00, 0xFF, 0xFF, 0x0C, 0x0C, 0x0C, 0x0C, 0x1C, 0x3E, 0x77,
+ 0xE3, 0xC1, 0x00, 0x00, 0x7F, 0xFF, 0xC0, 0xC0, 0xC0, 0xC0,
+ 0xC0, 0xE0, 0x70, 0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F, 0x70,
+ 0xE0, 0xC0, 0xC0, 0xC0, 0xE0, 0x70, 0x3F, 0x1F, 0x00, 0x00,
+ 0x7F, 0xFF, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xE3, 0x77, 0x3E,
+ 0x1C, 0x00, 0x00, 0x1F, 0x3F, 0x70, 0xE0, 0xC0, 0xC0, 0xC0,
+ 0xE0, 0x70, 0x3F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+ 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00
+};
+
+// arduboy_logo.png
+// drawCompressed() format
+// 88x16
+const PROGMEM uint8_t Arduboy2Base::arduboy_logo_compressed[] = {
+ 0x57, 0x0F, 0x9C, 0x53, 0x72, 0x75, 0x29, 0xE5, 0x9C, 0x92,
+ 0xCE, 0x95, 0x52, 0xAD, 0x4E, 0x49, 0xE7, 0x08, 0x09, 0xED,
+ 0x76, 0xBB, 0xDD, 0x2A, 0xAB, 0xAC, 0x55, 0x92, 0x90, 0xD0,
+ 0x6E, 0xB7, 0xDB, 0xAD, 0xB2, 0xCA, 0x5A, 0x25, 0xF9, 0xF8,
+ 0xF0, 0xC6, 0x47, 0x48, 0x28, 0x95, 0x54, 0x52, 0x49, 0x25,
+ 0x9D, 0x3A, 0x95, 0x5A, 0x3A, 0x45, 0x2A, 0xB7, 0x29, 0xA7,
+ 0xE4, 0x76, 0xBB, 0x55, 0x56, 0x59, 0xAB, 0x24, 0x9F, 0x5D,
+ 0x5B, 0x65, 0xD7, 0xE9, 0xEC, 0x92, 0x29, 0x3B, 0xA1, 0x4E,
+ 0xA7, 0xD3, 0xE9, 0x74, 0x9A, 0x8F, 0x8F, 0xEF, 0xED, 0x76,
+ 0xBB, 0x55, 0x4E, 0xAE, 0x52, 0xAD, 0x9C, 0x9C, 0x4F, 0xE7,
+ 0xED, 0x76, 0xBB, 0xDD, 0x2E, 0x95, 0x53, 0xD9, 0x25, 0xA5,
+ 0x54, 0xD6, 0x2A, 0xAB, 0xEC, 0x76, 0xBB, 0x54, 0x4E, 0x65,
+ 0x97, 0x94, 0x3A, 0x22, 0xA9, 0xA4, 0x92, 0x4A, 0x2A, 0xE9,
+ 0x94, 0x4D, 0x2D, 0x9D, 0xA2, 0x94, 0xCA, 0x5A, 0x65, 0x95,
+ 0xDD, 0x6E, 0x97, 0xCA, 0xA9, 0xEC, 0x12, 0x55, 0x69, 0x42,
+ 0x7A
+};
+
+// arduboy_logo.png
+// Sprites::drawSelfMasked() format
+// 88x16
+const PROGMEM uint8_t Arduboy2Base::arduboy_logo_sprite[] = {
+ 88, 16,
+ 0xF0, 0xF8, 0x9C, 0x8E, 0x87, 0x83, 0x87, 0x8E, 0x9C, 0xF8,
+ 0xF0, 0x00, 0x00, 0xFE, 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03,
+ 0x07, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0xFE, 0xFF, 0x03, 0x03,
+ 0x03, 0x03, 0x03, 0x07, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0xFF,
+ 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF,
+ 0x00, 0x00, 0xFE, 0xFF, 0x83, 0x83, 0x83, 0x83, 0x83, 0xC7,
+ 0xEE, 0x7C, 0x38, 0x00, 0x00, 0xF8, 0xFC, 0x0E, 0x07, 0x03,
+ 0x03, 0x03, 0x07, 0x0E, 0xFC, 0xF8, 0x00, 0x00, 0x3F, 0x7F,
+ 0xE0, 0xC0, 0x80, 0x80, 0xC0, 0xE0, 0x7F, 0x3F, 0xFF, 0xFF,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xFF, 0xFF, 0x00,
+ 0x00, 0xFF, 0xFF, 0x0C, 0x0C, 0x0C, 0x0C, 0x1C, 0x3E, 0x77,
+ 0xE3, 0xC1, 0x00, 0x00, 0x7F, 0xFF, 0xC0, 0xC0, 0xC0, 0xC0,
+ 0xC0, 0xE0, 0x70, 0x3F, 0x1F, 0x00, 0x00, 0x1F, 0x3F, 0x70,
+ 0xE0, 0xC0, 0xC0, 0xC0, 0xE0, 0x70, 0x3F, 0x1F, 0x00, 0x00,
+ 0x7F, 0xFF, 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0xE3, 0x77, 0x3E,
+ 0x1C, 0x00, 0x00, 0x1F, 0x3F, 0x70, 0xE0, 0xC0, 0xC0, 0xC0,
+ 0xE0, 0x70, 0x3F, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+ 0xFF, 0xFF, 0x01, 0x00, 0x00, 0x00
+};
+
+// ASCII based 5x7 font
+// IBM PC code page 437
+const PROGMEM uint8_t Arduboy2::font5x7[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x3E, 0x5B, 0x4F, 0x5B, 0x3E,
+ 0x3E, 0x6B, 0x4F, 0x6B, 0x3E,
+ 0x1C, 0x3E, 0x7C, 0x3E, 0x1C,
+ 0x18, 0x3C, 0x7E, 0x3C, 0x18,
+ 0x1C, 0x57, 0x7D, 0x57, 0x1C,
+ 0x1C, 0x5E, 0x7F, 0x5E, 0x1C,
+ 0x00, 0x18, 0x3C, 0x18, 0x00,
+ 0xFF, 0xE7, 0xC3, 0xE7, 0xFF,
+ 0x00, 0x18, 0x24, 0x18, 0x00,
+ 0xFF, 0xE7, 0xDB, 0xE7, 0xFF,
+ 0x30, 0x48, 0x3A, 0x06, 0x0E,
+ 0x26, 0x29, 0x79, 0x29, 0x26,
+ 0x40, 0x7F, 0x05, 0x05, 0x07,
+ 0x40, 0x7F, 0x05, 0x25, 0x3F,
+ 0x5A, 0x3C, 0xE7, 0x3C, 0x5A,
+ 0x7F, 0x3E, 0x1C, 0x1C, 0x08,
+ 0x08, 0x1C, 0x1C, 0x3E, 0x7F,
+ 0x14, 0x22, 0x7F, 0x22, 0x14,
+ 0x5F, 0x5F, 0x00, 0x5F, 0x5F,
+ 0x06, 0x09, 0x7F, 0x01, 0x7F,
+ 0x00, 0x66, 0x89, 0x95, 0x6A,
+ 0x60, 0x60, 0x60, 0x60, 0x60,
+ 0x94, 0xA2, 0xFF, 0xA2, 0x94,
+ 0x08, 0x04, 0x7E, 0x04, 0x08,
+ 0x10, 0x20, 0x7E, 0x20, 0x10,
+ 0x08, 0x08, 0x2A, 0x1C, 0x08,
+ 0x08, 0x1C, 0x2A, 0x08, 0x08,
+ 0x1E, 0x10, 0x10, 0x10, 0x10,
+ 0x0C, 0x1E, 0x0C, 0x1E, 0x0C,
+ 0x30, 0x38, 0x3E, 0x38, 0x30,
+ 0x06, 0x0E, 0x3E, 0x0E, 0x06,
+ 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x5F, 0x00, 0x00,
+ 0x00, 0x07, 0x00, 0x07, 0x00,
+ 0x14, 0x7F, 0x14, 0x7F, 0x14,
+ 0x24, 0x2A, 0x7F, 0x2A, 0x12,
+ 0x23, 0x13, 0x08, 0x64, 0x62,
+ 0x36, 0x49, 0x56, 0x20, 0x50,
+ 0x00, 0x08, 0x07, 0x03, 0x00,
+ 0x00, 0x1C, 0x22, 0x41, 0x00,
+ 0x00, 0x41, 0x22, 0x1C, 0x00,
+ 0x2A, 0x1C, 0x7F, 0x1C, 0x2A,
+ 0x08, 0x08, 0x3E, 0x08, 0x08,
+ 0x00, 0x80, 0x70, 0x30, 0x00,
+ 0x08, 0x08, 0x08, 0x08, 0x08,
+ 0x00, 0x00, 0x60, 0x60, 0x00,
+ 0x20, 0x10, 0x08, 0x04, 0x02,
+ 0x3E, 0x51, 0x49, 0x45, 0x3E,
+ 0x00, 0x42, 0x7F, 0x40, 0x00,
+ 0x72, 0x49, 0x49, 0x49, 0x46,
+ 0x21, 0x41, 0x49, 0x4D, 0x33,
+ 0x18, 0x14, 0x12, 0x7F, 0x10,
+ 0x27, 0x45, 0x45, 0x45, 0x39,
+ 0x3C, 0x4A, 0x49, 0x49, 0x31,
+ 0x41, 0x21, 0x11, 0x09, 0x07,
+ 0x36, 0x49, 0x49, 0x49, 0x36,
+ 0x46, 0x49, 0x49, 0x29, 0x1E,
+ 0x00, 0x00, 0x14, 0x00, 0x00,
+ 0x00, 0x40, 0x34, 0x00, 0x00,
+ 0x00, 0x08, 0x14, 0x22, 0x41,
+ 0x14, 0x14, 0x14, 0x14, 0x14,
+ 0x00, 0x41, 0x22, 0x14, 0x08,
+ 0x02, 0x01, 0x59, 0x09, 0x06,
+ 0x3E, 0x41, 0x5D, 0x59, 0x4E,
+ 0x7C, 0x12, 0x11, 0x12, 0x7C,
+ 0x7F, 0x49, 0x49, 0x49, 0x36,
+ 0x3E, 0x41, 0x41, 0x41, 0x22,
+ 0x7F, 0x41, 0x41, 0x41, 0x3E,
+ 0x7F, 0x49, 0x49, 0x49, 0x41,
+ 0x7F, 0x09, 0x09, 0x09, 0x01,
+ 0x3E, 0x41, 0x41, 0x51, 0x73,
+ 0x7F, 0x08, 0x08, 0x08, 0x7F,
+ 0x00, 0x41, 0x7F, 0x41, 0x00,
+ 0x20, 0x40, 0x41, 0x3F, 0x01,
+ 0x7F, 0x08, 0x14, 0x22, 0x41,
+ 0x7F, 0x40, 0x40, 0x40, 0x40,
+ 0x7F, 0x02, 0x1C, 0x02, 0x7F,
+ 0x7F, 0x04, 0x08, 0x10, 0x7F,
+ 0x3E, 0x41, 0x41, 0x41, 0x3E,
+ 0x7F, 0x09, 0x09, 0x09, 0x06,
+ 0x3E, 0x41, 0x51, 0x21, 0x5E,
+ 0x7F, 0x09, 0x19, 0x29, 0x46,
+ 0x26, 0x49, 0x49, 0x49, 0x32,
+ 0x03, 0x01, 0x7F, 0x01, 0x03,
+ 0x3F, 0x40, 0x40, 0x40, 0x3F,
+ 0x1F, 0x20, 0x40, 0x20, 0x1F,
+ 0x3F, 0x40, 0x38, 0x40, 0x3F,
+ 0x63, 0x14, 0x08, 0x14, 0x63,
+ 0x03, 0x04, 0x78, 0x04, 0x03,
+ 0x61, 0x59, 0x49, 0x4D, 0x43,
+ 0x00, 0x7F, 0x41, 0x41, 0x41,
+ 0x02, 0x04, 0x08, 0x10, 0x20,
+ 0x00, 0x41, 0x41, 0x41, 0x7F,
+ 0x04, 0x02, 0x01, 0x02, 0x04,
+ 0x40, 0x40, 0x40, 0x40, 0x40,
+ 0x00, 0x03, 0x07, 0x08, 0x00,
+ 0x20, 0x54, 0x54, 0x78, 0x40,
+ 0x7F, 0x28, 0x44, 0x44, 0x38,
+ 0x38, 0x44, 0x44, 0x44, 0x28,
+ 0x38, 0x44, 0x44, 0x28, 0x7F,
+ 0x38, 0x54, 0x54, 0x54, 0x18,
+ 0x00, 0x08, 0x7E, 0x09, 0x02,
+ 0x18, 0xA4, 0xA4, 0x9C, 0x78,
+ 0x7F, 0x08, 0x04, 0x04, 0x78,
+ 0x00, 0x44, 0x7D, 0x40, 0x00,
+ 0x20, 0x40, 0x40, 0x3D, 0x00,
+ 0x7F, 0x10, 0x28, 0x44, 0x00,
+ 0x00, 0x41, 0x7F, 0x40, 0x00,
+ 0x7C, 0x04, 0x78, 0x04, 0x78,
+ 0x7C, 0x08, 0x04, 0x04, 0x78,
+ 0x38, 0x44, 0x44, 0x44, 0x38,
+ 0xFC, 0x18, 0x24, 0x24, 0x18,
+ 0x18, 0x24, 0x24, 0x18, 0xFC,
+ 0x7C, 0x08, 0x04, 0x04, 0x08,
+ 0x48, 0x54, 0x54, 0x54, 0x24,
+ 0x04, 0x04, 0x3F, 0x44, 0x24,
+ 0x3C, 0x40, 0x40, 0x20, 0x7C,
+ 0x1C, 0x20, 0x40, 0x20, 0x1C,
+ 0x3C, 0x40, 0x30, 0x40, 0x3C,
+ 0x44, 0x28, 0x10, 0x28, 0x44,
+ 0x4C, 0x90, 0x90, 0x90, 0x7C,
+ 0x44, 0x64, 0x54, 0x4C, 0x44,
+ 0x00, 0x08, 0x36, 0x41, 0x00,
+ 0x00, 0x00, 0x77, 0x00, 0x00,
+ 0x00, 0x41, 0x36, 0x08, 0x00,
+ 0x02, 0x01, 0x02, 0x04, 0x02,
+ 0x3C, 0x26, 0x23, 0x26, 0x3C,
+ 0x1E, 0xA1, 0xA1, 0x61, 0x12,
+ 0x3A, 0x40, 0x40, 0x20, 0x7A,
+ 0x38, 0x54, 0x54, 0x55, 0x59,
+ 0x21, 0x55, 0x55, 0x79, 0x41,
+ 0x21, 0x54, 0x54, 0x78, 0x41,
+ 0x21, 0x55, 0x54, 0x78, 0x40,
+ 0x20, 0x54, 0x55, 0x79, 0x40,
+ 0x0C, 0x1E, 0x52, 0x72, 0x12,
+ 0x39, 0x55, 0x55, 0x55, 0x59,
+ 0x39, 0x54, 0x54, 0x54, 0x59,
+ 0x39, 0x55, 0x54, 0x54, 0x58,
+ 0x00, 0x00, 0x45, 0x7C, 0x41,
+ 0x00, 0x02, 0x45, 0x7D, 0x42,
+ 0x00, 0x01, 0x45, 0x7C, 0x40,
+ 0xF0, 0x29, 0x24, 0x29, 0xF0,
+ 0xF0, 0x28, 0x25, 0x28, 0xF0,
+ 0x7C, 0x54, 0x55, 0x45, 0x00,
+ 0x20, 0x54, 0x54, 0x7C, 0x54,
+ 0x7C, 0x0A, 0x09, 0x7F, 0x49,
+ 0x32, 0x49, 0x49, 0x49, 0x32,
+ 0x32, 0x48, 0x48, 0x48, 0x32,
+ 0x32, 0x4A, 0x48, 0x48, 0x30,
+ 0x3A, 0x41, 0x41, 0x21, 0x7A,
+ 0x3A, 0x42, 0x40, 0x20, 0x78,
+ 0x00, 0x9D, 0xA0, 0xA0, 0x7D,
+ 0x39, 0x44, 0x44, 0x44, 0x39,
+ 0x3D, 0x40, 0x40, 0x40, 0x3D,
+ 0x3C, 0x24, 0xFF, 0x24, 0x24,
+ 0x48, 0x7E, 0x49, 0x43, 0x66,
+ 0x2B, 0x2F, 0xFC, 0x2F, 0x2B,
+ 0xFF, 0x09, 0x29, 0xF6, 0x20,
+ 0xC0, 0x88, 0x7E, 0x09, 0x03,
+ 0x20, 0x54, 0x54, 0x79, 0x41,
+ 0x00, 0x00, 0x44, 0x7D, 0x41,
+ 0x30, 0x48, 0x48, 0x4A, 0x32,
+ 0x38, 0x40, 0x40, 0x22, 0x7A,
+ 0x00, 0x7A, 0x0A, 0x0A, 0x72,
+ 0x7D, 0x0D, 0x19, 0x31, 0x7D,
+ 0x26, 0x29, 0x29, 0x2F, 0x28,
+ 0x26, 0x29, 0x29, 0x29, 0x26,
+ 0x30, 0x48, 0x4D, 0x40, 0x20,
+ 0x38, 0x08, 0x08, 0x08, 0x08,
+ 0x08, 0x08, 0x08, 0x08, 0x38,
+ 0x2F, 0x10, 0xC8, 0xAC, 0xBA,
+ 0x2F, 0x10, 0x28, 0x34, 0xFA,
+ 0x00, 0x00, 0x7B, 0x00, 0x00,
+ 0x08, 0x14, 0x2A, 0x14, 0x22,
+ 0x22, 0x14, 0x2A, 0x14, 0x08,
+ 0x95, 0x00, 0x22, 0x00, 0x95,
+ 0xAA, 0x00, 0x55, 0x00, 0xAA,
+ 0xAA, 0x55, 0xAA, 0x55, 0xAA,
+ 0x00, 0x00, 0x00, 0xFF, 0x00,
+ 0x10, 0x10, 0x10, 0xFF, 0x00,
+ 0x14, 0x14, 0x14, 0xFF, 0x00,
+ 0x10, 0x10, 0xFF, 0x00, 0xFF,
+ 0x10, 0x10, 0xF0, 0x10, 0xF0,
+ 0x14, 0x14, 0x14, 0xFC, 0x00,
+ 0x14, 0x14, 0xF7, 0x00, 0xFF,
+ 0x00, 0x00, 0xFF, 0x00, 0xFF,
+ 0x14, 0x14, 0xF4, 0x04, 0xFC,
+ 0x14, 0x14, 0x17, 0x10, 0x1F,
+ 0x10, 0x10, 0x1F, 0x10, 0x1F,
+ 0x14, 0x14, 0x14, 0x1F, 0x00,
+ 0x10, 0x10, 0x10, 0xF0, 0x00,
+ 0x00, 0x00, 0x00, 0x1F, 0x10,
+ 0x10, 0x10, 0x10, 0x1F, 0x10,
+ 0x10, 0x10, 0x10, 0xF0, 0x10,
+ 0x00, 0x00, 0x00, 0xFF, 0x10,
+ 0x10, 0x10, 0x10, 0x10, 0x10,
+ 0x10, 0x10, 0x10, 0xFF, 0x10,
+ 0x00, 0x00, 0x00, 0xFF, 0x14,
+ 0x00, 0x00, 0xFF, 0x00, 0xFF,
+ 0x00, 0x00, 0x1F, 0x10, 0x17,
+ 0x00, 0x00, 0xFC, 0x04, 0xF4,
+ 0x14, 0x14, 0x17, 0x10, 0x17,
+ 0x14, 0x14, 0xF4, 0x04, 0xF4,
+ 0x00, 0x00, 0xFF, 0x00, 0xF7,
+ 0x14, 0x14, 0x14, 0x14, 0x14,
+ 0x14, 0x14, 0xF7, 0x00, 0xF7,
+ 0x14, 0x14, 0x14, 0x17, 0x14,
+ 0x10, 0x10, 0x1F, 0x10, 0x1F,
+ 0x14, 0x14, 0x14, 0xF4, 0x14,
+ 0x10, 0x10, 0xF0, 0x10, 0xF0,
+ 0x00, 0x00, 0x1F, 0x10, 0x1F,
+ 0x00, 0x00, 0x00, 0x1F, 0x14,
+ 0x00, 0x00, 0x00, 0xFC, 0x14,
+ 0x00, 0x00, 0xF0, 0x10, 0xF0,
+ 0x10, 0x10, 0xFF, 0x10, 0xFF,
+ 0x14, 0x14, 0x14, 0xFF, 0x14,
+ 0x10, 0x10, 0x10, 0x1F, 0x00,
+ 0x00, 0x00, 0x00, 0xF0, 0x10,
+ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xF0, 0xF0, 0xF0, 0xF0, 0xF0,
+ 0xFF, 0xFF, 0xFF, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0xFF, 0xFF,
+ 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
+ 0x38, 0x44, 0x44, 0x38, 0x44,
+ 0x7C, 0x2A, 0x2A, 0x3E, 0x14,
+ 0x7E, 0x02, 0x02, 0x06, 0x06,
+ 0x02, 0x7E, 0x02, 0x7E, 0x02,
+ 0x63, 0x55, 0x49, 0x41, 0x63,
+ 0x38, 0x44, 0x44, 0x3C, 0x04,
+ 0x40, 0x7E, 0x20, 0x1E, 0x20,
+ 0x06, 0x02, 0x7E, 0x02, 0x02,
+ 0x99, 0xA5, 0xE7, 0xA5, 0x99,
+ 0x1C, 0x2A, 0x49, 0x2A, 0x1C,
+ 0x4C, 0x72, 0x01, 0x72, 0x4C,
+ 0x30, 0x4A, 0x4D, 0x4D, 0x30,
+ 0x30, 0x48, 0x78, 0x48, 0x30,
+ 0xBC, 0x62, 0x5A, 0x46, 0x3D,
+ 0x3E, 0x49, 0x49, 0x49, 0x00,
+ 0x7E, 0x01, 0x01, 0x01, 0x7E,
+ 0x2A, 0x2A, 0x2A, 0x2A, 0x2A,
+ 0x44, 0x44, 0x5F, 0x44, 0x44,
+ 0x40, 0x51, 0x4A, 0x44, 0x40,
+ 0x40, 0x44, 0x4A, 0x51, 0x40,
+ 0x00, 0x00, 0xFF, 0x01, 0x03,
+ 0xE0, 0x80, 0xFF, 0x00, 0x00,
+ 0x08, 0x08, 0x6B, 0x6B, 0x08,
+ 0x36, 0x12, 0x36, 0x24, 0x36,
+ 0x06, 0x0F, 0x09, 0x0F, 0x06,
+ 0x00, 0x00, 0x18, 0x18, 0x00,
+ 0x00, 0x00, 0x10, 0x10, 0x00,
+ 0x30, 0x40, 0xFF, 0x01, 0x01,
+ 0x00, 0x1F, 0x01, 0x01, 0x1E,
+ 0x00, 0x19, 0x1D, 0x17, 0x12,
+ 0x00, 0x3C, 0x3C, 0x3C, 0x3C,
+ 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
diff --git a/board-package-source/libraries/Arduboy2/src/Sprites.cpp b/board-package-source/libraries/Arduboy2/src/Sprites.cpp
index f9ef342..fca1e1a 100644
--- a/board-package-source/libraries/Arduboy2/src/Sprites.cpp
+++ b/board-package-source/libraries/Arduboy2/src/Sprites.cpp
@@ -206,10 +206,11 @@ void Sprites::drawBitmap(int16_t x, int16_t y,
Arduboy2Base::sBuffer[ofs] = data;
}
if (yOffset != 0 && sRow < 7) {
- data = Arduboy2Base::sBuffer[ofs + WIDTH];
- data &= (*((unsigned char *) (&mask_data) + 1));
- data |= (*((unsigned char *) (&bitmap_data) + 1));
- Arduboy2Base::sBuffer[ofs + WIDTH] = data;
+ const size_t index = static_cast(ofs + WIDTH);
+ data = Arduboy2Base::sBuffer[index];
+ data &= (uint8_t)(mask_data >> 8);
+ data |= (uint8_t)(bitmap_data >> 8);
+ Arduboy2Base::sBuffer[index] = data;
}
ofs++;
bofs++;
@@ -228,7 +229,8 @@ void Sprites::drawBitmap(int16_t x, int16_t y,
Arduboy2Base::sBuffer[ofs] |= (uint8_t)(bitmap_data);
}
if (yOffset != 0 && sRow < 7) {
- Arduboy2Base::sBuffer[ofs + WIDTH] |= (*((unsigned char *) (&bitmap_data) + 1));
+ const size_t index = static_cast(ofs + WIDTH);
+ Arduboy2Base::sBuffer[index] |= (uint8_t)(bitmap_data >> 8);
}
ofs++;
bofs++;
@@ -247,7 +249,8 @@ void Sprites::drawBitmap(int16_t x, int16_t y,
Arduboy2Base::sBuffer[ofs] &= ~(uint8_t)(bitmap_data);
}
if (yOffset != 0 && sRow < 7) {
- Arduboy2Base::sBuffer[ofs + WIDTH] &= ~(*((unsigned char *) (&bitmap_data) + 1));
+ const size_t index = static_cast(ofs + WIDTH);
+ Arduboy2Base::sBuffer[index] &= ~(uint8_t)(bitmap_data >> 8);
}
ofs++;
bofs++;
@@ -281,10 +284,11 @@ void Sprites::drawBitmap(int16_t x, int16_t y,
Arduboy2Base::sBuffer[ofs] = data;
}
if (yOffset != 0 && sRow < 7) {
- data = Arduboy2Base::sBuffer[ofs + WIDTH];
- data &= (*((unsigned char *) (&mask_data) + 1));
- data |= (*((unsigned char *) (&bitmap_data) + 1));
- Arduboy2Base::sBuffer[ofs + WIDTH] = data;
+ const size_t index = static_cast(ofs + WIDTH);
+ data = Arduboy2Base::sBuffer[index];
+ data &= (uint8_t)(mask_data >> 8);
+ data |= (uint8_t)(bitmap_data >> 8);
+ Arduboy2Base::sBuffer[index] = data;
}
ofs++;
mask_ofs++;
diff --git a/board-package-source/libraries/Arduboy2/src/SpritesB.cpp b/board-package-source/libraries/Arduboy2/src/SpritesB.cpp
index 27924ae..5f7c1b9 100644
--- a/board-package-source/libraries/Arduboy2/src/SpritesB.cpp
+++ b/board-package-source/libraries/Arduboy2/src/SpritesB.cpp
@@ -159,10 +159,11 @@ void SpritesB::drawBitmap(int16_t x, int16_t y,
Arduboy2Base::sBuffer[ofs] = data;
}
if (yOffset != 0 && sRow < 7) {
- data = Arduboy2Base::sBuffer[ofs + WIDTH];
- data &= (*((unsigned char *) (&mask_data) + 1));
- data |= (*((unsigned char *) (&bitmap_data) + 1));
- Arduboy2Base::sBuffer[ofs + WIDTH] = data;
+ const size_t index = static_cast(ofs + WIDTH);
+ data = Arduboy2Base::sBuffer[index];
+ data &= (uint8_t)(mask_data >> 8);
+ data |= (uint8_t)(bitmap_data >> 8);
+ Arduboy2Base::sBuffer[index] = data;
}
ofs++;
mask_ofs += ofs_step;
diff --git a/board-package-source/libraries/Arduboy2/src/SpritesCommon.h b/board-package-source/libraries/Arduboy2/src/SpritesCommon.h
index ffa7938..c7d3b7a 100644
--- a/board-package-source/libraries/Arduboy2/src/SpritesCommon.h
+++ b/board-package-source/libraries/Arduboy2/src/SpritesCommon.h
@@ -1,7 +1,7 @@
/**
* @file SpritesCommon.h
* \brief
- * Common header file for sprite functions
+ * Common header file for sprite functions.
*/
#ifndef SpritesCommon_h
diff --git a/board-package-source/libraries/ArduboyFX/LICENSE b/board-package-source/libraries/ArduboyFX/LICENSE
new file mode 100644
index 0000000..0e259d4
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/LICENSE
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+ INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+ REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+ PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+ HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national
+ implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied,
+ statutory or otherwise, including without limitation warranties of
+ title, merchantability, fitness for a particular purpose, non
+ infringement, or the absence of latent or other defects, accuracy, or
+ the present or absence of errors, whether or not discoverable, all to
+ the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the
+ Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
diff --git a/board-package-source/libraries/ArduboyFX/README.md b/board-package-source/libraries/ArduboyFX/README.md
new file mode 100644
index 0000000..d6abb56
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/README.md
@@ -0,0 +1,2 @@
+# ArduboyFX
+Arduboy library for accessing external flash memory
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball.bin b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball.bin
new file mode 100644
index 0000000..5effa10
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball.bin differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball.png b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball.png
new file mode 100644
index 0000000..0cd48c7
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball.png differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball_16x16.bin b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball_16x16.bin
new file mode 100644
index 0000000..5effa10
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball_16x16.bin differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball_16x16.png b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball_16x16.png
new file mode 100644
index 0000000..30a02c5
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/ball_16x16.png differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/drawballs-single-datafile.bin b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/drawballs-single-datafile.bin
new file mode 100644
index 0000000..83e0245
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/drawballs-single-datafile.bin differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tilemap.bin b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tilemap.bin
new file mode 100644
index 0000000..bf9bbaf
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tilemap.bin differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tiles_16x16.bin b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tiles_16x16.bin
new file mode 100644
index 0000000..518d782
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tiles_16x16.bin differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tiles_16x16.png b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tiles_16x16.png
new file mode 100644
index 0000000..b857549
Binary files /dev/null and b/board-package-source/libraries/ArduboyFX/examples/drawballs/assets/tiles_16x16.png differ
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/drawballs.ino b/board-package-source/libraries/ArduboyFX/examples/drawballs/drawballs.ino
new file mode 100644
index 0000000..0682396
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/examples/drawballs/drawballs.ino
@@ -0,0 +1,176 @@
+/* *****************************************************************************
+ * Flash cart draw balls test v1.14 by Mr.Blinky May-Jun.2019 licenced under MIT
+ * *****************************************************************************
+ *
+ * This test depend on file drawballs-test.bin being uploaded with the
+ * flash-writer Python script in the develop area using the following command:
+ *
+ * python flash-writer.py -d drawballs-single-datafile.bin
+ *
+ * This demo draws a moving background tilemap with a bunch of bouncing ball sprites around
+ *
+ * Button controls:
+ *
+ * A - increase the number of bounching balls up to MAX_BALLS
+ * B - decrease the number of balls down to zero
+ *
+ * D-Pad scroll the background
+ *
+ */
+
+#include
+#include
+#include "fxdata.h"
+
+#define FRAME_RATE 60
+
+#define MAX_BALLS 55 // 55 Balls possible at 60fps 155 at 30fps
+#define CIRCLE_POINTS 84
+#define VISABLE_TILES_PER_COLUMN 5 // the maximum number of tiles visable horizontally
+#define VISABLE_TILES_PER_ROW 9 // the maximum number of tiles visable vertically
+
+//datafile offsets
+constexpr uint8_t ballWidth = 16;
+constexpr uint8_t ballHeight = 16;
+constexpr uint8_t tilemapWidth = 16; // number of tiles in a tilemap row
+constexpr uint8_t tileWidth = 16;
+constexpr uint8_t tileHeight = 16;
+
+Arduboy2 arduboy;
+
+Point circlePoints[CIRCLE_POINTS] = // all the points of a circle with radius 15 used for the circling background effect
+{
+ {-15,0}, {-15,1}, {-15,2}, {-15,3}, {-15,4}, {-14,5}, {-14,6}, {-13,7}, {-13,8}, {-12,9}, {-11,10}, {-10,11}, {-9,12}, {-8,13}, {-7,13}, {-6,14},
+ {-5,14}, {-4,14}, {-3,15}, {-2,15}, {-1,15}, {0,15}, {1,15}, {2,15}, {3,15}, {4,14}, {5,14}, {6,14}, {7,13}, {8,13}, {9,12}, {10,11},
+ {11,10}, {12,9}, {12,8}, {13,7}, {13,6}, {14,5}, {14,4}, {14,3}, {14,2}, {14,1}, {15,0}, {15,-1}, {15,-2}, {15,-3}, {15,-4}, {14,-5},
+ {14,-6}, {13,-7}, {13,-8}, {12,-9}, {11,-10}, {10,-11}, {9,-12}, {8,-13}, {7,-13}, {6,-14}, {5,-14}, {4,-14}, {3,-15}, {2,-15}, {1,-15}, {0,-15},
+ {-1,-15}, {-2,-15}, {-3,-15}, {-4,-14}, {-5,-14}, {-6,-14}, {-7,-13}, {-8,-13}, {-9,-12}, {-10,-11}, {-11,-10}, {-12,-9}, {-12,-8}, {-13,-7}, {-13,-6}, {-14,-5},
+ {-14,-4}, {-14,-3}, {-14,-2}, {-14,-1}
+};
+
+Point camera;
+Point mapLocation = {16,16};
+
+struct Ball
+{
+ int8_t x;
+ int8_t y;
+ int8_t xspeed;
+ int8_t yspeed;
+};
+
+Ball ball[MAX_BALLS];
+uint8_t ballsVisible = MAX_BALLS;
+
+uint8_t pos;
+
+void setup() {
+ arduboy.begin();
+ arduboy.setFrameRate(FRAME_RATE);
+ FX::disableOLED(); // OLED must be disabled before cart can be used. OLED display should only be enabled prior updating the display.
+ FX::begin(FX_DATA_PAGE); // wakeup external flash chip, initialize datapage, detect presence of external flash chip
+
+ for (uint8_t i=0; i < MAX_BALLS; i++) // initialize ball sprites
+ {
+ ball[i].x = random(113);
+ ball[i].y = random(49);
+ ball[i].xspeed = random(1,3);
+ if (random(100) > 49) ball[i].xspeed = -ball[i].xspeed;
+ ball[i].yspeed = random(1,3);
+ if (random(100) > 49) ball[i].yspeed = -ball[i].yspeed;
+ }
+}
+
+uint8_t tilemapBuffer[VISABLE_TILES_PER_ROW]; // a small buffer to store one horizontal row of tiles from the tilemap
+
+void loop() {
+ if (!arduboy.nextFrame()) return;
+
+ arduboy.pollButtons();
+ if ((arduboy.justPressed(A_BUTTON) && ballsVisible < MAX_BALLS)) ballsVisible++; // Pressing A button increases the number of visible balls until the maximum has been reached
+ if ((arduboy.justPressed(B_BUTTON) && ballsVisible > 0)) ballsVisible--; // Pressing B reduces the number of visible balls until none are visible
+ if (arduboy.pressed(UP_BUTTON) && mapLocation.y > 16) mapLocation.y--; // Pressing directional buttons will scroll the tilemap
+ if (arduboy.pressed(DOWN_BUTTON) && mapLocation.y < 176) mapLocation.y++;
+ if (arduboy.pressed(LEFT_BUTTON) && mapLocation.x > 16) mapLocation.x--;
+ if (arduboy.pressed(RIGHT_BUTTON) && mapLocation.x < 112) mapLocation.x++;
+
+ camera.x = mapLocation.x + circlePoints[pos].x; // circle around a fixed point
+ camera.y = mapLocation.y + circlePoints[pos].y;
+
+ //draw tilemap
+ for (int8_t y = 0; y < VISABLE_TILES_PER_COLUMN; y++)
+ {
+ FX::readDataArray(FX_DATA_TILEMAP, // read the visible tiles on a row from the tilemap in external flash
+ y + camera.y / tileHeight, // the tilemap row
+ camera.x / tileWidth, // the column within tilemap row
+ tilemapWidth, // use the width of tilemap as array element size
+ tilemapBuffer, // reading tiles into a small buffer is faster then reading each tile individually
+ VISABLE_TILES_PER_ROW);
+
+ for (uint8_t x = 0; x < VISABLE_TILES_PER_ROW; x++)
+ {
+ FX::drawBitmap(x * tileWidth - camera.x % tileWidth, // we're substracting the tile width and height modulus for scrolling effect
+ y * tileHeight - camera.y % tileHeight, //
+ FX_DATA_TILES, // the tilesheet bitmap offset in external flash
+ tilemapBuffer[x], // tile index
+ dbmNormal); // draw a row of normal tiles
+ }
+ }
+ if (arduboy.notPressed(UP_BUTTON | DOWN_BUTTON | LEFT_BUTTON | RIGHT_BUTTON)) pos = ++pos % CIRCLE_POINTS; //only circle around when no directional buttons are pressed
+
+ //draw balls
+ for (uint8_t i=0; i < ballsVisible; i++)
+ FX::drawBitmap(ball[i].x, // although this function is called drawBitmap it can also draw masked sprites
+ ball[i].y,
+ FX_DATA_BALLS, // the ball sprites masked bitmap offset in external flash memory
+ 0, // the drawballs-singe-datafile.bin file only has a single sprite frame
+ dbmMasked /* | dbmReverse */ ); // remove the '/*' and '/*' to reverse the balls into white balls
+
+ //when uploading the drawballs-singe-datafile.bin into the development area,
+ //you can replace the "0" value in the drawBitmap function above with "i % 16" without the quotes to display 16 different balls
+
+ //update ball movements
+ for (uint8_t i=0; i < ballsVisible; i++)
+ {
+ if (ball[i].xspeed > 0) // Moving right
+ {
+ ball[i].x += ball[i].xspeed;
+ if (ball[i].x > WIDTH - ballWidth) //off the right
+ {
+ ball[i].x = WIDTH - ballWidth;
+ ball[i].xspeed = - ball[i].xspeed;
+ }
+ }
+ else // moving left
+ {
+ ball[i].x += ball[i].xspeed;
+ if (ball[i].x < 0) // off the left
+ {
+ ball[i].x = 0;
+ ball[i].xspeed = - ball[i].xspeed;
+ }
+ }
+ if (ball[i].yspeed > 0) // moving down
+ {
+ ball[i].y += ball[i].yspeed;
+ if (ball[i].y > HEIGHT - tileHeight) // off the bottom
+ {
+ ball[i].y = HEIGHT - tileHeight;
+ ball[i].yspeed = - ball[i].yspeed;
+ }
+ }
+ else // moving up
+ {
+ ball[i].y += ball[i].yspeed;
+ if (ball[i].y < 0) // off the top
+ {
+ ball[i].y = 0;
+ ball[i].yspeed = - ball[i].yspeed;
+ }
+ }
+ }
+
+ FX::enableOLED();// only enable OLED for updating the display
+ arduboy.display(CLEAR_BUFFER);
+ FX::disableOLED();// disable so flash cart can be used at any time
+}
diff --git a/board-package-source/libraries/ArduboyFX/examples/drawballs/fxdata.h b/board-package-source/libraries/ArduboyFX/examples/drawballs/fxdata.h
new file mode 100644
index 0000000..35740c9
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/examples/drawballs/fxdata.h
@@ -0,0 +1,11 @@
+#ifndef FXDATA_H
+#define FXDATA_H
+
+using uint24_t = __uint24;
+
+constexpr uint16_t FX_DATA_PAGE = 0xFFFE; //value given by flashcart-writer.py script using -d option
+constexpr uint24_t FX_DATA_TILES = 0x000000; // Background tiles offset in external flash
+constexpr uint24_t FX_DATA_TILEMAP = 0x000044; // 16 x 16 tilemap offset in external flash
+constexpr uint24_t FX_DATA_BALLS = 0x000144; // masked ball sprite offset in external flash
+
+#endif
diff --git a/board-package-source/libraries/ArduboyFX/library.properties b/board-package-source/libraries/ArduboyFX/library.properties
new file mode 100644
index 0000000..a96ae5a
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/library.properties
@@ -0,0 +1,10 @@
+name=ArduboyFX
+version=1.0.0
+author=Mr.Blinky
+maintainer=mstr.blinky@gmail.com
+sentence=The Arduboy FX library.
+paragraph=This library is for accessing the external flash memory used by Arduboy FX and home made Arduboys with flash chip.
+category=Communication
+url=https://github.com/mrblinky/ArduboyFX
+architectures=avr
+includes=ArduboyFX.h
diff --git a/board-package-source/libraries/ArduboyFX/src/ArduboyFX.cpp b/board-package-source/libraries/ArduboyFX/src/ArduboyFX.cpp
new file mode 100644
index 0000000..2233a68
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/src/ArduboyFX.cpp
@@ -0,0 +1,697 @@
+#include "ArduboyFX.h"
+#include
+
+uint16_t FX::programDataPage; // program read only data location in flash memory
+uint16_t FX::programSavePage; // program read and write data location in flash memory
+
+
+uint8_t FX::writeByte(uint8_t data)
+{
+ writeByteBeforeWait(data);
+ return SPDR;
+}
+
+
+uint8_t FX::readByte()
+{
+ return writeByte(0);
+}
+
+
+void FX::begin()
+{
+ wakeUp();
+}
+
+
+void FX::begin(uint16_t developmentDataPage)
+{
+ if (pgm_read_word(FX_DATA_VECTOR_KEY_POINTER) == FX_VECTOR_KEY_VALUE)
+ {
+ programDataPage = (pgm_read_byte(FX_DATA_VECTOR_PAGE_POINTER) << 8) | pgm_read_byte(FX_DATA_VECTOR_PAGE_POINTER + 1);
+ }
+ else
+ {
+ programDataPage = developmentDataPage;
+ }
+ wakeUp();
+}
+
+
+void FX::begin(uint16_t developmentDataPage, uint16_t developmentSavePage)
+{
+ if (pgm_read_word(FX_DATA_VECTOR_KEY_POINTER) == FX_VECTOR_KEY_VALUE)
+ {
+ programDataPage = (pgm_read_byte(FX_DATA_VECTOR_PAGE_POINTER) << 8) | pgm_read_byte(FX_DATA_VECTOR_PAGE_POINTER + 1);
+ }
+ else
+ {
+ programDataPage = developmentDataPage;
+ }
+ if (pgm_read_word(FX_SAVE_VECTOR_KEY_POINTER) == FX_VECTOR_KEY_VALUE)
+ {
+ programSavePage = (pgm_read_byte(FX_SAVE_VECTOR_PAGE_POINTER) << 8) | pgm_read_byte(FX_SAVE_VECTOR_PAGE_POINTER + 1);
+ }
+ else
+ {
+ programSavePage = developmentSavePage;
+ }
+ wakeUp();
+}
+
+void FX::readJedecID(JedecID* id)
+{
+ enable();
+ writeByte(SFC_JEDEC_ID);
+ id -> manufacturer = readByte();
+ id -> device = readByte();
+ id -> size = readByte();
+ disable();
+}
+
+bool FX::detect()
+{
+ seekCommand(SFC_READ, 0);
+ SPDR = 0;
+ return readPendingLastUInt16() == 0x4152;
+}
+
+
+void FX::noFXReboot()
+ {
+ if (!detect())
+ {
+ do
+ {
+ if (*(uint8_t *)&timer0_millis & 0x80) bitSet(PORTB, RED_LED_BIT);
+ else bitClear(PORTB, RED_LED_BIT);
+ }
+ while (bitRead(DOWN_BUTTON_PORTIN, DOWN_BUTTON_BIT)); // wait for DOWN button to enter bootloader
+ Arduboy2Core::exitToBootloader();
+ }
+ }
+
+
+void FX::writeCommand(uint8_t command)
+{
+ enable();
+ writeByte(command);
+ disable();
+}
+
+void FX::wakeUp()
+{
+ writeCommand(SFC_RELEASE_POWERDOWN);
+}
+
+
+void FX::sleep()
+{
+ writeCommand(SFC_POWERDOWN);
+}
+
+void FX::writeEnable()
+{
+ writeCommand(SFC_WRITE_ENABLE);
+}
+
+
+void FX::seekCommand(uint8_t command, uint24_t address)
+{
+ enable();
+ writeByte(command);
+ writeByte(address >> 16);
+ writeByte(address >> 8);
+ writeByte(address);
+}
+
+
+void FX::seekData(uint24_t address)
+{
+ #ifdef ARDUINO_ARCH_AVR
+ asm volatile( // assembly optimizer for AVR platform
+ "lds r0, %[page]+0 \n"
+ "add %B[addr], r0 \n"
+ "lds r0, %[page]+1 \n"
+ "adc %C[addr], r0 \n"
+ :[addr] "+&r" (address)
+ :[page] "" (&programDataPage)
+ :
+ );
+ #else // C++ version for non AVR platforms
+ address += (uint24_t)programDataPage << 8;
+ #endif
+ seekCommand(SFC_READ, address);
+ SPDR = 0;
+}
+
+
+void FX::seekDataArray(uint24_t address, uint8_t index, uint8_t offset, uint8_t elementSize)
+{
+ #ifdef ARDUINO_ARCH_AVR
+ asm volatile (
+ " mul %[index], %[size] \n"
+ " brne .+2 \n" //treat size 0 as size 256
+ " mov r1, %[index] \n"
+ " clr r24 \n" //use as alternative zero reg
+ " add r0, %[offset] \n"
+ " adc r1, r24 \n"
+ " add %A[address], r0 \n"
+ " adc %B[address], r1 \n"
+ " adc %C[address], r24 \n"
+ " clr r1 \n"
+ : [address] "+r" (address)
+ : [index] "r" (index),
+ [offset] "r" (offset),
+ [size] "r" (elementSize)
+ : "r24"
+ );
+ #else
+ address += size ? index * size + offset : index * 256 + offset;
+ #endif
+ seekData(address);
+}
+
+
+void FX::seekSave(uint24_t address)
+{
+ #ifdef ARDUINO_ARCH_AVR
+ asm volatile( // assembly optimizer for AVR platform
+ "lds r0, %[page]+0 \n"
+ "add %B[addr], r0 \n"
+ "lds r0, %[page]+1 \n"
+ "adc %C[addr], r0 \n"
+ :[addr] "+&r" (address)
+ :[page] "" (&programSavePage)
+ :"r24"
+ );
+ #else // C++ version for non AVR platforms
+ address += (uint24_t)programSavePage << 8;
+ #endif
+ seekCommand(SFC_READ, address);
+ SPDR = 0;
+}
+
+
+uint8_t FX::readPendingUInt8()
+{
+ #ifdef ARDUINO_ARCH_AVR
+ asm volatile("ArduboyFX_cpp_readPendingUInt8:\n"); // create label for calls in FX::readPendingUInt16
+ #endif
+ wait();
+ uint8_t result = SPDR;
+ SPDR = 0;
+ return result;
+}
+
+
+uint8_t FX::readPendingLastUInt8()
+{
+ #ifdef ARDUINO_ARCH_AVR
+ asm volatile("ArduboyFX_cpp_readPendingLastUInt8:\n"); // create label for calls in FX::readPendingUInt16
+ #endif
+ return readEnd();
+}
+
+
+uint16_t FX::readPendingUInt16()
+{
+ #ifdef ARDUINO_ARCH_AVR // Assembly implementation for AVR platform
+ uint16_t result asm("r24"); // we want result to be assigned to r24,r25
+ asm volatile
+ ( "ArduboyFX_cpp_readPendingUInt16: \n"
+ "call ArduboyFX_cpp_readPendingUInt8 \n"
+ "mov %B[val], r24 \n"
+ "call ArduboyFX_cpp_readPendingUInt8 \n"
+ : [val] "=&r" (result)
+ : "" (readPendingUInt8)
+ :
+ );
+ return result;
+ #else //C++ implementation for non AVR platforms
+ return ((uint16_t)readPendingUInt8() << 8) | (uint16_t)readPendingUInt8();
+ #endif
+}
+
+
+uint16_t FX::readPendingLastUInt16()
+{
+ #ifdef ARDUINO_ARCH_AVR // Assembly implementation for AVR platform
+ uint16_t result asm("r24"); // we want result to be assigned to r24,r25
+ asm volatile
+ ( "ArduboyFX_cpp_readPendingLastUInt16: \n"
+ "call ArduboyFX_cpp_readPendingUInt8 \n"
+ "mov %B[val], r24 \n"
+ "call ArduboyFX_cpp_readPendingLastUInt8 \n"
+ : [val] "=&r" (result)
+ : "" (readPendingUInt8),
+ "" (readPendingLastUInt8)
+ :
+ );
+ return result;
+ #else //C++ implementation for non AVR platforms
+ return ((uint16_t)readPendingUint8() << 8) | (uint16_t)readPendingLastUInt8();
+ #endif
+}
+
+
+uint24_t FX::readPendingUInt24()
+{
+ #ifdef ARDUINO_ARCH_AVR // Assembly implementation for AVR platform
+ uint24_t result asm("r24"); // we want result to be assigned to r24,r25,r26
+ asm volatile
+ (
+ "call ArduboyFX_cpp_readPendingUInt16 \n"
+ "mov %C[val], r25 \n"
+ "mov %B[val], r24 \n"
+ "call ArduboyFX_cpp_readPendingUInt8 \n"
+ : [val] "=&r" (result)
+ : "" (readPendingUInt16),
+ "" (readPendingUInt8)
+ :
+ );
+ return result;
+ #else //C++ implementation for non AVR platforms
+ return ((uint24_t)readPendingUInt16() << 8) | readPendingUInt8();
+ #endif
+}
+
+
+uint24_t FX::readPendingLastUInt24()
+{
+ #ifdef ARDUINO_ARCH_AVR // Assembly implementation for AVR platform
+ uint24_t result asm("r24"); // we want result to be assigned to r24,r25,r26
+ asm volatile
+ (
+ "call ArduboyFX_cpp_readPendingUInt16 \n"
+ "mov %C[val], r25 \n"
+ "mov %B[val], r24 \n"
+ "call ArduboyFX_cpp_readPendingLastUInt8 \n"
+ : [val] "=&r" (result)
+ : "" (readPendingUInt16),
+ "" (readPendingLastUInt8)
+ :
+ );
+ return result;
+ #else //C++ implementation for non AVR platforms
+ return ((uint24_t)readPendingUInt16() << 8) | readPendingLastUInt8();
+ #endif
+}
+
+
+uint32_t FX::readPendingUInt32()
+{
+ #ifdef ARDUINO_ARCH_AVR //Assembly implementation for AVR platform
+ uint32_t result asm("r24"); // we want result to be assigned to r24,r25,r26,r27
+ asm volatile
+ (
+ "call ArduboyFX_cpp_readPendingUInt16 \n"
+ "movw %C[val], r24 \n"
+ "call ArduboyFX_cpp_readPendingUInt16 \n"
+ : [val] "=&r" (result)
+ : "" (readPendingUInt16)
+ :
+ );
+ return result;
+ #else //C++ implementation for non AVR platforms
+ return ((uint32_t)readPendingUInt16() << 16) | readPendingUInt16();
+ #endif
+}
+
+
+uint32_t FX::readPendingLastUInt32()
+{
+ #ifdef ARDUINO_ARCH_AVR //Assembly implementation for AVR platform
+ uint32_t result asm("r24"); // we want result to be assigned to r24,r25,r26,r27
+ asm volatile
+ (
+ "call ArduboyFX_cpp_readPendingUInt16 \n"
+ "movw %C[val], r24 \n"
+ "call ArduboyFX_cpp_readPendingLastUInt16 \n"
+ : [val] "=&r" (result)
+ : "" (readPendingUInt16)
+ :
+ );
+ return result;
+ #else //C++ implementation for non AVR platforms
+ return ((uint32_t)readPendingUInt16() << 16) | readPendingLastUInt16();
+ #endif
+}
+
+
+void FX::readBytes(uint8_t* buffer, size_t length)
+{
+ for (size_t i = 0; i < length; i++)
+ {
+ buffer[i] = readPendingUInt8();
+ }
+}
+
+
+void FX::readBytesEnd(uint8_t* buffer, size_t length)
+{
+ for (size_t i = 0; i <= length; i++)
+ {
+ if ((i+1) != length)
+ buffer[i] = readPendingUInt8();
+ else
+ {
+ buffer[i] = readEnd();
+ break;
+ }
+ }
+}
+
+
+uint8_t FX::readEnd()
+{
+ wait(); // wait for a pending read to complete
+ return readUnsafeEnd(); // read last byte and disable flash
+}
+
+
+void FX::readDataBytes(uint24_t address, uint8_t* buffer, size_t length)
+{
+ seekData(address);
+ readBytesEnd(buffer, length);
+}
+
+
+void FX::readSaveBytes(uint24_t address, uint8_t* buffer, size_t length)
+{
+ seekSave(address);
+ readBytesEnd(buffer, length);
+}
+
+
+void FX::eraseSaveBlock(uint16_t page)
+{
+ writeEnable();
+ seekCommand(SFC_ERASE, (uint24_t)(programSavePage + page) << 8);
+ disable();
+}
+
+
+void FX::writeSavePage(uint16_t page, uint8_t* buffer)
+{
+ writeEnable();
+ seekCommand(SFC_WRITE, (uint24_t)(programSavePage + page) << 8);
+ uint8_t i = 0;
+ do
+ {
+ writeByte(buffer[i]);
+ }
+ while (i++ < 255);
+ disable();
+}
+
+void FX::drawBitmap(int16_t x, int16_t y, uint24_t address, uint8_t frame, uint8_t mode)
+{
+ // read bitmap dimensions from flash
+ seekData(address);
+ int16_t width = readPendingUInt16();
+ int16_t height = readPendingLastUInt16();
+ // return if the bitmap is completely off screen
+ if (x + width <= 0 || x >= WIDTH || y + height <= 0 || y >= HEIGHT) return;
+
+ // determine render width
+ int16_t skipleft = 0;
+ uint8_t renderwidth;
+ if (x<0)
+ {
+ skipleft = -x;
+ if (width - skipleft < WIDTH) renderwidth = width - skipleft;
+ else renderwidth = WIDTH;
+ }
+ else
+ {
+ if (x + width > WIDTH) renderwidth = WIDTH - x;
+ else renderwidth = width;
+ }
+
+ //determine render height
+ int16_t skiptop; // pixel to be skipped at the top
+ int8_t renderheight; // in pixels
+ if (y < 0)
+ {
+ skiptop = -y & -8; // optimized -y / 8 * 8
+ if (height - skiptop <= HEIGHT) renderheight = height - skiptop;
+ else renderheight = HEIGHT + (y & 7);
+ skiptop >>= 3;//pixels to displayrows
+ }
+ else
+ {
+ skiptop = 0;
+ if (y + height > HEIGHT) renderheight = HEIGHT - y;
+ else renderheight = height;
+ }
+ uint24_t offset = (uint24_t)(frame * ((height+7) / 8) + skiptop) * width + skipleft;
+ if (mode & dbmMasked)
+ {
+ offset += offset; // double for masked bitmaps
+ width += width;
+ }
+ address += offset + 4; // skip non rendered pixels, width, height
+ int8_t displayrow = (y >> 3) + skiptop;
+ uint16_t displayoffset = displayrow * WIDTH + x + skipleft;
+ uint8_t yshift = bitShiftLeftUInt8(y); //shift by multiply
+#ifdef ARDUINO_ARCH_AVR
+ uint8_t rowmask;
+ uint16_t bitmap;
+ asm volatile(
+ "1: ;render_row: \n"
+ " cbi %[fxport], %[fxbit] \n"
+ " ldi r24, %[cmd] \n" // writeByte(SFC_READ);
+ " out %[spdr], r24 \n"
+ " lds r24, %[datapage]+0 \n" // address + programDataPage;
+ " lds r25, %[datapage]+1 \n"
+ " add r24, %B[address] \n"
+ " adc r25, %C[address] \n"
+ " in r0, %[spsr] \n" // wait()
+ " sbrs r0, %[spif] \n"
+ " rjmp .-6 \n"
+ " out %[spdr], r25 \n" // writeByte(address >> 16);
+ " in r0, %[spsr] \n" // wait()
+ " sbrs r0, %[spif] \n"
+ " rjmp .-6 \n"
+ " out %[spdr], r24 \n" // writeByte(address >> 8);
+ " in r0, %[spsr] \n" // wait()
+ " sbrs r0, %[spif] \n"
+ " rjmp .-6 \n"
+ " out %[spdr], %A[address] \n" // writeByte(address);
+ " \n"
+ " add %A[address], %A[width] \n" // address += width;
+ " adc %B[address], %B[width] \n"
+ " adc %C[address], r1 \n"
+ " in r0, %[spsr] \n" // wait();
+ " sbrs r0, %[spif] \n"
+ " rjmp .-6 \n"
+ " out %[spdr], r1 \n" // SPDR = 0;
+ " \n"
+ " lsl %[mode] \n" // 'clear' mode dbfExtraRow by shifting into carry
+ " cpi %[displayrow], %[lastrow] \n"
+ " brge .+4 \n" // row >= lastrow, clear carry
+ " sec \n" // row < lastrow set carry
+ " sbrc %[yshift], 0 \n" // yshift != 1, don't change carry state
+ " clc \n" // yshift == 1, clear carry
+ " ror %[mode] \n" // carry to mode dbfExtraRow
+ " \n"
+ " ldi %[rowmask], 0x02 \n" // rowmask = 0xFF >> (height & 7);
+ " sbrs %[height], 1 \n"
+ " ldi %[rowmask], 0x08 \n"
+ " sbrs %[height], 2 \n"
+ " swap %[rowmask] \n"
+ " sbrs %[height], 0 \n"
+ " lsl %[rowmask] \n"
+ " dec %[rowmask] \n"
+ " cpi %[renderheight], 8 \n" // if (renderheight >= 8) rowmask = 0xFF;
+ " brlt .+2 \n"
+ " ldi %[rowmask], 0xFF \n"
+ " \n"
+ " mov r25, %[renderwidth] \n" // for (c < renderwidth)
+ "2: ;render_column: \n"
+ " in r0, %[spdr] \n" // read bitmap data
+ " out %[spdr], r1 \n" // start next read
+ " \n"
+ " sbrc %[mode], %[reverseblack] \n" // test reverse mode
+ " com r0 \n" // reverse bitmap data
+ " mov r24, %[rowmask] \n" // temporary move rowmask
+ " sbrc %[mode], %[whiteblack] \n" // for black and white modes:
+ " mov r24, r0 \n" // rowmask = bitmap
+ " sbrc %[mode], %[black] \n" // for black mode:
+ " clr r0 \n" // bitmap = 0
+ " mul r0, %[yshift] \n"
+ " movw %[bitmap], r0 \n" // bitmap *= yshift
+ " bst %[mode], %[masked] \n" // if bitmap has no mask:
+ " brtc 3f ;render_mask \n" // skip next part
+ " \n"
+ " lpm \n" // above code took 11 cycles, wait 7 cycles more for SPI data ready
+ " lpm \n"
+ " clr r1 \n" // restore zero reg
+ " \n"
+ " in r0, %[spdr] \n" // read mask data
+ " out %[spdr],r1 \n" // start next read
+ " sbrc %[mode], %[whiteblack] \n" //
+ "3: ;render_mask: \n"
+ " mov r0, r24 \n" // get mask in r0
+ " mul r0, %[yshift] \n" // mask *= yshift
+ ";render_page0: \n"
+ " cpi %[displayrow], 0 \n" // skip if displayrow < 0
+ " brlt 4f ;render_page1 \n"
+ " \n"
+ " ld r24, %a[buffer] \n" // do top row or to row half
+ " sbrs %[mode],%[invert] \n" // skip 1st eor for invert mode
+ " eor %A[bitmap], r24 \n"
+ " and %A[bitmap], r0 \n" // and with mask LSB
+ " eor %A[bitmap], r24 \n"
+ " st %a[buffer], %A[bitmap] \n"
+ "4: ;render_page1: \n"
+ " subi %A[buffer], lo8(-%[displaywidth]) \n"
+ " sbci %B[buffer], hi8(-%[displaywidth]) \n"
+ " sbrs %[mode], %[extrarow] \n" // test if ExtraRow mode:
+ " rjmp 5f ;render_next \n" // else skip
+ " \n"
+ " ld r24, %a[buffer] \n" // do shifted 2nd half
+ " sbrs %[mode], %[invert] \n" // skip 1st eor for invert mode
+ " eor %B[bitmap], r24 \n"
+ " and %B[bitmap], r1 \n"// and with mask MSB
+ " eor %B[bitmap], r24 \n"
+ " st %a[buffer], %B[bitmap] \n"
+ "5: ;render_next: \n"
+ " clr r1 \n" // restore zero reg
+ " subi %A[buffer], lo8(%[displaywidth]-1) \n"
+ " sbci %B[buffer], hi8(%[displaywidth]-1) \n"
+ " dec r25 \n"
+ " brne 2b ;render_column \n" // for (c < renderheigt) loop
+ " \n"
+ " subi %A[buffer], lo8(-%[displaywidth]) \n" // buffer += WIDTH - renderwidth
+ " sbci %B[buffer], hi8(-%[displaywidth]) \n"
+ " sub %A[buffer], %[renderwidth] \n"
+ " sbc %B[buffer], r1 \n"
+ " subi %[renderheight], 8 \n" // reinderheight -= 8
+ " inc %[displayrow] \n" // displayrow++
+ " in r0, %[spsr] \n" // clear SPI status
+ " sbi %[fxport], %[fxbit] \n" // disable external flash
+ " cp r1, %[renderheight] \n" // while (renderheight > 0)
+ " brge .+2 \n"
+ " rjmp 1b ;render_row \n"
+ :
+ [address] "+r" (address),
+ [mode] "+r" (mode),
+ [rowmask] "=&d" (rowmask),
+ [bitmap] "=&r" (bitmap),
+ [renderheight] "+d" (renderheight),
+ [displayrow] "+d" (displayrow)
+ :
+ [width] "r" (width),
+ [height] "r" (height),
+ [yshift] "r" (yshift),
+ [renderwidth] "r" (renderwidth),
+ [buffer] "e" (Arduboy2Base::sBuffer + displayoffset),
+
+ [fxport] "I" (_SFR_IO_ADDR(FX_PORT)),
+ [fxbit] "I" (FX_BIT),
+ [cmd] "I" (SFC_READ),
+ [spdr] "I" (_SFR_IO_ADDR(SPDR)),
+ [datapage] "" (&programDataPage),
+ [spsr] "I" (_SFR_IO_ADDR(SPSR)),
+ [spif] "I" (SPIF),
+ [lastrow] "I" (HEIGHT / 8 - 1),
+ [displaywidth] "" (WIDTH),
+ [reverseblack] "I" (dbfReverseBlack),
+ [whiteblack] "I" (dbfWhiteBlack),
+ [black] "I" (dbfBlack),
+ [masked] "I" (dbfMasked),
+ [invert] "I" (dbfInvert),
+ [extrarow] "I" (dbfExtraRow)
+ :
+ "r24", "r25"
+ );
+#else
+ uint8_t lastmask = bitShiftRightMaskUInt8(height); // mask for bottom most pixels
+ do
+ {
+ seekData(address);
+ address += width;
+ mode &= ~(_BV(dbfExtraRow));
+ if (yshift != 1 && displayrow < (HEIGHT / 8 - 1)) mode |= _BV(dbfExtraRow);
+ uint8_t rowmask = 0xFF;
+ if (renderheight < 8) rowmask = lastmask;
+ wait();
+ for (uint8_t c = 0; c < renderwidth; c++)
+ {
+ uint8_t bitmapbyte = readUnsafe();
+ if (mode & _BV(dbfReverseBlack)) bitmapbyte ^= 0xFF;
+ uint8_t maskbyte = rowmask;
+ if (mode & _BV(dbfWhiteBlack)) maskbyte = bitmapbyte;
+ if (mode & _BV(dbfBlack)) bitmapbyte = 0;
+ uint16_t bitmap = multiplyUInt8(bitmapbyte, yshift);
+ if (mode & _BV(dbfMasked))
+ {
+ wait();
+ uint8_t tmp = readUnsafe();
+ if ((mode & dbfWhiteBlack) == 0) maskbyte = tmp;
+ }
+ uint16_t mask = multiplyUInt8(maskbyte, yshift);
+ if (displayrow >= 0)
+ {
+ uint8_t pixels = bitmap;
+ uint8_t display = Arduboy2Base::sBuffer[displayoffset];
+ if ((mode & _BV(dbfInvert)) == 0) pixels ^= display;
+ pixels &= mask;
+ pixels ^= display;
+ Arduboy2Base::sBuffer[displayoffset] = pixels;
+ }
+ if (mode & _BV(dbfExtraRow))
+ {
+ uint8_t display = Arduboy2Base::sBuffer[displayoffset + WIDTH];
+ uint8_t pixels = bitmap >> 8;
+ if ((mode & dbfInvert) == 0) pixels ^= display;
+ pixels &= mask >> 8;
+ pixels ^= display;
+ Arduboy2Base::sBuffer[displayoffset + WIDTH] = pixels;
+ }
+ displayoffset++;
+ }
+ displayoffset += WIDTH - renderwidth;
+ displayrow ++;
+ renderheight -= 8;
+ readEnd();
+ } while (renderheight > 0);
+#endif
+}
+
+
+void FX::readDataArray(uint24_t address, uint8_t index, uint8_t offset, uint8_t elementSize, uint8_t* buffer, size_t length)
+{
+ seekDataArray(address, index, offset, elementSize);
+ readBytesEnd(buffer, length);
+}
+
+
+uint16_t FX::readIndexedUInt8(uint24_t address, uint8_t index)
+{
+ seekDataArray(address, index, 0, sizeof(uint8_t));
+ return readEnd();
+}
+
+
+uint16_t FX::readIndexedUInt16(uint24_t address, uint8_t index)
+{
+ seekDataArray(address, index, 0, sizeof(uint16_t));
+ return readPendingLastUInt16();
+}
+
+
+uint24_t FX::readIndexedUInt24(uint24_t address, uint8_t index)
+{
+ seekDataArray(address, index, 0, sizeof(uint24_t));
+ return readPendingLastUInt24();
+}
+
+
+uint32_t FX::readIndexedUInt32(uint24_t address, uint8_t index)
+{
+ seekDataArray(address, index, 0, sizeof(uint24_t));
+ return readPendingLastUInt32();
+}
diff --git a/board-package-source/libraries/ArduboyFX/src/ArduboyFX.h b/board-package-source/libraries/ArduboyFX/src/ArduboyFX.h
new file mode 100644
index 0000000..0b0c283
--- /dev/null
+++ b/board-package-source/libraries/ArduboyFX/src/ArduboyFX.h
@@ -0,0 +1,324 @@
+#ifndef ARDUBOYFX_H
+#define ARDUBOYFX_H
+
+#include
+
+#ifdef CART_CS_RX
+ #define FX_PORT PORTD
+ #define FX_BIT PORTD2
+#else
+ #define FX_PORT PORTD
+ #define FX_BIT PORTD1
+#endif
+
+
+//progam data and save data pages(set by PC manager tool)
+constexpr uint16_t FX_VECTOR_KEY_VALUE = 0x9518; /* RETI instruction used a magic key */
+constexpr uint16_t FX_DATA_VECTOR_KEY_POINTER = 0x0014; /* reserved interrupt vector 5 area */
+constexpr uint16_t FX_DATA_VECTOR_PAGE_POINTER = 0x0016;
+constexpr uint16_t FX_SAVE_VECTOR_KEY_POINTER = 0x0018; /* reserved interrupt vector 6 area */
+constexpr uint16_t FX_SAVE_VECTOR_PAGE_POINTER = 0x001A;
+
+//Serial Flash Commands
+constexpr uint8_t SFC_JEDEC_ID = 0x9F;
+constexpr uint8_t SFC_READSTATUS1 = 0x05;
+constexpr uint8_t SFC_READSTATUS2 = 0x35;
+constexpr uint8_t SFC_READSTATUS3 = 0x15;
+constexpr uint8_t SFC_READ = 0x03;
+constexpr uint8_t SFC_WRITE_ENABLE = 0x06;
+constexpr uint8_t SFC_WRITE = 0x04;
+constexpr uint8_t SFC_ERASE = 0x20;
+constexpr uint8_t SFC_RELEASE_POWERDOWN = 0xAB;
+constexpr uint8_t SFC_POWERDOWN = 0xB9;
+
+//drawbitmap bit flags (used by modes below and internally)
+constexpr uint8_t dbfWhiteBlack = 0; // bitmap is used as mask
+constexpr uint8_t dbfInvert = 1; // bitmap is exclusive or-ed with display
+constexpr uint8_t dbfBlack = 2; // bitmap will be blackened
+constexpr uint8_t dbfReverseBlack = 3; // reverses bitmap data
+constexpr uint8_t dbfMasked = 4; // bitmap contains mask data
+constexpr uint8_t dbfExtraRow = 7; // ignored (internal use)
+
+//drawBitmap modes with same behaviour as Arduboy library drawBitmap modes
+constexpr uint8_t dbmBlack = _BV(dbfReverseBlack) | // white pixels in bitmap will be drawn as black pixels on display
+ _BV(dbfBlack) | // black pixels in bitmap will not change pixels on display
+ _BV(dbfWhiteBlack); // (same as sprites drawErase)
+
+constexpr uint8_t dbmWhite = _BV(dbfWhiteBlack); // white pixels in bitmap will be drawn as white pixels on display
+ // black pixels in bitmap will not change pixels on display
+ //(same as sprites drawSelfMasked)
+
+constexpr uint8_t dbmInvert = _BV(dbfInvert); // when a pixel in bitmap has a different color than on display the
+ // pixel on display will be drawn as white. In all other cases the
+ // pixel will be drawn as black
+//additional drawBitmap modes
+constexpr uint8_t dbmNormal = 0; // White pixels in bitmap will be drawn as white pixels on display
+constexpr uint8_t dbmOverwrite = 0; // Black pixels in bitmap will be drawn as black pixels on display
+ // (Same as sprites drawOverwrite)
+
+constexpr uint8_t dbmReverse = _BV(dbfReverseBlack); // White pixels in bitmap will be drawn as black pixels on display
+ // Black pixels in bitmap will be drawn as white pixels on display
+
+constexpr uint8_t dbmMasked = _BV(dbfMasked); // The bitmap contains a mask that will determine which pixels are
+ // drawn and which will remain
+ // (same as sprites drawPlusMask)
+
+// Note above modes may be combined like (dbmMasked | dbmReverse)
+
+using uint24_t = __uint24;
+
+struct JedecID
+{
+ uint8_t manufacturer;
+ uint8_t device;
+ uint8_t size;
+};
+
+struct FXAddress
+{
+ uint16_t page;
+ uint8_t offset;
+};
+
+class FX
+{
+ public:
+ static inline void enableOLED() __attribute__((always_inline)) // selects OLED display.
+ {
+ CS_PORT &= ~(1 << CS_BIT);
+ };
+
+ static inline void disableOLED() __attribute__((always_inline)) // deselects OLED display.
+ {
+ CS_PORT |= (1 << CS_BIT);
+ };
+
+ static inline void enable() __attribute__((always_inline)) // selects external flash memory and allows new commands
+ {
+ FX_PORT &= ~(1 << FX_BIT);
+ };
+
+ static inline void disable() __attribute__((always_inline)) // deselects external flash memory and ends the last command
+ {
+ FX_PORT |= (1 << FX_BIT);
+ };
+
+ static inline void wait() __attribute__((always_inline)) // wait for a pending flash transfer to complete
+ {
+ while ((SPSR & _BV(SPIF)) == 0);
+ }
+
+ static uint8_t writeByte(uint8_t data); // write a single byte to flash memory.
+
+ static inline void writeByteBeforeWait(uint8_t data) __attribute__((always_inline))
+ {
+ SPDR = data;
+ asm volatile("nop\n");
+ wait();
+ }
+
+ static inline void writeByteAfterWait(uint8_t data) __attribute__((always_inline))
+ {
+ wait();
+ SPDR = data;
+ }
+
+ static uint8_t readByte(); //read a single byte from flash memory
+
+ static void begin(); // Initializes flash memory. Use only when program does not require data and save areas in flash memory
+
+ static void begin(uint16_t programDataPage); // Initializes flash memory. Use when program depends on data in flash memory
+
+ static void begin(uint16_t datapage, uint16_t savepage); // Initializes flash memory. Use when program depends on both data and save data in flash memory
+
+ static void readJedecID(JedecID* id);
+
+ static bool detect(); //detect presence of initialized flash memory
+
+ static void noFXReboot(); // flash RGB LED red and wait for DOWN button to exit to bootloader when no initialized external flash memory is present
+
+ static void writeCommand(uint8_t command); // write a single byte flash command
+
+ static void wakeUp(); // Wake up flash memory from power down mode
+
+ static void sleep(); // Put flash memory in power down mode for low power
+
+ static void writeEnable();// Puts flash memory in write mode, required prior to any write command
+
+ static void seekCommand(uint8_t command, uint24_t address);// Write command and selects flash memory address. Required by any read or write command
+
+ static void seekData(uint24_t address); // selects flashaddress of program data area for reading and starts the first read
+
+ static void seekDataArray(uint24_t address, uint8_t index, uint8_t offset, uint8_t elementSize);
+
+ static void seekSave(uint24_t address); // selects flashaddress of program save area for reading and starts the first read
+
+ static inline uint8_t readUnsafe() __attribute__((always_inline)) // read flash data without performing any checks and starts the next read.
+ {
+ uint8_t result = SPDR;
+ SPDR = 0;
+ return result;
+ };
+
+ static inline uint8_t readUnsafeEnd() __attribute__((always_inline))
+ {
+ uint8_t result = SPDR;
+ disable();
+ return result;
+ };
+
+ static uint8_t readPendingUInt8() __attribute__ ((noinline)); //read a prefetched byte from the current flash location
+
+ static uint8_t readPendingLastUInt8() __attribute__ ((noinline)); //read a prefetched byte from the current flash location
+
+ static uint16_t readPendingUInt16() __attribute__ ((noinline)); //read a partly prefetched 16-bit word from the current flash location
+
+ static uint16_t readPendingLastUInt16() __attribute__ ((noinline)); //read a partly prefetched 16-bit word from the current flash location
+
+ static uint24_t readPendingUInt24() ; //read a partly prefetched 24-bit word from the current flash location
+
+ static uint24_t readPendingLastUInt24() ; //read a partly prefetched 24-bit word from the current flash location
+
+ static uint32_t readPendingUInt32(); //read a partly prefetched a 32-bit word from the current flash location
+
+ static uint32_t readPendingLastUInt32(); //read a partly prefetched a 32-bit word from the current flash location
+
+ static void readBytes(uint8_t* buffer, size_t length);// read a number of bytes from the current flash location
+
+ static void readBytesEnd(uint8_t* buffer, size_t length); // read a number of bytes from the current flash location and end the read command
+
+ static uint8_t readEnd(); //read last pending byte and end read command
+
+ static void readDataBytes(uint24_t address, uint8_t* buffer, size_t length);
+
+ static void readSaveBytes(uint24_t address, uint8_t* buffer, size_t length);
+
+ static void eraseSaveBlock(uint16_t page);
+
+ static void writeSavePage(uint16_t page, uint8_t* buffer);
+
+ static void drawBitmap(int16_t x, int16_t y, uint24_t address, uint8_t frame, uint8_t mode);
+
+ static void readDataArray(uint24_t address, uint8_t index, uint8_t offset, uint8_t elementSize, uint8_t* buffer, size_t length);
+
+ static uint16_t readIndexedUInt8(uint24_t address, uint8_t index);
+
+ static uint16_t readIndexedUInt16(uint24_t address, uint8_t index);
+
+ static uint24_t readIndexedUInt24(uint24_t address, uint8_t index);
+
+ static uint32_t readIndexedUInt32(uint24_t address, uint8_t index);
+
+ static inline uint16_t multiplyUInt8 (uint8_t a, uint8_t b) __attribute__((always_inline))
+ {
+ #ifdef ARDUINO_ARCH_AVR
+ uint16_t result;
+ asm volatile(
+ "mul %[a], %[b] \n"
+ "movw %A[result], r0 \n"
+ "clr r1 \n"
+ : [result] "=&r" (result)
+ : [a] "r" (a),
+ [b] "r" (b)
+ :
+ );
+ return result;
+ #else
+ return (a * b);
+ #endif
+ }
+
+ static inline uint8_t bitShiftLeftUInt8(uint8_t bit) __attribute__((always_inline)) //fast (1 << (bit & 7))
+ {
+ #ifdef ARDUINO_ARCH_AVR
+ uint8_t result;
+ asm volatile(
+ "ldi %[result], 1 \n" // 0 = 000 => 0000 0001
+ "sbrc %[bit], 1 \n" // 1 = 001 => 0000 0010
+ "ldi %[result], 4 \n" // 2 = 010 => 0000 0100
+ "sbrc %[bit], 0 \n" // 3 = 011 => 0000 1000
+ "lsl %[result] \n"
+ "sbrc %[bit], 2 \n" // 4 = 100 => 0001 0000
+ "swap %[result] \n" // 5 = 101 => 0010 0000
+ :[result] "=&d" (result) // 6 = 110 => 0100 0000
+ :[bit] "r" (bit) // 7 = 111 => 1000 0000
+ :
+ );
+ return result;
+ #else
+ return 1 << (bit & 7);
+ #endif
+ }
+
+ static inline uint8_t bitShiftRightUInt8(uint8_t bit) __attribute__((always_inline)) //fast (0x80 >> (bit & 7))
+ {
+ #ifdef ARDUINO_ARCH_AVR
+ uint8_t result;
+ asm volatile(
+ "ldi %[result], 1 \n" // 0 = 000 => 1000 0000
+ "sbrs %[bit], 1 \n" // 1 = 001 => 0100 0000
+ "ldi %[result], 4 \n" // 2 = 010 => 0010 0000
+ "sbrs %[bit], 0 \n" // 3 = 011 => 0001 0000
+ "lsl %[result] \n"
+ "sbrs %[bit], 2 \n" // 4 = 100 => 0000 1000
+ "swap %[result] \n" // 5 = 101 => 0000 0100
+ :[result] "=&d" (result) // 6 = 110 => 0000 0010
+ :[bit] "r" (bit) // 7 = 111 => 0000 0001
+ :
+ );
+ return result;
+ #else
+ return 0x80 >> (bit & 7);
+ #endif
+ }
+
+ static inline uint8_t bitShiftLeftMaskUInt8(uint8_t bit) __attribute__((always_inline)) //fast (0xFF << (bit & 7) & 0xFF)
+ {
+ #ifdef ARDUINO_ARCH_AVR
+ uint8_t result;
+ asm volatile(
+ "ldi %[result], 1 \n" // 0 = 000 => 1111 1111 = -1
+ "sbrc %[bit], 1 \n" // 1 = 001 => 1111 1110 = -2
+ "ldi %[result], 4 \n" // 2 = 010 => 1111 1100 = -4
+ "sbrc %[bit], 0 \n" // 3 = 011 => 1111 1000 = -8
+ "lsl %[result] \n"
+ "sbrc %[bit], 2 \n" // 4 = 100 => 1111 0000 = -16
+ "swap %[result] \n" // 5 = 101 => 1110 0000 = -32
+ "neg %[result] \n" // 6 = 110 => 1100 0000 = -64
+ :[result] "=&d" (result) // 7 = 111 => 1000 0000 = -128
+ :[bit] "r" (bit)
+ :
+ );
+ return result;
+ #else
+ return (0xFF << (bit & 7)) & 0xFF;
+ #endif
+ }
+
+ static inline uint8_t bitShiftRightMaskUInt8(uint8_t bit) __attribute__((always_inline)) //fast (0xFF >> (bit & 7))
+ {
+ #ifdef ARDUINO_ARCH_AVR
+ uint8_t result;
+ asm volatile(
+ "ldi %[result], 2 \n" // 0 = 000 => 1111 1111 = 0x00 - 1
+ "sbrs %A[bit], 1 \n" // 1 = 001 => 0111 1111 = 0x80 - 1
+ "ldi %[result], 8 \n" // 2 = 010 => 0011 1111 = 0x40 - 1
+ "sbrs %A[bit], 2 \n" // 3 = 011 => 0001 1111 = 0x20 - 1
+ "swap %[result] \n"
+ "sbrs %A[bit], 0 \n" // 4 = 100 => 0000 1111 = 0x10 - 1
+ "lsl %[result] \n" // 5 = 101 => 0000 0111 = 0x08 - 1
+ "dec %[result] \n" // 6 = 110 => 0000 0011 = 0x04 - 1
+ :[result] "=&d" (result) // 7 = 111 => 0000 0001 = 0x02 - 1
+ :[bit] "r" (bit)
+ :
+ );
+ return result;
+ #else
+ return 0xFF >> (bit & 7);
+ #endif
+ }
+
+ static uint16_t programDataPage; // program read only data area in flash memory
+ static uint16_t programSavePage; // program read and write data area in flash memory
+};
+#endif
diff --git a/board-package-source/libraries/ArduboyPlaytune/.gitignore b/board-package-source/libraries/ArduboyPlaytune/.gitignore
new file mode 100644
index 0000000..94f90d1
--- /dev/null
+++ b/board-package-source/libraries/ArduboyPlaytune/.gitignore
@@ -0,0 +1 @@
+doxygen/
diff --git a/board-package-source/libraries/ArduboyTones/.gitignore b/board-package-source/libraries/ArduboyTones/.gitignore
new file mode 100644
index 0000000..94f90d1
--- /dev/null
+++ b/board-package-source/libraries/ArduboyTones/.gitignore
@@ -0,0 +1 @@
+doxygen/
diff --git a/board-package-source/libraries/EEPROM/src/EEPROM.h b/board-package-source/libraries/EEPROM/src/EEPROM.h
index cde75db..2a2359f 100644
--- a/board-package-source/libraries/EEPROM/src/EEPROM.h
+++ b/board-package-source/libraries/EEPROM/src/EEPROM.h
@@ -40,7 +40,7 @@ struct EERef{
//Access/read members.
uint8_t operator*() const { return eeprom_read_byte( (uint8_t*) index ); }
- operator const uint8_t() const { return **this; }
+ operator uint8_t() const { return **this; }
//Assignment/write members.
EERef &operator=( const EERef &ref ) { return *this = *ref; }
@@ -89,7 +89,7 @@ struct EEPtr{
EEPtr( const int index )
: index( index ) {}
- operator const int() const { return index; }
+ operator int() const { return index; }
EEPtr &operator=( int in ) { return index = in, *this; }
//Iterator functionality.
@@ -142,5 +142,5 @@ struct EEPROMClass{
}
};
-static EEPROMClass EEPROM;
-#endif
\ No newline at end of file
+static EEPROMClass EEPROM __attribute__((used));
+#endif
diff --git a/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.cpp b/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.cpp
index 474fe4a..3163d7a 100644
--- a/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.cpp
+++ b/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.cpp
@@ -316,7 +316,7 @@ void SoftwareSerial::begin(long speed)
_tx_delay = subtract_cap(bit_delay, 15 / 4);
// Only setup rx when we have a valid PCINT for this pin
- if (digitalPinToPCICR(_receivePin)) {
+ if (digitalPinToPCICR((int8_t)_receivePin)) {
#if GCC_VERSION > 40800
// Timings counted from gcc 4.8.2 output. This works up to 115200 on
// 16Mhz and 57600 on 8Mhz.
@@ -357,7 +357,7 @@ void SoftwareSerial::begin(long speed)
// Enable the PCINT for the entire port here, but never disable it
// (others might also need it, so we disable the interrupt by using
// the per-pin PCMSK register).
- *digitalPinToPCICR(_receivePin) |= _BV(digitalPinToPCICRbit(_receivePin));
+ *digitalPinToPCICR((int8_t)_receivePin) |= _BV(digitalPinToPCICRbit(_receivePin));
// Precalculate the pcint mask register and value, so setRxIntMask
// can be used inside the ISR without costing too much time.
_pcint_maskreg = digitalPinToPCMSK(_receivePin);
diff --git a/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.h b/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.h
index b1a37c4..d8b88ce 100644
--- a/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.h
+++ b/board-package-source/libraries/SoftwareSerial/src/SoftwareSerial.h
@@ -111,13 +111,4 @@ public:
static inline void handle_interrupt() __attribute__((__always_inline__));
};
-// Arduino 0012 workaround
-#undef int
-#undef char
-#undef long
-#undef byte
-#undef float
-#undef abs
-#undef round
-
#endif
diff --git a/board-package-source/libraries/Wire/src/Wire.cpp b/board-package-source/libraries/Wire/src/Wire.cpp
index d2146f7..c407776 100644
--- a/board-package-source/libraries/Wire/src/Wire.cpp
+++ b/board-package-source/libraries/Wire/src/Wire.cpp
@@ -17,6 +17,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
+ Modified 2017 by Chuck Todd (ctodd@cableone.net) to correct Unconfigured Slave Mode reboot
+ Modified 2020 by Greyson Christoforo (grey@christoforo.net) to implement timeouts
*/
extern "C" {
@@ -60,14 +62,14 @@ void TwoWire::begin(void)
txBufferLength = 0;
twi_init();
+ twi_attachSlaveTxEvent(onRequestService); // default callback must exist
+ twi_attachSlaveRxEvent(onReceiveService); // default callback must exist
}
void TwoWire::begin(uint8_t address)
{
- twi_setAddress(address);
- twi_attachSlaveTxEvent(onRequestService);
- twi_attachSlaveRxEvent(onReceiveService);
begin();
+ twi_setAddress(address);
}
void TwoWire::begin(int address)
@@ -85,6 +87,52 @@ void TwoWire::setClock(uint32_t clock)
twi_setFrequency(clock);
}
+/***
+ * Sets the TWI timeout.
+ *
+ * This limits the maximum time to wait for the TWI hardware. If more time passes, the bus is assumed
+ * to have locked up (e.g. due to noise-induced glitches or faulty slaves) and the transaction is aborted.
+ * Optionally, the TWI hardware is also reset, which can be required to allow subsequent transactions to
+ * succeed in some cases (in particular when noise has made the TWI hardware think there is a second
+ * master that has claimed the bus).
+ *
+ * When a timeout is triggered, a flag is set that can be queried with `getWireTimeoutFlag()` and is cleared
+ * when `clearWireTimeoutFlag()` or `setWireTimeoutUs()` is called.
+ *
+ * Note that this timeout can also trigger while waiting for clock stretching or waiting for a second master
+ * to complete its transaction. So make sure to adapt the timeout to accomodate for those cases if needed.
+ * A typical timeout would be 25ms (which is the maximum clock stretching allowed by the SMBus protocol),
+ * but (much) shorter values will usually also work.
+ *
+ * In the future, a timeout will be enabled by default, so if you require the timeout to be disabled, it is
+ * recommended you disable it by default using `setWireTimeoutUs(0)`, even though that is currently
+ * the default.
+ *
+ * @param timeout a timeout value in microseconds, if zero then timeout checking is disabled
+ * @param reset_with_timeout if true then TWI interface will be automatically reset on timeout
+ * if false then TWI interface will not be reset on timeout
+
+ */
+void TwoWire::setWireTimeout(uint32_t timeout, bool reset_with_timeout){
+ twi_setTimeoutInMicros(timeout, reset_with_timeout);
+}
+
+/***
+ * Returns the TWI timeout flag.
+ *
+ * @return true if timeout has occured since the flag was last cleared.
+ */
+bool TwoWire::getWireTimeoutFlag(void){
+ return(twi_manageTimeoutFlag(false));
+}
+
+/***
+ * Clears the TWI timeout flag.
+ */
+void TwoWire::clearWireTimeoutFlag(void){
+ twi_manageTimeoutFlag(true);
+}
+
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop)
{
if (isize > 0) {
diff --git a/board-package-source/libraries/Wire/src/Wire.h b/board-package-source/libraries/Wire/src/Wire.h
index 702f37d..e70d72e 100644
--- a/board-package-source/libraries/Wire/src/Wire.h
+++ b/board-package-source/libraries/Wire/src/Wire.h
@@ -17,6 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
+ Modified 2020 by Greyson Christoforo (grey@christoforo.net) to implement timeouts
*/
#ifndef TwoWire_h
@@ -54,13 +55,16 @@ class TwoWire : public Stream
void begin(int);
void end();
void setClock(uint32_t);
+ void setWireTimeout(uint32_t timeout = 25000, bool reset_with_timeout = false);
+ bool getWireTimeoutFlag(void);
+ void clearWireTimeoutFlag(void);
void beginTransmission(uint8_t);
void beginTransmission(int);
uint8_t endTransmission(void);
uint8_t endTransmission(uint8_t);
uint8_t requestFrom(uint8_t, uint8_t);
uint8_t requestFrom(uint8_t, uint8_t, uint8_t);
- uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t);
+ uint8_t requestFrom(uint8_t, uint8_t, uint32_t, uint8_t, uint8_t);
uint8_t requestFrom(int, int);
uint8_t requestFrom(int, int, int);
virtual size_t write(uint8_t);
diff --git a/board-package-source/libraries/Wire/src/utility/twi.c b/board-package-source/libraries/Wire/src/utility/twi.c
index 171af73..5539633 100644
--- a/board-package-source/libraries/Wire/src/utility/twi.c
+++ b/board-package-source/libraries/Wire/src/utility/twi.c
@@ -17,6 +17,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts
+ Modified 2020 by Greyson Christoforo (grey@christoforo.net) to implement timeouts
*/
#include
@@ -24,8 +25,9 @@
#include
#include
#include
+#include
#include
-#include "Arduino.h" // for digitalWrite
+#include "Arduino.h" // for digitalWrite and micros
#ifndef cbi
#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
@@ -43,6 +45,16 @@ static volatile uint8_t twi_slarw;
static volatile uint8_t twi_sendStop; // should the transaction end with a stop
static volatile uint8_t twi_inRepStart; // in the middle of a repeated start
+// twi_timeout_us > 0 prevents the code from getting stuck in various while loops here
+// if twi_timeout_us == 0 then timeout checking is disabled (the previous Wire lib behavior)
+// at some point in the future, the default twi_timeout_us value could become 25000
+// and twi_do_reset_on_timeout could become true
+// to conform to the SMBus standard
+// http://smbus.org/specs/SMBus_3_1_20180319.pdf
+static volatile uint32_t twi_timeout_us = 0ul;
+static volatile bool twi_timed_out_flag = false; // a timeout has been seen
+static volatile bool twi_do_reset_on_timeout = false; // reset the TWI registers on timeout
+
static void (*twi_onSlaveTransmit)(void);
static void (*twi_onSlaveReceive)(uint8_t*, int);
@@ -154,8 +166,12 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
}
// wait until twi is ready, become master receiver
+ uint32_t startMicros = micros();
while(TWI_READY != twi_state){
- continue;
+ if((twi_timeout_us > 0ul) && ((micros() - startMicros) > twi_timeout_us)) {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return 0;
+ }
}
twi_state = TWI_MRX;
twi_sendStop = sendStop;
@@ -183,28 +199,38 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
// up. Also, don't enable the START interrupt. There may be one pending from the
// repeated start that we sent ourselves, and that would really confuse things.
twi_inRepStart = false; // remember, we're dealing with an ASYNC ISR
+ startMicros = micros();
do {
TWDR = twi_slarw;
+ if((twi_timeout_us > 0ul) && ((micros() - startMicros) > twi_timeout_us)) {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return 0;
+ }
} while(TWCR & _BV(TWWC));
TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE); // enable INTs, but not START
- }
- else
+ } else {
// send start condition
TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWEA) | _BV(TWINT) | _BV(TWSTA);
-
- // wait for read operation to complete
- while(TWI_MRX == twi_state){
- continue;
}
- if (twi_masterBufferIndex < length)
+ // wait for read operation to complete
+ startMicros = micros();
+ while(TWI_MRX == twi_state){
+ if((twi_timeout_us > 0ul) && ((micros() - startMicros) > twi_timeout_us)) {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return 0;
+ }
+ }
+
+ if (twi_masterBufferIndex < length) {
length = twi_masterBufferIndex;
+ }
// copy twi buffer to data
for(i = 0; i < length; ++i){
data[i] = twi_masterBuffer[i];
}
-
+
return length;
}
@@ -222,6 +248,7 @@ uint8_t twi_readFrom(uint8_t address, uint8_t* data, uint8_t length, uint8_t sen
* 2 .. address send, NACK received
* 3 .. data send, NACK received
* 4 .. other twi error (lost bus arbitration, bus error, ..)
+ * 5 .. timeout
*/
uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait, uint8_t sendStop)
{
@@ -233,8 +260,12 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
}
// wait until twi is ready, become master transmitter
+ uint32_t startMicros = micros();
while(TWI_READY != twi_state){
- continue;
+ if((twi_timeout_us > 0ul) && ((micros() - startMicros) > twi_timeout_us)) {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return (5);
+ }
}
twi_state = TWI_MTX;
twi_sendStop = sendStop;
@@ -265,18 +296,27 @@ uint8_t twi_writeTo(uint8_t address, uint8_t* data, uint8_t length, uint8_t wait
// up. Also, don't enable the START interrupt. There may be one pending from the
// repeated start that we sent outselves, and that would really confuse things.
twi_inRepStart = false; // remember, we're dealing with an ASYNC ISR
+ startMicros = micros();
do {
- TWDR = twi_slarw;
+ TWDR = twi_slarw;
+ if((twi_timeout_us > 0ul) && ((micros() - startMicros) > twi_timeout_us)) {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return (5);
+ }
} while(TWCR & _BV(TWWC));
TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE); // enable INTs, but not START
- }
- else
+ } else {
// send start condition
TWCR = _BV(TWINT) | _BV(TWEA) | _BV(TWEN) | _BV(TWIE) | _BV(TWSTA); // enable INTs
+ }
// wait for write operation to complete
+ startMicros = micros();
while(wait && (TWI_MTX == twi_state)){
- continue;
+ if((twi_timeout_us > 0ul) && ((micros() - startMicros) > twi_timeout_us)) {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return (5);
+ }
}
if (twi_error == 0xFF)
@@ -356,7 +396,7 @@ void twi_reply(uint8_t ack)
if(ack){
TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT) | _BV(TWEA);
}else{
- TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT);
+ TWCR = _BV(TWEN) | _BV(TWIE) | _BV(TWINT);
}
}
@@ -373,8 +413,19 @@ void twi_stop(void)
// wait for stop condition to be exectued on bus
// TWINT is not set after a stop condition!
+ // We cannot use micros() from an ISR, so approximate the timeout with cycle-counted delays
+ const uint8_t us_per_loop = 8;
+ uint32_t counter = (twi_timeout_us + us_per_loop - 1)/us_per_loop; // Round up
while(TWCR & _BV(TWSTO)){
- continue;
+ if(twi_timeout_us > 0ul){
+ if (counter > 0ul){
+ _delay_us(10);
+ counter--;
+ } else {
+ twi_handleTimeout(twi_do_reset_on_timeout);
+ return;
+ }
+ }
}
// update twi state
@@ -396,6 +447,59 @@ void twi_releaseBus(void)
twi_state = TWI_READY;
}
+/*
+ * Function twi_setTimeoutInMicros
+ * Desc set a timeout for while loops that twi might get stuck in
+ * Input timeout value in microseconds (0 means never time out)
+ * Input reset_with_timeout: true causes timeout events to reset twi
+ * Output none
+ */
+void twi_setTimeoutInMicros(uint32_t timeout, bool reset_with_timeout){
+ twi_timed_out_flag = false;
+ twi_timeout_us = timeout;
+ twi_do_reset_on_timeout = reset_with_timeout;
+}
+
+/*
+ * Function twi_handleTimeout
+ * Desc this gets called whenever a while loop here has lasted longer than
+ * twi_timeout_us microseconds. always sets twi_timed_out_flag
+ * Input reset: true causes this function to reset the twi hardware interface
+ * Output none
+ */
+void twi_handleTimeout(bool reset){
+ twi_timed_out_flag = true;
+
+ if (reset) {
+ // remember bitrate and address settings
+ uint8_t previous_TWBR = TWBR;
+ uint8_t previous_TWAR = TWAR;
+
+ // reset the interface
+ twi_disable();
+ twi_init();
+
+ // reapply the previous register values
+ TWAR = previous_TWAR;
+ TWBR = previous_TWBR;
+ }
+}
+
+/*
+ * Function twi_manageTimeoutFlag
+ * Desc returns true if twi has seen a timeout
+ * optionally clears the timeout flag
+ * Input clear_flag: true if we should reset the hardware
+ * Output none
+ */
+bool twi_manageTimeoutFlag(bool clear_flag){
+ bool flag = twi_timed_out_flag;
+ if (clear_flag){
+ twi_timed_out_flag = false;
+ }
+ return(flag);
+}
+
ISR(TWI_vect)
{
switch(TW_STATUS){
@@ -416,16 +520,16 @@ ISR(TWI_vect)
TWDR = twi_masterBuffer[twi_masterBufferIndex++];
twi_reply(1);
}else{
- if (twi_sendStop)
+ if (twi_sendStop){
twi_stop();
- else {
- twi_inRepStart = true; // we're gonna send the START
- // don't enable the interrupt. We'll generate the start, but we
- // avoid handling the interrupt until we're in the next transaction,
- // at the point where we would normally issue the start.
- TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ;
- twi_state = TWI_READY;
- }
+ } else {
+ twi_inRepStart = true; // we're gonna send the START
+ // don't enable the interrupt. We'll generate the start, but we
+ // avoid handling the interrupt until we're in the next transaction,
+ // at the point where we would normally issue the start.
+ TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ;
+ twi_state = TWI_READY;
+ }
}
break;
case TW_MT_SLA_NACK: // address sent, nack received
@@ -445,6 +549,7 @@ ISR(TWI_vect)
case TW_MR_DATA_ACK: // data received, ack sent
// put byte into buffer
twi_masterBuffer[twi_masterBufferIndex++] = TWDR;
+ __attribute__ ((fallthrough));
case TW_MR_SLA_ACK: // address sent, ack received
// ack if more bytes are expected, otherwise nack
if(twi_masterBufferIndex < twi_masterBufferLength){
@@ -456,17 +561,17 @@ ISR(TWI_vect)
case TW_MR_DATA_NACK: // data received, nack sent
// put final byte into buffer
twi_masterBuffer[twi_masterBufferIndex++] = TWDR;
- if (twi_sendStop)
- twi_stop();
- else {
- twi_inRepStart = true; // we're gonna send the START
- // don't enable the interrupt. We'll generate the start, but we
- // avoid handling the interrupt until we're in the next transaction,
- // at the point where we would normally issue the start.
- TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ;
- twi_state = TWI_READY;
- }
- break;
+ if (twi_sendStop){
+ twi_stop();
+ } else {
+ twi_inRepStart = true; // we're gonna send the START
+ // don't enable the interrupt. We'll generate the start, but we
+ // avoid handling the interrupt until we're in the next transaction,
+ // at the point where we would normally issue the start.
+ TWCR = _BV(TWINT) | _BV(TWSTA)| _BV(TWEN) ;
+ twi_state = TWI_READY;
+ }
+ break;
case TW_MR_SLA_NACK: // address sent, nack received
twi_stop();
break;
@@ -530,6 +635,7 @@ ISR(TWI_vect)
twi_txBufferLength = 1;
twi_txBuffer[0] = 0x00;
}
+ __attribute__ ((fallthrough));
// transmit first byte from buffer, fall
case TW_ST_DATA_ACK: // byte sent, ack returned
// copy data to output register
@@ -558,4 +664,3 @@ ISR(TWI_vect)
break;
}
}
-
diff --git a/board-package-source/libraries/Wire/src/utility/twi.h b/board-package-source/libraries/Wire/src/utility/twi.h
index d27325e..85b9837 100644
--- a/board-package-source/libraries/Wire/src/utility/twi.h
+++ b/board-package-source/libraries/Wire/src/utility/twi.h
@@ -15,6 +15,8 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Modified 2020 by Greyson Christoforo (grey@christoforo.net) to implement timeouts
*/
#ifndef twi_h
@@ -50,6 +52,8 @@
void twi_reply(uint8_t);
void twi_stop(void);
void twi_releaseBus(void);
+ void twi_setTimeoutInMicros(uint32_t, bool);
+ void twi_handleTimeout(bool);
+ bool twi_manageTimeoutFlag(bool);
#endif
-
diff --git a/board-package/arduboy-homemade-1.2.9.zip b/board-package/arduboy-homemade-1.2.9.zip
new file mode 100644
index 0000000..9ca0043
Binary files /dev/null and b/board-package/arduboy-homemade-1.2.9.zip differ
diff --git a/package_arduboy_homemade_index.json b/package_arduboy_homemade_index.json
index fd20613..b3eb960 100644
--- a/package_arduboy_homemade_index.json
+++ b/package_arduboy_homemade_index.json
@@ -207,6 +207,28 @@
],
"toolsDependencies": [
]
+ },
+ {
+ "name": "Arduboy homemade package",
+ "architecture": "avr",
+ "version": "1.2.9",
+ "category": "Contributed",
+ "help": {
+ "online": "http://community.arduboy.com/"
+ },
+ "url": "https://github.com/MrBlinky/Arduboy-homemade-package/raw/master/board-package/arduboy-homemade-1.2.9.zip",
+ "archiveFileName": "arduboy-homemade-1.2.9.zip",
+ "checksum": "SHA-256:c04b01d3b0bd6cff89067c73b0407b12ecb142fa1e8145be7bdeeba9329f9463",
+ "size": "1274735",
+ "boards": [
+ {"name": "Arduboy production"},
+ {"name": "Arduboy DevKit"},
+ {"name": "Arduino Leonardo"},
+ {"name": "Arduino / Genuino Micro"},
+ {"name": "SparkFun ProMicro 5V"}
+ ],
+ "toolsDependencies": [
+ ]
} ],
"tools":[]
}