andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-12 14:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

simple analog mapping fix (& binaries)

Browse Source
This commit is contained in:
Andrey Klimov
2019-06-29 16:35:45 +03:00
parent ea67d46810
commit 1919d3c210
14 changed files with 13605 additions and 13587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lighthub/inputs.cpp
View File

@@ -486,11 +486,12 @@ void Input::analogPoll() {
if (aJson.getArraySize(inputMap)==2)
{
simple = 1;
if (mappedInputVal < aJson.getArrayItem(inputMap, 0)->valueint) mappedInputVal = 0;
else if (mappedInputVal > aJson.getArrayItem(inputMap, 1)->valueint) mappedInputVal = 1;
if (inputVal < aJson.getArrayItem(inputMap, 0)->valueint) mappedInputVal = 0;
else if (inputVal > aJson.getArrayItem(inputMap, 1)->valueint) mappedInputVal = 1;
else return;
}
}
} else mappedInputVal = inputVal*10; //No mapping arguments
if (simple) {
if (mappedInputVal != store->currentValue)
{
@@ -498,6 +499,7 @@ void Input::analogPoll() {
store->currentValue = mappedInputVal;
}}
else
{
//if (abs(mappedInputVal - store->currentValue)>Noize || mappedInputVal == min || mappedInputVal ==max) // value changed >ANALOG_NOIZE
if (abs(inputVal - store->currentValue)>Noize ) // value changed >ANALOG_NOIZE
store->bounce = 0;
@@ -510,7 +512,7 @@ void Input::analogPoll() {
// store->currentValue = mappedInputVal;
store->currentValue = inputVal;
}
}
}

2
lighthub/modules/in_ccs811_hdc1080.cpp
View File

@@ -85,7 +85,7 @@ int in_hdc1080::Poll()
int reg;
if (!HDC1080ready) {debugSerial<<F("HDC1080 not initialized")<<endl; return 0;}
Serial.print("HDC Status=");
Serial.print(reg=hdc1080.readRegister().rawData,HEX);
Serial.println(reg=hdc1080.readRegister().rawData,HEX);
if (reg!=0xff)
{
Serial.print(" T=");