diff --git a/Tools/AP_Bootloader/Web/index.html b/Tools/AP_Bootloader/Web/index.html index a48662e049..f287a58c94 100644 --- a/Tools/AP_Bootloader/Web/index.html +++ b/Tools/AP_Bootloader/Web/index.html @@ -3,6 +3,30 @@ AP_Bootloader + +

Bootloader

@@ -19,5 +43,9 @@ +
+ +
+ diff --git a/Tools/AP_Bootloader/network.cpp b/Tools/AP_Bootloader/network.cpp index 9b86561433..2139203ce2 100644 --- a/Tools/AP_Bootloader/network.cpp +++ b/Tools/AP_Bootloader/network.cpp @@ -26,6 +26,8 @@ #include #include "app_comms.h" #include "can.h" +#include +#include #ifndef AP_NETWORKING_BOOTLOADER_DEFAULT_MAC_ADDR #define AP_NETWORKING_BOOTLOADER_DEFAULT_MAC_ADDR "C2:AF:51:03:CF:46" @@ -403,9 +405,11 @@ void BL_Network::handle_post(SocketAPM *sock, uint32_t content_length) /* erase all of flash */ + status_printf("Erasing ..."); flash_set_keep_unlocked(true); uint32_t sec=0; while (flash_func_erase_sector(sec)) { + thread_sleep_ms(10); sec++; } /* @@ -433,6 +437,8 @@ void BL_Network::handle_post(SocketAPM *sock, uint32_t content_length) } flash_write_buffer(ofs, buf, n/4); ofs += n; + uint8_t pct = ofs*100/max_ofs; + status_printf("Flashing %u%%", unsigned(pct)); } if (ofs % 32 != 0) { // pad to 32 bytes @@ -443,7 +449,12 @@ void BL_Network::handle_post(SocketAPM *sock, uint32_t content_length) flash_set_keep_unlocked(false); const auto ok = check_good_firmware(); if (ok == check_fw_result_t::CHECK_FW_OK) { - jump_to_app(); + need_launch = true; + status_printf("Flash done: OK"); + const char *str = "Flash OK, booting"; + sock->send(str, strlen(str)); + } else { + status_printf("Flash done: ERR:%u", unsigned(ok)); } } @@ -457,6 +468,12 @@ void BL_Network::handle_request(SocketAPM *sock) */ char *headers = read_headers(sock); + const char *header = "HTTP/1.1 200 OK\r\n" + "Content-Type: text/html\r\n" + "Connection: close\r\n" + "\r\n"; + sock->send(header, strlen(header)); + if (strncmp(headers, "POST / ", 7) == 0) { const char *clen = "\r\nContent-Length:"; const char *p = strstr(headers, clen); @@ -464,23 +481,33 @@ void BL_Network::handle_request(SocketAPM *sock) p += strlen(clen); const uint32_t content_length = atoi(p); handle_post(sock, content_length); + delete headers; + delete sock; + return; } } - if (strncmp(headers, "GET /REBOOT", 11) == 0) { + /* + check for async status + */ + const char *get_status = "GET /bootloader_status.html"; + if (strncmp(headers, get_status, strlen(get_status)) == 0) { + { + WITH_SEMAPHORE(status_mtx); + sock->send(bl_status, strlen(bl_status)); + } + delete headers; + delete sock; + return; + } + + const char *get_reboot = "GET /REBOOT"; + if (strncmp(headers, get_reboot, strlen(get_reboot)) == 0) { need_reboot = true; } uint32_t size = 0; - /* - we only need one URL in the bootloader - */ - const char *header = "HTTP/1.1 200 OK\r\n" - "Content-Type: text/html\r\n" - "Connection: close\r\n" - "\r\n"; const auto *msg = AP_ROMFS::find_decompress("index.html", size); - sock->send(header, strlen(header)); if (need_reboot) { const char *str = ""; sock->send(str, strlen(str)); @@ -490,9 +517,22 @@ void BL_Network::handle_request(SocketAPM *sock) delete msg2; } delete headers; + delete sock; AP_ROMFS::free(msg); } +struct req_context { + BL_Network *driver; + SocketAPM *sock; +}; + +void BL_Network::net_request_trampoline(void *ctx) +{ + auto *req = (req_context *)ctx; + req->driver->handle_request(req->sock); + delete req; +} + /* web server thread */ @@ -508,11 +548,23 @@ void BL_Network::web_server(void) need_reboot = false; NVIC_SystemReset(); } + if (need_launch) { + need_launch = false; + thread_sleep_ms(1000); + jump_to_app(); + } if (sock == nullptr) { continue; } - handle_request(sock); - delete sock; + // a neq thread for each connection to allow for AJAX + auto *req = new req_context; + req->driver = this; + req->sock = sock; + thread_create_alloc(THD_WORKING_AREA_SIZE(2048), + "net_request", + 60, + net_request_trampoline, + req); } } @@ -553,5 +605,17 @@ void BL_Network::save_comms_ip(void) } } +/* + update status message + */ +void BL_Network::status_printf(const char *fmt, ...) +{ + WITH_SEMAPHORE(status_mtx); + va_list ap; + va_start(ap, fmt); + vsnprintf(bl_status, sizeof(bl_status), fmt, ap); + va_end(ap); +} + #endif // AP_BOOTLOADER_NETWORK_ENABLED diff --git a/Tools/AP_Bootloader/network.h b/Tools/AP_Bootloader/network.h index 3da28ff132..599724e785 100644 --- a/Tools/AP_Bootloader/network.h +++ b/Tools/AP_Bootloader/network.h @@ -24,6 +24,7 @@ private: void net_thread(void); void web_server(void); + static void net_request_trampoline(void *); void handle_request(SocketAPM *); void handle_post(SocketAPM *, uint32_t content_length); char *read_headers(SocketAPM *); @@ -45,6 +46,11 @@ private: } addr; bool need_reboot; + bool need_launch; + HAL_Semaphore status_mtx; + char bl_status[256]; + + void status_printf(const char *fmt, ...); }; #endif // AP_BOOTLOADER_NETWORK_ENABLED