unrefactor harness configuration, fix lladc for jungle

Author: aubsw

SConscript

@@ -155,17 +155,21 @@ def build_project(project_name, project, extra_flags):
   if _is_stm32h7:
       sources.extend([
         ("drivers_fake_siren", f"{panda_root}/board/drivers/fake_siren.c"),
-        ("stm32h7_peripherals", f"{panda_root}/board/stm32h7/peripherals.c"),
-        ("stm32h7_llusb", f"{panda_root}/board/stm32h7/llusb.c"),
         ("stm32h7_clock", f"{panda_root}/board/stm32h7/clock.c"),
-        ("stm32h7_lladc", f"{panda_root}/board/stm32h7/lladc.c"),
         ("stm32h7_lldac", f"{panda_root}/board/stm32h7/lldac.c"),
         ("stm32h7_llflash", f"{panda_root}/board/stm32h7/llflash.c"),
         ("stm32h7_lli2c", f"{panda_root}/board/stm32h7/lli2c.c"),
         ("stm32h7_llspi", f"{panda_root}/board/stm32h7/llspi.c"),
+        ("stm32h7_llusb", f"{panda_root}/board/stm32h7/llusb.c"),
+        ("stm32h7_peripherals", f"{panda_root}/board/stm32h7/peripherals.c"),
       ])
-      if not _is_panda_jungle:
+      if _is_panda_jungle:
+          sources.extend([
+            ("stm32h7_jungle_lladc", f"{panda_root}/board/jungle/stm32h7/lladc.c"),
+          ])
+      else:
           sources.extend([
+            ("stm32h7_lladc", f"{panda_root}/board/stm32h7/lladc.c"),
             ("stm32h7_llfan", f"{panda_root}/board/stm32h7/llfan.c"),
             ("stm32h7_sound", f"{panda_root}/board/stm32h7/sound.c"),
           ])

include/board/jungle/stm32h7/lladc.h board/jungle/stm32h7/lladc.cinclude/board/jungle/stm32h7/lladc.h renamed to board/jungle/stm32h7/lladc.c

@@ -1,12 +1,7 @@
-#pragma once
+#include "board/jungle/stm32h7/lladc.h"
 #include "config.h"
 
-typedef struct {
-  ADC_TypeDef *adc;
-  uint8_t channel;
-} adc_channel_t;
-
-static inline void adc_init(ADC_TypeDef *adc) {
+void adc_init(ADC_TypeDef *adc) {
   adc->CR &= ~(ADC_CR_DEEPPWD); // Reset deep-power-down mode
   adc->CR |= ADC_CR_ADVREGEN; // Enable ADC regulator
   while(!(adc->ISR & ADC_ISR_LDORDY) && (adc != ADC3));
@@ -23,7 +18,7 @@ static inline void adc_init(ADC_TypeDef *adc) {
   while(!(adc->ISR & ADC_ISR_ADRDY));
 }
 
-static inline uint16_t adc_get_raw(ADC_TypeDef *adc, uint8_t channel) {
+uint16_t adc_get_raw(ADC_TypeDef *adc, uint8_t channel) {
   adc->SQR1 &= ~(ADC_SQR1_L);
   adc->SQR1 = ((uint32_t) channel << 6U);
 
@@ -45,7 +40,7 @@ static inline uint16_t adc_get_raw(ADC_TypeDef *adc, uint8_t channel) {
   return res;
 }
 
-static inline uint16_t adc_get_mV(ADC_TypeDef *adc, uint8_t channel) {
+uint16_t adc_get_mV(ADC_TypeDef *adc, uint8_t channel) {
   uint16_t ret = 0;
   if ((adc == ADC1) || (adc == ADC2)) {
     ret = (adc_get_raw(adc, channel) * current_board->avdd_mV) / 65535U;

include/board/boards/board.h

@@ -3,12 +3,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "platform_definitions.h"
-#include "drivers/harness_configuration.h"
 
 #ifdef PANDA_JUNGLE
 #include "jungle/boards/board.h"
 #else
 
+#include "drivers/harness.h"
+
 typedef enum {
   BOOT_STANDBY,
   BOOT_BOOTKICK,
@@ -31,7 +32,7 @@ typedef void (*board_set_bootkick)(BootState state);
 typedef bool (*board_read_som_gpio)(void);
 typedef void (*board_set_amp_enabled)(bool enabled);
 
-typedef struct board {
+typedef struct board_t {
   harness_configuration *harness_config;
   GPIO_TypeDef * const led_GPIO[3];
   const uint8_t led_pin[3];
@@ -81,12 +82,12 @@ typedef struct board {
 #define CAN_MODE_NORMAL 0U
 #define CAN_MODE_OBD_CAN2 1U
 
-extern struct board board_black;
-extern struct board board_dos;
-extern struct board board_uno;
-extern struct board board_tres;
-extern struct board board_grey;
-extern struct board board_white;
-extern struct board board_cuatro;
-extern struct board board_red;
+extern board board_black;
+extern board board_dos;
+extern board board_uno;
+extern board board_tres;
+extern board board_grey;
+extern board board_white;
+extern board board_cuatro;
+extern board board_red;
 #endif

include/board/drivers/harness.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <stdbool.h>
 #include <stdint.h>
-#include "drivers/harness_configuration.h"
+#include "platform_definitions.h"
 
 extern uint16_t adc_get_mV(uint8_t channel);
 
@@ -18,6 +18,19 @@ struct harness_t {
 };
 extern struct harness_t harness;
 
+typedef struct harness_configuration {
+  const bool has_harness;
+  GPIO_TypeDef * const GPIO_SBU1;
+  GPIO_TypeDef * const GPIO_SBU2;
+  GPIO_TypeDef * const GPIO_relay_SBU1;
+  GPIO_TypeDef * const GPIO_relay_SBU2;
+  const uint8_t pin_SBU1;
+  const uint8_t pin_SBU2;
+  const uint8_t pin_relay_SBU1;
+  const uint8_t pin_relay_SBU2;
+  const uint8_t adc_channel_SBU1;
+  const uint8_t adc_channel_SBU2;
+} harness_configuration;
 
 // The ignition relay is only used for testing purposes
 void set_intercept_relay(bool intercept, bool ignition_relay);

include/board/drivers/harness_configuration.h

@@ -7,7 +7,6 @@
 
 // ///// Board definition and detection ///// //
 #include "stm32f4/lladc.h"
-#include "drivers/harness.h"
 #include "drivers/fan.h"
 #include "stm32f4/llfan.h"
 #include "drivers/clock_source.h"

include/board/stm32f4/board.h

@@ -7,7 +7,6 @@
 
 // ///// Board definition and detection ///// //
 #include "stm32h7/lladc.h"
-#include "drivers/harness.h"
 #include "drivers/fan.h"
 #include "stm32h7/llfan.h"
 #include "stm32h7/lldac.h"