diff --git a/platformio.ini b/platformio.ini index bb600258..94ccba46 100644 --- a/platformio.ini +++ b/platformio.ini @@ -11,7 +11,7 @@ ;To choose board please use one of definition: ;esp8266_1mb , esp8266_4mb , esp32_4mb [platformio] -default_envs = esp8266_4mb +default_envs = esp8266_1mb [common_env_data] diff --git a/src/ItemsList.cpp b/src/ItemsList.cpp index 10415c85..6cde0280 100644 --- a/src/ItemsList.cpp +++ b/src/ItemsList.cpp @@ -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; diff --git a/src/items/vSensorAnalog.cpp b/src/items/vSensorAnalog.cpp index ea1ec282..c59bcbbb 100644 --- a/src/items/vSensorAnalog.cpp +++ b/src/items/vSensorAnalog.cpp @@ -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;