Cuatro: changes for new board rev (#2176)

changes for new board rev

Co-authored-by: Comma Device <device@comma.ai>

Author: robbederks

board/boards/cuatro.h

@@ -91,7 +91,7 @@ static void cuatro_init(void) {
   tres_set_ir_power(0U);
 
   // Clock source
-  clock_source_init();
+  clock_source_init(true);
 
   // Sound codec
   cuatro_set_amp_enabled(false);
@@ -105,8 +105,22 @@ static void cuatro_init(void) {
   sound_init();
 }
 
+static harness_configuration cuatro_harness_config = {
+  .has_harness = true,
+  .GPIO_SBU1 = GPIOC,
+  .GPIO_SBU2 = GPIOA,
+  .GPIO_relay_SBU1 = GPIOA,
+  .GPIO_relay_SBU2 = GPIOA,
+  .pin_SBU1 = 4,
+  .pin_SBU2 = 1,
+  .pin_relay_SBU1 = 9,
+  .pin_relay_SBU2 = 3,
+  .adc_channel_SBU1 = 4, // ADC12_INP4
+  .adc_channel_SBU2 = 17 // ADC1_INP17
+};
+
 board board_cuatro = {
-  .harness_config = &tres_harness_config,
+  .harness_config = &cuatro_harness_config,
   .has_spi = true,
   .has_canfd = true,
   .fan_max_rpm = 12500U,

board/boards/dos.h

@@ -106,7 +106,7 @@ static void dos_init(void) {
   dos_set_bootkick(true);
 
   // Init clock source (camera strobe) using PWM
-  clock_source_init();
+  clock_source_init(false);
 }
 
 static harness_configuration dos_harness_config = {

board/boards/tres.h

@@ -129,7 +129,7 @@ static void tres_init(void) {
   register_set_bits(&(GPIOC->OTYPER), GPIO_OTYPER_OT10 | GPIO_OTYPER_OT11); // open drain
 
   // Clock source
-  clock_source_init();
+  clock_source_init(false);
 }
 
 static harness_configuration tres_harness_config = {

board/drivers/clock_source.h

@@ -4,7 +4,7 @@ void clock_source_set_period(uint8_t period) {
   register_set(&(TIM1->ARR), ((period*10U) - 1U), 0xFFFFU);
 }
 
-void clock_source_init(void) {
+void clock_source_init(bool enable_channel1) {
   // Setup timer
   register_set(&(TIM1->PSC), ((APB2_TIMER_FREQ*100U)-1U), 0xFFFFU);           // Tick on 0.1 ms
   register_set(&(TIM1->ARR), ((CLOCK_SOURCE_PERIOD_MS*10U) - 1U), 0xFFFFU);   // Period
@@ -21,11 +21,14 @@ void clock_source_init(void) {
   NVIC_DisableIRQ(TIM1_CC_IRQn);
 
   // Set GPIO as timer channels
+  if (enable_channel1) {
+    set_gpio_alternate(GPIOA, 8, GPIO_AF1_TIM1);
+  }
   set_gpio_alternate(GPIOB, 14, GPIO_AF1_TIM1);
   set_gpio_alternate(GPIOB, 15, GPIO_AF1_TIM1);
 
   // Set PWM mode
-  register_set(&(TIM1->CCMR1), (0b110UL << TIM_CCMR1_OC2M_Pos), 0xFFFFU);
+  register_set(&(TIM1->CCMR1), (0b110UL << TIM_CCMR1_OC1M_Pos) | (0b110UL << TIM_CCMR1_OC2M_Pos), 0xFFFFU);
   register_set(&(TIM1->CCMR2), (0b110UL << TIM_CCMR2_OC3M_Pos), 0xFFFFU);
 
   // Enable output

board/drivers/clock_source_declarations.h

@@ -4,4 +4,4 @@
 #define CLOCK_SOURCE_PULSE_LEN_MS        2U
 
 void clock_source_set_period(uint8_t period);
-void clock_source_init(void);
+void clock_source_init(bool enable_channel1);