fix: external MPM flash (#3671)

This commit is contained in:
Michael
2023-06-20 11:39:43 +10:00
committed by GitHub
parent cb533f4493
commit fa490e5adb
2 changed files with 16 additions and 12 deletions
+5 -7
View File
@@ -96,7 +96,7 @@ bool MultiFirmwareUpdateDriver::init()
params.polarity = ETX_Pol_Inverted; params.polarity = ETX_Pol_Inverted;
mod_st = modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_UART, &params); mod_st = modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_UART, &params);
if (!mod_st) { if (!mod_st) {
params.polarity = ETX_Pol_Normal; params.polarity = ETX_Pol_Inverted;
mod_st = modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_SOFT_INV, &params); mod_st = modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_SOFT_INV, &params);
if (!mod_st) return false; if (!mod_st) return false;
} }
@@ -104,7 +104,7 @@ bool MultiFirmwareUpdateDriver::init()
params.direction = ETX_Dir_RX; params.direction = ETX_Dir_RX;
params.polarity = ETX_Pol_Inverted; params.polarity = ETX_Pol_Inverted;
if (!modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_SPORT, &params)) { if (!modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_SPORT, &params)) {
params.polarity = ETX_Pol_Normal; params.polarity = ETX_Pol_Inverted;
if (!modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_SPORT_INV, &params)) { if (!modulePortInitSerial(EXTERNAL_MODULE, ETX_MOD_PORT_SPORT_INV, &params)) {
modulePortDeInit(mod_st); modulePortDeInit(mod_st);
return false; return false;
@@ -161,11 +161,9 @@ void MultiFirmwareUpdateDriver::deinit()
bool MultiFirmwareUpdateDriver::getRxByte(uint8_t & byte) const bool MultiFirmwareUpdateDriver::getRxByte(uint8_t & byte) const
{ {
uint16_t time; uint32_t time = RTOS_GET_MS();
time = getTmr2MHz(); while ((RTOS_GET_MS() - time) < 100) { // 100ms
while ((uint16_t) (getTmr2MHz() - time) < 25000) { // 12.5mS
if (getByte(byte)) { if (getByte(byte)) {
#if defined(DEBUG_EXT_MODULE_FLASH) #if defined(DEBUG_EXT_MODULE_FLASH)
TRACE("[RX] 0x%X", byte); TRACE("[RX] 0x%X", byte);
@@ -298,12 +298,18 @@ void stm32_pulse_start_dma_req(const stm32_pulse_timer_t* tim,
// Enable TC IRQ // Enable TC IRQ
LL_DMA_EnableIT_TC(tim->DMAx, tim->DMA_Stream); LL_DMA_EnableIT_TC(tim->DMAx, tim->DMA_Stream);
// Reset counter if (ocmode == LL_TIM_OCMODE_PWM1) {
LL_TIM_SetCounter(tim->TIMx, 0x00); // preloads first period for PWM)
LL_TIM_SetCounter(tim->TIMx, 0x00);
// only on PWM (preloads the first period)
if (ocmode == LL_TIM_OCMODE_PWM1)
LL_TIM_GenerateEvent_UPDATE(tim->TIMx); LL_TIM_GenerateEvent_UPDATE(tim->TIMx);
} else {
// Reset counter close to overflow
if (IS_TIM_32B_COUNTER_INSTANCE(tim->TIMx)) {
LL_TIM_SetCounter(tim->TIMx, 0xFFFFFFFF);
} else {
LL_TIM_SetCounter(tim->TIMx, 0xFFFF);
}
}
LL_TIM_EnableDMAReq_UPDATE(tim->TIMx); LL_TIM_EnableDMAReq_UPDATE(tim->TIMx);
LL_DMA_EnableStream(tim->DMAx, tim->DMA_Stream); LL_DMA_EnableStream(tim->DMAx, tim->DMA_Stream);