Merge pull request #6 from CAP1Sup/master

Fixes to Firmware Building
bigtreetech · Jan 14, 2021 · 13b5a4c · 13b5a4c
2 parents 0814d4a + 84b4912
commit 13b5a4c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 1,202 deletions.
diff --git a/S42B/firmware/S42BV2.0/.gitignore b/S42B/firmware/S42BV2.0/.gitignore
@@ -1,6 +1,4 @@
 .pio
 .pioenvs
 .piolibdeps
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
+**.vscode
diff --git a/S42B/firmware/S42BV2.0/Close_loop/src/hardware/can.c b/S42B/firmware/S42BV2.0/Close_loop/src/hardware/can.c
@@ -1,9 +1,5 @@
 #include "can.h"
 
-
-
-
-
 uint8_t CAN1_Mode_Init(uint8_t tsjw,uint8_t tbs2,uint8_t tbs1,uint16_t brp,uint8_t mode)
 {
 

diff --git a/S42B/firmware/S42BV2.0/Close_loop/src/user/stm32f10x.h b/S42B/firmware/S42BV2.0/Close_loop/src/user/stm32f10x.h
@@ -476,7 +476,6 @@ typedef enum IRQn
   */
 
 #include "core_cm3.h"
-#include "system_stm32f10x.h"
 #include <stdint.h>
 
 /** @addtogroup Exported_types