X12S fixes

This commit is contained in:
Bertrand Songis
2019-04-25 09:16:32 +02:00
parent e682d30c22
commit 1fb995b915
4 changed files with 22 additions and 3 deletions
+4 -2
View File
@@ -1,7 +1,9 @@
option(DISK_CACHE "Enable SD card disk cache" YES)
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" ON)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(CPU_TYPE STM32F4)
set(HSE_VALUE 12000000)
set(SDCARD YES)
@@ -14,7 +16,7 @@ set(LINKER_SCRIPT targets/horus/stm32f4_flash.ld)
set(RAMBACKUP YES)
set(LUA YES)
set(PPM_LIMITS_SYMETRICAL YES)
SET(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)")
set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)")
# for size report script
set(CPU_TYPE_FULL STM32F429xI)
+2
View File
@@ -222,7 +222,9 @@ void SDRAM_Init(void);
void init_ppm(uint8_t module);
void disable_ppm(uint8_t module);
void init_pxx1_pulses(uint8_t module);
void init_pxx1_serial(uint8_t module);
void disable_pxx1_pulses(uint8_t module);
void disable_pxx1_serial(uint8_t module);
void init_pxx2(uint8_t module);
void disable_pxx2(uint8_t module);
void disable_serial(uint8_t module);
+16
View File
@@ -58,6 +58,14 @@ void init_pxx1_pulses(uint8_t module)
extmodulePxxStart();
}
void init_pxx1_serial(uint8_t module)
{
if (module == INTERNAL_MODULE)
intmodulePxxStart();
else
extmodulePxxStart();
}
void disable_pxx1_pulses(uint8_t module)
{
if (module == INTERNAL_MODULE)
@@ -66,6 +74,14 @@ void disable_pxx1_pulses(uint8_t module)
extmoduleStop();
}
void disable_pxx1_serial(uint8_t module)
{
if (module == INTERNAL_MODULE)
intmoduleStop();
else
extmoduleStop();
}
#if defined(DSM2)
void disable_serial(uint8_t module)
{
-1
View File
@@ -6,7 +6,6 @@ option(MODULE_R9M_FULLSIZE "xlite option to use full size R9M instead of mini" O
option(PXX1 "PXX1 protocol support" ON)
option(PXX2 "PXX2 protocol support" ON)
if(PCB STREQUAL X9E)
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
set(STICKS "STANDARD" CACHE STRING "Sticks type (STANDARD/HORUS)")