Kt/himactestingv2

fsae-pcc/src/can.cpp

@@ -11,11 +11,11 @@
 #define PCC_CAN_ID 0x123
 
 typedef struct __attribute__((packed)) {
-    uint32_t timestamp; // Timestamp in milliseconds
-    uint8_t state;      // Precharge state
+    // uint32_t timestamp; // Timestamp in milliseconds
+    uint8_t state;     // Precharge state
     uint8_t errorCode; // Error code
-    float accumulatorVoltage; // Accumulator voltage in volts
-    float tsVoltage; // Transmission side voltage in volts
+    // float accumulatorVoltage; // Accumulator voltage in volts
+    // float tsVoltage; // Transmission side voltage in volts
     float prechargeProgress; // Precharge progress in percent
 } PCC;
 
@@ -34,14 +34,16 @@ void CAN_Init() {
     pccMsg.id = PCC_CAN_ID; // can change ID
 }
 
-void CAN_SendPCCMessage(uint32_t timestamp, uint8_t state, uint8_t errorCode, float accumulatorVoltage, float tsVoltage, float prechargeProgress) {
+void CAN_SendPCCMessage(uint32_t timestamp, uint8_t state, uint8_t errorCode,
+                        float accumulatorVoltage, float tsVoltage,
+                        float prechargeProgress) {
     pccData = {
-        .timestamp = timestamp,
-        .state = state,
-        .errorCode = errorCode,
-        .accumulatorVoltage = accumulatorVoltage,
-        .tsVoltage = tsVoltage,
-        .prechargeProgress = prechargeProgress
+        //.timestamp = timestamp, 4 bytes
+        .state = state,         // 1 bytes
+        .errorCode = errorCode, // 1 bytes
+        //.accumulatorVoltage = accumulatorVoltage, 4 bytes
+        //.tsVoltage = tsVoltage, 4 bytes
+        .prechargeProgress = prechargeProgress // 4 bytes
     };
 
     // Serial.print("PCC Message: ");
@@ -60,4 +62,4 @@ void CAN_SendPCCMessage(uint32_t timestamp, uint8_t state, uint8_t errorCode, fl
 
     memcpy(pccMsg.buf, &pccData, sizeof(PCC));
     can1.write(pccMsg);
-}
+}

fsae-pcc/src/can.h

@@ -5,4 +5,6 @@
 #include <stdint.h>
 
 void CAN_Init();
-void CAN_SendPCCMessage(uint32_t timestamp, uint8_t state, uint8_t errorCode, float accumulatorVoltage, float tsVoltage, float prechargeProgress);
+void CAN_SendPCCMessage(uint32_t timestamp, uint8_t state, uint8_t errorCode,
+                        float accumulatorVoltage, float tsVoltage,
+                        float prechargeProgress);

fsae-pcc/src/gpio.cpp

@@ -1,11 +1,11 @@
 // Anteater Electric Racing, 2025
 
-#include <Arduino.h>
 #include "gpio.h"
 #include "utils.h"
+#include <Arduino.h>
 
-void gpioInit(void){
+void gpioInit(void) {
     pinMode(SHUTDOWN_CTRL_PIN, INPUT);
     pinMode(FREQ_ACCU_PIN, INPUT);
     pinMode(FREQ_TS_PIN, INPUT);
-}
+}

fsae-pcc/src/gpio.h

@@ -2,4 +2,4 @@
 
 #pragma once
 
-void gpioInit(void);
+void gpioInit(void);

fsae-pcc/src/main.cpp

@@ -11,17 +11,19 @@
 
 #include <Arduino.h>
 #include <arduino_freertos.h>
-#include "precharge.h"
+
+#include "can.h"
 #include "gpio.h"
+#include "precharge.h"
 #include "utils.h"
-#include "can.h"
 
 static void threadMain(void *pvParameters);
 
 void setup() {
     Serial.begin(9600);
 
-    xTaskCreate(threadMain, "threadMain", THREAD_MAIN_STACK_SIZE, NULL, THREAD_MAIN_PRIORITY, NULL);
+    xTaskCreate(threadMain, "threadMain", THREAD_MAIN_STACK_SIZE, NULL,
+                THREAD_MAIN_PRIORITY, NULL);
 
     gpioInit(); // Initialize GPIO pins
 
@@ -48,21 +50,21 @@ void threadMain(void *pvParameters) {
 
         Serial.print("State: ");
         switch (state) {
-            case STATE_STANDBY:
-                Serial.print("STANDBY");
-                break;
-            case STATE_PRECHARGE:
-                Serial.print("PRECHARGE");
-                break;
-            case STATE_ONLINE:
-                Serial.print("ONLINE");
-                break;
-            case STATE_ERROR:
-                Serial.print("ERROR");
-                break;
-            default:
-                Serial.print("UNDEFINED");
-                break;
+        case STATE_STANDBY:
+            Serial.print("STANDBY");
+            break;
+        case STATE_PRECHARGE:
+            Serial.print("PRECHARGE");
+            break;
+        case STATE_ONLINE:
+            Serial.print("ONLINE");
+            break;
+        case STATE_ERROR:
+            Serial.print("ERROR");
+            break;
+        default:
+            Serial.print("UNDEFINED");
+            break;
         }
         Serial.print(" | Accumulator Voltage: ");
         Serial.print(accumulator_voltage, 4);
@@ -76,5 +78,4 @@ void threadMain(void *pvParameters) {
     }
 }
 
-void loop() {
-}
+void loop() {}