Explicitly initialize variables, use "bool-specific" values when setting.

This commit is contained in:
John Stäck 2019-10-16 15:30:49 +02:00
parent 7c1aa2c0a4
commit 0cbb6bde78

View file

@ -1051,8 +1051,8 @@ void doorKnobCheck() {
//*********************************************************** //***********************************************************
void extraController() { void extraController() {
bool CC2sw; bool CC2sw = false;
bool CC1sw; bool CC1sw = false;
int extracCC; int extracCC;
// Extra Controller is the lip touch sensor (proportional) in front of the mouthpiece // Extra Controller is the lip touch sensor (proportional) in front of the mouthpiece
exSensor = exSensor * 0.6 + 0.4 * touchRead(extraPin); // get sensor data, do some smoothing - SENSOR PIN 16 - PCB PIN "EC" (marked K4 on some prototype boards) exSensor = exSensor * 0.6 + 0.4 * touchRead(extraPin); // get sensor data, do some smoothing - SENSOR PIN 16 - PCB PIN "EC" (marked K4 on some prototype boards)
@ -1072,17 +1072,17 @@ void extraController() {
} else if (pinkySetting == ECSW){ } else if (pinkySetting == ECSW){
if (pinkyKey){ if (pinkyKey){
//send extra controller CC2 only //send extra controller CC2 only
CC2sw = 1; CC2sw = true;
CC1sw = 0; CC1sw = false;
} else { } else {
//send extra controller primary CC only //send extra controller primary CC only
CC2sw = 0; CC2sw = false;
CC1sw = 1; CC1sw = true;
} }
} else { } else {
//send both primary CC and CC2 //send both primary CC and CC2
CC2sw = 1; CC2sw = true;
CC1sw = 1; CC1sw = true;
} }
if ((extraCT || extraCT2) && (exSensor >= extracThrVal)) { // if we are enabled and over the threshold, send data if ((extraCT || extraCT2) && (exSensor >= extracThrVal)) { // if we are enabled and over the threshold, send data
if (!extracIsOn) { if (!extracIsOn) {