diff --git a/lib/lv_fs_if/lv_fs_pc.c b/lib/lv_fs_if/lv_fs_pc.c index a7faeeab..f9b1fdc3 100644 --- a/lib/lv_fs_if/lv_fs_pc.c +++ b/lib/lv_fs_if/lv_fs_pc.c @@ -13,7 +13,7 @@ #include #include #include -#if !defined(ARDUINO_ARCH_ESP8266) && !defined(STM32F4xx) +#if !defined(ARDUINO_ARCH_ESP8266) && !defined(STM32F4xx) && !defined(STM32F7xx) #include #endif #ifdef WIN32 diff --git a/lib/lv_lib_zifont/lv_zifont.cpp b/lib/lv_lib_zifont/lv_zifont.cpp index 397d6724..3d6f594d 100644 --- a/lib/lv_lib_zifont/lv_zifont.cpp +++ b/lib/lv_lib_zifont/lv_zifont.cpp @@ -5,7 +5,7 @@ * INCLUDES *********************/ -#if !(defined(WINDOWS) || defined(POSIX)) +#if !(defined(WINDOWS) || defined(POSIX) || defined(STM32F7xx)) #include #include diff --git a/src/log/hasp_debug.cpp b/src/log/hasp_debug.cpp index 6a8ed8cc..8d87dc6c 100644 --- a/src/log/hasp_debug.cpp +++ b/src/log/hasp_debug.cpp @@ -25,7 +25,7 @@ #elif defined(ARDUINO_ARCH_ESP32) #include #include -#elif defined(STM32F4xx) +#elif defined(STM32F4xx) || defined(STM32F7xx) #include #endif @@ -297,12 +297,13 @@ void debugStartSerial() if(baudrate >= 9600u) { /* the baudrates are stored divided by 10 */ -#if defined(STM32F4xx) +#if defined(STM32F4xx) || defined(STM32F7xx) #ifndef STM32_SERIAL1 // Define what Serial port to use for log output Serial.setRx(PA3); // User Serial2 Serial.setTx(PA2); #endif #endif + Serial.begin(baudrate); /* prepare for possible serial debug */ delay(10); Log.registerOutput(0, &Serial, LOG_LEVEL_VERBOSE, true); // LOG_LEVEL_VERBOSE diff --git a/src/sys/net/hasp_ethernet_stm32.cpp b/src/sys/net/hasp_ethernet_stm32.cpp index 39787953..e484dcdd 100644 --- a/src/sys/net/hasp_ethernet_stm32.cpp +++ b/src/sys/net/hasp_ethernet_stm32.cpp @@ -6,7 +6,7 @@ #include "hasp_debug.h" #include "hal/hasp_hal.h" -#if HASP_USE_ETHERNET > 0 && defined(STM32F4xx) +#if HASP_USE_ETHERNET > 0 && (defined(STM32F4xx) || defined(STM32F7xx)) EthernetClient EthClient; IPAddress ip; @@ -109,4 +109,29 @@ void ethernet_get_statusupdate(char* buffer, size_t len) snprintf_P(buffer, len, PSTR("\"eth\":\"%s\",\"link\":%d,\"ip\":\"%d.%d.%d.%d\","), state ? F("on") : F("off"), 10, ip[0], ip[1], ip[2], ip[3]); } + +void ethernet_get_info(JsonDocument& doc) +{ + char size_buf[32]; + String buffer((char*)0); + buffer.reserve(64); + + JsonObject info = doc.createNestedObject(F(D_INFO_ETHERNET)); + + // buffer = Ethernet.linkSpeed(); + // buffer += F(" Mbps"); + // if(Ethernet.fullDuplex()) { + // buffer += F(" " D_INFO_FULL_DUPLEX); + // } + + // info[F(D_INFO_LINK_SPEED)] = buffer; + + IPAddress ip = Ethernet.localIP(); + snprintf_P(size_buf, sizeof(size_buf), PSTR("%d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]); + info[F(D_INFO_IP_ADDRESS)] = size_buf; + // info[F(D_INFO_GATEWAY)] = Ethernet.gatewayIP().toString(); + // info[F(D_INFO_DNS_SERVER)] = Ethernet.dnsIP().toString(); + // info[F(D_INFO_MAC_ADDRESS)] = Ethernet.macAddress(); +} + #endif \ No newline at end of file diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index 6c07e3a1..04cca423 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -67,7 +67,7 @@ hasp_http_config_t http_config; #define HTTP_PAGE_SIZE (6 * 256) -#if defined(STM32F4xx) && HASP_USE_ETHERNET > 0 +#if(defined(STM32F4xx) || defined(STM32F7xx)) && HASP_USE_ETHERNET > 0 #include EthernetWebServer webServer(80); #endif @@ -594,7 +594,7 @@ void webHandleInfoJson() webSendPage(haspDevice.get_hostname(), htmldata.length(), false); webServer.sendContent(htmldata); - htmldata.clear(); + // htmldata.clear(); webSendFooter(); }