piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SKY compile errors

Browse Source
This commit is contained in:
michael.blandford@mypostoffice.co.uk
2013-04-14 21:24:39 +00:00
parent 5118eccf4d
commit 37cc13c140
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pulses_arm.cpp
+12 -2
View File
@@ -422,10 +422,20 @@ void setupPulsesPXX(MODULE_INDEX_PARAM)
/* FLAG1 */
uint8_t flag1;
if (pxxFlag[0] & PXX_SEND_RXNUM) {
flag1 = (g_model.moduleData[module_index].rfProtocol << 6) | (g_eeGeneral.countryCode << 1) | pxxFlag[module_index];
#if defined(PCBTARANIS)
flag1 = (g_model.moduleData[module_index].rfProtocol << 6) | (g_eeGeneral.countryCode << 1) | pxxFlag[module_index];
}
else {
flag1 = (g_model.moduleData[module_index].rfProtocol << 6) | pxxFlag[0];
#else
flag1 = (g_model.moduleData[0].rfProtocol << 6) | (g_eeGeneral.countryCode << 1) | pxxFlag[module_index];
}
else {
flag1 = (g_model.moduleData[0].rfProtocol << 6) | pxxFlag[0];
#endif
#if defined(PCBTARANIS)
if (g_model.moduleData[module_index].failsafeMode != FAILSAFE_HOLD) {
if (failsafeCounter-- == 0) {
@@ -719,7 +729,7 @@ void setupPulses(MODULE_INDEX_PARAM)
#if defined(PCBTARANIS)
disable_ppm(module_index);
#else
disable_ppm();
disable_main_ppm();
#endif
break;
}