kopia lustrzana https://github.com/OpenRTX/OpenRTX
Fixed compilation errors with MD-9600 and Module 17 targets
rodzic
ab3d148449
commit
5ffd6e5c43
|
@ -464,15 +464,15 @@ void _ui_drawMenuBackup(ui_state_t* ui_state)
|
|||
// Shutdown RF stage
|
||||
state.rtxShutdown = true;
|
||||
|
||||
#ifndef PLATFORM_LINUX
|
||||
if(platform_getPttStatus() == 1)
|
||||
{
|
||||
platform_ledOn(GREEN);
|
||||
#if !defined(PLATFORM_LINUX) && !defined(PLATFORM_MOD17)
|
||||
eflash_dump();
|
||||
platform_terminate();
|
||||
NVIC_SystemReset();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void _ui_drawMenuRestore(ui_state_t* ui_state)
|
||||
|
@ -497,15 +497,15 @@ void _ui_drawMenuRestore(ui_state_t* ui_state)
|
|||
// Shutdown RF stage
|
||||
state.rtxShutdown = true;
|
||||
|
||||
#ifndef PLATFORM_LINUX
|
||||
if(platform_getPttStatus() == 1)
|
||||
{
|
||||
platform_ledOn(GREEN);
|
||||
#if !defined(PLATFORM_LINUX) && !defined(PLATFORM_MOD17)
|
||||
eflash_restore();
|
||||
platform_terminate();
|
||||
NVIC_SystemReset();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void _ui_drawMenuInfo(ui_state_t* ui_state)
|
||||
|
|
|
@ -159,7 +159,7 @@ bool platform_pwrButtonStatus()
|
|||
*/
|
||||
__disable_irq();
|
||||
uint32_t prevRowState = GPIOD->ODR & (1 << 4); /* Row 3 is PD4 */
|
||||
GPIOD->BSRRH = 1 << 4; /* PD4 low */
|
||||
GPIOD->BSRR = 1 << (4 + 16); /* PD4 low */
|
||||
delayUs(10);
|
||||
uint32_t btnStatus = GPIOE->IDR & 0x01; /* Col 3 is PE0 */
|
||||
GPIOD->ODR |= prevRowState; /* Restore PD4 */
|
||||
|
|
Ładowanie…
Reference in New Issue