diff --git a/irlearner-firmware/.gitignore b/ESPMegaPRO-IRKit-SDK/.gitignore similarity index 100% rename from irlearner-firmware/.gitignore rename to ESPMegaPRO-IRKit-SDK/.gitignore diff --git a/ESPMegaPRO-firmware/.vscode/extensions.json b/ESPMegaPRO-IRKit-SDK/.vscode/extensions.json similarity index 100% rename from ESPMegaPRO-firmware/.vscode/extensions.json rename to ESPMegaPRO-IRKit-SDK/.vscode/extensions.json diff --git a/ESPMegaPRO-firmware/include/README b/ESPMegaPRO-IRKit-SDK/include/README similarity index 100% rename from ESPMegaPRO-firmware/include/README rename to ESPMegaPRO-IRKit-SDK/include/README diff --git a/ESPMegaPRO-firmware/lib/README b/ESPMegaPRO-IRKit-SDK/lib/README similarity index 100% rename from ESPMegaPRO-firmware/lib/README rename to ESPMegaPRO-IRKit-SDK/lib/README diff --git a/irlearner-firmware/platformio.ini b/ESPMegaPRO-IRKit-SDK/platformio.ini similarity index 100% rename from irlearner-firmware/platformio.ini rename to ESPMegaPRO-IRKit-SDK/platformio.ini diff --git a/irlearner-firmware/src/main.cpp b/ESPMegaPRO-IRKit-SDK/src/main.cpp similarity index 100% rename from irlearner-firmware/src/main.cpp rename to ESPMegaPRO-IRKit-SDK/src/main.cpp diff --git a/irlearner-firmware/src/main.cpp.d b/ESPMegaPRO-IRKit-SDK/src/main.cpp.d similarity index 100% rename from irlearner-firmware/src/main.cpp.d rename to ESPMegaPRO-IRKit-SDK/src/main.cpp.d diff --git a/irlearner-firmware/src/test.txt b/ESPMegaPRO-IRKit-SDK/src/test.txt similarity index 100% rename from irlearner-firmware/src/test.txt rename to ESPMegaPRO-IRKit-SDK/src/test.txt diff --git a/irlearner-firmware/src/test2.txt b/ESPMegaPRO-IRKit-SDK/src/test2.txt similarity index 100% rename from irlearner-firmware/src/test2.txt rename to ESPMegaPRO-IRKit-SDK/src/test2.txt diff --git a/ESPMegaPRO-firmware/test/README b/ESPMegaPRO-IRKit-SDK/test/README similarity index 100% rename from ESPMegaPRO-firmware/test/README rename to ESPMegaPRO-IRKit-SDK/test/README diff --git a/ESPMegaPRO-firmware/.gitignore b/ESPMegaPRO-OS-SDK/.gitignore similarity index 100% rename from ESPMegaPRO-firmware/.gitignore rename to ESPMegaPRO-OS-SDK/.gitignore diff --git a/irlearner-firmware/.vscode/extensions.json b/ESPMegaPRO-OS-SDK/.vscode/extensions.json similarity index 100% rename from irlearner-firmware/.vscode/extensions.json rename to ESPMegaPRO-OS-SDK/.vscode/extensions.json diff --git a/ESPMegaPRO-firmware/.vscode/settings.json b/ESPMegaPRO-OS-SDK/.vscode/settings.json similarity index 100% rename from ESPMegaPRO-firmware/.vscode/settings.json rename to ESPMegaPRO-OS-SDK/.vscode/settings.json diff --git a/ESPMegaPRO-firmware/helper_scripts/html2cpp.py b/ESPMegaPRO-OS-SDK/helper_scripts/html2cpp.py similarity index 100% rename from ESPMegaPRO-firmware/helper_scripts/html2cpp.py rename to ESPMegaPRO-OS-SDK/helper_scripts/html2cpp.py diff --git a/irlearner-firmware/include/README b/ESPMegaPRO-OS-SDK/include/README similarity index 100% rename from irlearner-firmware/include/README rename to ESPMegaPRO-OS-SDK/include/README diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogCard.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogCard.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogCard.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogCard.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogCard.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogCard.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogCard.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogCard.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogIoT.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogIoT.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogIoT.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogIoT.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogIoT.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogIoT.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/AnalogIoT.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/AnalogIoT.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateCard.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateCard.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateCard.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateCard.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateCard.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateCard.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateCard.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateCard.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateIoT.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateIoT.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateIoT.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateIoT.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateIoT.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateIoT.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ClimateIoT.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ClimateIoT.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputCard.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputCard.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputCard.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputCard.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputCard.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputIoT.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputIoT.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputIoT.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputIoT.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputIoT.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputIoT.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalInputIoT.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalInputIoT.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputCard.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputCard.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputCard.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputCard.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputCard.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputCard.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputCard.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputCard.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputIoT.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputIoT.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputIoT.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputIoT.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputIoT.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputIoT.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/DigitalOutputIoT.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/DigitalOutputIoT.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaDisplay.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaDisplay.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaDisplay.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaDisplay.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaDisplay.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaDisplay.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaDisplay.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaDisplay.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaIoT.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaIoT.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaIoT.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaIoT.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaIoT.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaIoT.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaIoT.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaIoT.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaPRO.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaPRO.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO.h b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaPRO.h similarity index 95% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO.h rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaPRO.h index d5324fc..c11688e 100644 --- a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO.h +++ b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaPRO.h @@ -14,8 +14,6 @@ #include #endif -#warning "The procedural ESPMega library does not support installing card. If you want to use the card system, please use the OOP version of the library." - #define INPUT_BANK_A_ADDRESS 0x21 #define INPUT_BANK_B_ADDRESS 0x22 #define PWM_BANK_ADDRESS 0x5F diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO_OOP.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaProOS.cpp similarity index 99% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO_OOP.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaProOS.cpp index 2c306de..80112b8 100644 --- a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO_OOP.cpp +++ b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaProOS.cpp @@ -1,4 +1,4 @@ -#include +#include // Reserve FRAM address 0 - 1000 for ESPMegaPRO Internal Use // (34 Bytes) Address 0-33 for Built-in Digital Output Card diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaProOS.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaPRO_OOP.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaProOS.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaTCP.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaTCP.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaTCP.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaTCP.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaWebServer.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaWebServer.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaWebServer.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaWebServer.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaWebServer.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaWebServer.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ESPMegaWebServer.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ESPMegaWebServer.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/ExpansionCard.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ExpansionCard.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/ExpansionCard.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/ExpansionCard.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/InternalDisplay.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/InternalDisplay.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/InternalDisplay.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/InternalDisplay.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/InternalDisplay.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/InternalDisplay.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/InternalDisplay.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/InternalDisplay.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/IoTComponent.cpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/IoTComponent.cpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/IoTComponent.cpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/IoTComponent.cpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/IoTComponent.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/IoTComponent.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/IoTComponent.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/IoTComponent.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/TimeStructure.hpp b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/TimeStructure.hpp similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/TimeStructure.hpp rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/TimeStructure.hpp diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/html/all.h b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/all.h similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/html/all.h rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/all.h diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/html/config.h b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/config.h similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/html/config.h rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/config.h diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/html/config.html b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/config.html similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/html/config.html rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/config.html diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/html/ota.h b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/ota.h similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/html/ota.h rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/ota.h diff --git a/ESPMegaPRO-firmware/lib/ESPMegaPRO/html/ota.html b/ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/ota.html similarity index 100% rename from ESPMegaPRO-firmware/lib/ESPMegaPRO/html/ota.html rename to ESPMegaPRO-OS-SDK/lib/ESPMegaPRO/html/ota.html diff --git a/irlearner-firmware/lib/README b/ESPMegaPRO-OS-SDK/lib/README similarity index 100% rename from irlearner-firmware/lib/README rename to ESPMegaPRO-OS-SDK/lib/README diff --git a/ESPMegaPRO-firmware/platformio.ini b/ESPMegaPRO-OS-SDK/platformio.ini similarity index 100% rename from ESPMegaPRO-firmware/platformio.ini rename to ESPMegaPRO-OS-SDK/platformio.ini diff --git a/ESPMegaPRO-firmware/src/.vscode/c_cpp_properties.json b/ESPMegaPRO-OS-SDK/src/.vscode/c_cpp_properties.json similarity index 100% rename from ESPMegaPRO-firmware/src/.vscode/c_cpp_properties.json rename to ESPMegaPRO-OS-SDK/src/.vscode/c_cpp_properties.json diff --git a/ESPMegaPRO-firmware/src/.vscode/launch.json b/ESPMegaPRO-OS-SDK/src/.vscode/launch.json similarity index 100% rename from ESPMegaPRO-firmware/src/.vscode/launch.json rename to ESPMegaPRO-OS-SDK/src/.vscode/launch.json diff --git a/ESPMegaPRO-firmware/src/.vscode/settings.json b/ESPMegaPRO-OS-SDK/src/.vscode/settings.json similarity index 100% rename from ESPMegaPRO-firmware/src/.vscode/settings.json rename to ESPMegaPRO-OS-SDK/src/.vscode/settings.json diff --git a/ESPMegaPRO-firmware/src/dump_fram.cpp.disabled b/ESPMegaPRO-OS-SDK/src/dump_fram.cpp.disabled similarity index 100% rename from ESPMegaPRO-firmware/src/dump_fram.cpp.disabled rename to ESPMegaPRO-OS-SDK/src/dump_fram.cpp.disabled diff --git a/ESPMegaPRO-firmware/src/i2c_scanner.cpp.disabled b/ESPMegaPRO-OS-SDK/src/i2c_scanner.cpp.disabled similarity index 100% rename from ESPMegaPRO-firmware/src/i2c_scanner.cpp.disabled rename to ESPMegaPRO-OS-SDK/src/i2c_scanner.cpp.disabled diff --git a/ESPMegaPRO-firmware/src/i2cmssc.cpp.disabled b/ESPMegaPRO-OS-SDK/src/i2cmssc.cpp.disabled similarity index 100% rename from ESPMegaPRO-firmware/src/i2cmssc.cpp.disabled rename to ESPMegaPRO-OS-SDK/src/i2cmssc.cpp.disabled diff --git a/ESPMegaPRO-firmware/src/main.cpp b/ESPMegaPRO-OS-SDK/src/main.cpp similarity index 99% rename from ESPMegaPRO-firmware/src/main.cpp rename to ESPMegaPRO-OS-SDK/src/main.cpp index fdf4c3a..64bda7c 100644 --- a/ESPMegaPRO-firmware/src/main.cpp +++ b/ESPMegaPRO-OS-SDK/src/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/irlearner-firmware/test/README b/ESPMegaPRO-OS-SDK/test/README similarity index 100% rename from irlearner-firmware/test/README rename to ESPMegaPRO-OS-SDK/test/README