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

Custom Switches renamed to Logical Switches in comments

Browse source
This commit is contained in:
bsongis 2014-04-07 17:02:24 +02:00
parent 711112846c
commit e1df9df40f
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/eeprominterface.h
View file

@ -656,7 +656,7 @@ enum CSFunctionFamily {
LS_FAMILY_STAY, LS_FAMILY_STAY,
}; };
class LogicalSwitchData { // Custom Switches data class LogicalSwitchData { // Logical Switches data
public: public:
LogicalSwitchData(unsigned int func=0) LogicalSwitchData(unsigned int func=0)
{ {

2
radio/src/eeprom_conversions.cpp
View file

@ -449,7 +449,7 @@ void ConvertModel_215_to_216(ModelData &model)
// Curves: structure changed, 32 curves // Curves: structure changed, 32 curves
// Limits: min and max with PREC1 // Limits: min and max with PREC1
// Custom Functions: play repeat * 5 // Custom Functions: play repeat * 5
// Custom Switches: better precision for x when A comes from telemetry // Logical Switches: better precision for x when A comes from telemetry
// Main View: altitude in top bar // Main View: altitude in top bar
// Mixes: GVARS in weight moved from 512 to 4096 and -512 to -4096, because GVARS may be used in limits [-1250:1250] // Mixes: GVARS in weight moved from 512 to 4096 and -512 to -4096, because GVARS may be used in limits [-1250:1250]
// Switches: two 6-pos pots added, REa added to Sky9x // Switches: two 6-pos pots added, REa added to Sky9x

4
radio/src/gui/view_main.cpp
View file

@ -724,7 +724,7 @@ void menuMainView(uint8_t event)
doMainScreenGraphics(); doMainScreenGraphics();
} }
else { else {
// Custom Switches // Logical Switches
uint8_t sw = 0; uint8_t sw = 0;
for (uint8_t line=0; line<4; line++) { for (uint8_t line=0; line<4; line++) {
for (uint8_t col=0; col<8; col++) { for (uint8_t col=0; col<8; col++) {
@ -823,7 +823,7 @@ void menuMainView(uint8_t event)
} }
#endif // PCBGRUVIN9X && ROTARY_ENCODERS #endif // PCBGRUVIN9X && ROTARY_ENCODERS
// Custom Switches // Logical Switches
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++) { for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++) {
int8_t len = getSwitch(SWSRC_SW1+i) ? BAR_HEIGHT : 1; int8_t len = getSwitch(SWSRC_SW1+i) ? BAR_HEIGHT : 1;

4
radio/src/myeeprom.h
View file

@ -745,7 +745,7 @@ enum LogicalSwitchesFunctions {
#define MAX_LS_DELAY 250 /*25s*/ #define MAX_LS_DELAY 250 /*25s*/
#define MAX_LS_ANDSW SWSRC_LAST #define MAX_LS_ANDSW SWSRC_LAST
typedef int16_t ls_telemetry_value_t; typedef int16_t ls_telemetry_value_t;
PACK(typedef struct t_LogicalSwitchData { // Custom Switches data PACK(typedef struct t_LogicalSwitchData { // Logical Switches data
int8_t v1; int8_t v1;
int16_t v2; int16_t v2;
int16_t v3; int16_t v3;
@ -757,7 +757,7 @@ PACK(typedef struct t_LogicalSwitchData { // Custom Switches data
#else #else
typedef uint8_t ls_telemetry_value_t; typedef uint8_t ls_telemetry_value_t;
#define MAX_LS_ANDSW 15 #define MAX_LS_ANDSW 15
PACK(typedef struct t_LogicalSwitchData { // Custom Switches data PACK(typedef struct t_LogicalSwitchData { // Logical Switches data
int8_t v1; //input int8_t v1; //input
int8_t v2; //offset int8_t v2; //offset
uint8_t func:4; uint8_t func:4;