From c2b99b18bb9aaefcd55cba8e08f2a56e7c9098ab Mon Sep 17 00:00:00 2001
From: just-another-jxliu <just-another-jxliu@users.noreply.github.com>
Date: Fri, 7 Sep 2018 11:17:27 -0700
Subject: [PATCH 01/21] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a2e5ca7..87d2d4b 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@
 4. In your terminal, change to the directory where you downloaded the executable.
 
 5. **Windows** - Run `mdloader_windows.exe --list`. Copy the port name, e.g. `/dev/ttyACM0`, `/dev/ttyS23`, `/dev/cu.usbmodem234411`.  
-**Linux** -  Run `mdloader_linux --list`. Copy the port name as described above.  
-**Mac** - Run `mdloader_mac --list`. If you downloaded with Mac Safari, run `mdloader_mac.dms --list`. Copy the port name as described above.
+**Linux** -  Run `./mdloader_linux --list`. Copy the port name as described above.  
+**Mac** - Run `./mdloader_mac --list`. If you downloaded with Mac Safari, run `./mdloader_mac.dms --list`. Copy the port name as described above.
 
 6. **Windows** - Run `mdloader_windows.exe --port PORT_NAME --download FILE_NAME --restart`. Replace "PORT_NAME" with the port name you copied in the previous step. Replace "FILE_NAME" with the filename of your compiled firmware.  
-**Linux** - Run `mdloader_linux --port PORT_NAME --download FILE_NAME --restart`. Replace "PORT_NAME" and "FILE_NAME" in the command as instructed above.  
-**Mac** - Run `mdloader_mac --port PORT_NAME --download FILE_NAME --restart`.  If you downloaded with Mac Safari, run `mdloader_mac.dms --port PORT_NAME --download FILE_NAME --restart`. Replace "PORT_NAME" and "FILE_NAME" in the command as instructed above.
+**Linux** - Run `./mdloader_linux --port PORT_NAME --download FILE_NAME --restart`. Replace "PORT_NAME" and "FILE_NAME" in the command as instructed above.  
+**Mac** - Run `./mdloader_mac --port PORT_NAME --download FILE_NAME --restart`.  If you downloaded with Mac Safari, run `./mdloader_mac.dms --port PORT_NAME --download FILE_NAME --restart`. Replace "PORT_NAME" and "FILE_NAME" in the command as instructed above.
 
 7. Enjoy (important)
 

From 0492244fcfaa4be7de74d19c3ee4e42a484ab7df Mon Sep 17 00:00:00 2001
From: just-another-jxliu <just-another-jxliu@users.noreply.github.com>
Date: Tue, 6 Aug 2019 14:22:00 -0700
Subject: [PATCH 02/21] Update README.md

---
 README.md | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 175779f..4f0aedf 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,38 @@
-### tl;dr
+### User instructions
 
 1. Follow the instructions here to download the executable for your operating system: https://github.com/Massdrop/mdloader/releases
 
 2. Plug in your keyboard.
 
-3. Press the reset button on your keyboard.
+3. In your terminal, change to the directory where you downloaded the executable and applet-*.bin file(s).
 
-4. In your terminal, change to the directory where you downloaded the executable and applet-*.bin file(s).
-
-5. **Windows** - Run `mdloader_windows.exe --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
+4. **Windows** - Run `mdloader_windows.exe --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
 **Linux** - Run `mdloader_linux --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
-**Mac** - Run `mdloader_mac --first --download FILE_NAME --restart`.  If you downloaded with Mac Safari, run `mdloader_mac.dms --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
+**Mac** - Run `mdloader_mac --first --download FILE_NAME --restart`.  If you downloaded with Mac Safari, run `mdloader_mac.dms --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware. 
+  
+5. You should see the message:  
+```
+Scanning for device for 60 seconds  
+.....
+```
+
+6. Within 60 seconds, press the reset button on your keyboard. For most keyboards running the default firmware, you can hold `Fn` + `b` for half a second and release to reset your keyboard (you will see the LEDs turn off). For CTRL keyboards in the first production run running original firmware or of the first method does not work for you, you will need to use a pin to press the reset button through the hole in the bottom of the keyboard.
+
+7. You should see a series of messages similar to:
+```
+Device port: /dev/cu.usbmodem234431 (SAMD51J18A)
+
+Opening port '/dev/cu.usbmodem234431'... Success!
+Found MCU: SAMD51J18A
+Bootloader version: v2.18Sep  4 2018 16:48:28
+Applet file: applet-flash-samd51j18a.bin
+Applet Version: 1
+Writing firmware... Complete!
+Booting device... Success!
+Closing port... Success!
+```
 
-6. Enjoy (important)
+8. Afterwards, you should see the keyboard's LEDs light up again (if your configuration has LEDs enabled) and the keyboard should respond to typing. Your keyboard is now running the new firmware you specified.
 
 -----
 
@@ -79,4 +99,4 @@ Test mode also allows viewing of binary data from a read instead of writing to a
 
 ## Troubleshooting
 
-Linux: User may need to be added to group dialout to access programming port  
+**Linux**: User may need to be added to group dialout to access programming port  

From caa03ede129d53ba48cdb28e11c7a6e197d595e4 Mon Sep 17 00:00:00 2001
From: just-another-jxliu <just-another-jxliu@users.noreply.github.com>
Date: Tue, 6 Aug 2019 14:26:09 -0700
Subject: [PATCH 03/21] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4f0aedf..84e3bd7 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 3. In your terminal, change to the directory where you downloaded the executable and applet-*.bin file(s).
 
 4. **Windows** - Run `mdloader_windows.exe --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
-**Linux** - Run `mdloader_linux --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
+**Linux** - Run `mdloader_linux --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware. Depending on your user's permissions, you might have to add your user to the `dialout` group or use `sudo` on the command.  
 **Mac** - Run `mdloader_mac --first --download FILE_NAME --restart`.  If you downloaded with Mac Safari, run `mdloader_mac.dms --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware. 
   
 5. You should see the message:  

From fcef3c437e1c283ea6009435399ebfb2004b4c31 Mon Sep 17 00:00:00 2001
From: Shailendra Govardhan <shailendra.govardhan@shorelineiot.com>
Date: Thu, 16 Jul 2020 07:05:25 +0530
Subject: [PATCH 04/21] Added die revision id mask in chip identification 
 Changes to be committed: 	modified:   mdloader_common.c 	modified:  
 mdloader_common.h  Added die revision mask to chip id. Now mdloader shall
 work for all die  revision ids as per chip datasheet.

---
 mdloader_common.c | 2 +-
 mdloader_common.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index bfe8b0d..e96b9e4 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -336,7 +336,7 @@ int test_mcu(char silent)
             continue;
         }
 
-        if (deviceid == mcu->cidr)
+        if ((deviceid & CIDR_DIE_REVISION_MASK) == mcu->cidr)
         {
             if (!silent && verbose) printf("Found supported device ID: %08X\n", deviceid);
             break;
diff --git a/mdloader_common.h b/mdloader_common.h
index 5d4ffa3..379c00d 100644
--- a/mdloader_common.h
+++ b/mdloader_common.h
@@ -22,7 +22,7 @@
 
 #define PROGRAM_NAME  "Massdrop Loader"
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 3 //0-99
+#define VERSION_MINOR 4 //0-99
 
 #ifdef _WIN32
 #define INITGUID
@@ -102,6 +102,8 @@ extern mailbox_t initparams;
 extern mailbox_t appletinfo;
 extern appinfo_t appinfo;
 
+#define CIDR_DIE_REVISION_MASK 0xFFFFF0FF
+
 typedef struct mcu_s {
     char name[20];      //MCU Name
     int cidr_addr;      //Chip ID Address

From 591b431ca26353ef10aa7c60c8a90dedcfeaf756 Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Thu, 1 Oct 2020 00:33:12 -0700
Subject: [PATCH 05/21] Update mdloader_common.c

Expanded MCU chip ID definitions.
---
 mdloader_common.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index e96b9e4..7560534 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -35,7 +35,32 @@ appinfo_t appinfo;      //Applet application information from end of applet bina
 mcu_t mcus[] = {
       //Name,       Chip ID     Chip ID,    Program Memory, Data Memory,    Program Addr,   Data Addr
       //            Address                 (FLASH_SIZE)    (HSRAM_SIZE)    (FLASH_ADDR)    (HSRAM_ADDR)
-    { "SAMD51J18A", 0x41002018, 0x60060006, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME54P19A", 0x41002018, 0x61840001, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME54P20A", 0x41002018, 0x61840000, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME54N19A", 0x41002018, 0x61840003, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME54N20A", 0x41002018, 0x61840002, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME53N20A", 0x41002018, 0x61830002, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME53N19A", 0x41002018, 0x61830003, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME53J18A", 0x41002018, 0x61830006, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME53J19A", 0x41002018, 0x61830005, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME53J20A", 0x41002018, 0x61830004, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51N19A", 0x41002018, 0x61810001, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51N20A", 0x41002018, 0x61810000, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51J18A", 0x41002018, 0x61810003, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51J19A", 0x41002018, 0x61810002, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51J20A", 0x41002018, 0x61810004, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51P20A", 0x41002018, 0x60060000, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51P19A", 0x41002018, 0x60060001, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51N19A", 0x41002018, 0x60060003, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51N20A", 0x41002018, 0x60060002, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51J18A", 0x41002018, 0x60060006, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51J19A", 0x41002018, 0x60060005, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51J20A", 0x41002018, 0x60060004, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51G18A", 0x41002018, 0x60060008, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAMD51G19A", 0x41002018, 0x60060007, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51G18A", 0x41002018, 0x61810306, 0x40000,        0x20000,        0x00000000,     0x20000000},
+{"SAME51G19A", 0x41002018, 0x61810305, 0x40000,        0x20000,        0x00000000,     0x20000000},
+
 };
 
 mcu_t *mcu; //Pointer to mcus entry if found

From f47c341accfaabc4562174fa85c2c3502029757b Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Thu, 1 Oct 2020 12:09:25 -0700
Subject: [PATCH 06/21] Update mdloader_common.c

Copyright notice refresh
---
 mdloader_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 7560534..0a6b926 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -470,7 +470,7 @@ void display_version(void)
 //Display program copyright
 void display_copyright(void)
 {
-    printf(PROGRAM_NAME "  Copyright (C) 2018  Massdrop Inc.\n");
+    printf(PROGRAM_NAME "  Copyright (C) 2018-2020 Massdrop Inc.\n");
     printf("This program is Free Software and has ABSOLUTELY NO WARRANTY\n");
     printf("\n");
 }

From c06abbf9623ef09d966428735f7f33ff65cb51da Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Thu, 1 Oct 2020 12:10:33 -0700
Subject: [PATCH 07/21] Update mdloader_common.c

---
 mdloader_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 0a6b926..2348268 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018  Massdrop Inc.
+ *  Copyright (C) 2018-2020 Massdrop Inc.
  *
  *  This file is part of Massdrop Loader.
  *

From c14ec9561d0a02a996e519a78d41bdf1d9897f44 Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:10:12 -0700
Subject: [PATCH 08/21] Update mdloader_common.c

New MCU definitions are breaking applet filename dependency. Putting in this quick fix until a more formal solution is implemented.
---
 mdloader_common.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 2348268..6316f6f 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -756,7 +756,9 @@ int main(int argc, char *argv[])
     char appletfname[128] = "";
     strlower(mcu->name);
 
-    sprintf(appletfname, "applet-flash-%s.bin", mcu->name);
+    //sprintf(appletfname, "applet-flash-%s.bin", mcu->name);
+    sprintf(appletfname, "applet-flash-samd51j19a.bin", mcu->name);  //temporary fix
+      
     printf("Applet file: %s\n", appletfname);
 
     fIn = fopen(appletfname, "rb");

From 04eafd940112c02b64d58a8435f7d88675b6f897 Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Tue, 6 Oct 2020 14:54:02 -0700
Subject: [PATCH 09/21] Update mdloader_common.c

Changing applet flash name to be chipset ID agnostic.
---
 mdloader_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 6316f6f..4321de2 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -757,7 +757,7 @@ int main(int argc, char *argv[])
     strlower(mcu->name);
 
     //sprintf(appletfname, "applet-flash-%s.bin", mcu->name);
-    sprintf(appletfname, "applet-flash-samd51j19a.bin", mcu->name);  //temporary fix
+    sprintf(appletfname, "applet-mdflash.bin");  //make filename non-dependent upon mcu->name
       
     printf("Applet file: %s\n", appletfname);
 

From e3ee607e120886dc2cda0f8dc951d6a298054d76 Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Tue, 6 Oct 2020 14:54:52 -0700
Subject: [PATCH 10/21] Add files via upload

---
 applet-mdflash.bin | Bin 0 -> 1504 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 applet-mdflash.bin

diff --git a/applet-mdflash.bin b/applet-mdflash.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2fd3e18f4e63332522f4329b048c61bb0450e17e
GIT binary patch
literal 1504
zcmdT@O>7%Q6rS;JVyAJ59hW9{DV}E2Vq(<^X#}l(S?{`Qk|nkHRa%7DEfU(Lf?6#|
zL0q=^L69g?rCg#!oJ^rrIJAy}nuBGkHgNUYDN2<dqDE!&1C@zwX={+e+muuYA#p^k
z^mg8R^S*E1d^6+v9uw~nCg^|qU9D*Cjf=a)QzLo%@3;HpIv=W_^Sk<3lMYUBRh{a2
zbz})<5J|?H!4Qk07N%~oR_xituk^{2+9T}aimX+04Qf1#ySI7Ww;KagZg0Sra|d?o
zCuO_HmJhNMf5X)Pdy}=oHoitgb(1P)s46PDIA^w5u=pR%*?Y!SzDQH!vPb31h~kSZ
z<&i1zrOhszPlGB4bO1dhXB{WLD<xWQloAKO;qV<`$PnRb90jU6?)oxaHc<BD1x(CY
zQr>#QDLg40D*9_j=VmMD?LCDj5_AQ<{`|f~8J#;Iba=1Fo97_&;U%u3o0$&5E=~Z`
zYR=5G30q9+HQbp7Tvfkk+|V$ofE`{l`LklO*QcB<MQuLm198VIn5fmt-GuQy(J3T~
z$T1O5lr?7FMB2PbYts^}dwxSAOi(_gOe<~b%x{~eGqQ{MTA7xw2tUrfC9X&t%09dy
zGxD^OlFq29fuOoFu%V<NURSL8b!9~cR^IZN)9*^hmt&zOJ)3SHI?+345~QVB>N4!Y
z)FJA)r{E(~=_}w_(Nubz`?-La`ej?FOJ6WuT2SF*GZigC=Mj^VY|J~-{^fx3tg>J_
zFGfUsEE?;Mu`x@P2YNsWDlhc%v8D7(b+Ghioxl3|<}rbdU5?)}9T!pHx-LnKvcxme
z@gq-XLt<^q<Y`1QtL7jTa_T<;`hfaC_QpDeqrx+w^jFd?Q02Z64b|wa;*=VZHq?|<
zHt3K;S5;2<n0FKZ_K94|jTki{`p;}5DH&Xd(!JZ5y9N*VCb6)Fm><9v4136~qxR7p
zYH<q<;$AWlA2y1iYdU6_3mV)HbQH16!<e8wi2DfciVNPmb+%uCKM#foj*eOHpP;DM
zis9ZNRzr$Figr9EcxTUj>xOebHRtYj_cXpZz%>?N>_%h+Jlx`w4zF$b8@d}r3~Ogr
zxBQt^FFPzG<1d?Zf-`CHz5)Mw1A1|MipgE*#p-9roRDLopZx=v3<=S7M0tu7^}f!A
zqXl4yz&nooS0fwF<U2au|JsKu{7c^1S@XD#4nNG(osL}I{#4d&;s^r6h5FAZO#)p&
zhc-`P)IOGT!A?hVH-Dw6yl?3*wOZjh(-t9MpBQxbP63B^SRUr<`>CYZ&nHLw2a^_C
QZ;Xo~(9hCv>mR;90C`Xbpa1{>

literal 0
HcmV?d00001


From 8c4896330a7c29db5dbd2f99fa849c30d2d1197e Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Tue, 6 Oct 2020 15:19:08 -0700
Subject: [PATCH 11/21] Delete applet-flash-samd51j18a.bin

---
 applet-flash-samd51j18a.bin | Bin 1504 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 applet-flash-samd51j18a.bin

diff --git a/applet-flash-samd51j18a.bin b/applet-flash-samd51j18a.bin
deleted file mode 100644
index 2fd3e18f4e63332522f4329b048c61bb0450e17e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1504
zcmdT@O>7%Q6rS;JVyAJ59hW9{DV}E2Vq(<^X#}l(S?{`Qk|nkHRa%7DEfU(Lf?6#|
zL0q=^L69g?rCg#!oJ^rrIJAy}nuBGkHgNUYDN2<dqDE!&1C@zwX={+e+muuYA#p^k
z^mg8R^S*E1d^6+v9uw~nCg^|qU9D*Cjf=a)QzLo%@3;HpIv=W_^Sk<3lMYUBRh{a2
zbz})<5J|?H!4Qk07N%~oR_xituk^{2+9T}aimX+04Qf1#ySI7Ww;KagZg0Sra|d?o
zCuO_HmJhNMf5X)Pdy}=oHoitgb(1P)s46PDIA^w5u=pR%*?Y!SzDQH!vPb31h~kSZ
z<&i1zrOhszPlGB4bO1dhXB{WLD<xWQloAKO;qV<`$PnRb90jU6?)oxaHc<BD1x(CY
zQr>#QDLg40D*9_j=VmMD?LCDj5_AQ<{`|f~8J#;Iba=1Fo97_&;U%u3o0$&5E=~Z`
zYR=5G30q9+HQbp7Tvfkk+|V$ofE`{l`LklO*QcB<MQuLm198VIn5fmt-GuQy(J3T~
z$T1O5lr?7FMB2PbYts^}dwxSAOi(_gOe<~b%x{~eGqQ{MTA7xw2tUrfC9X&t%09dy
zGxD^OlFq29fuOoFu%V<NURSL8b!9~cR^IZN)9*^hmt&zOJ)3SHI?+345~QVB>N4!Y
z)FJA)r{E(~=_}w_(Nubz`?-La`ej?FOJ6WuT2SF*GZigC=Mj^VY|J~-{^fx3tg>J_
zFGfUsEE?;Mu`x@P2YNsWDlhc%v8D7(b+Ghioxl3|<}rbdU5?)}9T!pHx-LnKvcxme
z@gq-XLt<^q<Y`1QtL7jTa_T<;`hfaC_QpDeqrx+w^jFd?Q02Z64b|wa;*=VZHq?|<
zHt3K;S5;2<n0FKZ_K94|jTki{`p;}5DH&Xd(!JZ5y9N*VCb6)Fm><9v4136~qxR7p
zYH<q<;$AWlA2y1iYdU6_3mV)HbQH16!<e8wi2DfciVNPmb+%uCKM#foj*eOHpP;DM
zis9ZNRzr$Figr9EcxTUj>xOebHRtYj_cXpZz%>?N>_%h+Jlx`w4zF$b8@d}r3~Ogr
zxBQt^FFPzG<1d?Zf-`CHz5)Mw1A1|MipgE*#p-9roRDLopZx=v3<=S7M0tu7^}f!A
zqXl4yz&nooS0fwF<U2au|JsKu{7c^1S@XD#4nNG(osL}I{#4d&;s^r6h5FAZO#)p&
zhc-`P)IOGT!A?hVH-Dw6yl?3*wOZjh(-t9MpBQxbP63B^SRUr<`>CYZ&nHLw2a^_C
QZ;Xo~(9hCv>mR;90C`Xbpa1{>


From 9df711a7c2df36ad9efae34fb7302ecbfa49c0a6 Mon Sep 17 00:00:00 2001
From: dropfelix <71285757+dropfelix@users.noreply.github.com>
Date: Tue, 6 Oct 2020 15:38:18 -0700
Subject: [PATCH 12/21] Update mdloader_common.h

---
 mdloader_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mdloader_common.h b/mdloader_common.h
index 379c00d..0bd8575 100644
--- a/mdloader_common.h
+++ b/mdloader_common.h
@@ -22,7 +22,7 @@
 
 #define PROGRAM_NAME  "Massdrop Loader"
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 4 //0-99
+#define VERSION_MINOR 5 //0-99
 
 #ifdef _WIN32
 #define INITGUID

From 5c4895affadd93d5b6879abd3735f196034c332a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 1 Oct 2021 01:01:38 +0100
Subject: [PATCH 13/21] Build via GitHub Actions (#60)

* Initial CI workflow

* bind more events
---
 .github/workflows/build.yml | 72 +++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..25880bf
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,72 @@
+name: CI
+
+on:
+  push:
+    branches:
+    - master
+  release:
+    types:
+      - published
+  pull_request:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, windows-2016, ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Compile and Package
+      shell: bash
+      run: |
+        make clean all
+        7z a ./build/mdloader-${RUNNER_OS}.zip ./build/mdloader*
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.os }}
+        path: build/mdloader*.zip
+
+  publish_release:
+    name: Publish (Release)
+    runs-on: ubuntu-latest
+
+    needs: [build]
+
+    if: github.event.release.tag_name
+
+    steps:
+    - uses: actions/download-artifact@v2
+
+    - uses: softprops/action-gh-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        name: ${{ github.event.release.name }}
+        files: |
+          ./*/mdloader*
+
+  publish_beta:
+    name: Publish (Beta)
+    runs-on: ubuntu-latest
+
+    needs: [build]
+
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+
+    steps:
+    - uses: actions/download-artifact@v2
+
+    - uses: marvinpinto/action-automatic-releases@latest
+      with:
+        repo_token: "${{ secrets.GITHUB_TOKEN }}"
+        automatic_release_tag: "beta"
+        prerelease: true
+        title: "Latest Beta"
+        files: |
+          ./*/mdloader*

From 81765349cdfc4c16959d834b523bfce5775452d1 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 5 Oct 2021 06:12:27 +0100
Subject: [PATCH 14/21] Bundle applet-mdflash.bin into executable (#61)

* Bundle applet-mdflash.bin into exe

* incbin

* fix read logic

* strip out alloc+copy logic
---
 Makefile                   |   2 -
 incbin/.travis.yml         |  12 ++
 incbin/README.md           | 167 +++++++++++++++++
 incbin/UNLICENSE           |  24 +++
 incbin/incbin.c            | 291 +++++++++++++++++++++++++++++
 incbin/incbin.h            | 368 +++++++++++++++++++++++++++++++++++++
 incbin/test/.gitignore     |   1 +
 incbin/test/Makefile       |   5 +
 incbin/test/asserts.c      |  20 ++
 incbin/test/loremipsum.txt |   1 +
 incbin/test/onebyte.txt    |   1 +
 incbin/test/sevenbytes.txt |   1 +
 mdloader_common.c          | 107 +++--------
 13 files changed, 919 insertions(+), 81 deletions(-)
 create mode 100644 incbin/.travis.yml
 create mode 100644 incbin/README.md
 create mode 100644 incbin/UNLICENSE
 create mode 100644 incbin/incbin.c
 create mode 100644 incbin/incbin.h
 create mode 100644 incbin/test/.gitignore
 create mode 100644 incbin/test/Makefile
 create mode 100644 incbin/test/asserts.c
 create mode 100644 incbin/test/loremipsum.txt
 create mode 100644 incbin/test/onebyte.txt
 create mode 100644 incbin/test/sevenbytes.txt

diff --git a/Makefile b/Makefile
index cbffc63..599496b 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,6 @@ OBJFILES = $(patsubst %.c,%.o,$(SRCFILES))
 OBJS = $(addprefix $(OBJDIR)/,$(OBJFILES))
 
 all: $(OBJDIR)/$(OUTNAME)
-	$(info Copying applets to ${OBJDIR}...)
-	@cp applet-*.bin $(OBJDIR)
 	$(info Done!)
 
 $(OBJDIR)/$(OUTNAME): $(OBJS)
diff --git a/incbin/.travis.yml b/incbin/.travis.yml
new file mode 100644
index 0000000..4337da6
--- /dev/null
+++ b/incbin/.travis.yml
@@ -0,0 +1,12 @@
+language: c
+
+os:
+- linux
+- osx
+
+compiler:
+- gcc
+- clang
+
+script:
+- make -C test test
diff --git a/incbin/README.md b/incbin/README.md
new file mode 100644
index 0000000..cada41f
--- /dev/null
+++ b/incbin/README.md
@@ -0,0 +1,167 @@
+# incbin
+
+Include binary files in your C/C++ applications with ease
+
+## Example
+
+``` c
+    #include "incbin.h"
+
+    INCBIN(Icon, "icon.png");
+
+    // This translation unit now has three symbols
+    // const unsigned char gIconData[];
+    // const unsigned char *const gIconEnd; // a marker to the end, take the address to get the ending pointer
+    // const unsigned int gIconSize;
+
+    // Reference in other translation units like this
+    INCBIN_EXTERN(Icon);
+
+    // This translation unit now has three extern symbols
+    // Use `extern "C"` in case of writing C++ code
+    // extern const unsigned char gIconData[];
+    // extern const unsigned char *const gIconEnd; // a marker to the end, take the address to get the ending pointer
+    // extern const unsigned int gIconSize;
+```
+
+## Portability
+
+Known to work on the following compilers
+
+* GCC
+* Clang
+* PathScale
+* Intel
+* Solaris & Sun Studio
+* Green Hills
+* SNC (ProDG)
+* Diab C++ (WindRiver)
+* XCode
+* ArmCC
+* RealView
+* ImageCraft
+* Stratus VOS C
+* TinyCC
+* cparser & libfirm
+* LCC
+* MSVC _See MSVC below_
+
+If your compiler is not listed, as long as it supports GCC inline assembler, this
+should work.
+
+## MISRA
+INCBIN can be used in MISRA C setting. However it should be independently checked
+due to its use of inline assembly to achieve what it does. Independent verification
+of the header has been done several times based on commit: 7e327a28ba5467c4202ec37874beca7084e4b08c
+
+## Alignment
+
+The data included by this tool will be aligned on the architectures word boundary
+unless some variant of SIMD is detected, then it's aligned on a byte boundary that
+respects SIMD convention just incase your binary data may be used in vectorized
+code. The table of the alignments for SIMD this header recognizes is as follows:
+
+| SIMD                                    | Alignment |
+|-----------------------------------------|-----------|
+| SSE, SSE2, SSE3, SSSE3, SSE4.1, SSE4.2  | 16        |
+| Neon                                    | 16        |
+| AVX, AVX2                               | 32        |
+| AVX512                                  | 64        |
+
+## Prefix
+By default, `incbin.h` emits symbols with a `g` prefix. This can be adjusted by
+defining `INCBIN_PREFIX` before including `incbin.h` with a desired prefix. For
+instance
+
+``` c
+    #define INCBIN_PREFIX g_
+    #include "incbin.h"
+    INCBIN(test, "test.txt");
+
+    // This translation unit now has three symbols
+    // const unsigned char g_testData[];
+    // const unsigned char *const g_testEnd;
+    // const unsigned int g_testSize;
+```
+
+You can also choose to have no prefix by defining the prefix with nothing, for example:
+
+``` c
+    #define INCBIN_PREFIX
+    #include "incbin.h"
+    INCBIN(test, "test.txt");
+
+    // This translation unit now has three symbols
+    // const unsigned char testData[];
+    // const unsigned char *const testEnd;
+    // const unsigned int testSize;
+```
+
+## Style
+By default, `incbin.h` emits symbols with `CamelCase` style. This can be adjusted
+by defining `INCBIN_STYLE` before including `incbin.h` to change the style. There
+are two possible styles to choose from
+
+* INCBIN_STYLE_CAMEL (CamelCase)
+* INCBIN_STYLE_SNAKE (snake_case)
+
+For instance:
+
+``` c
+    #define INCBIN_STYLE INCBIN_STYLE_SNAKE
+    #include "incbin.h"
+    INCBIN(test, "test.txt");
+
+    // This translation unit now has three symbols
+    // const unsigned char gtest_data[];
+    // const unsigned char *const gtest_end;
+    // const unsigned int gtest_size;
+```
+
+Combining both the style and prefix allows for you to adjust `incbin.h` to suite
+your existing style and practices.
+
+## Overriding Linker Output section
+By default, `incbin.h` emits into the read-only linker output section used on
+the detected platform. If you need to override this for whatever reason, you
+can manually specify the linker output section.
+
+For example, to emit data into program memory for
+[esp8266/Arduino](github.com/esp8266/Arduino):
+
+``` c
+#define INCBIN_OUTPUT_SECTION ".irom.text"
+#include "incbin.h"
+INCBIN(Foo, "foo.txt");
+// Data is emitted into program memory that never gets copied to RAM
+```
+
+## Explanation
+
+`INCBIN` is a macro which uses the inline assembler provided by almost all
+compilers to include binary files. It achieves this by utilizing the `.incbin`
+directive of the inline assembler. It then uses the assembler to calculate the
+size of the included binary and exports two global symbols that can be externally
+referenced in other translation units which contain the data and size of the
+included binary data respectively.
+
+## MSVC
+
+Supporting MSVC is slightly harder as MSVC lacks an inline assembler which can
+include data. To support this we ship a tool which can process source files
+containing `INCBIN` macro usage and generate an external source file containing
+the data of all of them combined. This file is named `data.c` by default.
+Just include it into your build and use the `incbin.h` to reference data as
+needed. It's suggested you integrate this tool as part of your projects's
+pre-build events so that this can be automated. A more comprehensive list of
+options for this tool can be viewed by invoking the tool with `-help`
+
+If you're using a custom prefix, be sure to specify the prefix on the command
+line with `-p <prefix>` so that everything matches up; similarly, if you're
+using a custom style, be sure to specify the style on the command line with
+`-S <style>` as well.
+
+## Miscellaneous
+
+Documentation for the API is provided by the header using Doxygen notation.
+For licensing information see UNLICENSE.
diff --git a/incbin/UNLICENSE b/incbin/UNLICENSE
new file mode 100644
index 0000000..68a49da
--- /dev/null
+++ b/incbin/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org/>
diff --git a/incbin/incbin.c b/incbin/incbin.c
new file mode 100644
index 0000000..f162d36
--- /dev/null
+++ b/incbin/incbin.c
@@ -0,0 +1,291 @@
+#ifdef _MSC_VER
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <limits.h>
+
+#ifndef PATH_MAX
+#  define PATH_MAX 260
+#endif
+
+#define SEARCH_PATHS_MAX 64
+#define FILE_PATHS_MAX 1024
+
+static int fline(char **line, size_t *n, FILE *fp) {
+    int chr;
+    char *pos;
+    if (!line || !n || !fp)
+        return -1;
+    if (!*line)
+        if (!(*line = (char *)malloc((*n=64))))
+            return -1;
+    chr = *n;
+    pos = *line;
+    for (;;) {
+        int c = fgetc(fp);
+        if (chr < 2) {
+            *n += (*n > 16) ? *n : 64;
+            chr = *n + *line - pos;
+            if (!(*line = (char *)realloc(*line,*n)))
+                return -1;
+            pos = *n - chr + *line;
+        }
+        if (ferror(fp))
+            return -1;
+        if (c == EOF) {
+            if (pos == *line)
+                return -1;
+            else
+                break;
+        }
+        *pos++ = c;
+        chr--;
+        if (c == '\n')
+            break;
+    }
+    *pos = '\0';
+    return pos - *line;
+}
+
+static FILE *open_file(const char *name, const char *mode, const char (*searches)[PATH_MAX], int count) {
+    int i;
+    for (i = 0; i < count; i++) {
+        char buffer[FILENAME_MAX + PATH_MAX];
+        FILE *fp;
+#ifndef _MSC_VER
+        snprintf(buffer, sizeof(buffer), "%s/%s", searches[i], name);
+#else
+        _snprintf(buffer, sizeof(buffer), "%s/%s", searches[i], name);
+#endif
+        if ((fp = fopen(buffer, mode)))
+            return fp;
+    }
+    return !count ? fopen(name, mode) : NULL;
+}
+
+static int strcicmp(const char *s1, const char *s2) {
+    const unsigned char *us1 = (const unsigned char *)s1,
+                        *us2 = (const unsigned char *)s2;
+    while (tolower(*us1) == tolower(*us2)) {
+        if (*us1++ == '\0')
+            return 0;
+        us2++;
+    }
+    return tolower(*us1) - tolower(*us2);
+}
+
+/* styles */
+enum { kCamel, kSnake };
+/* identifiers */
+enum { kData, kEnd, kSize };
+
+static const char *styled(int style, int ident) {
+    switch (style) {
+    case kCamel:
+        switch (ident) {
+        case kData: return "Data";
+        case kEnd: return "End";
+        case kSize: return "Size";
+        }
+        break;
+    case kSnake:
+        switch (ident) {
+        case kData: return "_data";
+        case kEnd: return "_end";
+        case kSize: return "_size";
+        }
+        break;
+    }
+    return "";
+}
+
+int main(int argc, char **argv) {
+    int ret = 0, i, paths, files = 0, style = kCamel;
+    char outfile[FILENAME_MAX] = "data.c";
+    char search_paths[SEARCH_PATHS_MAX][PATH_MAX];
+    char prefix[FILENAME_MAX] = "g";
+    char file_paths[FILE_PATHS_MAX][PATH_MAX];
+    FILE *out = NULL;
+
+    argc--;
+    argv++;
+
+    #define s(IDENT) styled(style, IDENT)
+
+    if (argc == 0) {
+usage:
+        fprintf(stderr, "%s [-help] [-Ipath...] | <files> | [-o output] | [-p prefix]\n", argv[-1]);
+        fprintf(stderr, "   -o         - output file [default is \"data.c\"]\n");
+        fprintf(stderr, "   -p         - specify a prefix for symbol names (default is \"g\")\n");
+        fprintf(stderr, "   -S<style>  - specify a style for symbol generation (default is \"camelcase\")\n");
+        fprintf(stderr, "   -I<path>   - specify an include path for the tool to use\n");
+        fprintf(stderr, "   -help      - this\n");
+        fprintf(stderr, "example:\n");
+        fprintf(stderr, "   %s icon.png music.mp3 -o file.c\n", argv[-1]);
+        fprintf(stderr, "styles (for -S):\n");
+        fprintf(stderr, "   camelcase\n");
+        fprintf(stderr, "   snakecase\n");
+        return 1;
+    }
+
+    for (i = 0, paths = 0; i < argc; i++) {
+        if (!strcmp(argv[i], "-o")) {
+            if (i + 1 < argc) {
+                strcpy(outfile, argv[i + 1]);
+                memmove(argv+i+1, argv+i+2, (argc-i-2) * sizeof *argv);
+                argc--;
+                continue;
+            }
+        } else if (!strcmp(argv[i], "-p")) {
+            /* supports "-p" with no prefix as well as
+             * "-p -" which is another way of saying "no prefix"
+             * and "-p <prefix>" for an actual prefix.
+             */
+            if (argv[i+1][0] == '-') {
+                prefix[0] = '\0';
+                /* is it just a -? */
+                if (i + 1 < argc && !strcmp(argv[i+1], "-")) {
+                    memmove(argv+i+1, argv+i+2, (argc-i-2) * sizeof *argv);
+                    argc--;
+                }
+                continue;
+            }
+            strcpy(prefix, argv[i + 1]);
+            memmove(argv+i+1, argv+i+2, (argc-i-2) * sizeof *argv);
+            argc--;
+            continue;
+        } else if (!strncmp(argv[i], "-I", 2)) {
+            char *name = argv[i] + 2; /* skip "-I"; */
+            if (paths >= SEARCH_PATHS_MAX) {
+                fprintf(stderr, "maximum search paths exceeded\n");
+                return 1;
+            }
+            strcpy(search_paths[paths++], name);
+            continue;
+        } else if (!strncmp(argv[i], "-S", 2)) {
+            char *name = argv[i] + 2; /* skip "-S"; */
+            if (!strcicmp(name, "camel") || !strcicmp(name, "camelcase"))
+                style = kCamel;
+            else if (!strcicmp(name, "snake") || !strcicmp(name, "snakecase"))
+                style = kSnake;
+            else
+                goto usage;
+            continue;
+        } else if (!strcmp(argv[i], "-help")) {
+            goto usage;
+        } else {
+            if (files >= sizeof file_paths / sizeof *file_paths) {
+                fprintf(stderr, "maximum file paths exceeded\n");
+                return 1;
+            }
+            strcpy(file_paths[files++], argv[i]);
+        }
+    }
+
+    if (!(out = fopen(outfile, "w"))) {
+        fprintf(stderr, "failed to open `%s' for output\n", outfile);
+        return 1;
+    }
+
+    fprintf(out, "/* File automatically generated by incbin */\n");
+    /* Be sure to define the prefix if we're not using the default */
+    if (strcmp(prefix, "g"))
+        fprintf(out, "#define INCBIN_PREFIX %s\n", prefix);
+    if (style != 0)
+        fprintf(out, "#define INCBIN_STYLE INCBIN_STYLE_SNAKE\n");
+    fprintf(out, "#include \"incbin.h\"\n\n");
+    fprintf(out, "#ifdef __cplusplus\n");
+    fprintf(out, "extern \"C\" {\n");
+    fprintf(out, "#endif\n\n");
+
+    for (i = 0; i < files; i++) {
+        FILE *fp = open_file(file_paths[i], "r", search_paths, paths);
+        char *line = NULL;
+        size_t size = 0;
+        if (!fp) {
+            fprintf(stderr, "failed to open `%s' for reading\n", file_paths[i]);
+            fclose(out);
+            return 1;
+        }
+        while (fline(&line, &size, fp) != -1) {
+            char *inc, *beg, *sep, *end, *name, *file;
+            FILE *f;
+            if (!(inc = strstr(line, "INCBIN"))) continue;
+            if (!(beg = strchr(inc, '(')))       continue;
+            if (!(sep = strchr(beg, ',')))       continue;
+            if (!(end = strchr(sep, ')')))       continue;
+            name = beg + 1;
+            file = sep + 1;
+            while (isspace(*name)) name++;
+            while (isspace(*file)) file++;
+            sep--;
+            while (isspace(*sep)) sep--;
+            *++sep = '\0';
+            end--;
+            while (isspace(*end)) end--;
+            *++end = '\0';
+            fprintf(out, "/* INCBIN(%s, %s); */\n", name, file);
+            fprintf(out, "INCBIN_CONST INCBIN_ALIGN unsigned char %s%s%s[] = {\n    ", prefix, name, s(kData));
+            *--end = '\0';
+            file++;
+            if (!(f = open_file(file, "rb", search_paths, paths))) {
+                fprintf(stderr, "failed to include data `%s'\n", file);
+                ret = 1;
+                goto end;
+            } else {
+                long size, i;
+                unsigned char *data, count = 0;
+                fseek(f, 0, SEEK_END);
+                size = ftell(f);
+                fseek(f, 0, SEEK_SET);
+                if (!(data = (unsigned char *)malloc(size))) {
+                    fprintf(stderr, "out of memory\n");
+                    fclose(f);
+                    ret = 1;
+                    goto end;
+                }
+                if (fread(data, size, 1, f) != 1) {
+                    fprintf(stderr, "failed reading include data `%s'\n", file);
+                    free(data);
+                    fclose(f);
+                    ret = 1;
+                    goto end;
+                }
+                for (i = 0; i < size; i++) {
+                    if (count == 12) {
+                        fprintf(out, "\n    ");
+                        count = 0;
+                    }
+                    fprintf(out, i != size - 1 ? "0x%02X, " : "0x%02X", data[i]);
+                    count++;
+                }
+                free(data);
+                fclose(f);
+            }
+            fprintf(out, "\n};\n");
+            fprintf(out, "INCBIN_CONST INCBIN_ALIGN unsigned char *const %s%s%s = %s%s%s + sizeof(%s%s%s);\n", prefix, name, s(kEnd), prefix, name, s(kData), prefix, name, s(kData));
+            fprintf(out, "INCBIN_CONST unsigned int %s%s%s = sizeof(%s%s%s);\n", prefix, name, s(kSize), prefix, name, s(kData));
+        }
+end:
+        free(line);
+        fclose(fp);
+        printf("included `%s'\n", file_paths[i]);
+    }
+
+    if (ret == 0) {
+        fprintf(out, "\n#ifdef __cplusplus\n");
+        fprintf(out, "}\n");
+        fprintf(out, "#endif\n");
+        fclose(out);
+        printf("generated `%s'\n", outfile);
+        return 0;
+    }
+
+    fclose(out);
+    remove(outfile);
+    return 1;
+}
diff --git a/incbin/incbin.h b/incbin/incbin.h
new file mode 100644
index 0000000..c19684d
--- /dev/null
+++ b/incbin/incbin.h
@@ -0,0 +1,368 @@
+/**
+ * @file incbin.h
+ * @author Dale Weiler
+ * @brief Utility for including binary files
+ *
+ * Facilities for including binary files into the current translation unit and
+ * making use from them externally in other translation units.
+ */
+#ifndef INCBIN_HDR
+#define INCBIN_HDR
+#include <limits.h>
+#if   defined(__AVX512BW__) || \
+      defined(__AVX512CD__) || \
+      defined(__AVX512DQ__) || \
+      defined(__AVX512ER__) || \
+      defined(__AVX512PF__) || \
+      defined(__AVX512VL__) || \
+      defined(__AVX512F__)
+# define INCBIN_ALIGNMENT_INDEX 6
+#elif defined(__AVX__)      || \
+      defined(__AVX2__)
+# define INCBIN_ALIGNMENT_INDEX 5
+#elif defined(__SSE__)      || \
+      defined(__SSE2__)     || \
+      defined(__SSE3__)     || \
+      defined(__SSSE3__)    || \
+      defined(__SSE4_1__)   || \
+      defined(__SSE4_2__)   || \
+      defined(__neon__)
+# define INCBIN_ALIGNMENT_INDEX 4
+#elif ULONG_MAX != 0xffffffffu
+# define INCBIN_ALIGNMENT_INDEX 3
+# else
+# define INCBIN_ALIGNMENT_INDEX 2
+#endif
+
+/* Lookup table of (1 << n) where `n' is `INCBIN_ALIGNMENT_INDEX' */
+#define INCBIN_ALIGN_SHIFT_0 1
+#define INCBIN_ALIGN_SHIFT_1 2
+#define INCBIN_ALIGN_SHIFT_2 4
+#define INCBIN_ALIGN_SHIFT_3 8
+#define INCBIN_ALIGN_SHIFT_4 16
+#define INCBIN_ALIGN_SHIFT_5 32
+#define INCBIN_ALIGN_SHIFT_6 64
+
+/* Actual alignment value */
+#define INCBIN_ALIGNMENT \
+    INCBIN_CONCATENATE( \
+        INCBIN_CONCATENATE(INCBIN_ALIGN_SHIFT, _), \
+        INCBIN_ALIGNMENT_INDEX)
+
+/* Stringize */
+#define INCBIN_STR(X) \
+    #X
+#define INCBIN_STRINGIZE(X) \
+    INCBIN_STR(X)
+/* Concatenate */
+#define INCBIN_CAT(X, Y) \
+    X ## Y
+#define INCBIN_CONCATENATE(X, Y) \
+    INCBIN_CAT(X, Y)
+/* Deferred macro expansion */
+#define INCBIN_EVAL(X) \
+    X
+#define INCBIN_INVOKE(N, ...) \
+    INCBIN_EVAL(N(__VA_ARGS__))
+
+/* Green Hills uses a different directive for including binary data */
+#if defined(__ghs__)
+#  if (__ghs_asm == 2)
+#    define INCBIN_MACRO ".file"
+/* Or consider the ".myrawdata" entry in the ld file */
+#  else
+#    define INCBIN_MACRO "\tINCBIN"
+#  endif
+#else
+#  define INCBIN_MACRO ".incbin"
+#endif
+
+#ifndef _MSC_VER
+#  define INCBIN_ALIGN \
+    __attribute__((aligned(INCBIN_ALIGNMENT)))
+#else
+#  define INCBIN_ALIGN __declspec(align(INCBIN_ALIGNMENT))
+#endif
+
+#if defined(__arm__) || /* GNU C and RealView */ \
+    defined(__arm) || /* Diab */ \
+    defined(_ARM) /* ImageCraft */
+#  define INCBIN_ARM
+#endif
+
+#ifdef __GNUC__
+/* Utilize .balign where supported */
+#  define INCBIN_ALIGN_HOST ".balign " INCBIN_STRINGIZE(INCBIN_ALIGNMENT) "\n"
+#  define INCBIN_ALIGN_BYTE ".balign 1\n"
+#elif defined(INCBIN_ARM)
+/*
+ * On arm assemblers, the alignment value is calculated as (1 << n) where `n' is
+ * the shift count. This is the value passed to `.align'
+ */
+#  define INCBIN_ALIGN_HOST ".align " INCBIN_STRINGIZE(INCBIN_ALIGNMENT_INDEX) "\n"
+#  define INCBIN_ALIGN_BYTE ".align 0\n"
+#else
+/* We assume other inline assembler's treat `.align' as `.balign' */
+#  define INCBIN_ALIGN_HOST ".align " INCBIN_STRINGIZE(INCBIN_ALIGNMENT) "\n"
+#  define INCBIN_ALIGN_BYTE ".align 1\n"
+#endif
+
+/* INCBIN_CONST is used by incbin.c generated files */
+#if defined(__cplusplus)
+#  define INCBIN_EXTERNAL extern "C"
+#  define INCBIN_CONST    extern const
+#else
+#  define INCBIN_EXTERNAL extern
+#  define INCBIN_CONST    const
+#endif
+
+/**
+ * @brief Optionally override the linker section into which data is emitted.
+ *
+ * @warning If you use this facility, you'll have to deal with platform-specific linker output
+ * section naming on your own
+ *
+ * Overriding the default linker output section, e.g for esp8266/Arduino:
+ * @code
+ * #define INCBIN_OUTPUT_SECTION ".irom.text"
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ * // Data is emitted into program memory that never gets copied to RAM
+ * @endcode
+ */
+#if !defined(INCBIN_OUTPUT_SECTION)
+#  if defined(__APPLE__)
+#    define INCBIN_OUTPUT_SECTION         ".const_data"
+#  else
+#    define INCBIN_OUTPUT_SECTION         ".rodata"
+#  endif
+#endif
+
+#if defined(__APPLE__)
+/* The directives are different for Apple branded compilers */
+#  define INCBIN_SECTION         INCBIN_OUTPUT_SECTION "\n"
+#  define INCBIN_GLOBAL(NAME)    ".globl " INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "\n"
+#  define INCBIN_INT             ".long "
+#  define INCBIN_MANGLE          "_"
+#  define INCBIN_BYTE            ".byte "
+#  define INCBIN_TYPE(...)
+#else
+#  define INCBIN_SECTION         ".section " INCBIN_OUTPUT_SECTION "\n"
+#  define INCBIN_GLOBAL(NAME)    ".global " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "\n"
+#  if defined(__ghs__)
+#    define INCBIN_INT           ".word "
+#  else
+#    define INCBIN_INT           ".int "
+#  endif
+#  if defined(__USER_LABEL_PREFIX__)
+#    define INCBIN_MANGLE        INCBIN_STRINGIZE(__USER_LABEL_PREFIX__)
+#  else
+#    define INCBIN_MANGLE        ""
+#  endif
+#  if defined(INCBIN_ARM)
+/* On arm assemblers, `@' is used as a line comment token */
+#    define INCBIN_TYPE(NAME)    ".type " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME ", %object\n"
+#  elif defined(__MINGW32__) || defined(__MINGW64__)
+/* Mingw doesn't support this directive either */
+#    define INCBIN_TYPE(NAME)
+#  else
+/* It's safe to use `@' on other architectures */
+#    define INCBIN_TYPE(NAME)    ".type " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME ", @object\n"
+#  endif
+#  define INCBIN_BYTE            ".byte "
+#endif
+
+/* List of style types used for symbol names */
+#define INCBIN_STYLE_CAMEL 0
+#define INCBIN_STYLE_SNAKE 1
+
+/**
+ * @brief Specify the prefix to use for symbol names.
+ *
+ * By default this is `g', producing symbols of the form:
+ * @code
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char gFooData[];
+ * // const unsigned char *const gFooEnd;
+ * // const unsigned int gFooSize;
+ * @endcode
+ *
+ * If however you specify a prefix before including: e.g:
+ * @code
+ * #define INCBIN_PREFIX incbin
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ *
+ * // Now you have the following symbols instead:
+ * // const unsigned char incbinFooData[];
+ * // const unsigned char *const incbinFooEnd;
+ * // const unsigned int incbinFooSize;
+ * @endcode
+ */
+#if !defined(INCBIN_PREFIX)
+#  define INCBIN_PREFIX g
+#endif
+
+/**
+ * @brief Specify the style used for symbol names.
+ *
+ * Possible options are
+ * - INCBIN_STYLE_CAMEL "CamelCase"
+ * - INCBIN_STYLE_SNAKE "snake_case"
+ *
+ * Default option is *INCBIN_STYLE_CAMEL* producing symbols of the form:
+ * @code
+ * #include "incbin.h"
+ * INCBIN(Foo, "foo.txt");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char <prefix>FooData[];
+ * // const unsigned char *const <prefix>FooEnd;
+ * // const unsigned int <prefix>FooSize;
+ * @endcode
+ *
+ * If however you specify a style before including: e.g:
+ * @code
+ * #define INCBIN_STYLE INCBIN_STYLE_SNAKE
+ * #include "incbin.h"
+ * INCBIN(foo, "foo.txt");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char <prefix>foo_data[];
+ * // const unsigned char *const <prefix>foo_end;
+ * // const unsigned int <prefix>foo_size;
+ * @endcode
+ */
+#if !defined(INCBIN_STYLE)
+#  define INCBIN_STYLE INCBIN_STYLE_CAMEL
+#endif
+
+/* Style lookup tables */
+#define INCBIN_STYLE_0_DATA Data
+#define INCBIN_STYLE_0_END End
+#define INCBIN_STYLE_0_SIZE Size
+#define INCBIN_STYLE_1_DATA _data
+#define INCBIN_STYLE_1_END _end
+#define INCBIN_STYLE_1_SIZE _size
+
+/* Style lookup: returning identifier */
+#define INCBIN_STYLE_IDENT(TYPE) \
+    INCBIN_CONCATENATE( \
+        INCBIN_STYLE_, \
+        INCBIN_CONCATENATE( \
+            INCBIN_EVAL(INCBIN_STYLE), \
+            INCBIN_CONCATENATE(_, TYPE)))
+
+/* Style lookup: returning string literal */
+#define INCBIN_STYLE_STRING(TYPE) \
+    INCBIN_STRINGIZE( \
+        INCBIN_STYLE_IDENT(TYPE)) \
+
+/* Generate the global labels by indirectly invoking the macro with our style
+ * type and concatenating the name against them. */
+#define INCBIN_GLOBAL_LABELS(NAME, TYPE) \
+    INCBIN_INVOKE( \
+        INCBIN_GLOBAL, \
+        INCBIN_CONCATENATE( \
+            NAME, \
+            INCBIN_INVOKE( \
+                INCBIN_STYLE_IDENT, \
+                TYPE))) \
+    INCBIN_INVOKE( \
+        INCBIN_TYPE, \
+        INCBIN_CONCATENATE( \
+            NAME, \
+            INCBIN_INVOKE( \
+                INCBIN_STYLE_IDENT, \
+                TYPE)))
+
+/**
+ * @brief Externally reference binary data included in another translation unit.
+ *
+ * Produces three external symbols that reference the binary data included in
+ * another translation unit.
+ *
+ * The symbol names are a concatenation of `INCBIN_PREFIX' before *NAME*; with
+ * "Data", as well as "End" and "Size" after. An example is provided below.
+ *
+ * @param NAME The name given for the binary data
+ *
+ * @code
+ * INCBIN_EXTERN(Foo);
+ *
+ * // Now you have the following symbols:
+ * // extern const unsigned char <prefix>FooData[];
+ * // extern const unsigned char *const <prefix>FooEnd;
+ * // extern const unsigned int <prefix>FooSize;
+ * @endcode
+ */
+#define INCBIN_EXTERN(NAME) \
+    INCBIN_EXTERNAL const INCBIN_ALIGN unsigned char \
+        INCBIN_CONCATENATE( \
+            INCBIN_CONCATENATE(INCBIN_PREFIX, NAME), \
+            INCBIN_STYLE_IDENT(DATA))[]; \
+    INCBIN_EXTERNAL const INCBIN_ALIGN unsigned char *const \
+    INCBIN_CONCATENATE( \
+        INCBIN_CONCATENATE(INCBIN_PREFIX, NAME), \
+        INCBIN_STYLE_IDENT(END)); \
+    INCBIN_EXTERNAL const unsigned int \
+        INCBIN_CONCATENATE( \
+            INCBIN_CONCATENATE(INCBIN_PREFIX, NAME), \
+            INCBIN_STYLE_IDENT(SIZE))
+
+/**
+ * @brief Include a binary file into the current translation unit.
+ *
+ * Includes a binary file into the current translation unit, producing three symbols
+ * for objects that encode the data and size respectively.
+ *
+ * The symbol names are a concatenation of `INCBIN_PREFIX' before *NAME*; with
+ * "Data", as well as "End" and "Size" after. An example is provided below.
+ *
+ * @param NAME The name to associate with this binary data (as an identifier.)
+ * @param FILENAME The file to include (as a string literal.)
+ *
+ * @code
+ * INCBIN(Icon, "icon.png");
+ *
+ * // Now you have the following symbols:
+ * // const unsigned char <prefix>IconData[];
+ * // const unsigned char *const <prefix>IconEnd;
+ * // const unsigned int <prefix>IconSize;
+ * @endcode
+ *
+ * @warning This must be used in global scope
+ * @warning The identifiers may be different if INCBIN_STYLE is not default
+ *
+ * To externally reference the data included by this in another translation unit
+ * please @see INCBIN_EXTERN.
+ */
+#ifdef _MSC_VER
+#define INCBIN(NAME, FILENAME) \
+    INCBIN_EXTERN(NAME)
+#else
+#define INCBIN(NAME, FILENAME) \
+    __asm__(INCBIN_SECTION \
+            INCBIN_GLOBAL_LABELS(NAME, DATA) \
+            INCBIN_ALIGN_HOST \
+            INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(DATA) ":\n" \
+            INCBIN_MACRO " \"" FILENAME "\"\n" \
+            INCBIN_GLOBAL_LABELS(NAME, END) \
+            INCBIN_ALIGN_BYTE \
+            INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(END) ":\n" \
+                INCBIN_BYTE "1\n" \
+            INCBIN_GLOBAL_LABELS(NAME, SIZE) \
+            INCBIN_ALIGN_HOST \
+            INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(SIZE) ":\n" \
+                INCBIN_INT INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(END) " - " \
+                           INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME INCBIN_STYLE_STRING(DATA) "\n" \
+            INCBIN_ALIGN_HOST \
+            ".text\n" \
+    ); \
+    INCBIN_EXTERN(NAME)
+
+#endif
+#endif
diff --git a/incbin/test/.gitignore b/incbin/test/.gitignore
new file mode 100644
index 0000000..377c803
--- /dev/null
+++ b/incbin/test/.gitignore
@@ -0,0 +1 @@
+/asserts
diff --git a/incbin/test/Makefile b/incbin/test/Makefile
new file mode 100644
index 0000000..aa31bec
--- /dev/null
+++ b/incbin/test/Makefile
@@ -0,0 +1,5 @@
+test: asserts
+	./asserts
+
+asserts: asserts.c ../incbin.h
+	$(CC) -o asserts asserts.c
diff --git a/incbin/test/asserts.c b/incbin/test/asserts.c
new file mode 100644
index 0000000..9028a2a
--- /dev/null
+++ b/incbin/test/asserts.c
@@ -0,0 +1,20 @@
+#include <assert.h>
+#include <stdlib.h>
+#include "../incbin.h"
+
+INCBIN(Lorem, "loremipsum.txt");
+INCBIN(Onebyte, "onebyte.txt");
+INCBIN(Sevenbytes, "sevenbytes.txt");
+
+int main(int argc, char **argv)
+{
+	assert(gLoremSize==962);
+	assert(&gLoremData[gLoremSize] == (const unsigned char*) &gLoremEnd);
+
+	assert(gOnebyteSize == 1);
+	assert(&gOnebyteData[gOnebyteSize] == (const unsigned char*) &gOnebyteEnd);
+
+	assert(gSevenbytesSize==7);
+	assert(&gSevenbytesData[gSevenbytesSize] == (const unsigned char*) &gSevenbytesEnd);
+	exit(0);
+}
diff --git a/incbin/test/loremipsum.txt b/incbin/test/loremipsum.txt
new file mode 100644
index 0000000..424477f
--- /dev/null
+++ b/incbin/test/loremipsum.txt
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.
\ No newline at end of file
diff --git a/incbin/test/onebyte.txt b/incbin/test/onebyte.txt
new file mode 100644
index 0000000..500c070
--- /dev/null
+++ b/incbin/test/onebyte.txt
@@ -0,0 +1 @@
+X
\ No newline at end of file
diff --git a/incbin/test/sevenbytes.txt b/incbin/test/sevenbytes.txt
new file mode 100644
index 0000000..462f61f
--- /dev/null
+++ b/incbin/test/sevenbytes.txt
@@ -0,0 +1 @@
+XXXXXXX
\ No newline at end of file
diff --git a/mdloader_common.c b/mdloader_common.c
index 4321de2..e3cd2f1 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -17,6 +17,11 @@
  *  along with Massdrop Loader.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#define INCBIN_PREFIX
+#define INCBIN_STYLE INCBIN_STYLE_SNAKE
+#include "incbin/incbin.h"
+INCBIN(applet, "applet-mdflash.bin");
+
 #include "mdloader_common.h"
 #include "mdloader_parser.h"
 
@@ -751,95 +756,39 @@ int main(int argc, char *argv[])
     print_bootloader_version();
     if (verbose) printf("Device ID: %08X\n", mcu->cidr);
 
-    //Load applet
-    FILE *fIn;
-    char appletfname[128] = "";
-    strlower(mcu->name);
-
-    //sprintf(appletfname, "applet-flash-%s.bin", mcu->name);
-    sprintf(appletfname, "applet-mdflash.bin");  //make filename non-dependent upon mcu->name
-      
-    printf("Applet file: %s\n", appletfname);
 
-    fIn = fopen(appletfname, "rb");
-    if (!fIn)
+    memcpy(&appinfo, applet_data + applet_size - sizeof(appinfo_t), sizeof(appinfo_t));
+    if (appinfo.magic != 0x4142444D)
     {
-        printf("Error: Could not open applet file: %s\n", appletfname);
+        printf("Error: Applet info not found!\n");
         goto closePort;
     }
-    else
-    {
-        char *appletbuf;
-        int filebytes;
-        int readbytes;
-
-        filebytes = filesize(appletfname);
-        if (filebytes == 0)
-        {
-            printf("Error: Applet file is empty!\n");
-            fclose(fIn);
-            goto closePort;
-        }
-
-        appletbuf = (char *)calloc(filebytes,1);
-        if (appletbuf == NULL)
-        {
-            printf("Error: Could not allocate memory for applet file!\n");
-            fclose(fIn);
-            goto closePort;
-        }
-
-        readbytes = (int)fread(appletbuf, 1, filebytes, fIn);
-        fclose(fIn);
-
-        if (readbytes != filebytes)
-        {
-            printf("Error: Applet read error!\n");
-            goto closePort;
-        }
 
-        if (readbytes < sizeof(appinfo_t))
-        {
-            printf("Error: Applet binary too small!\n");
-            goto closePort;
-        }
-
-        memcpy(&appinfo, appletbuf + readbytes - sizeof(appinfo_t), sizeof(appinfo_t));
-        if (appinfo.magic != 0x4142444D)
-        {
-            printf("Error: Applet info not found!\n");
-            goto closePort;
-        }
-
-        if (verbose)
-        {
-            printf("Applet load address: %08X\n", appinfo.load_addr);
-            printf("Applet mail address: %08X\n", appinfo.mail_addr);
-        }
-
-        //printf("Applet data:\n");
-        //print_hex_listing(appletbuf, readbytes, 0, 0);
-
-        if (verbose) printf("Applet size: %i\n", readbytes);
+    if (verbose)
+    {
+        printf("Applet load address: %08X\n", appinfo.load_addr);
+        printf("Applet mail address: %08X\n", appinfo.mail_addr);
+    }
 
-        if (!send_file(appinfo.load_addr, readbytes, appletbuf))
-        {
-            printf("Error: Could not send applet!\n");
-            free(appletbuf);
-            goto closePort;
-        }
+    //printf("Applet data:\n");
+    //print_hex_listing(appletbuf, readbytes, 0, 0);
 
-        free(appletbuf);
+    if (verbose) printf("Applet size: %i\n", applet_size);
 
-        //printf("Applet data in RAM:\n");
-        //char *data_recv = recv_file(appinfo.load_addr, readbytes);
-        //if (data_recv)
-        //{
-        //    print_hex_listing(data_recv, readbytes, 0, appinfo.load_addr);
-        //    free(data_recv); //Free memory allocated in recv_file
-        //}
+    if (!send_file(appinfo.load_addr, applet_size, (char*)applet_data))
+    {
+        printf("Error: Could not send applet!\n");
+        goto closePort;
     }
 
+    //printf("Applet data in RAM:\n");
+    //char *data_recv = recv_file(appinfo.load_addr, readbytes);
+    //if (data_recv)
+    //{
+    //    print_hex_listing(data_recv, readbytes, 0, appinfo.load_addr);
+    //    free(data_recv); //Free memory allocated in recv_file
+    //}
+
     initparams.command = APPLET_CMD_INIT;
     initparams.status = STATUS_BUSY;
     initparams.argument.inputInit.bank = 0;

From 063b37ef8830d185a4f9deea9bd4021112e7d3f6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 5 Oct 2021 06:25:06 +0100
Subject: [PATCH 15/21] Fix 'Memory leak: rawdata' (#64)

---
 mdloader_parser.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mdloader_parser.c b/mdloader_parser.c
index d2a33dc..2e8b9a5 100644
--- a/mdloader_parser.c
+++ b/mdloader_parser.c
@@ -386,12 +386,14 @@ data_t *load_file(char *fname)
         return NULL;
     }
 
+    data_t * ret = NULL;
     if (ftype == FTYPE_HEX)
-        return parse_hex(rawdata, readbytes);
+        ret = parse_hex(rawdata, readbytes);
     else if (ftype == FTYPE_BIN)
-        return parse_bin(rawdata, readbytes);
+        ret = parse_bin(rawdata, readbytes);
     else
         printf("ERROR: Parser: Unknown file type!\n");
 
-    return NULL;
+    free(rawdata);
+    return ret;
 }

From 22a719b88a5b610c3dc1de5a328b5b584654aa6c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 13 Oct 2021 21:51:27 +0100
Subject: [PATCH 16/21] Add SmartEEPROM Support (#62)

* Rework of 49 to latest requirements

* update wording

* update readme usage

* Add progress hints due to sleeps

* flush stdout

* Update mdloader_common.h

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: just-another-jxliu <just-another-jxliu@users.noreply.github.com>
---
 README.md         |   1 +
 mdloader_common.c | 132 +++++++++++++++++++++++++++++++++++++++++++++-
 mdloader_common.h |  66 +++++++++++++++++++++++
 3 files changed, 198 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 84e3bd7..08ac833 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,7 @@ Usage: mdloader [options] ...
   -s --size size                 Read firmware size of <size>
   -D --download file             Write firmware from <file> into device
   -t --test                      Test mode (download/upload writes disabled, upload outputs data to stdout, restart disabled)
+     --ignore-eep                Ignore differences in SmartEEPROM configuration
      --cols count                Hex listing column count <count> [8]
      --colw width                Hex listing column width <width> [4]
      --restart                   Restart device after successful programming
diff --git a/mdloader_common.c b/mdloader_common.c
index e3cd2f1..5e642de 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -29,6 +29,7 @@ char verbose;
 char testmode;
 char first_device;
 int restart_after_program;
+int ignore_smarteeprom_config;
 int hex_cols;
 int hex_colw;
 
@@ -382,6 +383,126 @@ int test_mcu(char silent)
     return 1;
 }
 
+static void sleep_between_writes(void)
+{
+    printf(".");
+    fflush(stdout);
+    slp(SLEEP_BETWEEN_WRITES);
+}
+
+// SmartEEPROM NVMCTRL section
+uint8_t write_user_row(uint32_t* data)
+{
+    //Read the current state of NVMCTRL.CTRLA
+    NVMCTRL_CTRLA_Type ctrla;
+    ctrla.reg = read_half_word(NVMCTRL_CTRLA);
+    if (verbose) printf("NVMCTRL.CTRLA: 0x%04x\n\tAUTOWS: 0x%01x\n\tSUSPEN: 0x%01x\n\tWMODE: 0x%02x\n\tPRM: 0x%02x\n\tRWS: 0x%04x\n\tAHBNS0: 0x%01x\n\tAHBNS1: 0x%01x\n\tCACHEDIS0: 0x%01x\n\tCACHEDIS1: 0x%01x\n", ctrla.reg, ctrla.bit.AUTOWS, ctrla.bit.SUSPEN, ctrla.bit.WMODE, ctrla.bit.PRM, ctrla.bit.RWS, ctrla.bit.AHBNS0, ctrla.bit.AHBNS1, ctrla.bit.CACHEDIS0, ctrla.bit.CACHEDIS1);
+
+    printf("SmartEEPROM: Configuring...");
+
+    //Set WMODE to Manual
+    ctrla.bit.WMODE = NVMCTRL_CTRLA_WMODE_MAN;
+    if (!write_half_word(NVMCTRL_CTRLA, ctrla.reg))
+    {
+        printf("Error: setting NVMCTRL.CTRLA.WMODE to Manual.\n");
+        return 0;
+    }
+    sleep_between_writes();
+
+    // Set user row address
+    if (!write_word(NVMCTRL_ADDR, NVMCTRL_USER))
+    {
+        printf("Error: setting NVMCTRL_ADDR to NVMCTRL_USER (1).\n");
+        return 0;
+    }
+    sleep_between_writes();
+
+    // Erase page
+    NVMCTRL_CTRLB_Type ctrlb;
+    ctrlb.reg = 0;
+    ctrlb.bit.CMD = NVMCTRL_CTRLB_CMD_EP;
+    ctrlb.bit.CMDEX = NVMCTRL_CTRLB_CMDEX_KEY;
+    if (!write_half_word(NVMCTRL_CTRLB, ctrlb.reg))
+    {
+        printf("Error: setting NVMCTRL_CTRLB to 0x%04x (Erase page).\n", ctrlb.reg);
+        return 0;
+    }
+    sleep_between_writes();
+
+    // Page buffer clear
+    ctrlb.reg = 0;
+    ctrlb.bit.CMD = NVMCTRL_CTRLB_CMD_PBC;
+    ctrlb.bit.CMDEX = NVMCTRL_CTRLB_CMDEX_KEY;
+    if (!write_half_word(NVMCTRL_CTRLB, ctrlb.reg))
+    {
+        printf("Error: setting NVMCTRL_CTRLB to 0x%04x (Page buffer clear).\n", ctrlb.reg);
+        return 0;
+    }
+    sleep_between_writes();
+
+    // Write in the write buffer
+    for (int i = 0; i < 4; i++)
+    {
+        if (!write_word(NVMCTRL_USER + i * 4, data[i]))
+        {
+            printf("Error: Unable to write NVMCTRL_USER page %i.\n", i);
+            return 0;
+        }
+        sleep_between_writes();
+    }
+
+    if (!write_word(NVMCTRL_ADDR, NVMCTRL_USER))
+    {
+        printf("Error: setting NVMCTRL_ADDR to NVMCTRL_USER (2).\n");
+        return 0;
+    }
+    sleep_between_writes();
+
+    // Write quad word (128bits)
+    ctrlb.reg = 0;
+    ctrlb.bit.CMD = NVMCTRL_CTRLB_CMD_WQW;
+    ctrlb.bit.CMDEX = NVMCTRL_CTRLB_CMDEX_KEY;
+    if (!write_half_word(NVMCTRL_CTRLB, ctrlb.reg))
+    {
+        printf("Error: setting NVMCTRL_CTRLB to 0x%04x (Write Quad Word).\n", ctrlb.reg);
+        return 0;
+    }
+    sleep_between_writes();
+
+    printf(" Success!\n");
+    return 1;
+}
+
+uint8_t configure_smarteeprom(void)
+{
+    uint32_t user_row[4];
+    for (int i = 0; i < 4; i++)
+    {
+        user_row[i] = read_word(NVMCTRL_USER + i * 4);
+    }
+
+    NVMCTRL_USER_ROW_MAPPING1_Type* puser_row1 = (NVMCTRL_USER_ROW_MAPPING1_Type*)(&user_row[1]);
+
+    if (verbose) printf("SmartEEPROM: config - SBLK: 0x%04x - PSZ: 0x%03x.\n", puser_row1->bit.SBLK, puser_row1->bit.PSZ);
+
+    if(puser_row1->bit.SBLK == SMARTEEPROM_TARGET_SBLK && puser_row1->bit.PSZ == SMARTEEPROM_TARGET_PSZ)
+    {
+        if (verbose) printf("SmartEEPROM: Configured!\n");
+        return 1;
+    }
+
+    if(ignore_smarteeprom_config)
+    {
+        printf("SmartEEPROM: Your settings do not match the recommended values - Some functionality may not work as expected!");
+        return 1;
+    }
+
+    // Set SmartEEPROM Virtual Size.
+    puser_row1->bit.SBLK = SMARTEEPROM_TARGET_SBLK;
+    puser_row1->bit.PSZ = SMARTEEPROM_TARGET_PSZ;
+    return write_user_row(user_row);
+}
+
 //Upper case any lower case characters in a string
 void strlower(char *str)
 {
@@ -495,6 +616,7 @@ void display_help(void)
     printf("  -s --size size                 Read firmware size of <size>\n");
     printf("  -D --download file             Write firmware from <file> into device\n");
     printf("  -t --test                      Test mode (download/upload writes disabled, upload outputs data to stdout, restart disabled)\n");
+    printf("     --ignore-eep                Ignore differences in SmartEEPROM configuration\n");
     printf("     --cols count                Hex listing column count <count> [%i]\n", COLS);
     printf("     --colw width                Hex listing column width <width> [%i]\n", COLW);
     printf("     --restart                   Restart device after successful programming\n");
@@ -507,7 +629,8 @@ void display_help(void)
 //Program command line options
 struct option long_options[] = {
     //Flags
-    { "restart",        no_argument,        &restart_after_program, 1 },
+    { "restart",        no_argument,        &restart_after_program,     1 },
+    { "ignore-eep",     no_argument,        &ignore_smarteeprom_config, 1 },
     //Other
     { "verbose",        no_argument,        0,  'v' },
     { "help",           no_argument,        0,  'h' },
@@ -531,6 +654,7 @@ int main(int argc, char *argv[])
     testmode = 0;
     first_device = 0;
     restart_after_program = 0;
+    ignore_smarteeprom_config = 0;
     hex_cols = COLS;
     hex_colw = COLW;
 
@@ -756,7 +880,13 @@ int main(int argc, char *argv[])
     print_bootloader_version();
     if (verbose) printf("Device ID: %08X\n", mcu->cidr);
 
+    if (!configure_smarteeprom())
+    {
+        printf("Error: Config feature failed!\n");
+        goto closePort;
+    }
 
+    //Load applet
     memcpy(&appinfo, applet_data + applet_size - sizeof(appinfo_t), sizeof(appinfo_t));
     if (appinfo.magic != 0x4142444D)
     {
diff --git a/mdloader_common.h b/mdloader_common.h
index 0bd8575..7f8d26b 100644
--- a/mdloader_common.h
+++ b/mdloader_common.h
@@ -46,6 +46,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <getopt.h>
+#include <ctype.h>
 
 //Atmel files
 #include "./atmel/applet.h"
@@ -163,6 +164,7 @@ int read_byte(int addr);
 int read_half_word(int addr);
 int read_word(int addr);
 int set_terminal_mode(void);
+uint8_t configure_smarteeprom(void);
 
 //OS specific commands
 void print_com_example(void);
@@ -181,8 +183,72 @@ int filesize(char *fname);
 int read_data(int addr, int readsize);
 int write_data(int addr, int writesize, int data);
 void list_devices(char *first);
+
+// helpers
 void strupper(char *str);
 void strlower(char *str);
 
+// Smart EEPROM specific
+#define NVMCTRL 0x41004000
+#define NVMCTRL_CTRLA (NVMCTRL)
+#define NVMCTRL_CTRLB (NVMCTRL + 4)
+#define NVMCTRL_ADDR (NVMCTRL + 0x14)
+
+#define NVMCTRL_CTRLA_WMODE_MAN 0x0
+#define NVMCTRL_CTRLB_CMDEX_KEY 0xA5
+#define NVMCTRL_CTRLB_CMD_WQW 0x4
+#define NVMCTRL_CTRLB_CMD_PBC 0x15
+#define NVMCTRL_CTRLB_CMD_EP 0x0
+
+#define NVMCTRL_USER 0x00804000
+
+#define SLEEP_BETWEEN_WRITES 200
+
+// Configured for 4096 bytes - DS60001507E-page 653
+#define SMARTEEPROM_TARGET_SBLK 1 // 1 block
+#define SMARTEEPROM_TARGET_PSZ 3  // 32 bytes
+
+typedef union {
+    struct {
+        uint32_t SBLK          : 4; /* bit: 35:32 - Number of NVM Blocks composing a SmartEEPROM sector   */
+        uint32_t PSZ           : 3; /* bit: 38:36 - SmartEEPROM Page Size                                 */
+        uint32_t RAM_ECCDIS    : 1; /* bit:    39 - RAM ECC Disable                                       */
+        uint32_t               : 8; /* bit: 47:40 - Factory settings - do not change                      */
+        uint32_t WDT_ENABLE    : 1; /* bit:    48 - WDT Enable at power-on                                */
+        uint32_t WDT_ALWAYS_ON : 1; /* bit:    49 - WDT Always-On at power-on                             */
+        uint32_t WDT_PERIOD    : 4; /* bit: 53:50 - WDT Period at power-on                                */
+        uint32_t WDT_WINDOW    : 4; /* bit: 57:54 - WDT Window mode time-out at power - on                */
+        uint32_t WDT_EWOFFSET  : 4; /* bit: 61:58 - WDT Early Warning Interrupt Time Offset at power - on */
+        uint32_t WDT_WEN       : 1; /* bit:    62 - WDT Window Mode Enable at power - on                  */
+        uint32_t               : 1; /* bit:    63 - Factory settings - do not change                      */
+    } bit;
+    uint32_t reg;
+} NVMCTRL_USER_ROW_MAPPING1_Type;
+
+typedef union {
+    struct {
+        uint16_t           : 2; /* bit:  1:0  Reserved                                                                   */
+        uint16_t AUTOWS    : 1; /* bit:    2  Auto Wait State Enable                                                     */
+        uint16_t SUSPEN    : 1; /* bit:    3  Suspend Enable                                                             */
+        uint16_t WMODE     : 2; /* bit:  5:4  Write Mode                                                                 */
+        uint16_t PRM       : 2; /* bit:  7:6  Power Reduction Mode during Sleep                                          */
+        uint16_t RWS       : 4; /* bit: 11:8  NVM Read Wait States                                                       */
+        uint16_t AHBNS0    : 1; /* bit:   12  Force AHB0 access to NONSEQ, burst transfers are continuously rearbitrated */
+        uint16_t AHBNS1    : 1; /* bit:   13  Force AHB1 access to NONSEQ, burst transfers are continuously rearbitrated */
+        uint16_t CACHEDIS0 : 1; /* bit:   14  AHB0 Cache Disable                                                         */
+        uint16_t CACHEDIS1 : 1; /* bit:   15  AHB1 Cache Disable                                                         */
+    } bit;
+    uint16_t reg;
+} NVMCTRL_CTRLA_Type;
+
+typedef union {
+    struct {
+        uint16_t CMD   : 7; /* bit:  6:0  Command           */
+        uint16_t       : 1; /* bit:    7  Reserved          */
+        uint16_t CMDEX : 8; /* bit: 15:8  Command Execution */
+    } bit;
+    uint16_t reg;
+} NVMCTRL_CTRLB_Type;
+
 #endif //_MDLOADER_COMMON_H
 

From 0501d04b9ef6af21e91249bd15c64677ebbe0600 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 13 Oct 2021 21:53:24 +0100
Subject: [PATCH 17/21] Bump version and date (#66)

* bump version

* bump copyright
---
 mdloader_common.c | 4 ++--
 mdloader_common.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 5e642de..a60d7f9 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018-2020 Massdrop Inc.
+ *  Copyright (C) 2018-2021 Massdrop Inc.
  *
  *  This file is part of Massdrop Loader.
  *
@@ -596,7 +596,7 @@ void display_version(void)
 //Display program copyright
 void display_copyright(void)
 {
-    printf(PROGRAM_NAME "  Copyright (C) 2018-2020 Massdrop Inc.\n");
+    printf(PROGRAM_NAME "  Copyright (C) 2018-2021 Massdrop Inc.\n");
     printf("This program is Free Software and has ABSOLUTELY NO WARRANTY\n");
     printf("\n");
 }
diff --git a/mdloader_common.h b/mdloader_common.h
index 7f8d26b..5025eef 100644
--- a/mdloader_common.h
+++ b/mdloader_common.h
@@ -22,7 +22,7 @@
 
 #define PROGRAM_NAME  "Massdrop Loader"
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 5 //0-99
+#define VERSION_MINOR 6 //0-99
 
 #ifdef _WIN32
 #define INITGUID

From e4f977416994f54ca3f8d2e72f2b225d52f7c42e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 18 Oct 2021 21:01:43 +0100
Subject: [PATCH 18/21] Update README to reflect new packaging (#67)

* Update README to reflect new packaging

* code blocks

* Update README.md

Co-authored-by: John Bowser <66637570+jgbowser@users.noreply.github.com>

Co-authored-by: John Bowser <66637570+jgbowser@users.noreply.github.com>
---
 README.md | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 08ac833..0b1d7b6 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,17 @@
 
 2. Plug in your keyboard.
 
-3. In your terminal, change to the directory where you downloaded the executable and applet-*.bin file(s).
+3. In your terminal, change to the directory where you downloaded the executable file.
 
-4. **Windows** - Run `mdloader_windows.exe --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware.  
-**Linux** - Run `mdloader_linux --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware. Depending on your user's permissions, you might have to add your user to the `dialout` group or use `sudo` on the command.  
-**Mac** - Run `mdloader_mac --first --download FILE_NAME --restart`.  If you downloaded with Mac Safari, run `mdloader_mac.dms --first --download FILE_NAME --restart`. Replace "FILE_NAME" with the filename of your compiled firmware. 
-  
-5. You should see the message:  
+4. Run the following command:
 ```
-Scanning for device for 60 seconds  
+./mdloader --first --download FILE_NAME --restart
+```
+**Note**: Replace `FILE_NAME` with the filename of your compiled firmware.
+
+5. You should see the message:
+```
+Scanning for device for 60 seconds
 .....
 ```
 
@@ -25,7 +27,6 @@ Device port: /dev/cu.usbmodem234431 (SAMD51J18A)
 Opening port '/dev/cu.usbmodem234431'... Success!
 Found MCU: SAMD51J18A
 Bootloader version: v2.18Sep  4 2018 16:48:28
-Applet file: applet-flash-samd51j18a.bin
 Applet Version: 1
 Writing firmware... Complete!
 Booting device... Success!
@@ -42,9 +43,9 @@ Massdrop Loader is used to read firmware from and write firmware to Massdrop key
 
 ## Supported operating systems
 
-Windows XP or greater (32-bit and 64-bit versions, USB Serial driver in drv_win folder)  
-Linux x86 (32-bit and 64-bit versions)  
-Mac OS X
+- Windows XP or greater (32-bit and 64-bit versions, USB Serial driver in drv_win folder)
+- Linux x86 (32-bit and 64-bit versions)
+- Mac OS X
 
 ## Supported devices
 
@@ -52,13 +53,13 @@ Massdrop keyboard's featuring Microchip's SAM-BA bootloader.
 
 ## Building
 
-Enter mdloader directory where Makefile is located and excute:
+Enter mdloader directory where Makefile is located and execute:
 
-`make`
+```
+make
+```
 
-This will create a `build` directory with the compiled executable and required applet-*.bin files.  
-Run `./build/mdloader` to test.
-Note that the target MCU applet file must exist in the directory the executable is called from.
+This will create a `build` directory with the compiled executable. Run `./build/mdloader` to test.
 
 ## Usage
 ```
@@ -82,7 +83,9 @@ Usage: mdloader [options] ...
 
 To write firmware to the device and restart it:
 
-`mdloader --first --download new_firmware.hex --restart`
+```
+mdloader --first --download new_firmware.hex --restart`
+```
 
 The program will now be searching for your device. Press the reset switch found through the small hole on the back case or by appropriate key sequence to enter programming mode and allow programming to commence.  
 Firmware may be provided as a binary ending in .bin or an Intel HEX format ending in .hex, but .hex is preferred for data integrity.  
@@ -90,12 +93,14 @@ Note that safeguards are in place to prevent overwriting the bootloader section
 
 To read firmware from the device:
 
-`mdloader --first --upload read_firmware.bin --addr 0x4000 --size 0x10000`
+```
+mdloader --first --upload read_firmware.bin --addr 0x4000 --size 0x10000
+```
 
-Where --addr and --size are set as desired.  
+Where `--addr` and `--size` are set as desired.  
 Note the output of reading firmware will be in binary format.
 
-Test mode may be invoked with the --test switch to test operations while preventing firmware modification.  
+Test mode may be invoked with the `--test` switch to test operations while preventing firmware modification.  
 Test mode also allows viewing of binary data from a read instead of writing to a file.
 
 ## Troubleshooting

From c089b6df4c32c3075266d754ae5a63239e7fcde8 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 15 Jul 2022 05:44:51 +0100
Subject: [PATCH 19/21] Allow user row to be repaired on previous flash failure
 (#78)

---
 .github/workflows/build.yml |  2 +-
 mdloader_common.c           | 20 ++++++++++++++++----
 mdloader_common.h           |  4 ----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25880bf..fcfd956 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, windows-2016, ubuntu-latest]
+        os: [macos-latest, windows-2019, ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/mdloader_common.c b/mdloader_common.c
index a60d7f9..2ce3087 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -25,6 +25,10 @@ INCBIN(applet, "applet-mdflash.bin");
 #include "mdloader_common.h"
 #include "mdloader_parser.h"
 
+#define SMARTEEPROM_CONFIG 0xaeecffb1
+#define USER_ROW_INVALID 0xFFFFFFFF
+#define USER_ROW_REPAIR 0xfe9a9239
+
 char verbose;
 char testmode;
 char first_device;
@@ -479,13 +483,14 @@ uint8_t configure_smarteeprom(void)
     for (int i = 0; i < 4; i++)
     {
         user_row[i] = read_word(NVMCTRL_USER + i * 4);
+        if (verbose) printf("SmartEEPROM: config - NVMCTRL_USER: 0x%u - 0x%08x.\n", i, user_row[i]);
     }
 
     NVMCTRL_USER_ROW_MAPPING1_Type* puser_row1 = (NVMCTRL_USER_ROW_MAPPING1_Type*)(&user_row[1]);
 
     if (verbose) printf("SmartEEPROM: config - SBLK: 0x%04x - PSZ: 0x%03x.\n", puser_row1->bit.SBLK, puser_row1->bit.PSZ);
 
-    if(puser_row1->bit.SBLK == SMARTEEPROM_TARGET_SBLK && puser_row1->bit.PSZ == SMARTEEPROM_TARGET_PSZ)
+    if ((puser_row1->reg == SMARTEEPROM_CONFIG) && (user_row[0] != USER_ROW_INVALID))
     {
         if (verbose) printf("SmartEEPROM: Configured!\n");
         return 1;
@@ -493,13 +498,20 @@ uint8_t configure_smarteeprom(void)
 
     if(ignore_smarteeprom_config)
     {
-        printf("SmartEEPROM: Your settings do not match the recommended values - Some functionality may not work as expected!");
+        printf("SmartEEPROM: Your settings do not match the recommended values - Some functionality may not work as expected!\n");
         return 1;
     }
 
     // Set SmartEEPROM Virtual Size.
-    puser_row1->bit.SBLK = SMARTEEPROM_TARGET_SBLK;
-    puser_row1->bit.PSZ = SMARTEEPROM_TARGET_PSZ;
+    puser_row1->reg = SMARTEEPROM_CONFIG;
+
+    // Repair if we have a previous failure
+    if(user_row[0] == USER_ROW_INVALID)
+    {
+        printf("SmartEEPROM: Setting additional user row.\n");
+        user_row[0] = USER_ROW_REPAIR;
+    }
+
     return write_user_row(user_row);
 }
 
diff --git a/mdloader_common.h b/mdloader_common.h
index 5025eef..0df8a06 100644
--- a/mdloader_common.h
+++ b/mdloader_common.h
@@ -204,10 +204,6 @@ void strlower(char *str);
 
 #define SLEEP_BETWEEN_WRITES 200
 
-// Configured for 4096 bytes - DS60001507E-page 653
-#define SMARTEEPROM_TARGET_SBLK 1 // 1 block
-#define SMARTEEPROM_TARGET_PSZ 3  // 32 bytes
-
 typedef union {
     struct {
         uint32_t SBLK          : 4; /* bit: 35:32 - Number of NVM Blocks composing a SmartEEPROM sector   */

From aeee18977d113d2f5d3a1df0dcdcea53d4f230b7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 15 Jul 2022 05:45:25 +0100
Subject: [PATCH 20/21] Bump version and date (#81)

---
 mdloader_common.c | 4 ++--
 mdloader_common.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mdloader_common.c b/mdloader_common.c
index 2ce3087..f3a105b 100644
--- a/mdloader_common.c
+++ b/mdloader_common.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2018-2021 Massdrop Inc.
+ *  Copyright (C) 2018-2022 Massdrop Inc.
  *
  *  This file is part of Massdrop Loader.
  *
@@ -608,7 +608,7 @@ void display_version(void)
 //Display program copyright
 void display_copyright(void)
 {
-    printf(PROGRAM_NAME "  Copyright (C) 2018-2021 Massdrop Inc.\n");
+    printf(PROGRAM_NAME "  Copyright (C) 2018-2022 Massdrop Inc.\n");
     printf("This program is Free Software and has ABSOLUTELY NO WARRANTY\n");
     printf("\n");
 }
diff --git a/mdloader_common.h b/mdloader_common.h
index 0df8a06..8ee8bc1 100644
--- a/mdloader_common.h
+++ b/mdloader_common.h
@@ -22,7 +22,7 @@
 
 #define PROGRAM_NAME  "Massdrop Loader"
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 6 //0-99
+#define VERSION_MINOR 7 //0-99
 
 #ifdef _WIN32
 #define INITGUID

From c4d56b478da8a061231d1992a263a8a1ae5873c6 Mon Sep 17 00:00:00 2001
From: just-another-jxliu <just-another-jxliu@users.noreply.github.com>
Date: Fri, 15 Jul 2022 10:26:49 -0700
Subject: [PATCH 21/21] Update README.md

---
 README.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0b1d7b6..7716102 100644
--- a/README.md
+++ b/README.md
@@ -6,21 +6,23 @@
 
 3. In your terminal, change to the directory where you downloaded the executable file.
 
-4. Run the following command:
+4. Move your compiled firmware to the same directory as the executable file.
+
+5. Run the following command:
 ```
 ./mdloader --first --download FILE_NAME --restart
 ```
 **Note**: Replace `FILE_NAME` with the filename of your compiled firmware.
 
-5. You should see the message:
+6. You should see the message:
 ```
 Scanning for device for 60 seconds
 .....
 ```
 
-6. Within 60 seconds, press the reset button on your keyboard. For most keyboards running the default firmware, you can hold `Fn` + `b` for half a second and release to reset your keyboard (you will see the LEDs turn off). For CTRL keyboards in the first production run running original firmware or of the first method does not work for you, you will need to use a pin to press the reset button through the hole in the bottom of the keyboard.
+7. Within 60 seconds, press the reset button on your keyboard. For most keyboards running the default firmware, you can hold `Fn` + `b` for half a second and release to reset your keyboard (you will see the LEDs turn off). For CTRL keyboards in the first production run running original firmware or of the first method does not work for you, you will need to use a pin to press the reset button through the hole in the bottom of the keyboard.
 
-7. You should see a series of messages similar to:
+8. You should see a series of messages similar to:
 ```
 Device port: /dev/cu.usbmodem234431 (SAMD51J18A)
 
@@ -33,7 +35,7 @@ Booting device... Success!
 Closing port... Success!
 ```
 
-8. Afterwards, you should see the keyboard's LEDs light up again (if your configuration has LEDs enabled) and the keyboard should respond to typing. Your keyboard is now running the new firmware you specified.
+9. Afterwards, you should see the keyboard's LEDs light up again (if your configuration has LEDs enabled) and the keyboard should respond to typing. Your keyboard is now running the new firmware you specified.
 
 -----