feat: (ISP) jump to bootloader

avem-labs · Jun 5, 2017 · ba766ae · ba766ae
1 parent 2ad843e
commit ba766ae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ LDLIBS+=-lstm32
 
 STARTUP=startup.c
 
-all: clean libs src
+all: libs src
  $(CC) -o $(PROGRAM).elf $(LDFLAGS) \
  -Wl,--whole-archive \
  src/app.a \
@@ -40,7 +40,13 @@ tshow:
  @echo "=🍺====>> optimize settings: $(InfoTextLib), $(InfoTextSrc)"
  @echo "=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_"
 
-flash:
+isp: /dev/cu.SLAB_USBtoUART main.bin
+ cat -u /dev/cu.SLAB_USBtoUART & stty -f /dev/cu.SLAB_USBtoUART 115200
+ echo '>' > /dev/cu.SLAB_USBtoUART
+ pkill cat -u /dev/cu.SLAB_USBtoUART
+ make flash || make flash
+
+flash: /dev/cu.SLAB_USBtoUART main.bin
  stm32flash -w $(TOP)/main.bin -v -g 0 /dev/tty.SLAB_USBtoUART
 dump:
  $(OBJDUMP) -D main.elf > DUMP.s

diff --git a/src/main.c b/src/main.c
@@ -11,6 +11,13 @@
 #include "pid.h"
 #include "tty.h"
 
+#define ISP_ADDR 0x1FFFF000
+
+void jump2ISP() {
+ __set_MSP(*(unsigned int *)ISP_ADDR);
+ ((void (*)(void))*((unsigned int *)(ISP_ADDR + 4)))();
+}
+
 
 double _asin(double i) {return asin(i);}
 double _atan2(double i,double k) {return atan2(i,k);}