From 30ae35abad3d9031517dedce751fc5f2320eaadf Mon Sep 17 00:00:00 2001
From: Luiz Villa <lflavado@laas.fr>
Date: Mon, 4 Apr 2022 11:01:15 +0200
Subject: [PATCH] Implements the triggering moment for the adc, changes the adc
conversion time
---
.../owntech_adc_driver/zephyr/src/adc_channels.c | 2 +-
.../zephyr/public_api/HardwareConfiguration.cpp | 5 +++++
.../zephyr/public_api/HardwareConfiguration.h | 3 +++
.../zephyr/src/adc_configuration.cpp | 10 +++++++---
.../zephyr/src/hrtim_configuration.cpp | 7 +++++++
.../zephyr/src/hrtim_configuration.h | 6 ++++++
.../zephyr/public_include/hrtim.h | 1 +
.../owntech_hrtim_driver/zephyr/src/hrtim_common.c | 11 +++++++++--
8 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/zephyr/modules/owntech_adc_driver/zephyr/src/adc_channels.c b/zephyr/modules/owntech_adc_driver/zephyr/src/adc_channels.c
index 3f25f13..7e3ab48 100644
--- a/zephyr/modules/owntech_adc_driver/zephyr/src/adc_channels.c
+++ b/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
);
}
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
index af95ccd..62d8423 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.cpp
+++ b/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
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h b/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
index 7f26503..48be111 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/public_api/HardwareConfiguration.h
+++ b/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();
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/src/adc_configuration.cpp b/zephyr/modules/owntech_hardware_configuration/zephyr/src/adc_configuration.cpp
index af7042b..1b39bb7 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/src/adc_configuration.cpp
+++ b/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"
};
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.cpp b/zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.cpp
index dbdab19..f54a035 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.cpp
+++ b/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);
+}
diff --git a/zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.h b/zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.h
index 26e1803..f980e81 100644
--- a/zephyr/modules/owntech_hardware_configuration/zephyr/src/hrtim_configuration.h
+++ b/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_
diff --git a/zephyr/modules/owntech_hrtim_driver/zephyr/public_include/hrtim.h b/zephyr/modules/owntech_hrtim_driver/zephyr/public_include/hrtim.h
index 73d144a..4826336 100644
--- a/zephyr/modules/owntech_hrtim_driver/zephyr/public_include/hrtim.h
+++ b/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);
diff --git a/zephyr/modules/owntech_hrtim_driver/zephyr/src/hrtim_common.c b/zephyr/modules/owntech_hrtim_driver/zephyr/src/hrtim_common.c
index f3c9281..2f6ac9c 100644
--- a/zephyr/modules/owntech_hrtim_driver/zephyr/src/hrtim_common.c
+++ b/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();
--
GitLab