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

Cosmetics

Browse Source
This commit is contained in:
3djc
2022-03-21 11:48:50 +01:00
committed by Raphael Coeffic
parent c0e6f2a7f9
commit 0cc2b95b09
20 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/datastructs_private.h
+1 -1
View File
@@ -868,7 +868,7 @@ PACK(struct RadioData {
int8_t timezone:5;
uint8_t adjustRTC:1;
NOBACKUP(uint8_t inactivityTimer);
uint8_t InternalModuleBaudrate:3;
uint8_t internalModuleBaudrate:3;
SPLASH_MODE; /* 3bits */
int8_t hapticMode:2 CUST(r_beeperMode,w_beeperMode);
int8_t switchesDelay;
radio/src/gui/colorlcd/radio_hardware.cpp
+2 -2
View File
@@ -288,10 +288,10 @@ class InternalModuleWindow : public FormGroup {
new StaticText(this, grid.getLabelSlot(), STR_BAUDRATE, 0,COLOR_THEME_PRIMARY1);
new Choice(this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,CROSSFIRE_MAX_INTERNAL_BAUDRATE,
[=]() -> int {
return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate);
return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate);
},
[=](int newValue) {
g_eeGeneral.InternalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(newValue);
g_eeGeneral.internalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(newValue);
SET_DIRTY();
restartExternalModule();
});
radio/src/gui/common/stdlcd/radio_hardware.cpp
+1 -1
View File
@@ -537,7 +537,7 @@ void menuRadioHardware(event_t event)
lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE);
lcdDrawNumber(HW_SETTINGS_COLUMN2, y, INT_CROSSFIRE_BAUDRATE, attr|LEFT);
if (attr) {
g_eeGeneral.InternalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate), 0, CROSSFIRE_MAX_INTERNAL_BAUDRATE));
g_eeGeneral.internalModuleBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event, CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate), 0, CROSSFIRE_MAX_INTERNAL_BAUDRATE));
if (checkIncDec_Ret) {
restartInternalModule();
}
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+1 -1
View File
@@ -380,7 +380,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_PADDING( 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_t12.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_t8.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_tlite.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+1 -1
View File
@@ -359,7 +359,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_tx12.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+1 -1
View File
@@ -401,7 +401,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_PADDING( 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+1 -1
View File
@@ -399,7 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_PADDING( 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x7.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+1 -1
View File
@@ -358,7 +358,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+1 -1
View File
@@ -397,7 +397,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x9lite.cpp
+1 -1
View File
@@ -338,7 +338,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_x9lites.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_xlite.cpp
+1 -1
View File
@@ -343,7 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+1 -1
View File
@@ -345,7 +345,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/storage/yaml/yaml_datastructs_zorro.cpp
+1 -1
View File
@@ -351,7 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "timezone", 5 ),
YAML_UNSIGNED( "adjustRTC", 1 ),
YAML_UNSIGNED( "inactivityTimer", 8 ),
YAML_UNSIGNED( "InternalModuleBaudrate", 3 ),
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
YAML_SIGNED( "splashMode", 3 ),
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
YAML_SIGNED( "switchesDelay", 8 ),
radio/src/telemetry/crossfire.h
+1 -1
View File
@@ -139,7 +139,7 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
% DIM(CROSSFIRE_BAUDRATES)
#endif
#define INT_CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate)]
#define INT_CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate)]
#define EXT_CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[EXTERNAL_MODULE].crsf.telemetryBaudrate)]
#define CROSSFIRE_PERIOD (CROSSFIRE_FRAME_PERIODS[CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[EXTERNAL_MODULE].crsf.telemetryBaudrate)] * 1000)