rfidrig/ChameleonMini
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonMini.git synced 2026-05-12 11:20:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug within cycle_settings button functionality

Browse Source
This commit is contained in:
Georg
2017-11-07 15:29:23 +01:00
parent 1dc6698915
commit 44f2085401
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Settings.c
+31 -21
View File
@@ -35,7 +35,14 @@ void SettingsLoad(void) {
void SettingsSave(void) {
#if ENABLE_EEPROM_SETTINGS
WriteEEPBlock((uint16_t) &StoredSettings, &GlobalSettings, sizeof(SettingsType));
WriteEEPBlock((uint16_t) &StoredSettings, &GlobalSettings, sizeof(SettingsType));
#endif
}
void ActiveSettingNumberSave(void) {
#if ENABLE_EEPROM_SETTINGS
eeprom_update_byte(&StoredSettings.ActiveSettingIdx, GlobalSettings.ActiveSettingIdx);
eeprom_update_word((uint16_t*)&StoredSettings.ActiveSettingPtr, (uint16_t)GlobalSettings.ActiveSettingPtr);
#endif
}
@@ -56,33 +63,36 @@ void SettingsCycle(void) {
}
bool SettingsSetActiveById(uint8_t Setting) {
if ( (Setting >= SETTINGS_FIRST) && (Setting <= SETTINGS_LAST) ) {
uint8_t SettingIdx = SETTING_TO_INDEX(Setting);
if ( (Setting >= SETTINGS_FIRST) && (Setting <= SETTINGS_LAST) ) {
uint8_t SettingIdx = SETTING_TO_INDEX(Setting);
/* Break potentially pending timeout task (manual timeout) */
CommandLinePendingTaskBreak();
/* Break potentially pending timeout task (manual timeout) */
CommandLinePendingTaskBreak();
/* Store current memory contents permanently */
MemoryStore();
/* Store current memory contents permanently */
MemoryStore();
GlobalSettings.ActiveSettingIdx = SettingIdx;
GlobalSettings.ActiveSettingPtr =
&GlobalSettings.Settings[SettingIdx];
GlobalSettings.ActiveSettingIdx = SettingIdx;
GlobalSettings.ActiveSettingPtr =
&GlobalSettings.Settings[SettingIdx];
/* Settings have changed. Progress changes through system */
ConfigurationSetById(GlobalSettings.ActiveSettingPtr->Configuration);
LogSetModeById(GlobalSettings.ActiveSettingPtr->LogMode);
/* Settings have changed. Progress changes through system */
ConfigurationSetById(GlobalSettings.ActiveSettingPtr->Configuration);
LogSetModeById(GlobalSettings.ActiveSettingPtr->LogMode);
/* Recall new memory contents */
MemoryRecall();
/* Recall new memory contents */
MemoryRecall();
/* Notify LED. blink according to current setting */
LEDHook(LED_SETTING_CHANGE, LED_BLINK + SettingIdx);
/* Store new setting number. */
ActiveSettingNumberSave();
return true;
} else {
return false;
}
/* Notify LED. blink according to current setting */
LEDHook(LED_SETTING_CHANGE, LED_BLINK + SettingIdx);
return true;
} else {
return false;
}
}
uint8_t SettingsGetActiveById(void) {
Firmware/Chameleon-Mini/Settings.h
+1
View File
@@ -41,6 +41,7 @@ extern SettingsType GlobalSettings;
void SettingsLoad(void);
void SettingsSave(void);
void ActiveSettingNumberSave(void);
void SettingsCycle(void);
bool SettingsSetActiveById(uint8_t Setting);
Firmware/Chameleon-Mini/Terminal/Commands.c
-1
View File
@@ -357,7 +357,6 @@ CommandStatusIdType CommandGetSetting(char* OutParam)
CommandStatusIdType CommandSetSetting(char* OutMessage, const char* InParam)
{
if (SettingsSetActiveByName(InParam)) {
SettingsSave();
return COMMAND_INFO_OK_ID;
} else {
return COMMAND_ERR_INVALID_PARAM_ID;