Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-18 05:45:21 +03:00
Code Issues Wiki Activity

Change default at model creation from XJT-D16 8CH to XJT-D16 16CH on … (#3913)

Browse source 
* Change default at model creation from XJT-D16 8CH to XJT-D16 16CH on Taranis and Horus

* Set defaultto 16CH also on protocol change

* External module on Taranis

* MACRO's are good for you

* They are so good they should be used everywhere !

* And everywhere also includes the 9X UIs!
This commit is contained in:
3djc 2016-10-16 09:22:36 +02:00 • committed by Bertrand Songis
parent 504bb7a98c
commit 26d2de18c2
5 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
radio/src/gui/128x64/model_setup.cpp
View file

@ -576,7 +576,7 @@ void menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[0].type = MODULE_TYPE_XJT; g_model.moduleData[0].type = MODULE_TYPE_XJT;
g_model.moduleData[0].channelsStart = 0; g_model.moduleData[0].channelsStart = 0;
g_model.moduleData[0].channelsCount = 0; g_model.moduleData[0].channelsCount = DEFAULT_CHANNELS(INTERNAL_MODULE);
} }
} }
break; break;
@ -613,10 +613,7 @@ void menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) g_model.moduleData[EXTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(EXTERNAL_MODULE);
g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0;
else
g_model.moduleData[EXTERNAL_MODULE].channelsCount = MAX_EXTERNAL_MODULE_CHANNELS();
} }
break; break;
case 1: case 1:
@ -645,7 +642,7 @@ void menuModelSetup(event_t event)
} }
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsCount = MAX_EXTERNAL_MODULE_CHANNELS(); g_model.moduleData[EXTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(EXTERNAL_MODULE);
} }
} }
} }

10
radio/src/gui/212x64/model_setup.cpp
View file

@ -669,14 +669,14 @@ void menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[INTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; g_model.moduleData[INTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; g_model.moduleData[INTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(INTERNAL_MODULE);;
} }
break; break;
case 1: case 1:
g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, RF_PROTO_X16, RF_PROTO_LAST, EE_MODEL, isRfProtocolAvailable); g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, RF_PROTO_X16, RF_PROTO_LAST, EE_MODEL, isRfProtocolAvailable);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[INTERNAL_MODULE].channelsStart = 0; g_model.moduleData[INTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[INTERNAL_MODULE].channelsCount = 0; g_model.moduleData[INTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(INTERNAL_MODULE);
} }
} }
} }
@ -690,7 +690,7 @@ void menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[0].type = MODULE_TYPE_XJT; g_model.moduleData[0].type = MODULE_TYPE_XJT;
g_model.moduleData[0].channelsStart = 0; g_model.moduleData[0].channelsStart = 0;
g_model.moduleData[0].channelsCount = 0; g_model.moduleData[0].channelsCount = DEFAULT_CHANNELS(INTERNAL_MODULE);
} }
} }
break; break;
@ -766,7 +766,7 @@ void menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsCount = min<int8_t>(0, MAX_EXTERNAL_MODULE_CHANNELS()); g_model.moduleData[EXTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(EXTERNAL_MODULE);
} }
break; break;
case 1: case 1:
@ -795,7 +795,7 @@ void menuModelSetup(event_t event)
} }
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0; g_model.moduleData[EXTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(EXTERNAL_MODULE);
} }
break; break;
#if defined(MULTIMODULE) #if defined(MULTIMODULE)

9
radio/src/gui/480x272/model_setup.cpp
View file

@ -610,7 +610,7 @@ bool menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[0].type = MODULE_TYPE_XJT; g_model.moduleData[0].type = MODULE_TYPE_XJT;
g_model.moduleData[0].channelsStart = 0; g_model.moduleData[0].channelsStart = 0;
g_model.moduleData[0].channelsCount = 0; g_model.moduleData[0].channelsCount = DEFAULT_CHANNELS(INTERNAL_MODULE);
} }
} }
break; break;
@ -697,10 +697,7 @@ bool menuModelSetup(event_t event)
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0; g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) g_model.moduleData[EXTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(EXTERNAL_MODULE);
g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0;
else
g_model.moduleData[EXTERNAL_MODULE].channelsCount = MAX_EXTERNAL_MODULE_CHANNELS();
} }
break; break;
case 1: case 1:
@ -727,7 +724,7 @@ bool menuModelSetup(event_t event)
} }
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsCount = MAX_EXTERNAL_MODULE_CHANNELS(); g_model.moduleData[EXTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(EXTERNAL_MODULE);
} }
break; break;
#if defined(MULTIMODULE) #if defined(MULTIMODULE)

3
radio/src/opentx.cpp
View file

@ -422,8 +422,9 @@ void modelDefault(uint8_t id)
} }
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS) || defined(PCBHORUS)
g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT; g_model.moduleData[INTERNAL_MODULE].type = MODULE_TYPE_XJT;
g_model.moduleData[INTERNAL_MODULE].channelsCount = DEFAULT_CHANNELS(INTERNAL_MODULE);
#elif defined(PCBSKY9X) #elif defined(PCBSKY9X)
g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM; g_model.moduleData[EXTERNAL_MODULE].type = MODULE_TYPE_PPM;
#endif #endif

1
radio/src/opentx.h
View file

@ -440,6 +440,7 @@ void memswap(void * a, void * b, uint8_t size);
#define MAX_CHANNELS(idx) (idx==EXTERNAL_MODULE ? MAX_EXTERNAL_MODULE_CHANNELS() : MAX_TRAINER_CHANNELS_M8()) #define MAX_CHANNELS(idx) (idx==EXTERNAL_MODULE ? MAX_EXTERNAL_MODULE_CHANNELS() : MAX_TRAINER_CHANNELS_M8())
#define NUM_CHANNELS(idx) (8+g_model.moduleData[idx].channelsCount) #define NUM_CHANNELS(idx) (8+g_model.moduleData[idx].channelsCount)
#endif #endif
#define DEFAULT_CHANNELS(idx) (IS_MODULE_PPM(idx) ? 0 : MAX_CHANNELS(idx))
#if defined(CPUARM) #if defined(CPUARM)
#define MASK_CFN_TYPE uint64_t // current max = 64 function switches #define MASK_CFN_TYPE uint64_t // current max = 64 function switches