Fixed discrepancy between sensorCell structure and sensorCol/sensorRo…

…w information, this now properly handles octave/transpose switch press at startup to enable low power mode, without showing the octave/transpose screen.
rogerlinndesign · May 17, 2016 · 1e84b3a · 1e84b3a
1 parent aecf3a6
commit 1e84b3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/linnstrument-firmware.ino b/linnstrument-firmware.ino
@@ -879,6 +879,7 @@ void reset() {
 boolean switchPressAtStartup(byte switchRow) {
   sensorCol = 0;
   sensorRow = switchRow;
+  updateSensorCell();
   // initially we need read Z a few times for the readings to stabilize
   readZ(); readZ(); unsigned short switchZ = readZ();
   if (switchZ > Device.sensorLoZ + 128) {
@@ -1067,6 +1068,7 @@ void setup() {
   // default to performance mode
   sensorCol = 0;
   sensorRow = 0;
+  updateSensorCell();
   {
     operatingMode = modePerformance;
 

diff --git a/ls_handleTouches.ino b/ls_handleTouches.ino
@@ -1527,7 +1527,6 @@ inline void nextSensorCell() {
 
   sensorCol = scannedCells[cellCount][0];
   sensorRow = scannedCells[cellCount][1];
-  sensorSplit = getSplitOf(sensorCol);
   if (++cellCount >= MAX_CELLCOUNT) {
     cellCount = 0;
   }
@@ -1541,8 +1540,12 @@ inline void nextSensorCell() {
     }
   }
 
-  sensorCell = &cell(sensorCol, sensorRow);
+  updateSensorCell();
+}
 
+inline void updateSensorCell() {
+  sensorSplit = getSplitOf(sensorCol);
+  sensorCell = &cell(sensorCol, sensorRow);
   // we're keeping track of the state of X, Y and Z so that we don't refresh it needlessly for finger tracking
   sensorCell->shouldRefreshData();
 }