iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 22:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

esp32 adc bug

Browse Source
This commit is contained in:
Dmitry Borisenko
2021-01-05 14:57:01 +01:00
parent 6902d57be2
commit 54cb92d2bb
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ItemsList.cpp
View File

@@ -52,7 +52,7 @@ void addItem2(int num) {
if (seachingLine.indexOf("gpio") != -1) {
seachingLine.replace("gpio", "pin[" + String(getFreePinAll()) + "]");
}
addFile(DEVICE_CONFIG_FILE, seachingLine);
Serial.println(seachingLine);
}
@@ -132,7 +132,7 @@ uint8_t getFreePinAll() {
uint8_t pins[] = {0, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5};
#endif
#ifdef ESP32
uint8_t pins[] = {0, 12, 13, 14, 15, 16, 1, 2, 3, 4, 5};
uint8_t pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 25, 26, 27, 32, 33, 34, 35, 36, 39};
#endif
uint8_t array_sz = sizeof(pins) / sizeof(pins[0]);
uint8_t i = getNewElementNumber("pins.txt");
@@ -145,7 +145,12 @@ uint8_t getFreePinAll() {
bool isPinExist(unsigned int num) {
bool ret = false;
#ifdef ESP8266
unsigned int pins[] = {0, 1, 2, 3, 4, 5, 9, 10, 12, 13, 14, 15, 16};
#endif
#ifdef ESP32
unsigned int pins[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, 23, 25, 26, 27, 32, 33, 34, 35, 36, 39};
#endif
uint8_t array_sz = sizeof(pins) / sizeof(pins[0]);
for (uint8_t i = 0; i < array_sz; i++) {
if (pins[i] == num) ret = true;

2
src/items/vSensorAnalog.cpp
View File

@@ -7,7 +7,7 @@
SensorAnalog::SensorAnalog(String key, unsigned long interval, unsigned int adcPin, int map1, int map2, int map3, int map4, float c) {
_interval = interval * 1000;
_key = key;
_adcPin = _adcPin;
_adcPin = adcPin;
_map1 = map1;
_map2 = map2;