Merge pull request commaai#194 from commaai/refactor

panda code refactor pre MISRA
avolmensky · May 24, 2019 · 0c5b220 · 0c5b220
2 parents 1114cb1 + b35f6ff
commit 0c5b220
Show file tree

Hide file tree

Showing 37 changed files with 524 additions and 1,015 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -71,10 +71,6 @@ jobs:
           name: Build Pedal STM bootstub image
           command: |
             docker run panda_build /bin/bash -c "cd /panda/board/pedal; make obj/bootstub.bin"
-      - run:
-          name: Build NEO STM image
-          command: |
-            docker run panda_build /bin/bash -c "cd /panda/board; make clean; make -f Makefile.legacy obj/comma.bin"
       - run:
           name: Build ESP image
           command: |

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.2.1
+v1.3.0
diff --git a/board/Makefile.legacy b/board/Makefile.legacy
diff --git a/board/README.md b/board/README.md
@@ -23,12 +23,6 @@ Programming
 make
 ```
 
-**NEO**
-
-```
-make -f Makefile.legacy
-```
-
 Troubleshooting
 ----
 

diff --git a/board/bootstub.c b/board/bootstub.c
@@ -12,27 +12,21 @@
   #include "stm32f2xx_hal_gpio_ex.h"
 #endif
 
+// default since there's no serial
+int puts(const char *a) { return 0; }
+void puth(unsigned int i) {}
+
 #include "libc.h"
 #include "provision.h"
 
-#include "drivers/drivers.h"
-
+#include "drivers/clock.h"
 #include "drivers/llgpio.h"
 #include "gpio.h"
 
 #include "drivers/spi.h"
 #include "drivers/usb.h"
 //#include "drivers/uart.h"
 
-#ifdef PEDAL
-#define CUSTOM_CAN_INTERRUPTS
-#include "safety.h"
-#include "drivers/can.h"
-#endif
-
-int puts(const char *a) { return 0; }
-void puth(unsigned int i) {}
-
 #include "crypto/rsa.h"
 #include "crypto/sha.h"