Skip to content

Commit 7abffae

Browse files
committed
FIXED optocouplers offsets, mapped thrusters for
latest electronics configuration
1 parent cd7730f commit 7abffae

File tree

5 files changed

+51079
-51032
lines changed

5 files changed

+51079
-51032
lines changed

Core/Src/freertos.cpp

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -306,26 +306,27 @@ void StartDefaultTask(void *argument)
306306
void inline set_pwms(uint32_t pwms[8])
307307
{
308308
// HERE THE PWM Channel - Thruster relation is defined
309-
TIM3 -> CCR4 = pwms[0] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
310-
TIM2 -> CCR2 = pwms[1] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
311-
TIM2 -> CCR1 = pwms[2] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
312-
TIM3 -> CCR2 = pwms[3] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
309+
310+
TIM2 -> CCR1 = pwms[4] + 50;
311+
TIM2 -> CCR2 = pwms[3] + 50;
312+
TIM2 -> CCR3 = pwms[1] + 50;
313+
TIM2 -> CCR4 = pwms[0] - 5;
313314
// VERTICAL THRUSTERS
314-
TIM2 -> CCR3 = pwms[4] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
315-
TIM3 -> CCR3 = pwms[5] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
316-
TIM2 -> CCR4 = pwms[6] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
317-
TIM3 -> CCR1 = pwms[7] + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
315+
TIM3 -> CCR1 = pwms[7] + 50;
316+
TIM3 -> CCR2 = pwms[5] + 50;
317+
TIM3 -> CCR3 = pwms[2] + 50;
318+
TIM3 -> CCR4 = pwms[6] + 47;
318319
}
319320
void inline set_pwm_idle()
320321
{
321-
TIM2 -> CCR1 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
322-
TIM2 -> CCR2 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
323-
TIM2 -> CCR3 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
324-
TIM2 -> CCR4 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
325-
TIM3 -> CCR1 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
326-
TIM3 -> CCR2 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
327-
TIM3 -> CCR3 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
328-
TIM3 -> CCR4 = PWM_IDLE + OPTOCOUPLER_INTRODUCED_OFFSET_uS;
322+
TIM2 -> CCR1 = PWM_IDLE + 50;
323+
TIM2 -> CCR2 = PWM_IDLE + 50;
324+
TIM2 -> CCR3 = PWM_IDLE + 50;
325+
TIM2 -> CCR4 = PWM_IDLE - 5;
326+
TIM3 -> CCR1 = PWM_IDLE + 50;
327+
TIM3 -> CCR2 = PWM_IDLE + 50;
328+
TIM3 -> CCR3 = PWM_IDLE + 50;
329+
TIM3 -> CCR4 = PWM_IDLE + 47;
329330
}
330331
void clamp_pwm_output(uint32_t pwms[], int N) {
331332
for(uint16_t i = 0; i < N; i++) {

Debug/Core/Src/freertos.o

192 Bytes
Binary file not shown.

Debug/nereo_fc.elf

100 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)