From 9229280502d6040d06aaef943aa940afaa4c3da3 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Tue, 16 Feb 2021 17:07:25 +0100 Subject: [PATCH] Move files around --- src/drv/hasp_drv_display.cpp | 2 + src/drv/hasp_drv_display.h | 2 + src/drv/{ => touch}/hasp_drv_ft5206.cpp | 0 src/drv/{ => touch}/hasp_drv_ft5206.h | 2 +- src/drv/{ => touch}/hasp_drv_ft6336u.cpp | 0 src/drv/{ => touch}/hasp_drv_ft6336u.h | 2 +- src/drv/{ => touch}/hasp_drv_gt911.cpp | 0 src/drv/{ => touch}/hasp_drv_gt911.h | 2 +- src/drv/{ => touch}/hasp_drv_xpt2046.cpp | 0 src/drv/{ => touch}/hasp_drv_xpt2046.h | 0 src/hasp_hal.cpp | 445 ---------------------- src/hasp_hal.h | 21 - src/net/hasp_wifi.h | 23 -- src/svc/hasp_http.cpp | 20 +- src/svc/hasp_telnet.cpp | 2 +- src/{ => sys/gpio}/hasp_gpio.cpp | 0 src/{ => sys/gpio}/hasp_gpio.h | 0 src/{ => sys}/net/hasp_ethernet_esp32.cpp | 2 +- src/{ => sys}/net/hasp_ethernet_esp32.h | 0 src/{ => sys}/net/hasp_ethernet_stm32.cpp | 2 +- src/{ => sys}/net/hasp_ethernet_stm32.h | 0 src/{ => sys}/net/hasp_network.cpp | 6 +- src/{ => sys}/net/hasp_network.h | 0 src/{ => sys}/net/hasp_wifi.cpp | 0 24 files changed, 23 insertions(+), 508 deletions(-) rename src/drv/{ => touch}/hasp_drv_ft5206.cpp (100%) rename src/drv/{ => touch}/hasp_drv_ft5206.h (87%) rename src/drv/{ => touch}/hasp_drv_ft6336u.cpp (100%) rename src/drv/{ => touch}/hasp_drv_ft6336u.h (86%) rename src/drv/{ => touch}/hasp_drv_gt911.cpp (100%) rename src/drv/{ => touch}/hasp_drv_gt911.h (87%) rename src/drv/{ => touch}/hasp_drv_xpt2046.cpp (100%) rename src/drv/{ => touch}/hasp_drv_xpt2046.h (100%) delete mode 100644 src/hasp_hal.cpp delete mode 100644 src/hasp_hal.h delete mode 100644 src/net/hasp_wifi.h rename src/{ => sys/gpio}/hasp_gpio.cpp (100%) rename src/{ => sys/gpio}/hasp_gpio.h (100%) rename src/{ => sys}/net/hasp_ethernet_esp32.cpp (98%) rename src/{ => sys}/net/hasp_ethernet_esp32.h (100%) rename src/{ => sys}/net/hasp_ethernet_stm32.cpp (99%) rename src/{ => sys}/net/hasp_ethernet_stm32.h (100%) rename src/{ => sys}/net/hasp_network.cpp (95%) rename src/{ => sys}/net/hasp_network.h (100%) rename src/{ => sys}/net/hasp_wifi.cpp (100%) diff --git a/src/drv/hasp_drv_display.cpp b/src/drv/hasp_drv_display.cpp index ad80fdf8..54d96c6c 100644 --- a/src/drv/hasp_drv_display.cpp +++ b/src/drv/hasp_drv_display.cpp @@ -1,4 +1,6 @@ #include "hasp_drv_display.h" +#include "tft_espi_drv.h" +//#include "fsmc_ili9341.h" void drv_display_init(lv_disp_drv_t * disp_drv, uint8_t rotation, bool invert_display) { diff --git a/src/drv/hasp_drv_display.h b/src/drv/hasp_drv_display.h index 477cb762..75a26c63 100644 --- a/src/drv/hasp_drv_display.h +++ b/src/drv/hasp_drv_display.h @@ -4,6 +4,8 @@ #ifndef HASP_DRV_DISPLAY_H #define HASP_DRV_DISPLAY_H +#include "lvgl.h" + // Select Display Driver #if defined(USE_FSMC) #include "fsmc_ili9341.h" diff --git a/src/drv/hasp_drv_ft5206.cpp b/src/drv/touch/hasp_drv_ft5206.cpp similarity index 100% rename from src/drv/hasp_drv_ft5206.cpp rename to src/drv/touch/hasp_drv_ft5206.cpp diff --git a/src/drv/hasp_drv_ft5206.h b/src/drv/touch/hasp_drv_ft5206.h similarity index 87% rename from src/drv/hasp_drv_ft5206.h rename to src/drv/touch/hasp_drv_ft5206.h index e53c1c07..88c6eb3f 100644 --- a/src/drv/hasp_drv_ft5206.h +++ b/src/drv/touch/hasp_drv_ft5206.h @@ -8,7 +8,7 @@ #define FT5206_address 0x38 - #include "hasp_debug.h" // for TAG_DRVR + #include "log/hasp_debug.h" // for TAG_DRVR bool FT5206_getXY(int16_t * touchX, int16_t * touchY, bool debug); void FT5206_init(); diff --git a/src/drv/hasp_drv_ft6336u.cpp b/src/drv/touch/hasp_drv_ft6336u.cpp similarity index 100% rename from src/drv/hasp_drv_ft6336u.cpp rename to src/drv/touch/hasp_drv_ft6336u.cpp diff --git a/src/drv/hasp_drv_ft6336u.h b/src/drv/touch/hasp_drv_ft6336u.h similarity index 86% rename from src/drv/hasp_drv_ft6336u.h rename to src/drv/touch/hasp_drv_ft6336u.h index f8e0e1e3..ac1dd47a 100644 --- a/src/drv/hasp_drv_ft6336u.h +++ b/src/drv/touch/hasp_drv_ft6336u.h @@ -6,7 +6,7 @@ #if TOUCH_DRIVER == 6336 - #include "hasp_debug.h" // for TAG_DRVR + #include "log/hasp_debug.h" // for TAG_DRVR bool FT6336U_getXY(int16_t * touchX, int16_t * touchY, bool debug); void FT6336U_init(); diff --git a/src/drv/hasp_drv_gt911.cpp b/src/drv/touch/hasp_drv_gt911.cpp similarity index 100% rename from src/drv/hasp_drv_gt911.cpp rename to src/drv/touch/hasp_drv_gt911.cpp diff --git a/src/drv/hasp_drv_gt911.h b/src/drv/touch/hasp_drv_gt911.h similarity index 87% rename from src/drv/hasp_drv_gt911.h rename to src/drv/touch/hasp_drv_gt911.h index d72627a0..ec36b69b 100644 --- a/src/drv/hasp_drv_gt911.h +++ b/src/drv/touch/hasp_drv_gt911.h @@ -6,7 +6,7 @@ #if TOUCH_DRIVER == 911 - #include "hasp_debug.h" // for TAG_DRVR + #include "log/hasp_debug.h" // for TAG_DRVR bool GT911_getXY(int16_t * touchX, int16_t * touchY, bool debug); void GT911_init(); diff --git a/src/drv/hasp_drv_xpt2046.cpp b/src/drv/touch/hasp_drv_xpt2046.cpp similarity index 100% rename from src/drv/hasp_drv_xpt2046.cpp rename to src/drv/touch/hasp_drv_xpt2046.cpp diff --git a/src/drv/hasp_drv_xpt2046.h b/src/drv/touch/hasp_drv_xpt2046.h similarity index 100% rename from src/drv/hasp_drv_xpt2046.h rename to src/drv/touch/hasp_drv_xpt2046.h diff --git a/src/hasp_hal.cpp b/src/hasp_hal.cpp deleted file mode 100644 index aa0323d0..00000000 --- a/src/hasp_hal.cpp +++ /dev/null @@ -1,445 +0,0 @@ -/* MIT License - Copyright (c) 2020 Francis Van Roie - For full license information read the LICENSE file in the project folder */ - -#include "hasp_hal.h" -#include "hasp_conf.h" - -#if defined(ESP8266) - #include - #include -#endif - -#if defined(ESP32) - #include - #include - #include "esp_system.h" -#endif - -#if defined(ARDUINO_ARCH_ESP32) - #include // needed to get the ResetInfo - -// Compatibility function for ESP8266 getRestInfo -String esp32ResetReason(uint8_t cpuid) -{ - if(cpuid > 1) { - return F("Invalid CPU id"); - } - RESET_REASON reason = rtc_get_reset_reason(cpuid); - - String resetReason((char *)0); - resetReason.reserve(128); - - resetReason += F("CPU"); - resetReason += cpuid; - resetReason += F(": "); - - switch(reason) { - case 1: - resetReason += F("POWERON"); - break; /**<1, Vbat power on reset*/ - case 3: - resetReason += F("SW"); - break; /**<3, Software reset digital core*/ - case 4: - resetReason += F("OWDT"); - break; /**<4, Legacy watch dog reset digital core*/ - case 5: - resetReason += F("DEEPSLEEP"); - break; /**<5, Deep Sleep reset digital core*/ - case 6: - resetReason += F("SDIO"); - break; /**<6, Reset by SLC module, reset digital core*/ - case 7: - resetReason += F("TG0WDT_SYS"); - break; /**<7, Timer Group0 Watch dog reset digital core*/ - case 8: - resetReason += F("TG1WDT_SYS"); - break; /**<8, Timer Group1 Watch dog reset digital core*/ - case 9: - resetReason += F("RTCWDT_SYS"); - break; /**<9, RTC Watch dog Reset digital core*/ - case 10: - resetReason += F("INTRUSION"); - break; /**<10, Instrusion tested to reset CPU*/ - case 11: - resetReason += F("TGWDT_CPU"); - break; /**<11, Time Group reset CPU*/ - case 12: - resetReason += F("SW_CPU"); - break; /**<12, Software reset CPU*/ - case 13: - resetReason += F("RTCWDT_CPU"); - break; /**<13, RTC Watch dog Reset CPU*/ - case 14: - resetReason += F("EXT_CPU"); - break; /**<14, for APP CPU, reseted by PRO CPU*/ - case 15: - resetReason += F("RTCWDT_BROWN_OUT"); - break; /**<15, Reset when the vdd voltage is not stable*/ - case 16: - resetReason += F("RTCWDT_RTC"); - break; /**<16, RTC Watch dog reset digital core and rtc module*/ - default: - resetReason += F("NO_MEAN"); - return resetReason; - } - resetReason += F("_RESET"); - return resetReason; -} -#endif - -void halRestartMcu(void) -{ -#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) - ESP.restart(); -#else - NVIC_SystemReset(); -#endif - for(;;) { - } // halt -} - -String halGetResetInfo() -{ -#if defined(ARDUINO_ARCH_ESP32) - String resetReason((char *)0); - resetReason.reserve(128); - - resetReason += String(esp32ResetReason(0)); - resetReason += F(" / "); - resetReason += String(esp32ResetReason(1)); - return resetReason; -#elif defined(ARDUINO_ARCH_ESP8266) - return ESP.getResetInfo(); -#else - return ""; -#endif -} - -String halGetCoreVersion() -{ -#if defined(ARDUINO_ARCH_ESP32) - return String(ESP.getSdkVersion()); -#elif defined(ARDUINO_ARCH_ESP8266) - return String(ESP.getCoreVersion()); -#else - return String(STM32_CORE_VERSION_MAJOR) + "." + STM32_CORE_VERSION_MINOR + "." + STM32_CORE_VERSION_PATCH; -#endif -} - -String halGetChipModel() -{ - String model((char *)0); - model.reserve(128); - -#if defined(STM32F4xx) - model = F("STM32"); -#endif - -#if defined(STM32F4xx) - model = F("STM32F4xx"); - -#elif defined(ARDUINO_ARCH_ESP8266) - model = F("ESP8266"); - -#elif defined(ARDUINO_ARCH_ESP32) - esp_chip_info_t chip_info; - esp_chip_info(&chip_info); - - model = chip_info.cores; - model += F("core "); - switch(chip_info.model) { - case CHIP_ESP32: - model += F("ESP32"); - break; - #ifdef CHIP_ESP32S2 - case CHIP_ESP32S2: - model += F("ESP32-S2"); - break; - #endif - default: - model = F("Unknown ESP32"); - } - model += F(" rev"); - model += chip_info.revision; - -#else - model = F("Unknown"); -#endif - - return model; -} - -/*******************************/ -/* Memory Management Functions */ - -#if defined(STM32F4xx) - #include // for mallinfo() - #include // for sbrk() - -int freeHighMemory() -{ - char top; - #ifdef __arm__ - return &top - reinterpret_cast(sbrk(0)); - #elif defined(CORE_TEENSY) || (ARDUINO > 103 && ARDUINO != 151) - return &top - __brkval; - #else // __arm__ - return __brkval ? &top - __brkval : &top - __malloc_heap_start; - #endif // __arm__ -} -#endif - -/* -extern char *fake_heap_end; // current heap start -extern char *fake_heap_start; // current heap end - -char* getHeapStart() { - return fake_heap_start; -} - -char* getHeapEnd() { - return (char*)sbrk(0); -} - -char* getHeapLimit() { - return fake_heap_end; -} - -int getMemUsed() { // returns the amount of used memory in bytes - struct mallinfo mi = mallinfo(); - return mi.uordblks; -} - -int getMemFree() { // returns the amount of free memory in bytes - struct mallinfo mi = mallinfo(); - return mi.fordblks + freeHighMemory(); -} */ - -size_t halGetMaxFreeBlock() -{ -#if defined(ARDUINO_ARCH_ESP32) - return ESP.getMaxAllocHeap(); -#elif defined(ARDUINO_ARCH_ESP8266) - return ESP.getMaxFreeBlockSize(); -#else - return freeHighMemory(); -#endif -} - -size_t halGetFreeHeap(void) -{ -#if defined(ARDUINO_ARCH_ESP32) - return ESP.getFreeHeap(); -#elif defined(ARDUINO_ARCH_ESP8266) - return ESP.getFreeHeap(); -#else - struct mallinfo chuncks = mallinfo(); - - // fordblks - // This is the total size of memory occupied by free (not in use) chunks. - - return chuncks.fordblks + freeHighMemory(); -#endif -} - -uint8_t halGetHeapFragmentation() -{ -#if defined(ARDUINO_ARCH_ESP32) - return (int8_t)(100.00f - (float)ESP.getMaxAllocHeap() * 100.00f / (float)ESP.getFreeHeap()); -#elif defined(ARDUINO_ARCH_ESP8266) - return ESP.getHeapFragmentation(); -#else - return (int8_t)(100.00f - (float)freeHighMemory() * 100.00f / (float)halGetFreeHeap()); -#endif -} - -String halGetMacAddress(int start, const char * seperator) -{ - byte mac[6]; - -#if defined(STM32F4xx) - uint8_t * mac_p = nullptr; - #if HASP_USE_ETHERNET > 0 - #if USE_BUILTIN_ETHERNET > 0 - mac_p = Ethernet.MACAddress(); - for(int i = 0; i < 6; i++) mac[i] = *(mac_p + i); - #else - Ethernet.macAddress(mac); - #endif - #endif -#else - WiFi.macAddress(mac); -#endif - - String cMac((char *)0); - cMac.reserve(32); - - for(int i = start; i < 6; ++i) { - if(mac[i] < 0x10) cMac += "0"; - cMac += String(mac[i], HEX); - if(i < 5) cMac += seperator; - } - cMac.toUpperCase(); - return cMac; -} - -uint16_t halGetCpuFreqMHz() -{ -#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_32) - return ESP.getCpuFreqMHz(); -#else - return (F_CPU / 1000 / 1000); -#endif -} - - - -String halDisplayDriverName() -{ -#if defined(ILI9341_DRIVER) - return F("ILI9341"); -#elif defined(ST7735_DRIVER) - return F("ST7735"); -#elif defined(ILI9163_DRIVER) - return F("ILI9163"); -#elif defined(S6D02A1_DRIVER) - return F("S6D02A1"); -#elif defined(ST7796_DRIVER) - return F("ST7796"); -#elif defined(ILI9486_DRIVER) - return F("ILI9486"); -#elif defined(ILI9481_DRIVER) - return F("ILI9481"); -#elif defined(ILI9488_DRIVER) - return F("ILI9488"); -#elif defined(HX8357D_DRIVER) - return F("HX8357D"); -#elif defined(EPD_DRIVER) - return F("EPD"); -#elif defined(ST7789_DRIVER) - return F("ST7789"); -#elif defined(R61581_DRIVER) - return F("R61581"); -#elif defined(ST7789_2_DRIVER) - return F("ST7789_2"); -#elif defined(RM68140_DRIVER) - return F("RM68140"); -#endif - return F("Unknown"); -} - -String halGpioName(uint8_t gpio) -{ -#if defined(STM32F4xx) - String ioName; - uint16_t name = digitalPin[gpio]; - uint8_t num = name % 16; - switch(name / 16) { - case PortName::PortA: - ioName = F("PA"); - break; - case PortName::PortB: - ioName = F("PB"); - break; - #if defined GPIOC_BASE - case PortName::PortC: - ioName = F("PC"); - break; - #endif - #if defined GPIOD_BASE - case PortName::PortD: - ioName = F("PD"); - break; - #endif - #if defined GPIOE_BASE - case PortName::PortE: - ioName = F("PE"); - break; - #endif - #if defined GPIOF_BASE - case PortName::PortF: - ioName = F("PF"); - break; - #endif - #if defined GPIOG_BASE - case PortName::PortG: - ioName = F("PG"); - break; - #endif - #if defined GPIOH_BASE - case PortName::PortH: - ioName = F("PH"); - break; - #endif - #if defined GPIOI_BASE - case PortName::PortI: - ioName = F("PI"); - break; - #endif - #if defined GPIOJ_BASE - case PortName::PortJ: - ioName = F("PJ"); - break; - #endif - #if defined GPIOK_BASE - case PortName::PortK: - ioName = F("PK"); - break; - #endif - #if defined GPIOZ_BASE - case PortName::PortZ: - ioName = F("PZ"); - break; - #endif - default: - ioName = F("P?"); - } - ioName += num; - ioName += F(" (io"); - ioName += gpio; - ioName += F(")"); - return ioName; -#endif - -// For ESP32 pin labels on boards use the GPIO number -#ifdef ARDUINO_ARCH_ESP32 - return /*String(F("gpio")) +*/ String(gpio); -#endif - -#ifdef ARDUINO_ARCH_ESP8266 - // For ESP8266 the pin labels are not the same as the GPIO number - // These are for the NodeMCU pin definitions: - // GPIO Dxx - switch(gpio) { - case 16: - return F("D0"); - case 5: - return F("D1"); - case 4: - return F("D2"); - case 0: - return F("D3"); - case 2: - return F("D4"); - case 14: - return F("D5"); - case 12: - return F("D6"); - case 13: - return F("D7"); - case 15: - return F("D8"); - case 3: - return F("TX"); - case 1: - return F("RX"); - // case 9: - // return F("D11"); - // case 10: - // return F("D12"); - default: - return F("D?"); // Invalid pin - } -#endif -} \ No newline at end of file diff --git a/src/hasp_hal.h b/src/hasp_hal.h deleted file mode 100644 index 5c735bab..00000000 --- a/src/hasp_hal.h +++ /dev/null @@ -1,21 +0,0 @@ -/* MIT License - Copyright (c) 2020 Francis Van Roie - For full license information read the LICENSE file in the project folder */ - -#ifndef HASP_HAL_H -#define HASP_HAL_H - -#include - -void halRestartMcu(void); -uint8_t halGetHeapFragmentation(void); -String halGetResetInfo(void); -size_t halGetMaxFreeBlock(void); -size_t halGetFreeHeap(void); -String halGetCoreVersion(void); -String halGetChipModel(); -String halGetMacAddress(int start, const char * seperator); -uint16_t halGetCpuFreqMHz(void); -String halDisplayDriverName(void); -String halGpioName(uint8_t gpio); - -#endif \ No newline at end of file diff --git a/src/net/hasp_wifi.h b/src/net/hasp_wifi.h deleted file mode 100644 index 5364150f..00000000 --- a/src/net/hasp_wifi.h +++ /dev/null @@ -1,23 +0,0 @@ -/* MIT License - Copyright (c) 2020 Francis Van Roie - For full license information read the LICENSE file in the project folder */ - -#ifndef HASP_WIFI_H -#define HASP_WIFI_H - -#include "ArduinoJson.h" - -void wifiSetup(); -bool wifiShowAP(); -bool wifiShowAP(char * ssid, char * pass); -bool wifiEvery5Seconds(void); -void wifiStop(void); - -bool wifiValidateSsid(const char * ssid, const char * pass); -void wifi_get_statusupdate(char * buffer, size_t len); - -#if HASP_USE_CONFIG > 0 -bool wifiGetConfig(const JsonObject & settings); -bool wifiSetConfig(const JsonObject & settings); -#endif - -#endif \ No newline at end of file diff --git a/src/svc/hasp_http.cpp b/src/svc/hasp_http.cpp index 1fea82a0..194805ef 100644 --- a/src/svc/hasp_http.cpp +++ b/src/svc/hasp_http.cpp @@ -13,7 +13,7 @@ #include "hasp_conf.h" #include "hasp_gui.h" -#include "hasp_hal.h" +#include "hal/hasp_hal.h" #include "hasp_debug.h" #include "hasp_config.h" @@ -527,7 +527,7 @@ void webHandleInfo() httpMessage += F("s"); httpMessage += F("
Free Memory: "); - hasp_util_format_bytes(halGetFreeHeap(), size_buf, sizeof(size_buf)); + Utilities::format_bytes(halGetFreeHeap(), size_buf, sizeof(size_buf)); httpMessage += size_buf; httpMessage += F("
Memory Fragmentation: "); httpMessage += String(halGetHeapFragmentation()); @@ -535,10 +535,10 @@ void webHandleInfo() #if ARDUINO_ARCH_ESP32 if(psramFound()) { httpMessage += F("
Free PSRam: "); - hasp_util_format_bytes(ESP.getFreePsram(), size_buf, sizeof(size_buf)); + Utilities::format_bytes(ESP.getFreePsram(), size_buf, sizeof(size_buf)); httpMessage += size_buf; httpMessage += F("
PSRam Size: "); - hasp_util_format_bytes(ESP.getPsramSize(), size_buf, sizeof(size_buf)); + Utilities::format_bytes(ESP.getPsramSize(), size_buf, sizeof(size_buf)); httpMessage += size_buf; } #endif @@ -547,10 +547,10 @@ void webHandleInfo() lv_mem_monitor_t mem_mon; lv_mem_monitor(&mem_mon); httpMessage += F("

LVGL Memory: "); - hasp_util_format_bytes(mem_mon.total_size, size_buf, sizeof(size_buf)); + Utilities::format_bytes(mem_mon.total_size, size_buf, sizeof(size_buf)); httpMessage += size_buf; httpMessage += F("
LVGL Free: "); - hasp_util_format_bytes(mem_mon.free_size, size_buf, sizeof(size_buf)); + Utilities::format_bytes(mem_mon.free_size, size_buf, sizeof(size_buf)); httpMessage += size_buf; httpMessage += F("
LVGL Fragmentation: "); httpMessage += mem_mon.frag_pct; @@ -653,15 +653,15 @@ void webHandleInfo() #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266) httpMessage += F("
Flash Chip Size: "); - hasp_util_format_bytes(ESP.getFlashChipSize(), size_buf, sizeof(size_buf)); + Utilities::format_bytes(ESP.getFlashChipSize(), size_buf, sizeof(size_buf)); httpMessage += size_buf; httpMessage += F("
Program Size: "); - hasp_util_format_bytes(ESP.getSketchSize(), size_buf, sizeof(size_buf)); + Utilities::format_bytes(ESP.getSketchSize(), size_buf, sizeof(size_buf)); httpMessage += size_buf; httpMessage += F("
Free Program Space: "); - hasp_util_format_bytes(ESP.getFreeSketchSpace(), size_buf, sizeof(size_buf)); + Utilities::format_bytes(ESP.getFreeSketchSpace(), size_buf, sizeof(size_buf)); httpMessage += size_buf; #endif @@ -1834,7 +1834,7 @@ void webHandleSaveConfig() { if(!httpIsAuthenticated(F("saveConfig"))) return; - configWriteConfig(); + configWrite(); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/svc/hasp_telnet.cpp b/src/svc/hasp_telnet.cpp index 8b9689d3..6caff6ec 100644 --- a/src/svc/hasp_telnet.cpp +++ b/src/svc/hasp_telnet.cpp @@ -7,7 +7,7 @@ #include "ArduinoJson.h" #include "ConsoleInput.h" - #include "hasp_debug.h" + #include "log/hasp_debug.h" #include "hasp_config.h" #include "hasp_telnet.h" diff --git a/src/hasp_gpio.cpp b/src/sys/gpio/hasp_gpio.cpp similarity index 100% rename from src/hasp_gpio.cpp rename to src/sys/gpio/hasp_gpio.cpp diff --git a/src/hasp_gpio.h b/src/sys/gpio/hasp_gpio.h similarity index 100% rename from src/hasp_gpio.h rename to src/sys/gpio/hasp_gpio.h diff --git a/src/net/hasp_ethernet_esp32.cpp b/src/sys/net/hasp_ethernet_esp32.cpp similarity index 98% rename from src/net/hasp_ethernet_esp32.cpp rename to src/sys/net/hasp_ethernet_esp32.cpp index b32ba958..8d073cb6 100644 --- a/src/net/hasp_ethernet_esp32.cpp +++ b/src/sys/net/hasp_ethernet_esp32.cpp @@ -3,7 +3,7 @@ #include "hasp_conf.h" -#include "hasp_hal.h" +#include "hal/hasp_hal.h" #include "hasp_debug.h" #include "hasp_network.h" diff --git a/src/net/hasp_ethernet_esp32.h b/src/sys/net/hasp_ethernet_esp32.h similarity index 100% rename from src/net/hasp_ethernet_esp32.h rename to src/sys/net/hasp_ethernet_esp32.h diff --git a/src/net/hasp_ethernet_stm32.cpp b/src/sys/net/hasp_ethernet_stm32.cpp similarity index 99% rename from src/net/hasp_ethernet_stm32.cpp rename to src/sys/net/hasp_ethernet_stm32.cpp index 46935132..32bdebe7 100644 --- a/src/net/hasp_ethernet_stm32.cpp +++ b/src/sys/net/hasp_ethernet_stm32.cpp @@ -4,7 +4,7 @@ #include "hasp_conf.h" #include "hasp_debug.h" -#include "hasp_hal.h" +#include "hal/hasp_hal.h" #if HASP_USE_ETHERNET > 0 && defined(STM32F4xx) diff --git a/src/net/hasp_ethernet_stm32.h b/src/sys/net/hasp_ethernet_stm32.h similarity index 100% rename from src/net/hasp_ethernet_stm32.h rename to src/sys/net/hasp_ethernet_stm32.h diff --git a/src/net/hasp_network.cpp b/src/sys/net/hasp_network.cpp similarity index 95% rename from src/net/hasp_network.cpp rename to src/sys/net/hasp_network.cpp index 31ab26d2..b51d0778 100644 --- a/src/net/hasp_network.cpp +++ b/src/sys/net/hasp_network.cpp @@ -9,12 +9,12 @@ #include "ArduinoLog.h" #include "hasp_conf.h" -#include "hasp_hal.h" +#include "hal/hasp_hal.h" #include "hasp_debug.h" #include "hasp_network.h" -#include "../hasp/hasp.h" -#include "../svc/hasp_mdns.h" +#include "../../hasp/hasp.h" +#include "../../svc/hasp_mdns.h" #if HASP_USE_ETHERNET > 0 || HASP_USE_WIFI > 0 void networkStart(void) diff --git a/src/net/hasp_network.h b/src/sys/net/hasp_network.h similarity index 100% rename from src/net/hasp_network.h rename to src/sys/net/hasp_network.h diff --git a/src/net/hasp_wifi.cpp b/src/sys/net/hasp_wifi.cpp similarity index 100% rename from src/net/hasp_wifi.cpp rename to src/sys/net/hasp_wifi.cpp