Implements the triggering moment for the adc, changes the adc conversion time

zephyr/modules/owntech_adc_driver/zephyr/src/adc_channels.c

@@ -377,7 +377,7 @@ void adc_channels_configure(uint8_t adc_num)
 		 */
 		LL_ADC_SetChannelSamplingTime(adc,
 		                              __LL_ADC_DECIMAL_NB_TO_CHANNEL(current_channel),
-		                              LL_ADC_SAMPLINGTIME_92CYCLES_5
+		                              LL_ADC_SAMPLINGTIME_12CYCLES_5
 		                             );
 
 	}

zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp

@@ -21,6 +21,7 @@
  * @date   2022
  *
  * @author Clément Foucher <clement.foucher@laas.fr>
+ * @author Luiz Villa <luiz.villa@laas.fr>
  */
 
 
@@ -209,6 +210,10 @@ void HardwareConfiguration::setLeg2Off()
 	hrtim_stop_leg2();
 }
 
+void HardwareConfiguration::setHrtimAdcTrigInterleaved(uint16_t new_trig)
+{
+	set_adc_trig_interleaved(new_trig);
+}
 
 /////
 // Extra UART

zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h

@@ -21,6 +21,7 @@
  * @date   2022
  *
  * @author Clément Foucher <clement.foucher@laas.fr>
+ * @author Luiz Villa <luiz.villa@laas.fr>
  */
 
 
@@ -97,6 +98,8 @@ public:
 	static void setLeg1Off();
 	static void setLeg2Off();
 
+	static void setHrtimAdcTrigInterleaved(uint16_t new_trig);
+
 	// Extra UART
 	static void extraUartInit();
 	static char extraUartReadChar();

zephyr/modules/owntech_hardware_configuration/zephyr/src/adc_configuration.cpp

@@ -21,6 +21,7 @@
  * @date   2022
  *
  * @author Clément Foucher <clement.foucher@laas.fr>
+ * @author Luiz Villa <luiz.villa@laas.fr>
  */
 
 
@@ -46,8 +47,11 @@ void _initialize()
 
 		// Perform default configration
 		configure_adc_trigger_source(1, hrtim_ev1);
-		configure_adc_trigger_source(2, hrtim_ev1);
+		configure_adc_trigger_source(2, hrtim_ev3);
 		configure_adc_trigger_source(3, software);
+
+		adc_configure_discontinuous_mode(1, 1);
+		adc_configure_discontinuous_mode(2, 1);
 	}
 }
 
@@ -131,15 +135,15 @@ void configure_adc_default_all_measurements()
 
 	const char* adc1_channels[] =
 	{
+		"I1_LOW",
 		"V1_LOW",
-		"V2_LOW",
 		"V_HIGH"
 	};
 
 	const char* adc2_channels[] =
 	{
-		"I1_LOW",
 		"I2_LOW",
+		"V2_LOW",
 		"I_HIGH"
 	};
 

zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.cpp

@@ -127,6 +127,8 @@ void hrtim_interleaved_pwm_update(float32_t pwm_duty_cycle)
 		leg_set(TIMA, pwm_pulse_width, 0);
 		leg_set(TIMB, pwm_pulse_width, pwm_phase_shift);
 	}
+
+	hrtim_update_adc_trig_interleaved( (pwm_pulse_width>>1) + (pwm_pulse_width>>2));
 }
 
 /**
@@ -281,3 +283,8 @@ void hrtim_start_leg2()
 {
 	leg_start(TIMB);
 }
+
+void set_adc_trig_interleaved(uint16_t new_trig)
+{
+	hrtim_update_adc_trig_interleaved(new_trig);
+}

zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.h

@@ -117,6 +117,12 @@ void hrtim_start_leg1();
  */
 void hrtim_start_leg2();
 
+/**
+ * @brief     Updates the adc trigger moment
+ *
+ * @param[in] new_trig    defines the triggering moment
+ */
+void set_adc_trig_interleaved(uint16_t new_trig);
 
 
 #endif // HRTIM_CONFIGURATION_H_

zephyr/modules/owntech_hrtim_driver/zephyr/public_include/hrtim.h

@@ -83,6 +83,7 @@ void hrtim_init_voltage_buck();
 void hrtim_init_voltage_boost();
 void hrtim_init_voltage_leg1_buck_leg2_boost();
 void hrtim_init_voltage_leg1_boost_leg2_buck();
+void hrtim_update_adc_trig_interleaved(uint16_t new_trig);
 
 
 

zephyr/modules/owntech_hrtim_driver/zephyr/src/hrtim_common.c

@@ -33,11 +33,18 @@
 
 void _hrtim_init_events()
 {
-	hrtim_adc_trigger_set_postscaler(0, 9);
 	hrtim_adc_trigger_en(1, 1, LL_HRTIM_ADCTRIG_SRC13_TIMACMP3);
-	hrtim_cmp_set(0, TIMA, CMP3xR, 1);
+	hrtim_adc_trigger_en(3, 2, LL_HRTIM_ADCTRIG_SRC13_TIMBCMP4);
+	hrtim_update_adc_trig_interleaved(1);
 }
 
+void hrtim_update_adc_trig_interleaved(uint16_t new_trig)
+{
+	hrtim_cmp_set(0, TIMA, CMP3xR, new_trig);
+	hrtim_cmp_set(0, TIMB, CMP4xR, new_trig);
+}
+
+
 void hrtim_init_current()
 {
 	hrtim_cm_init();