[Pulses] PXX2 Probe warning

This commit is contained in:
Bertrand Songis
2019-03-12 18:20:55 +01:00
parent fd012a52c7
commit d3af7fca5d
6 changed files with 27 additions and 21 deletions
+2 -2
View File
@@ -532,12 +532,12 @@ bool isInternalModuleAvailable(int module)
#if defined(PXX1)
if (module == MODULE_TYPE_XJT)
return !isModulePXX(EXTERNAL_MODULE);
return !IS_PXX2_INTERNAL_ENABLED() && !isModulePXX(EXTERNAL_MODULE);
#endif
#if defined(PXX2)
if (module == MODULE_TYPE_XJT2)
return true;
return IS_PXX2_INTERNAL_ENABLED();
#endif
return false;
@@ -85,6 +85,7 @@ extern "C" void INTMODULE_USART_IRQHandler(void)
intmoduleFifo.errors++;
}
else {
hardwareOptions.pxx2Enabled = true;
intmoduleFifo.push(data);
}
status = INTMODULE_USART->SR;
+5 -3
View File
@@ -182,9 +182,6 @@ void boardInit()
pwrInit();
delaysInit();
// FrSky removed the volume chip in latest board, that's why it doesn't answer!
// i2cInit();
#if defined(DEBUG)
serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
#endif
@@ -194,6 +191,11 @@ void boardInit()
TRACE("\nHorus board started :)");
TRACE("RCC->CSR = %08x", RCC->CSR);
#if defined(PXX2)
#warning "PXX2 probe is not implemented"
hardwareOptions.pxx2Enabled = true;
#endif
audioInit();
// we need to initialize g_FATFS_Obj here, because it is in .ram section (because of DMA access)
+1 -5
View File
@@ -199,11 +199,7 @@ PACK(typedef struct {
extern HardwareOptions hardwareOptions;
#if defined(PCBX10)
#define IS_PXX2_INTERNAL_ENABLED() (true)
#else
#define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled)
#endif
#define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled)
void init_ppm(uint8_t module);
void disable_ppm(uint8_t module);
+5
View File
@@ -169,6 +169,11 @@ void boardInit()
bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE);
#endif
#if !defined(PCBXLITES) && !defined(PCBX3) && defined(PXX2)
#warning "PXX2 probe is not implemented"
hardwareOptions.pxx2Enabled = true;
#endif
#if !defined(PCBX9E)
// some X9E boards need that the pwrInit() is moved a little bit later
pwrInit();
+13 -11
View File
@@ -462,15 +462,6 @@ enum Analogs {
#define NUM_MOUSE_ANALOGS 0
#define NUM_DUMMY_ANAS 0
PACK(typedef struct {
#if defined(STICKS_PWM)
uint8_t sticksPwmDisabled:1;
#endif
uint8_t pxx2Enabled:1;
}) HardwareOptions;
extern HardwareOptions hardwareOptions;
#if defined(STICKS_PWM)
#define NUM_PWMSTICKS 4
#define STICKS_PWM_ENABLED() (!hardwareOptions.sticksPwmDisabled)
@@ -482,10 +473,21 @@ extern HardwareOptions hardwareOptions;
#define NUM_TRIMS_KEYS 8
#endif
#if defined(PCBXLITES) || defined(DEBUG)
PACK(typedef struct {
#if NUM_PWMSTICKS > 0
uint8_t sticksPwmDisabled:1;
#endif
uint8_t pxx2Enabled:1;
}) HardwareOptions;
extern HardwareOptions hardwareOptions;
#if !defined(PXX2)
#define IS_PXX2_INTERNAL_ENABLED() (false)
#elif defined(PCBXLITES) || defined(PCBX3) || defined(SIMU)
#define IS_PXX2_INTERNAL_ENABLED() (true)
#else
#define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled)
#define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled)
#endif
enum CalibratedAnalogs {