j3d1/fiatlux
1
0
Fork 1
Code Issues 18 Pull requests Projects Releases 2 Wiki Activity

add basic OTA Update fucionality
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
j3d1 2021-08-28 23:44:01 +02:00
parent 495163060d
commit 8874fecf15
8 changed files with 333 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

123
firmware/web.cpp
View file

@ -38,7 +38,7 @@ void websocket_task(void *pvParameter) {
has_changed = {true, true, true};
for (;;) {
if(pcb == NULL || pcb->state != ESTABLISHED) {
if(pcb == nullptr || pcb->state != ESTABLISHED) {
printf("Connection closed, deleting task\n");
break;
}
@ -46,14 +46,14 @@ void websocket_task(void *pvParameter) {
//Global Info
if(has_changed.global) {
has_changed.global = false;
timeval tv;
gettimeofday(&tv, NULL);
int uptime = xTaskGetTickCount() * portTICK_PERIOD_MS / 1000;
timeval tv{};
gettimeofday(&tv, nullptr);
size_t uptime = xTaskGetTickCount() * portTICK_PERIOD_MS / 1000;
int heap = (int) xPortGetFreeHeapSize();
uint32_t chip_id = sdk_system_get_chip_id();
uint32_t flash_id = sdk_spi_flash_get_id();
uint32_t flash_size = sdk_flashchip.chip_size >> 10;
char *hostname = NULL;
char *hostname = nullptr;
sysparam_get_string("hostname", &hostname);
/* Generate response in JSON format */
@ -80,21 +80,16 @@ void websocket_task(void *pvParameter) {
//Connection Info
if(has_changed.connection) {
has_changed.connection = false;
timeval tv;
gettimeofday(&tv, NULL);
int connuptime = (xTaskGetTickCount() - connstarttime) * portTICK_PERIOD_MS / 1000;
timeval tv{};
gettimeofday(&tv, nullptr);
size_t connuptime = (xTaskGetTickCount() - connstarttime) * portTICK_PERIOD_MS / 1000;
printf("conn %d: "
IPSTR
" <-> "
IPSTR
" \n", pcb->netif_idx, IP2STR(&pcb->local_ip), IP2STR(&pcb->remote_ip));
printf("conn %d: " IPSTR " <-> " IPSTR " \n", pcb->netif_idx, IP2STR(&pcb->local_ip),
IP2STR(&pcb->remote_ip));
char response[160];
size_t len = snprintf(response, sizeof(response),
"{\"connage\" : \"%d\","
"\"clientip\" : \""
IPSTR
"\""
"\"clientip\" : \"" IPSTR "\""
"}", connuptime, IP2STR(&pcb->remote_ip));
if(len < sizeof(response)) {
LOCK_TCPIP_CORE();
@ -137,10 +132,10 @@ void websocket_task(void *pvParameter) {
if(opmode == SOFTAP_MODE || opmode == STATIONAP_MODE) {
uint8_t hwaddr[6];
sdk_wifi_get_macaddr(SOFTAP_IF, hwaddr);
ip_info info;
ip_info info{};
sdk_wifi_get_ip_info(SOFTAP_IF, &info);
char *apssid = NULL;
char *apssid = nullptr;
sysparam_get_string("wifi_ap_ssid", &apssid);
/* Generate response in JSON format */
@ -148,12 +143,8 @@ void websocket_task(void *pvParameter) {
size_t len = snprintf(response, sizeof(response),
"{\"opmode\" : \"%s\","
" \"apssid\" : \"%s\","
" \"apip\" : \""
IPSTR
"\","
" \"apmac\" : \""
MACSTR
"\""
" \"apip\" : \"" IPSTR "\","
" \"apmac\" : \"" MACSTR "\""
"}", opmode_str, apssid, IP2STR(&info.ip), MAC2STR(hwaddr));
free(apssid);
if(len < sizeof(response)) {
@ -169,7 +160,7 @@ void websocket_task(void *pvParameter) {
if(opmode == STATION_MODE || opmode == STATIONAP_MODE) {
uint8_t hwaddr[6];
sdk_wifi_get_macaddr(STATION_IF, hwaddr);
ip_info info;
ip_info info{};
sdk_wifi_get_ip_info(STATION_IF, &info);
char *stassid = nullptr;
sysparam_get_string("wifi_sta_ssid", &stassid);
@ -179,12 +170,8 @@ void websocket_task(void *pvParameter) {
size_t len = snprintf(response, sizeof(response),
"{\"opmode\" : \"%s\","
" \"stassid\" : \"%s\","
" \"staip\" : \""
IPSTR
"\","
" \"stamac\" : \""
MACSTR
"\""
" \"staip\" : \"" IPSTR "\","
" \"stamac\" : \"" MACSTR "\""
"}", opmode_str, stassid, IP2STR(&info.ip), MAC2STR(hwaddr));
free(stassid);
if(len < sizeof(response)) {
@ -198,34 +185,49 @@ void websocket_task(void *pvParameter) {
}
vTaskDelayMs(500);
{
uint8_t response[3];
uint16_t val = 0;
val = sdk_system_adc_read();
response[2] = (uint8_t) val;
response[1] = val >> 8;
response[0] = 'V';
websocket_write(pcb, response, 3, WS_BIN_MODE);
}
vTaskDelayMs(500);
}
vTaskDelete(NULL);
vTaskDelete(nullptr);
}
struct fw_frame {
char t;
uint8_t reserved[3];
uint16_t seq;
uint16_t len;
uint32_t hash;
uint8_t data[];
} __attribute__((packed));
struct fw_check {
char t;
uint8_t reserved[3];
uint32_t len;
uint32_t hash;
} __attribute__((packed));
/**
* This function is called when websocket frame is received.
*
* Note: this function is executed on TCP thread and should return as soon
* as possible.
*/
void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len, uint8_t mode) {
void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
uint8_t /*mode*/) { //mode should be WS_BIN_MODE or WS_TEXT_MODE
uint8_t response[3];
uint16_t val = 0;
char cmd = '0';
bool togl = 0;
switch (data[0]) {
case 'R': // Restart
cmd = 'R';
break;
case 'X': // Clear Config
cmd = 'X';
break;
case 'D': // Disable LED
signal_led(false);
val = 1;
@ -236,9 +238,29 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len, uint8_t mode)
val = 0;
cmd = 'G';
break;
case 'F':
togl = ~togl;
signal_led(togl);
{
auto *f = (fw_frame *) data;
if(f->seq == 0) {
system_otaflash_init();
}
val = system_otaflash_chunk(f->data, ntohs(f->len), ntohs(f->seq), ntohl(f->hash));
}
cmd = 'F';
break;
case 'C':
signal_led(false);
{
auto *f = (fw_check *) data;
val = system_otaflash_verify_and_switch(ntohl(f->len), ntohl(f->hash));
}
cmd = 'C';
break;
default:
printf("[websocket_callback]:\n%.*s\n", (int) data_len, (char *) data);
printf("Unknown command\n");
printf("Unknown command %c\n", data[0]);
val = 0;
break;
}
@ -247,7 +269,18 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len, uint8_t mode)
response[1] = val >> 8;
response[0] = cmd;
LOCK_TCPIP_CORE();
websocket_write(pcb, response, 3, WS_BIN_MODE);
UNLOCK_TCPIP_CORE();
if(data[0] == 'R') { // Restart
vTaskDelay(500 / portTICK_PERIOD_MS);
vPortEnterCritical();
sdk_system_restart();
} else if(data[0] == 'X') { // Clear Config
vTaskDelay(500 / portTICK_PERIOD_MS);
system_clear_config();
}
}
/**
@ -262,10 +295,10 @@ void websocket_open_cb(struct tcp_pcb *pcb, const char *uri) {
}
extern "C" void httpd_task(void *pvParameters) {
(void) pvParameters;
while (!uxSemaphoreGetCount(wifi_available_semaphore))
vTaskDelay(500 / portTICK_PERIOD_MS);
websocket_register_callbacks((tWsOpenHandler) websocket_open_cb, (tWsHandler) websocket_cb);
httpd_init();