diff --git a/lib/patrix/base.h b/lib/patrix/base.h index 0c4e227..0cc9ee3 100644 --- a/lib/patrix/base.h +++ b/lib/patrix/base.h @@ -3,4 +3,14 @@ #include +#ifdef ESP32 + +#include + +#else + +#include + +#endif + #endif diff --git a/lib/patrix/config.cpp b/lib/patrix/config.cpp index b7847af..78990fe 100644 --- a/lib/patrix/config.cpp +++ b/lib/patrix/config.cpp @@ -1,6 +1,10 @@ #include "config.h" #include "log.h" + +#ifdef ESP32 + #include +#include Preferences config; @@ -47,3 +51,31 @@ double configGetDouble(const char *name, double fallback) { bool configPutDouble(const char *name, double fallback) { return config.value(name, fallback) == 0; } + +#else + +void configSetup() { + // ESP8266 FAKE +} + +void configReset() { + // ESP8266 FAKE +} + +String configGetString(const char *name, const char *fallback, bool allowEmpty) { + return fallback; +} + +bool configPutString(const char *name, const char *value) { + return false; +} + +double configGetDouble(const char *name, double fallback) { + return fallback; +} + +bool configPutDouble(const char *name, double fallback) { + return false; +} + +#endif diff --git a/lib/patrix/config.h b/lib/patrix/config.h index a379a89..9814b1e 100644 --- a/lib/patrix/config.h +++ b/lib/patrix/config.h @@ -1,7 +1,7 @@ #ifndef SENSOR3_CONFIG_H #define SENSOR3_CONFIG_H -#include +#include void configSetup(); diff --git a/lib/patrix/console.cpp b/lib/patrix/console.cpp index 79e3494..60556f0 100644 --- a/lib/patrix/console.cpp +++ b/lib/patrix/console.cpp @@ -1,8 +1,7 @@ #include -#include #include #include -#include +#include "base.h" #include "mqtt.h" #include "wifi.h" #include "config.h" @@ -167,8 +166,10 @@ void _info() { info(" sys: %s", datetime); info("Chip:"); +#ifdef ESP32 info(" model: %s", ESP.getChipModel()); info(" cores: %d", ESP.getChipCores()); +#endif info(" freq: %d", ESP.getCpuFreqMHz()); info("Flash:"); @@ -177,20 +178,24 @@ void _info() { info(" speed: %d", ESP.getFlashChipSpeed()); info("Heap:"); - info(" size: %d", ESP.getHeapSize()); info(" free: %d", ESP.getFreeHeap()); +#ifdef ESP32 + info(" size: %d", ESP.getHeapSize()); info(" minFree: %d", ESP.getMinFreeHeap()); info(" maxAlloc: %d", ESP.getMaxAllocHeap()); +#endif info("PS RAM:"); - info(" size: %d", ESP.getPsramSize()); +#ifdef ESP32 info(" free: %d", ESP.getFreePsram()); + info(" size: %d", ESP.getPsramSize()); info(" minFree: %d", ESP.getMinFreePsram()); info(" maxAlloc: %d", ESP.getMaxAllocPsram()); +#endif info("SDK:"); - info(" size: %d", ESP.getSketchSize()); info(" free: %d", ESP.getFreeSketchSpace()); + info(" size: %d", ESP.getSketchSize()); info(" MD5: %s", ESP.getSketchMD5().c_str()); info("SDK:"); @@ -207,10 +212,12 @@ const char *getFlashChipMode() { return "DIO"; case FM_DOUT: return "DOUT"; - case FM_FAST_READ: - return "FAST_READ"; - case FM_SLOW_READ: - return "SLOW_READ"; +#ifdef ESP32 + case FM_FAST_READ: + return "FAST_READ"; + case FM_SLOW_READ: + return "SLOW_READ"; +#endif case FM_UNKNOWN: return "UNKNOWN"; default: diff --git a/lib/patrix/wifi.cpp b/lib/patrix/wifi.cpp index 493d224..5b15769 100644 --- a/lib/patrix/wifi.cpp +++ b/lib/patrix/wifi.cpp @@ -1,10 +1,10 @@ #include "wifi.h" +#include "base.h" #include "log.h" #include "mqtt.h" #include "console.h" #include "config.h" -#include #include #include @@ -61,7 +61,11 @@ void wifiConnect() { info("WIFI connecting: %s", ssid.c_str()); +#ifdef ESP32 WiFiClass::hostname(HOSTNAME); +#else + WiFi.hostname(HOSTNAME); +#endif yield(); WiFi.begin(ssid, pkey); diff --git a/platformio.ini b/platformio.ini index 31515a7..796c2b0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -32,13 +32,13 @@ lib_deps = ${COMMON.lib_deps} build_flags = -D HOSTNAME=\"DEV\" -D WIFI_SSID=\"${COMMON.WIFI_SSID}\" -D WIFI_PKEY=\"${COMMON.WIFI_PKEY}\" -D OTA_PASSWORD=\"OtaAuthPatrixDEV\" -D BOOT_DELAY=false -D DEBUG_LOG=false [env:Fermenter] -upload_port = 10.0.0.138 -upload_flags = --auth=OtaAuthPatrixFermenter -upload_protocol = ${COMMON.ota_protocol} -;upload_port = ${COMMON.usb_port} -;upload_speed = ${COMMON.usb_speed} -platform = ${COMMON.platform} -board = ${COMMON.board} +;upload_port = 10.0.0.138 +;upload_flags = --auth=OtaAuthPatrixFermenter +;upload_protocol = ${COMMON.ota_protocol} +upload_port = ${COMMON.usb_port} +upload_speed = ${COMMON.usb_speed} +platform = espressif8266 +board = esp12e framework = ${COMMON.framework} monitor_port = ${COMMON.monitor_port} monitor_speed = ${COMMON.monitor_speed}