Pull default config out

This commit is contained in:
Ben V. Brown
2020-05-23 13:59:51 +10:00
parent 4814ae1393
commit f45fd087ab
3 changed files with 21 additions and 17 deletions

View File

@@ -105,6 +105,6 @@ void resetSettings() {
systemSettings.ReverseButtonTempChangeEnabled = REVERSE_BUTTON_TEMP_CHANGE; // systemSettings.ReverseButtonTempChangeEnabled = REVERSE_BUTTON_TEMP_CHANGE; //
systemSettings.TempChangeShortStep = TEMP_CHANGE_SHORT_STEP; // systemSettings.TempChangeShortStep = TEMP_CHANGE_SHORT_STEP; //
systemSettings.TempChangeLongStep = TEMP_CHANGE_LONG_STEP; // systemSettings.TempChangeLongStep = TEMP_CHANGE_LONG_STEP; //
systemSettings.KeepAwakePulse= 3; systemSettings.KeepAwakePulse= POWER_PULSE_DEFAULT;
saveSettings(); // Save defaults saveSettings(); // Save defaults
} }

View File

@@ -786,16 +786,15 @@ static void settings_displayTempChangeLongStep(void) {
static void settings_setPowerPulse(void) { static void settings_setPowerPulse(void) {
systemSettings.KeepAwakePulse += POWER_PULSE_INCREMENT; systemSettings.KeepAwakePulse += POWER_PULSE_INCREMENT;
if (systemSettings.KeepAwakePulse > POWER_PULSE_MAX) { systemSettings.KeepAwakePulse %= POWER_PULSE_MAX;
systemSettings.KeepAwakePulse = POWER_PULSE_MAX; // loop back to 0
}
} }
static void settings_displayPowerPulse(void) { static void settings_displayPowerPulse(void) {
printShortDescription(26, 5); printShortDescription(26, 5);
if (systemSettings.TempChangeLongStep) { if (systemSettings.KeepAwakePulse) {
OLED::printNumber(systemSettings.TempChangeLongStep / 10, 1); OLED::printNumber(systemSettings.KeepAwakePulse / 10, 1);
OLED::print(SymbolDot); OLED::print(SymbolDot);
OLED::printNumber(systemSettings.TempChangeLongStep % 10, 1); OLED::printNumber(systemSettings.KeepAwakePulse % 10, 1);
} else { } else {
OLED::drawCheckbox(false); OLED::drawCheckbox(false);
} }

View File

@@ -57,6 +57,11 @@
/* Power pulse for keeping power banks awake*/ /* Power pulse for keeping power banks awake*/
#define POWER_PULSE_INCREMENT 1 #define POWER_PULSE_INCREMENT 1
#define POWER_PULSE_MAX 50 // x10 max watts #define POWER_PULSE_MAX 50 // x10 max watts
#ifdef MODEL_TS100
#define POWER_PULSE_DEFAULT 0
#else
#define POWER_PULSE_DEFAULT 5
#endif
/** /**
* OLED Orientation Sensitivity on Automatic mode! * OLED Orientation Sensitivity on Automatic mode!
* Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive> * Motion Sensitivity <0=Off 1=Least Sensitive 9=Most Sensitive>