Merge pull request #494 from EdgeTX/nv14-build

NV14 Support and Build
This commit is contained in:
Raphael Coeffic
2021-07-27 09:39:03 +02:00
committed by GitHub
68 changed files with 823 additions and 354 deletions
+1 -1
View File
@@ -206,7 +206,7 @@ void boardInit()
#endif
init2MhzTimer();
init5msTimer();
init1msTimer();
usbInit();
hapticInit();
+1 -1
View File
@@ -75,7 +75,7 @@ void boardOff();
// Timers driver
void init2MhzTimer();
void init5msTimer();
void init1msTimer();
// PCBREV driver
enum {
@@ -166,8 +166,12 @@ void extmoduleSerialStart()
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
EXTMODULE_TIMER->EGR = 1; // Restart
EXTMODULE_TIMER->CCMR2 = TIM_CCMR2_OC3M_1 | TIM_CCMR2_OC3M_0;
#else
#if defined(PCBNV14)
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | TIM_CCER_CC1P; // inverted breaks NV14 build, inverted should be false here?
#else
EXTMODULE_TIMER->CCER = TIM_CCER_CC1E | (inverted ? 0 : TIM_CCER_CC1P);
#endif
EXTMODULE_TIMER->BDTR = TIM_BDTR_MOE; // Enable outputs
EXTMODULE_TIMER->CCR1 = 0;
EXTMODULE_TIMER->CCMR1 = TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1M_0; // Force O/P high
@@ -534,7 +534,6 @@ void flysky_hall_stick_loop(void)
if (log)
{
TRACE_NOCRLF("Hall(%0d):", FLYSKY_FLYSKY_HALL_BAUDRATE);
for (int idx = 0; idx < HallProtocol.length + 5; idx++)
{
TRACE_NOCRLF(" %02X", *((uint8_t*)&HallProtocol + idx));