merged in master, now builds. test still needs to be written and bugf…

…ixes made. also ignition switch message needs to be added.
lhr-solar · Sep 26, 2023 · 2f45100 · 2f45100
2 parents 6f69ba9 + fd33899
commit 2f45100
Show file tree

Hide file tree

Showing 58 changed files with 751 additions and 1,905 deletions.
diff --git a/Apps/Inc/SendCarCAN.h b/Apps/Inc/SendCarCAN.h
@@ -1,6 +1,7 @@
 #ifndef __SENDCARCAN_H
 #define __SENDCARCAN_H
 
+#include "CANbus.h"
 
 /**
  * @brief Initialize SendCarCAN

diff --git a/Apps/Inc/SendTritium.h b/Apps/Inc/SendTritium.h
@@ -3,8 +3,8 @@
 
 #include "common.h"
 
-#define MOTOR_MSG_PERIOD 500
-#define FSM_PERIOD 250
+#define MOTOR_MSG_PERIOD 100
+#define FSM_PERIOD 100
 #define DEBOUNCE_PERIOD 2 // in units of FSM_PERIOD
 #define MOTOR_MSG_COUNTER_THRESHOLD (MOTOR_MSG_PERIOD)/(FSM_PERIOD)
 
@@ -38,7 +38,7 @@ typedef struct TritiumState{
     void (*stateDecider)(void);
 } TritiumState_t;
 
-#define __TEST_SENDTRITIUM
+//#define __TEST_SENDTRITIUM
 #ifdef __TEST_SENDTRITIUM
 // Inputs
 extern bool cruiseEnable;

diff --git a/Apps/Inc/fifo_protected.h b/Apps/Inc/fifo_protected.h