Fix lv_v marshaling

Reviewed-on: #1

.gitignore

@@ -96,7 +96,6 @@ CMakeCache.txt
 CMakeFiles
 CMakeScripts
 Testing
-Makefile
 cmake_install.cmake
 install_manifest.txt
 compile_commands.json
@@ -134,3 +133,5 @@ fp-info-cache
 *.xml
 *.csv
 
+# clangd
+.cache/

Core/Inc/Channel_Control.h

@@ -13,27 +13,27 @@
 typedef union {
   struct {
     uint8_t NC : 1;
-    uint8_t en13 : 1;     // inverters
-    uint8_t en2 : 1;      //servos regler
-    uint8_t en1 : 1;      //acu
-    uint8_t en4 : 1;      // reserved
-    uint8_t en11 : 1;      //lidar
-    uint8_t en8 : 1;      // sdc
-    uint8_t alwayson : 1; // en7 ist always on 
+    uint8_t inverter : 1;
+    uint8_t drs_buck : 1;
+    uint8_t acu : 1;
+    uint8_t reserved : 1;
+    uint8_t lidar : 1;
+    uint8_t sdc : 1;
+    uint8_t alwayson : 1;
   };
   uint8_t porta;
 } gpio_port_a;
 
 typedef union {
   struct {
-    uint8_t en15: 1;      // epsc
-    uint8_t en12 : 1;     // hyd aggregat 
+    uint8_t epsc: 1;
+    uint8_t hyd_pump : 1;
     uint8_t NC : 1;       
-    uint8_t en3 : 1;      // ebs cs valve
-    uint8_t en6 : 1;      // ebs valve b
-    uint8_t en5 : 1;     //ebs valve a
-    uint8_t en14 : 1;    //servos
-    uint8_t en16 : 1;     //misc
+    uint8_t ebs_cs : 1;
+    uint8_t ebs_b : 1;
+    uint8_t ebs_a : 1;
+    uint8_t drs_profet : 1;
+    uint8_t misc : 1;
   };
   uint8_t portb;
 } gpio_port_b;

Core/Src/CAN_Communication.c

@@ -94,7 +94,7 @@ void can_sendloop() {
     case 4:
 
       data[0] = current_measurements_adc_val.lv_v >> 8;
-      data[1] = current_measurements_adc_val.lv_v && 0xFF;
+      data[1] = current_measurements_adc_val.lv_v & 0xFF;
       ftcan_transmit(LV_SENS_ID, data, 2);
 
     default:

Core/Src/Channel_Control.c

@@ -38,8 +38,9 @@ void ChannelControl_init(I2C_HandleTypeDef* hi2c, TIM_HandleTypeDef* timer3,
 void ChannelControl_UpdateGPIOs(PortExtenderGPIO UpdatePorts) { // ctrl + left click auf portextender 
   EN_Ports = UpdatePorts;
   UpdatePorts.porta.alwayson = 1; // Always on stays always on
-  if (inhibit_SDC)
-    UpdatePorts.porta.en8 = 0;
+  if (inhibit_SDC) {
+    UpdatePorts.porta.sdc = 0;
+  }
   PCA9535_setGPIOPortOutput(PC9535_PORTA, UpdatePorts.porta.porta);
   PCA9535_setGPIOPortOutput(PC9535_PORTB, UpdatePorts.portb.portb);
 }
@@ -71,7 +72,7 @@ void ChannelControl_UpdatePWMs(
   }
 
   if (timer2_running) {
-    if ( (tsacfans == 0) || (pwmaggregat == 0) ) {
+    if ( (tsacfans == 0) && (pwmaggregat == 0) ) {
       timer2_running = 0;
       HAL_TIM_PWM_Stop(pwmtimer2, TIM_CHANNEL_2);
       HAL_TIM_PWM_Stop(pwmtimer2, TIM_CHANNEL_3);

Makefile

@@ -0,0 +1,204 @@
+##########################################################################################################################
+# File automatically-generated by tool: [projectgenerator] version: [4.3.0-B58] date: [Mon Sep 02 16:07:24 CEST 2024]
+##########################################################################################################################
+
+# ------------------------------------------------
+# Generic Makefile (based on gcc)
+#
+# ChangeLog :
+#	2017-02-10 - Several enhancements + project update mode
+#   2015-07-22 - first version
+# ------------------------------------------------
+
+######################################
+# target
+######################################
+TARGET = PDU FT24 MCU
+
+
+######################################
+# building variables
+######################################
+# debug build?
+DEBUG = 1
+# optimization
+OPT = -Og
+
+
+#######################################
+# paths
+#######################################
+# Build path
+BUILD_DIR = build
+
+######################################
+# source
+######################################
+# C sources
+C_SOURCES =  \
+Core/Src/main.c \
+Core/Src/stm32f3xx_it.c \
+Core/Src/stm32f3xx_hal_msp.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_adc.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_adc_ex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_rcc.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_rcc_ex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_gpio.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_dma.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_cortex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_pwr.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_pwr_ex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_flash.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_flash_ex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_i2c.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_i2c_ex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_exti.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_can.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_tim.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_tim_ex.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_uart.c \
+Drivers/STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_uart_ex.c \
+Core/Src/system_stm32f3xx.c \
+Core/Src/sysmem.c \
+Core/Src/syscalls.c  
+
+# ASM sources
+ASM_SOURCES =  \
+startup_stm32f302xc.s
+
+# ASM sources
+ASMM_SOURCES = 
+
+
+#######################################
+# binaries
+#######################################
+PREFIX = arm-none-eabi-
+# The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx)
+# either it can be added to the PATH environment variable.
+ifdef GCC_PATH
+CC = $(GCC_PATH)/$(PREFIX)gcc
+AS = $(GCC_PATH)/$(PREFIX)gcc -x assembler-with-cpp
+CP = $(GCC_PATH)/$(PREFIX)objcopy
+SZ = $(GCC_PATH)/$(PREFIX)size
+else
+CC = $(PREFIX)gcc
+AS = $(PREFIX)gcc -x assembler-with-cpp
+CP = $(PREFIX)objcopy
+SZ = $(PREFIX)size
+endif
+HEX = $(CP) -O ihex
+BIN = $(CP) -O binary -S
+ 
+#######################################
+# CFLAGS
+#######################################
+# cpu
+CPU = -mcpu=cortex-m4
+
+# fpu
+FPU = -mfpu=fpv4-sp-d16
+
+# float-abi
+FLOAT-ABI = -mfloat-abi=hard
+
+# mcu
+MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)
+
+# macros for gcc
+# AS defines
+AS_DEFS = 
+
+# C defines
+C_DEFS =  \
+-DUSE_HAL_DRIVER \
+-DSTM32F302xC
+
+
+# AS includes
+AS_INCLUDES = 
+
+# C includes
+C_INCLUDES =  \
+-ICore/Inc \
+-IDrivers/STM32F3xx_HAL_Driver/Inc \
+-IDrivers/STM32F3xx_HAL_Driver/Inc/Legacy \
+-IDrivers/CMSIS/Device/ST/STM32F3xx/Include \
+-IDrivers/CMSIS/Include
+
+
+# compile gcc flags
+ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
+
+CFLAGS += $(MCU) $(C_DEFS) $(C_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
+
+ifeq ($(DEBUG), 1)
+CFLAGS += -g -gdwarf-2
+endif
+
+
+# Generate dependency information
+CFLAGS += -MMD -MP -MF"$(@:%.o=%.d)"
+
+
+#######################################
+# LDFLAGS
+#######################################
+# link script
+LDSCRIPT = STM32F302RBTx_FLASH.ld
+
+# libraries
+LIBS = -lc -lm -lnosys 
+LIBDIR = 
+LDFLAGS = $(MCU) -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections
+
+# default action: build all
+all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
+
+
+#######################################
+# build the application
+#######################################
+# list of objects
+OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
+vpath %.c $(sort $(dir $(C_SOURCES)))
+# list of ASM program objects
+OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
+vpath %.s $(sort $(dir $(ASM_SOURCES)))
+OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASMM_SOURCES:.S=.o)))
+vpath %.S $(sort $(dir $(ASMM_SOURCES)))
+
+$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) 
+	$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
+
+$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
+	$(AS) -c $(CFLAGS) $< -o $@
+$(BUILD_DIR)/%.o: %.S Makefile | $(BUILD_DIR)
+	$(AS) -c $(CFLAGS) $< -o $@
+
+$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile
+	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+	$(SZ) $@
+
+$(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
+	$(HEX) $< $@
+	
+$(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
+	$(BIN) $< $@	
+	
+$(BUILD_DIR):
+	mkdir $@		
+
+#######################################
+# clean up
+#######################################
+clean:
+	-rm -fR $(BUILD_DIR)
+  
+#######################################
+# dependencies
+#######################################
+-include $(wildcard $(BUILD_DIR)/*.d)
+
+# *** EOF ***

STM32Make.make

@@ -85,7 +85,7 @@ PREFIX = arm-none-eabi-
 POSTFIX = "
 # The gcc compiler bin path can be either defined in make command via GCC_PATH variable (> make GCC_PATH=xxx)
 # either it can be added to the PATH environment variable.
-GCC_PATH="c:/Users/GETAC/AppData/Roaming/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/arm-none-eabi-gcc/13.2.1-1.1.1/.content/bin
+GCC_PATH="/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/arm-none-eabi-gcc/13.2.1-1.1.1/.content/bin
 ifdef GCC_PATH
 CXX = $(GCC_PATH)/$(PREFIX)g++$(POSTFIX)
 CC = $(GCC_PATH)/$(PREFIX)gcc$(POSTFIX)
@@ -238,19 +238,19 @@ $(BUILD_DIR):
 # flash
 #######################################
 flash: $(BUILD_DIR)/$(TARGET).elf
-	"C:/USERS/GETAC/APPDATA/ROAMING/CODE/USER/GLOBALSTORAGE/BMD.STM32-FOR-VSCODE/@XPACK-DEV-TOOLS/OPENOCD/0.12.0-3.1/.CONTENT/BIN/OPENOCD.EXE" -f ./openocd.cfg -c "program $(BUILD_DIR)/$(TARGET).elf verify reset exit"
+	"/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.12.0-3.1/.content/bin/openocd" -f ./openocd.cfg -c "program $(BUILD_DIR)/$(TARGET).elf verify reset exit"
 
 #######################################
 # erase
 #######################################
 erase: $(BUILD_DIR)/$(TARGET).elf
-	"C:/USERS/GETAC/APPDATA/ROAMING/CODE/USER/GLOBALSTORAGE/BMD.STM32-FOR-VSCODE/@XPACK-DEV-TOOLS/OPENOCD/0.12.0-3.1/.CONTENT/BIN/OPENOCD.EXE" -f ./openocd.cfg -c "init; reset halt; stm32f3x mass_erase 0; exit"
+	"/home/jasper/.config/Code/User/globalStorage/bmd.stm32-for-vscode/@xpack-dev-tools/openocd/0.12.0-3.1/.content/bin/openocd" -f ./openocd.cfg -c "init; reset halt; stm32f3x mass_erase 0; exit"
 
 #######################################
 # clean up
 #######################################
 clean:
-	cmd /c rd /s /q $(BUILD_DIR)
+	-rm -fR $(BUILD_DIR)
 
 #######################################
 # custom makefile rules