Bug/cleanup headers (#265)

Co-authored-by: Caio <[email protected]>

Core/Inc/bms.h

@@ -1,4 +1,3 @@
-
 #ifndef BMS_H
 #define BMS_H
 

Core/Inc/can_handler.h

@@ -1,22 +1,8 @@
-/**
- * @file can_handler.h
- * @author Hamza Iqbal
- * @brief This CAN handler is meant to receive and properly route CAN messages
- * and keep this task seperate the CAN driver.  The purpose of this is
- * specifically to have a better way of routing the different messages.
- * @version 0.1
- * @date 2023-09-22
- *
- * @copyright Copyright (c) 2023
- *
- */
-
 #ifndef CAN_HANDLER_H
 #define CAN_HANDLER_H
 
 #include "can.h"
 #include "cmsis_os.h"
-#include "dti.h"
 
 /**
  * @brief Callback to be called when a message is received on CAN line 1.

Core/Inc/cerb_utils.h

@@ -11,8 +11,9 @@
 #ifndef CERB_UTILS_H
 #define CERB_UTILS_H
 
+#include <stdbool.h>
+
 #include "cmsis_os.h"
-#include "stdbool.h"
 #include "timer.h"
 
 /**

Core/Inc/dti.h

@@ -13,8 +13,6 @@
 #define DTI_H
 
 #include "can_handler.h"
-#include <stdbool.h>
-#include <stdint.h>
 
 /* Message IDs from DTI CAN Datasheet */
 #define DTI_CANID_ERPM	      0x416 /* ERPM, Duty, Input Voltage */

Core/Inc/fault.h

@@ -1,7 +1,6 @@
 #ifndef CERBERUS_FAULT_H
 #define CERBERUS_FAULT_H
 
-#include "cerberus_conf.h"
 #include "cmsis_os.h"
 
 typedef enum {

Core/Inc/monitor.h

@@ -1,12 +1,11 @@
 #ifndef CERBERUS_MONITOR_H
 #define CERBERUS_MONITOR_H
 
+#include <stdbool.h>
+
 #include "cmsis_os.h"
 #include "mpu.h"
 #include "pdu.h"
-#include "stdbool.h"
-#include "steeringio.h"
-#include "stm32f4xx_hal.h"
 
 /**
  * @brief Get the debounced TSMS reading.

Core/Inc/mpu.h

@@ -1,10 +1,10 @@
 #ifndef MPU_H
 #define MPU_H
 
-#include "cmsis_os2.h"
-#include "stm32f4xx_hal.h"
 #include <stdbool.h>
-#include <stdint.h>
+
+#include "cmsis_os.h"
+#include "stm32f4xx_hal.h"
 
 typedef struct {
 	I2C_HandleTypeDef *hi2c;

Core/Inc/pdu.h

@@ -1,10 +1,10 @@
 #ifndef PDU_H
 #define PDU_H
 
+#include <stdbool.h>
+
 #include "cmsis_os.h"
 #include "pca9539.h"
-#include <stdbool.h>
-#include <stdint.h>
 
 #define SOUND_RTDS_FLAG 1U
 

Core/Inc/pedals.h

@@ -11,8 +11,6 @@
 #ifndef PROCESSING_H
 #define PROCESSING_H
 
-#include "cmsis_os.h"
-#include "stdbool.h"
 #include "dti.h"
 #include "pdu.h"
 #include "mpu.h"

Core/Inc/state_machine.h

@@ -1,8 +1,6 @@
 #ifndef STATE_MACHINE_H
 #define STATE_MACHINE_H
 
-#include "cmsis_os.h"
-#include "fault.h"
 #include "pdu.h"
 #include "dti.h"
 #include "mpu.h"

Core/Inc/steeringio.h

@@ -2,11 +2,6 @@
 #define STEERING_H
 
 #include "can.h"
-#include "cmsis_os.h"
-#include "ringbuffer.h"
-#include "timer.h"
-#include <stdbool.h>
-#include <stdint.h>
 
 #define STEERING_CANID_IO 0x680
 

Core/Src/bms.c

@@ -1,11 +1,10 @@
 #include "bms.h"
-#include "timer.h"
-#include "fault.h"
-#include "can.h"
-#include "cerberus_conf.h"
+
 #include <assert.h>
 #include <stdlib.h>
-#include "stdio.h"
+
+#include "cerberus_conf.h"
+#include "fault.h"
 
 bms_t *bms;
 

Core/Src/can_handler.c

@@ -1,24 +1,14 @@
-/**
- * @file can_handler.c
- * @author Hamza Iqbal and Nick DePatie
- * @brief Source file for CAN handler
- * @version 0.1
- * @date 2023-09-22
- *
- * @copyright Copyright (c) 2023
- *
- */
-
 #include "can_handler.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "bms.h"
 #include "cerb_utils.h"
-#include "cerberus_conf.h"
+#include "dti.h"
 #include "fault.h"
-#include "stdio.h"
 #include "steeringio.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define CAN_MSG_QUEUE_SIZE 50 /* messages */
 

Core/Src/dti.c

@@ -8,17 +8,14 @@
  * @copyright Copyright (c) 2023
  *
  */
-
 #include "dti.h"
-#include "can.h"
-#include "emrax.h"
-#include "fault.h"
-#include "c_utils.h"
-#include <math.h>
+
 #include <assert.h>
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+
+#include "emrax.h"
 #include "bms.h"
 
 #define CAN_QUEUE_SIZE 5 /* messages */

Core/Src/fault.c

@@ -1,14 +1,11 @@
 #include "fault.h"
-#include "task.h"
-#include <assert.h>
+
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "state_machine.h"
-#include "can_handler.h"
 #include <string.h>
-#include "c_utils.h"
-#include "cerb_utils.h"
+
+#include "cerberus_conf.h"
 #include "state_machine.h"
 
 #define FAULT_HANDLE_QUEUE_SIZE 16

Core/Src/main.c

@@ -22,13 +22,12 @@
 
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
-#include "sht30.h"
-#include "lsm6dso.h"
-#include "monitor.h"
-#include "queues.h"
+#include <string.h>
+
+#include "bms.h"
 #include "fault.h"
 #include "can_handler.h"
 #include "state_machine.h"
@@ -38,7 +37,8 @@
 #include "dti.h"
 #include "steeringio.h"
 #include "pedals.h"
-#include "string.h"
+#include "monitor.h"
+#include "state_machine.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/

Core/Src/monitor.c

@@ -1,26 +1,14 @@
 #include "monitor.h"
-#include "c_utils.h"
-#include "can_handler.h"
+
+#include <assert.h>
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "cerb_utils.h"
 #include "cerberus_conf.h"
 #include "fault.h"
-// #include "lsm6dso.h"
-#include "mpu.h"
-#include "pdu.h"
-#include "pedals.h"
-#include "queues.h"
-#include "sht30.h"
 #include "state_machine.h"
-#include "steeringio.h"
-#include "stm32f405xx.h"
-#include "task.h"
-#include "timer.h"
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <assert.h>
 
 #define TSMS_DEBOUNCE_PERIOD 500 /* ms */
 

Core/Src/mpu.c

@@ -1,10 +1,11 @@
 #include "mpu.h"
-#include "stm32f405xx.h"
+
 #include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "c_utils.h"
-#include <stdio.h>
 
 #define YLED_PIN      GPIO_PIN_8
 #define RLED_PIN      GPIO_PIN_9

Core/Src/pdu.c

@@ -1,9 +1,11 @@
 #include "pdu.h"
-#include "fault.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "fault.h"
+
 #define PUMP_CTRL      0
 #define RADFAN_CTRL    1
 #define BRKLIGHT_CTRL  2

Core/Src/pedals.c

@@ -7,23 +7,24 @@
  * @copyright Copyright (c) 2024
  * 
  */
-
 #include "pedals.h"
 #include "state_machine.h"
-#include "queues.h"
 #include "cerb_utils.h"
 #include "can_handler.h"
 #include "cerberus_conf.h"
 #include "dti.h"
-#include "queues.h"
 #include "bms.h"
 #include "emrax.h"
 #include "monitor.h"
 #include <assert.h>
-#include <string.h>
-#include <stdio.h>
 #include <math.h>
 #include <stdlib.h>
+#include <string.h>
+
+#include "cerb_utils.h"
+#include "cerberus_conf.h"
+#include "fault.h"
+#include "state_machine.h"
 
 /* DO NOT ATTEMPT TO SEND TORQUE COMMANDS LOWER THAN THIS VALUE */
 #define MIN_COMMAND_FREQ  60 /* Hz */

Core/Src/state_machine.c

@@ -1,17 +1,14 @@
 #include "state_machine.h"
-#include "can_handler.h"
-#include "fault.h"
-#include "queues.h"
-#include "monitor.h"
-#include "queues.h"
-#include "pedals.h"
-#include <stdbool.h>
+
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "cerb_utils.h"
-#include <assert.h>
 #include <string.h>
 
+#include "cerb_utils.h"
+#include "monitor.h"
+#include "pedals.h"
+
 #define STATE_TRANS_QUEUE_SIZE 4
 
 #define SEND_NERO_TIMEOUT 500 /*in millis*/

Core/Src/steeringio.c

@@ -1,14 +1,9 @@
 #include "steeringio.h"
-#include "can.h"
-#include "cerb_utils.h"
-#include "cerberus_conf.h"
-#include "cmsis_os.h"
+
+#include <stdio.h>
+
 #include "pedals.h"
 #include "state_machine.h"
-#include "stdio.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
 
 #define CAN_QUEUE_SIZE 5 /* messages */