diff --git a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp index b6d940254..b49bb692e 100644 --- a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp +++ b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp @@ -415,6 +415,8 @@ Node convert::encode(const GeneralSettings& rhs) } } + node["oneLogPerDay"] = (int)rhs.oneLogPerDay; + return node; } @@ -772,6 +774,8 @@ bool convert::decode(const Node& node, GeneralSettings& rhs) } } + node["oneLogPerDay"] >> rhs.oneLogPerDay; + // override critical settings after import // TODO: for consistency move up call stack to use existing eeprom and profile conversions if (needsConversion) diff --git a/companion/src/firmwares/generalsettings.h b/companion/src/firmwares/generalsettings.h index 5e3cd1aff..c0d553f75 100644 --- a/companion/src/firmwares/generalsettings.h +++ b/companion/src/firmwares/generalsettings.h @@ -456,6 +456,7 @@ class GeneralSettings { char* keyShortcutTools[MAX_KEYSHORTCUTS]; unsigned int qmFavorites[MAX_QMFAVOURITES]; char* qmFavoritesTools[MAX_QMFAVOURITES]; + bool oneLogPerDay; void switchConfigClear(); diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp index da6720aae..2e0b935c6 100644 --- a/companion/src/generaledit/generalsetup.cpp +++ b/companion/src/generaledit/generalsetup.cpp @@ -473,6 +473,7 @@ void GeneralSetupPanel::setValues() ui->registrationId->setText(generalSettings.registrationId); ui->startSoundCB->setChecked(!generalSettings.dontPlayHello); ui->modelQuickSelect_CB->setChecked(generalSettings.modelQuickSelect); + ui->chkOneLogPerDay->setChecked(generalSettings.oneLogPerDay); if (Boards::getCapability(board, Board::HasColorLcd)) { ui->modelSelectLayout_CB->setCurrentIndex(generalSettings.modelSelectLayout); @@ -942,3 +943,11 @@ void GeneralSetupPanel::on_startSoundCB_stateChanged(int) emit modified(); } } + +void GeneralSetupPanel::on_chkOneLogPerDay_stateChanged(int) +{ + if (!lock) { + generalSettings.oneLogPerDay = ui->chkOneLogPerDay->isChecked(); + emit modified(); + } +} diff --git a/companion/src/generaledit/generalsetup.h b/companion/src/generaledit/generalsetup.h index 4570e1eb0..232e03730 100644 --- a/companion/src/generaledit/generalsetup.h +++ b/companion/src/generaledit/generalsetup.h @@ -102,6 +102,7 @@ class GeneralSetupPanel : public GeneralPanel void on_favMultiMode_CB_currentIndexChanged(int); void on_pwrOffIfInactiveSB_editingFinished(); + void on_chkOneLogPerDay_stateChanged(int); private: Ui::GeneralSetup *ui; diff --git a/companion/src/generaledit/generalsetup.ui b/companion/src/generaledit/generalsetup.ui index 62153da95..310b12bec 100644 --- a/companion/src/generaledit/generalsetup.ui +++ b/companion/src/generaledit/generalsetup.ui @@ -32,10 +32,17 @@ QLayout::SizeConstraint::SetDefaultConstraint - - + + + + Power On Delay + + + + + - + 0 0 @@ -43,38 +50,16 @@ 0 - 22 + 0 - - - 16777215 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - true + Battery Meter Range - - + + 0 @@ -87,84 +72,6 @@ p, li { white-space: pre-wrap; } 22 - - - - - - - - Battery warning voltage. -This is the threshold where the battery warning sounds. - -Acceptable values are 3v..12v - - - - - - V - - - 1 - - - 3.000000000000000 - - - 12.000000000000000 - - - 0.100000000000000 - - - 9.600000000000000 - - - - - - - GPS Coordinates - - - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - - - - - - Beeper volume - -0 - Quiet. No beeps at all. -1 - No Keys. Normal beeps but menu keys do not beep. -2 - Normal. -3 - Loud. -4 - Extra loud. - Quiet @@ -172,7 +79,7 @@ Acceptable values are 3v..12v - Alarms Only + Only Alarms @@ -187,15 +94,8 @@ Acceptable values are 3v..12v - - - - Play Startup Sound - - - - - + + 0 @@ -205,59 +105,45 @@ Acceptable values are 3v..12v 0 + 22 + + + + + + + + + + If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes. + + + min + + + 120 + + + + + + + + 0 + 0 + + + + + 20 0 - + - Contrast - - - - - - - Power Off Delay - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Haptic Mode - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - RSSI Poweroff Warning + Battery Warning @@ -280,124 +166,18 @@ Acceptable values are 3v..12v - - - - - DMS - - - - - NMEA - - - - - - - - - 0 - 0 - + + + + min - - MAVLink Baud Rate + + 255 - - - - - Metric - - - - - Imperial - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Haptic Strength - - - - - - - Measurement Units - - - - - - - - 0 - 0 - - - - Default Channel Order - - - - - - - - 0s - - - - - 0.5s - - - - - 1s - - - - - 2s - - - - - 3s - - - - - - - - Stick Mode - - - - - + + 0 @@ -431,6 +211,47 @@ p, li { white-space: pre-wrap; } + + + + + + + + + + Mode selection: + +Mode 1: + Left stick: Elevator, Rudder + Right stick: Throttle, Aileron + +Mode 2: + Left stick: Throttle, Rudder + Right stick: Elevator, Aileron + +Mode 3: + Left stick: Elevator, Aileron + Right stick: Throttle, Rudder + +Mode 4: + Left stick: Throttle, Aileron + Right stick: Elevator, Rudder + + + + + -1 + + + + + + + Power ON/OFF Haptic + + + @@ -485,54 +306,6 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 0 - 22 - - - - - X-Short - - - - - Short - - - - - Normal - - - - - Long - - - - - X-Long - - - - - - - - Power ON/OFF Haptic - - - @@ -540,8 +313,8 @@ p, li { white-space: pre-wrap; } - - + + 0 @@ -551,35 +324,62 @@ p, li { white-space: pre-wrap; } 0 - 22 + 0 + + + + + Contrast + + + + + - Quiet + Metric - Only Alarms - - - - - No Keys - - - - - All + Imperial - - + + + + Stick Mode + + + + + + + Play Startup Sound + + + + + + + + 0 + 0 + + + + MAVLink Baud Rate + + + + + - + 0 0 @@ -587,101 +387,51 @@ p, li { white-space: pre-wrap; } 0 - 22 + 0 - - - 16777215 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - true + "No Sound" Warning - - + + + + 0.-- + - 0s + 0.-- - 0.5s + 0.0 - 1s - - - - - 2s - - - - - 3s + us - - - - - Ask on Connect - - - - - Joystick (HID) - - - - - USB Mass Storage - - - - - USB Serial (CDC) - - - + + - - - - Jack Mode - - - - - - - Power Auto Off - + + + + + DMS + + + + + NMEA + + @@ -703,8 +453,27 @@ p, li { white-space: pre-wrap; } - - + + + + + + + + + + + + 0 + 0 + + + + + 0 + 22 + + @@ -712,28 +481,38 @@ p, li { white-space: pre-wrap; } - Mode selection: + Battery warning voltage. +This is the threshold where the battery warning sounds. -Mode 1: - Left stick: Elevator, Rudder - Right stick: Throttle, Aileron - -Mode 2: - Left stick: Throttle, Rudder - Right stick: Elevator, Aileron - -Mode 3: - Left stick: Elevator, Aileron - Right stick: Throttle, Rudder - -Mode 4: - Left stick: Throttle, Aileron - Right stick: Elevator, Rudder - - +Acceptable values are 3v..12v - - -1 + + + + + V + + + 1 + + + 3.000000000000000 + + + 12.000000000000000 + + + 0.100000000000000 + + + 9.600000000000000 + + + + + + + PPM Units @@ -781,26 +560,414 @@ Mode 4: - - - - 0.-- + + + + + 0s + + + + + 0.5s + + + + + 1s + + + + + 2s + + + + + 3s + + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> + + + + + + true + + + + + + + Power Off Delay + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Beeper Length + + + + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> + + + ms + + + 0 + + + 1000 + + + 10 + + + 0 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Low EEPROM Warning + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Haptic Mode + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + + + + + + Beeper volume + +0 - Quiet. No beeps at all. +1 - No Keys. Normal beeps but menu keys do not beep. +2 - Normal. +3 - Loud. +4 - Extra loud. - 0.-- + Quiet - 0.0 + Alarms Only - us + No Keys + + + All + + + + + + + + + + + + + + <html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html> + + + -1 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Inactivity Timer + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 16777215 + 16777215 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> + + + + + + true + + + + + + + GPS Coordinates + + + + + + + USB Mode + + + + + + + + Ask on Connect + + + + + Audio + + + + + Trainer + + + + + + + + + Ask on Connect + + + + + Joystick (HID) + + + + + USB Mass Storage + + + + + USB Serial (CDC) + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + RSSI Poweroff Warning + + + + + + + Hats Mode + + + + + + + + 0 + 0 + + + + Play Delay (switch mid position) + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Haptic Length + + + + + + + Jack Mode + @@ -865,58 +1032,6 @@ Mode 4: - - - - - 0 - 0 - - - - - 0 - 0 - - - - "No Sound" Warning - - - - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> - - - ms - - - 0 - - - 1000 - - - 10 - - - 0 - - - @@ -951,8 +1066,8 @@ p, li { white-space: pre-wrap; } - - + + 0 @@ -962,35 +1077,62 @@ p, li { white-space: pre-wrap; } 0 - 22 + 0 - - - - - - - - If not zero will sound beeps if the transmitter has been left without inputs for the specified number of minutes. - - - min - - - 120 - - - - - - PPM Units + Haptic Strength - - + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + + 0s + + + + + 0.5s + + + + + 1s + + + + + 2s + + + + + 3s + + + + + + + + Power Auto Off + + @@ -1033,8 +1175,8 @@ p, li { white-space: pre-wrap; } - - + + 0 @@ -1044,27 +1186,36 @@ p, li { white-space: pre-wrap; } 0 - 0 + 22 - - Haptic Length - + + + X-Short + + + + + Short + + + + + Normal + + + + + Long + + + + + X-Long + + - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - @@ -1072,60 +1223,6 @@ p, li { white-space: pre-wrap; } - - - - - 0 - 0 - - - - - 0 - 0 - - - - Beeper Length - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - - - - - - true - - - @@ -1154,153 +1251,56 @@ p, li { white-space: pre-wrap; } - - - - + + + + + 0 + 0 + - - + + + 0 + 22 + + + + + 16777215 + 16777215 + - <html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html> - - - -1 - - - - - - - - 0 - 0 - - - - - 20 - 0 - - - - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" text-decoration: underline;">Warnings</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These will define startup warnings.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Throttle warning - will alert if the throttle is not at idle during startup</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Switch warning - will alert if switches are not in their defaul position</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Memory warning - will alert if there's not a lot of memory left</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Silent mode warning - will alert you if the beeper is set to quiet (0)</p></body></html> - Battery Warning + + + + true - - + + - Power On Delay + Measurement Units - - - - min - - - 255 - - - - - - - - Ask on Connect - - - - - Audio - - - - - Trainer - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Inactivity Timer - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Battery Meter Range - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Low EEPROM Warning - - - - - - - Hats Mode - - - - - - - USB Mode - - - - - + + 0 @@ -1308,7 +1308,21 @@ p, li { white-space: pre-wrap; } - Play Delay (switch mid position) + Default Channel Order + + + + + + + One log per day + + + + + + + diff --git a/radio/src/datastructs_private.h b/radio/src/datastructs_private.h index 8f30ef87c..c7367c6e4 100644 --- a/radio/src/datastructs_private.h +++ b/radio/src/datastructs_private.h @@ -1161,12 +1161,14 @@ PACK(struct RadioData { // Radio level tabs control (global settings) NOBACKUP(uint8_t modelSelectLayout:2); NOBACKUP(uint8_t radioThemesDisabled:1); - NOBACKUP(uint8_t spare:1 SKIP); + NOBACKUP(uint8_t oneLogPerDay:1); #elif LCD_W == 128 uint8_t invertLCD:1; // Invert B&W LCD display - NOBACKUP(uint8_t spare:6 SKIP); + NOBACKUP(uint8_t oneLogPerDay:1); + NOBACKUP(uint8_t spare:5 SKIP); #else - NOBACKUP(uint8_t spare:7 SKIP); + NOBACKUP(uint8_t oneLogPerDay:1); + NOBACKUP(uint8_t spare:6 SKIP); #endif NOBACKUP(uint8_t pwrOffIfInactive); diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index ea2d2e89e..d83504d8d 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -87,6 +87,7 @@ enum { CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_SOURCE) CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE) CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP) + ITEM_RADIO_ONE_LOG_PER_DAY, CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED) CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_OFF_SPEED) @@ -618,6 +619,13 @@ void menuRadioSetup(event_t event) break; #endif + case ITEM_RADIO_ONE_LOG_PER_DAY: { + lcdDrawTextAlignedLeft(y, STR_ONE_LOG_PER_DAY); + g_eeGeneral.oneLogPerDay = + editCheckBox(g_eeGeneral.oneLogPerDay, LCD_W - 9, y, nullptr, attr, event); + break; + } + case ITEM_RADIO_SETUP_DISABLE_SPLASH: { lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 66e161fcd..6cc2d1175 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -84,6 +84,7 @@ enum MenuRadioSetupItems { ITEM_RADIO_SETUP_BACKLIGHT_SOURCE, ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE, ITEM_RADIO_SETUP_FLASH_BEEP, + ITEM_RADIO_ONE_LOG_PER_DAY, CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED) CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_OFF_SPEED) @@ -604,6 +605,13 @@ void menuRadioSetup(event_t event) lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, STR_SF_OVERRIDDEN, RIGHT); break; + case ITEM_RADIO_ONE_LOG_PER_DAY: { + lcdDrawTextAlignedLeft(y, STR_ONE_LOG_PER_DAY); + g_eeGeneral.oneLogPerDay = + editCheckBox(g_eeGeneral.oneLogPerDay, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event); + break; + } + case ITEM_RADIO_SETUP_DISABLE_SPLASH: lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); if (SPLASH_NEEDED()) { diff --git a/radio/src/gui/colorlcd/radio/radio_setup.cpp b/radio/src/gui/colorlcd/radio/radio_setup.cpp index 3802a9a19..5dab6abfd 100644 --- a/radio/src/gui/colorlcd/radio/radio_setup.cpp +++ b/radio/src/gui/colorlcd/radio/radio_setup.cpp @@ -782,6 +782,13 @@ const static SetupLineDef manageModelsSetupLines[] = { }; const static SetupLineDef setupLines[] = { + { + // Have only one log per day + STR_DEF(STR_ONE_LOG_PER_DAY), + [](Window* parent, coord_t x, coord_t y) { + new ToggleSwitch(parent, {x, y, 0, 0}, GET_SET_DEFAULT(g_eeGeneral.oneLogPerDay)); + } + }, { // Splash screen STR_DEF(STR_SPLASHSCREEN), diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index 7e7420b67..ef5c9ce22 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -122,7 +122,10 @@ const char * logsOpen() } #if defined(RTCLOCK) - tmp = strAppendDate(tmp, true); + if (g_eeGeneral.oneLogPerDay) + tmp = strAppendDate(tmp); + else + tmp = strAppendDate(tmp, true); #endif strAppend(tmp, LOGS_EXT); diff --git a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp index 0426587a1..9246fa136 100644 --- a/radio/src/storage/yaml/yaml_datastructs_128x64.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_128x64.cpp @@ -384,7 +384,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_UNSIGNED( "invertLCD", 1 ), - YAML_PADDING( 6 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_f16.cpp b/radio/src/storage/yaml/yaml_datastructs_f16.cpp index ce82d2175..1bc49eb77 100644 --- a/radio/src/storage/yaml/yaml_datastructs_f16.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_f16.cpp @@ -456,7 +456,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_gx12.cpp b/radio/src/storage/yaml/yaml_datastructs_gx12.cpp index 6bcae7b09..f1ec725f2 100644 --- a/radio/src/storage/yaml/yaml_datastructs_gx12.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_gx12.cpp @@ -408,7 +408,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_UNSIGNED( "invertLCD", 1 ), - YAML_PADDING( 6 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp index 419ebcb96..0612d9857 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nb4p.cpp @@ -447,7 +447,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp index dbbcf7a20..0d558b01c 100644 --- a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp @@ -454,7 +454,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_pa01.cpp b/radio/src/storage/yaml/yaml_datastructs_pa01.cpp index 7964e7604..1f31ce303 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pa01.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pa01.cpp @@ -479,7 +479,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp index 5dbb6661f..0c3c3ded1 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pl18.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pl18.cpp @@ -454,7 +454,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp b/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp index 07342b48b..7727001f6 100644 --- a/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_pl18u.cpp @@ -447,7 +447,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_st16.cpp b/radio/src/storage/yaml/yaml_datastructs_st16.cpp index e1af5c6fd..18ffed16d 100644 --- a/radio/src/storage/yaml/yaml_datastructs_st16.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_st16.cpp @@ -479,7 +479,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_t15.cpp b/radio/src/storage/yaml/yaml_datastructs_t15.cpp index 273fbbfd3..c826d265e 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t15.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t15.cpp @@ -464,7 +464,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp b/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp index e1af5c6fd..18ffed16d 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t15pro.cpp @@ -479,7 +479,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_t20.cpp b/radio/src/storage/yaml/yaml_datastructs_t20.cpp index d9a6f2e4d..36b0c22eb 100644 --- a/radio/src/storage/yaml/yaml_datastructs_t20.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_t20.cpp @@ -393,7 +393,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_UNSIGNED( "invertLCD", 1 ), - YAML_PADDING( 6 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp index ec744cfb4..773e72c43 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tpro.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tpro.cpp @@ -393,7 +393,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_UNSIGNED( "invertLCD", 1 ), - YAML_PADDING( 6 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_tx15.cpp b/radio/src/storage/yaml/yaml_datastructs_tx15.cpp index e1af5c6fd..18ffed16d 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx15.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx15.cpp @@ -479,7 +479,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_tx16smk3.cpp b/radio/src/storage/yaml/yaml_datastructs_tx16smk3.cpp index 0931ec971..60eeb8c37 100644 --- a/radio/src/storage/yaml/yaml_datastructs_tx16smk3.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_tx16smk3.cpp @@ -480,7 +480,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x10.cpp b/radio/src/storage/yaml/yaml_datastructs_x10.cpp index c938c8955..ad2938cec 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x10.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x10.cpp @@ -455,7 +455,7 @@ static const struct YamlNode struct_RadioData[] = { YAML_UNSIGNED( "favMultiMode", 1 ), YAML_UNSIGNED( "modelSelectLayout", 2 ), YAML_UNSIGNED( "radioThemesDisabled", 1 ), - YAML_PADDING( 1 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_ARRAY("keyShortcuts", 8, 6, struct_KeyShortcut, NULL), YAML_ARRAY("qmFavorites", 8, 12, struct_QMFavorite, NULL), diff --git a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp index 48d4034ff..24f9395ca 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9d.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9d.cpp @@ -383,7 +383,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ), YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), - YAML_PADDING( 7 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 6 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp b/radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp index 48d4034ff..24f9395ca 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9dp2019.cpp @@ -383,7 +383,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ), YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), - YAML_PADDING( 7 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 6 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp index 0cc9ff215..d6c6527e0 100644 --- a/radio/src/storage/yaml/yaml_datastructs_x9e.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_x9e.cpp @@ -383,7 +383,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disableTrainerPoweroffAlarm", 1 ), YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), - YAML_PADDING( 7 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 6 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp index 0426587a1..9246fa136 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlite.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlite.cpp @@ -384,7 +384,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_UNSIGNED( "invertLCD", 1 ), - YAML_PADDING( 6 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp index dea9859e5..4365672c6 100644 --- a/radio/src/storage/yaml/yaml_datastructs_xlites.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_xlites.cpp @@ -388,7 +388,8 @@ static const struct YamlNode struct_RadioData[] = { YAML_SIGNED( "disablePwrOnOffHaptic", 1 ), YAML_UNSIGNED( "modelQuickSelect", 1 ), YAML_UNSIGNED( "invertLCD", 1 ), - YAML_PADDING( 6 ), + YAML_UNSIGNED( "oneLogPerDay", 1 ), + YAML_PADDING( 5 ), YAML_UNSIGNED( "pwrOffIfInactive", 8 ), YAML_END }; diff --git a/radio/src/translations/i18n/cn.h b/radio/src/translations/i18n/cn.h index 9837c8bd1..38a577bac 100644 --- a/radio/src/translations/i18n/cn.h +++ b/radio/src/translations/i18n/cn.h @@ -568,6 +568,7 @@ #define TR_BLOFFBRIGHTNESS "背光关" #define TR_KEYS_BACKLIGHT "按键背光" #define TR_BLCOLOR "颜色" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "开机图片" #define TR_PLAY_HELLO "开机语音" #define TR_PWR_ON_DELAY "开机延迟" diff --git a/radio/src/translations/i18n/cz.h b/radio/src/translations/i18n/cz.h index 2ab0208dd..e90c96e66 100644 --- a/radio/src/translations/i18n/cz.h +++ b/radio/src/translations/i18n/cz.h @@ -571,6 +571,7 @@ #define TR_BLOFFBRIGHTNESS "Jas vypnutého LCD" #define TR_KEYS_BACKLIGHT "Podsvětlení kláves" #define TR_BLCOLOR "Barva" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN TR("úvodní logo", "Zobrazit úvodní logo") #define TR_PLAY_HELLO "Zvuk při spuštění" #define TR_PWR_ON_DELAY "Zpoždění zapnutí" diff --git a/radio/src/translations/i18n/da.h b/radio/src/translations/i18n/da.h index e284a35ef..aa026f6bd 100644 --- a/radio/src/translations/i18n/da.h +++ b/radio/src/translations/i18n/da.h @@ -573,6 +573,7 @@ #define TR_BLOFFBRIGHTNESS "FRA klarhed" #define TR_KEYS_BACKLIGHT "Taster klarhed" #define TR_BLCOLOR "Farve" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Start skærm" #define TR_PLAY_HELLO "Startop lyd" #define TR_PWR_ON_DELAY "Forsinkelse ved tænd" diff --git a/radio/src/translations/i18n/de.h b/radio/src/translations/i18n/de.h index ec873f890..dffbdae34 100644 --- a/radio/src/translations/i18n/de.h +++ b/radio/src/translations/i18n/de.h @@ -569,6 +569,7 @@ #define TR_BLOFFBRIGHTNESS "Aus-Helligkeit" #define TR_KEYS_BACKLIGHT "Tastenbeleucht." #define TR_BLCOLOR "Farbe" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN TR("Startbild Ein", "Startbild Anzeigedauer") #define TR_PLAY_HELLO "Startton abspielen" #define TR_PWR_ON_DELAY TR("PWR EIN Verzög.", "Einschaltverzögerung") diff --git a/radio/src/translations/i18n/en.h b/radio/src/translations/i18n/en.h index 618debff2..6eca516e3 100644 --- a/radio/src/translations/i18n/en.h +++ b/radio/src/translations/i18n/en.h @@ -569,6 +569,7 @@ #define TR_BLOFFBRIGHTNESS "OFF brightness" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Color" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Splash screen" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" diff --git a/radio/src/translations/i18n/es.h b/radio/src/translations/i18n/es.h index c08ad3474..7eba825d7 100644 --- a/radio/src/translations/i18n/es.h +++ b/radio/src/translations/i18n/es.h @@ -567,6 +567,7 @@ #define TR_BLOFFBRIGHTNESS "MENOS brillo" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Color" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Pantalla inicio" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY TR("Atraso On", "Atraso encendido") diff --git a/radio/src/translations/i18n/fi.h b/radio/src/translations/i18n/fi.h index 49bbcbde3..c021622c0 100644 --- a/radio/src/translations/i18n/fi.h +++ b/radio/src/translations/i18n/fi.h @@ -568,6 +568,7 @@ #define TR_BLOFFBRIGHTNESS "OFF Brightness" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Color" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Splash screen" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" diff --git a/radio/src/translations/i18n/fr.h b/radio/src/translations/i18n/fr.h index 2544b973a..940d456e2 100644 --- a/radio/src/translations/i18n/fr.h +++ b/radio/src/translations/i18n/fr.h @@ -572,6 +572,7 @@ #define TR_BLOFFBRIGHTNESS "Luminosité OFF" #define TR_KEYS_BACKLIGHT "Rétroéclairage touches" #define TR_BLCOLOR "Couleur" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Ecran d'accueil" #define TR_PLAY_HELLO "Son de démarrage" #define TR_PWR_ON_DELAY "Délai btn ON" diff --git a/radio/src/translations/i18n/he.h b/radio/src/translations/i18n/he.h index b433767f3..3d406638d 100644 --- a/radio/src/translations/i18n/he.h +++ b/radio/src/translations/i18n/he.h @@ -572,6 +572,7 @@ #define TR_BLOFFBRIGHTNESS "בהירות כבויה" #define TR_KEYS_BACKLIGHT "תאורת לחצנים" #define TR_BLCOLOR "צבע" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "מסך פתיחה" #define TR_PLAY_HELLO "צליל אתחול" #define TR_PWR_ON_DELAY "השהיית הפעלה פעיל" diff --git a/radio/src/translations/i18n/it.h b/radio/src/translations/i18n/it.h index 6cec0149e..46f37e3a4 100644 --- a/radio/src/translations/i18n/it.h +++ b/radio/src/translations/i18n/it.h @@ -569,6 +569,7 @@ #define TR_BLOFFBRIGHTNESS "Luminosità OFF" #define TR_KEYS_BACKLIGHT "Luce tasti" #define TR_BLCOLOR "Colore" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN TR("Sch. avvio", "Schermata d'avvio") #define TR_PLAY_HELLO "Suono all'accensione" #define TR_PWR_ON_DELAY "Rit. accens." diff --git a/radio/src/translations/i18n/jp.h b/radio/src/translations/i18n/jp.h index e36342a51..4cb5738f7 100644 --- a/radio/src/translations/i18n/jp.h +++ b/radio/src/translations/i18n/jp.h @@ -568,6 +568,7 @@ #define TR_BLOFFBRIGHTNESS "バックライトOFF" #define TR_KEYS_BACKLIGHT "キー バックライト" #define TR_BLCOLOR "カラー" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "起動イメージ" #define TR_PLAY_HELLO "起動時サウンド" #define TR_PWR_ON_DELAY "電源ON遅延" diff --git a/radio/src/translations/i18n/ko.h b/radio/src/translations/i18n/ko.h index fca1b999f..2f5137502 100644 --- a/radio/src/translations/i18n/ko.h +++ b/radio/src/translations/i18n/ko.h @@ -578,6 +578,7 @@ #define TR_BLOFFBRIGHTNESS "꺼짐 밝기" #define TR_KEYS_BACKLIGHT "키 백라이트" #define TR_BLCOLOR "색상" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "시작화면" #define TR_PLAY_HELLO "시작 사운드" diff --git a/radio/src/translations/i18n/nl.h b/radio/src/translations/i18n/nl.h index d9db8ed7b..e4510519d 100644 --- a/radio/src/translations/i18n/nl.h +++ b/radio/src/translations/i18n/nl.h @@ -570,6 +570,7 @@ #define TR_BLOFFBRIGHTNESS "Uit-Helderheid" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Kleur" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Startscherm Aan" #define TR_PLAY_HELLO "Startup Sound" #define TR_PWR_ON_DELAY "Pwr On delay" diff --git a/radio/src/translations/i18n/pl.h b/radio/src/translations/i18n/pl.h index c83aecf9f..8834f06a1 100644 --- a/radio/src/translations/i18n/pl.h +++ b/radio/src/translations/i18n/pl.h @@ -568,6 +568,7 @@ #define TR_BLOFFBRIGHTNESS "Jasność wył." #define TR_KEYS_BACKLIGHT "Podśw. przycisków" #define TR_BLCOLOR "Kolor" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Logo ekranu" #define TR_PLAY_HELLO "Dźwięk uruchomienia" #define TR_PWR_ON_DELAY "Pwr On delay" diff --git a/radio/src/translations/i18n/pt.h b/radio/src/translations/i18n/pt.h index 3f56949d4..3166d7c01 100644 --- a/radio/src/translations/i18n/pt.h +++ b/radio/src/translations/i18n/pt.h @@ -569,6 +569,7 @@ #define TR_BLOFFBRIGHTNESS "Brilho DESL" #define TR_KEYS_BACKLIGHT "Keys backlight" #define TR_BLCOLOR "Cor" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Tela abertura" #define TR_PLAY_HELLO "Som ao ligar" #define TR_PWR_ON_DELAY "Delay para LIGA" diff --git a/radio/src/translations/i18n/ru.h b/radio/src/translations/i18n/ru.h index 2eb1361d2..e2a7484f6 100644 --- a/radio/src/translations/i18n/ru.h +++ b/radio/src/translations/i18n/ru.h @@ -571,6 +571,7 @@ #define TR_BLOFFBRIGHTNESS "Подсветка Вык" #define TR_KEYS_BACKLIGHT "Подсветка клавиш" #define TR_BLCOLOR "Цвет" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Заставка" #define TR_PLAY_HELLO "Звук запуска" #define TR_PWR_ON_DELAY "Время включ" diff --git a/radio/src/translations/i18n/se.h b/radio/src/translations/i18n/se.h index f8798164f..d707aedb2 100644 --- a/radio/src/translations/i18n/se.h +++ b/radio/src/translations/i18n/se.h @@ -571,6 +571,7 @@ #define TR_BLONBRIGHTNESS "Ljusstyrka på" #define TR_BLOFFBRIGHTNESS "Ljusstyrka av" #define TR_KEYS_BACKLIGHT "Tangentbelysning" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Startbild" #define TR_PLAY_HELLO "Startljud" #define TR_PWR_ON_DELAY "Fördröj start" diff --git a/radio/src/translations/i18n/tw.h b/radio/src/translations/i18n/tw.h index 9530fcd89..fc974fd59 100644 --- a/radio/src/translations/i18n/tw.h +++ b/radio/src/translations/i18n/tw.h @@ -566,6 +566,7 @@ #define TR_BLOFFBRIGHTNESS "背光關" #define TR_KEYS_BACKLIGHT "按鍵背光" #define TR_BLCOLOR "顏色" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "開機圖片" #define TR_PLAY_HELLO "開機語音" #define TR_PWR_ON_DELAY "開機延遲" diff --git a/radio/src/translations/i18n/ua.h b/radio/src/translations/i18n/ua.h index f80771fc2..03329c26f 100644 --- a/radio/src/translations/i18n/ua.h +++ b/radio/src/translations/i18n/ua.h @@ -570,6 +570,7 @@ #define TR_BLOFFBRIGHTNESS "OFF яскравість" #define TR_KEYS_BACKLIGHT "Яскравість кнопки" #define TR_BLCOLOR "Колір" +#define TR_ONE_LOG_PER_DAY "One log per day" #define TR_SPLASHSCREEN "Заставка" #define TR_PLAY_HELLO "Звук запуску" #define TR_PWR_ON_DELAY "Затримка увімкн." diff --git a/radio/src/translations/sim_string_list.h b/radio/src/translations/sim_string_list.h index 2d132e9ec..87a5dacb8 100644 --- a/radio/src/translations/sim_string_list.h +++ b/radio/src/translations/sim_string_list.h @@ -1156,3 +1156,4 @@ #define STR_VUNITSSYSTEM currentLangStrings->STR_VUNITSSYSTEM #define STR_VVARIOCENTER currentLangStrings->STR_VVARIOCENTER #define STR_XJT_ACCST_RF_PROTOCOLS currentLangStrings->STR_XJT_ACCST_RF_PROTOCOLS +#define STR_ONE_LOG_PER_DAY currentLangStrings->STR_ONE_LOG_PER_DAY diff --git a/radio/src/translations/string_list.h b/radio/src/translations/string_list.h index 8a4258d5d..d618ecc47 100644 --- a/radio/src/translations/string_list.h +++ b/radio/src/translations/string_list.h @@ -945,6 +945,7 @@ STR(SOURCE) STR(SPECTRUM_ANALYSER_EXT) STR(SPECTRUM_ANALYSER_INT) STR(SPLASHSCREEN) +STR(ONE_LOG_PER_DAY) STR(SPORT_UPDATE_POWER_MODE) STR(SRC_BATT) STR(SRC_GPS)