Merge pull request #116 from Normalised/master

Use the right names for quantise options.
TomWhitwell · Jun 19, 2017 · a81090f · a81090f
2 parents 79523a3 + c61f162
commit a81090f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/RadioMusic/RadioMusic.ino b/RadioMusic/RadioMusic.ino
@@ -337,6 +337,8 @@ uint16_t checkInterface() {
 	if(resetTriggered) {
 		if((changes & CHANNEL_CHANGED) || playState.nextChannel != playState.currentChannel) {
 			playState.channelChanged = true;
+		} else {
+			resetLedTimer = 0;
 		}
 	}
 

diff --git a/RadioMusic/Settings.cpp b/RadioMusic/Settings.cpp
@@ -234,10 +234,10 @@ void Settings::applySetting(String settingName, String settingValue) {
 		loopMode = settingValue.toInt();
 	}
 
-	if(settingName.equalsIgnoreCase("quantiseNoteCV") || settingName.equalsIgnoreCase("quantizeNoteCV")) {
+	if(settingName.equalsIgnoreCase("quantiseNoteCV") || settingName.equalsIgnoreCase("quantizeRootCV")) {
 		quantiseRootCV = toBoolean(settingValue);
 	}
-	if(settingName.equalsIgnoreCase("quantiseNotePot") || settingName.equalsIgnoreCase("quantizeNotePot")) {
+	if(settingName.equalsIgnoreCase("quantiseNotePot") || settingName.equalsIgnoreCase("quantizeRootPot")) {
 		quantiseRootPot = toBoolean(settingValue);
 	}