Separate HTTP server code, list log files and download them in APRS format

pull/30/head
Pawel Jalocha 2020-11-03 02:47:57 +00:00
rodzic 5a04a97444
commit ba74f34bb5
5 zmienionych plików z 393 dodań i 253 usunięć

Wyświetl plik

@ -12,6 +12,7 @@
#include "socket.h"
#include "proc.h"
#include "wifi.h"
#include "http.h"
// #define DEBUG_PRINT
@ -19,258 +20,6 @@
// ============================================================================================================
static void SelectList(httpd_req_t *Req, const char *Name, const char **List, int Size, int Sel=0)
{ char Line[8];
httpd_resp_sendstr_chunk(Req, "<select name=\"");
httpd_resp_sendstr_chunk(Req, Name);
httpd_resp_sendstr_chunk(Req, "\">\n");
for(int Idx=0; Idx<Size; Idx++)
{ httpd_resp_sendstr_chunk(Req, "<option value=\"");
int Len=Format_UnsDec(Line, (uint16_t)Idx);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"");
if(Idx==Sel) httpd_resp_sendstr_chunk(Req, " selected>");
else httpd_resp_sendstr_chunk(Req, ">");
httpd_resp_sendstr_chunk(Req, List[Idx]);
httpd_resp_sendstr_chunk(Req, "</option>\n");
}
httpd_resp_sendstr_chunk(Req, "</select>\n"); }
static void ParmForm_Info(httpd_req_t *Req) // produce HTML form for aircraft parameters
{
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"Info\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Info</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Pilot</td><td><input type=\"text\" name=\"Pilot\" size=\"10\" value=\"");
if(Parameters.Pilot[0]) httpd_resp_sendstr_chunk(Req, Parameters.Pilot);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Crew</td><td><input type=\"text\" name=\"Crew\" size=\"10\" value=\"");
if(Parameters.Crew[0]) httpd_resp_sendstr_chunk(Req, Parameters.Crew);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Base airfield</td><td><input type=\"text\" name=\"Base\" size=\"10\" value=\"");
if(Parameters.Base[0]) httpd_resp_sendstr_chunk(Req, Parameters.Base);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Registration</td><td><input type=\"text\" name=\"Reg\" size=\"10\" value=\"");
if(Parameters.Reg[0]) httpd_resp_sendstr_chunk(Req, Parameters.Reg);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Manufacturer</td><td><input type=\"text\" name=\"Manuf\" size=\"10\" value=\"");
if(Parameters.Manuf[0]) httpd_resp_sendstr_chunk(Req, Parameters.Manuf);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Model</td><td><input type=\"text\" name=\"Model\" size=\"10\" value=\"");
if(Parameters.Model[0]) httpd_resp_sendstr_chunk(Req, Parameters.Model);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Type</td><td><input type=\"text\" name=\"Type\" size=\"10\" value=\"");
if(Parameters.Type[0]) httpd_resp_sendstr_chunk(Req, Parameters.Type);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
static void ParmForm_Acft(httpd_req_t *Req) // produce HTML form for aircraft parameters
{ char Line[16];
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"Acft\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Aircraft</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Address</td><td><input type=\"text\" name=\"Address\" size=\"10\" value=\"0x");
Format_Hex(Line, (uint8_t)(Parameters.Address>>16)); Format_Hex(Line+2, (uint16_t)Parameters.Address);
httpd_resp_send_chunk(Req, Line, 6);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
const char *AddrTypeTable[4] = { "Random", "ICAO", "FLARM", "OGN" } ;
httpd_resp_sendstr_chunk(Req, "<tr><td>Addr-Type</td><td>\n");
SelectList(Req, "AddrType", AddrTypeTable, 4, Parameters.AddrType);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
const char *AcftTypeTable[16] = { "Unknown", "(moto)Glider", "Tow-plane", "Helicopter", "Parachute", "Drop-plane", "Hang-glider", "Para-glider",
"Powered-aircraft", "Jet-aircraft", "UFO", "Balloon", "Airship", "UAV/drone", "Ground support", "Static object" } ;
httpd_resp_sendstr_chunk(Req, "<tr><td>Acft-Type</td><td>\n");
SelectList(Req, "AcftType", AcftTypeTable, 16, Parameters.AcftType);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
static void ParmForm_Other(httpd_req_t *Req) // produce HTML form for aircraft parameters
{ char Line[16]; int Len;
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"Other\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Other</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
const char *FreqPlanTable[16] = { "Auto", "Europe/Africa", "USA/Canada", "Australia/Chile", "New Zeeland", "Izrael" };
httpd_resp_sendstr_chunk(Req, "<tr><td>Freq. plan</td><td>\n");
SelectList(Req, "FreqPlan", FreqPlanTable, 6, Parameters.FreqPlan);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Tx power [dBm]</td><td><input type=\"text\" name=\"TxPower\" size=\"10\" value=\"");
Len=Format_SignDec(Line, (int16_t)Parameters.getTxPower());
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Freq.corr. [ppm]</td><td><input type=\"text\" name=\"RFchipFreqCorr\" size=\"10\" value=\"");
Len=Format_SignDec(Line, Parameters.RFchipFreqCorr, 2, 1);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Console baud</td><td><input type=\"text\" name=\"CONbaud\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, Parameters.CONbaud);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Verbose</td><td><input type=\"text\" name=\"Verbose\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, (uint16_t)Parameters.Verbose);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>OLED page sel.</td><td><input type=\"text\" name=\"PageMask\" size=\"10\" value=\"0x");
Len=Format_Hex(Line, Parameters.PageMask);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
static void ParmForm_AP(httpd_req_t *Req) // Wi-Fi access point parameters { char Line[16]; int Len;
{ char Line[16]; int Len;
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"AP\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Wi-Fi AP</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>SSID</td><td><input type=\"text\" name=\"APname\" size=\"10\" value=\"");
if(Parameters.APname[0]) httpd_resp_sendstr_chunk(Req, Parameters.APname);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Password</td><td><input type=\"text\" name=\"APpass\" size=\"10\" value=\"");
if(Parameters.APpass[0]) httpd_resp_sendstr_chunk(Req, Parameters.APpass);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Data port</td><td><input type=\"text\" name=\"APport\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, Parameters.APport);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Tx [dBm]</td><td><input type=\"text\" name=\"APtxPwr\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, Parameters.APtxPwr);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
static esp_err_t parm_get_handler(httpd_req_t *Req)
{ char Line[32]; int Len;
uint16_t URLlen=httpd_req_get_url_query_len(Req);
if(URLlen)
{ char *URL = (char *)malloc(URLlen+1);
httpd_req_get_url_query_str(Req, URL, URLlen+1);
#ifdef DEBUG_PRINT
xSemaphoreTake(CONS_Mutex, portMAX_DELAY);
Format_String(CONS_UART_Write, "parm_get_handler() => [");
Format_SignDec(CONS_UART_Write, URLlen);
Format_String(CONS_UART_Write, "] ");
Format_String(CONS_UART_Write, URL);
Format_String(CONS_UART_Write, "\n");
xSemaphoreGive(CONS_Mutex);
#endif
char *Line=URL;
for( ; ; )
{ Parameters.ReadLine(Line);
Line = strchr(Line, '&'); if(Line==0) break;
Line++; }
free(URL);
Parameters.WriteToNVS(); }
httpd_resp_sendstr_chunk(Req, "\
<!DOCTYPE html>\n\
<html>\n\
<head>\n\
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n\
</head>\n\
<body>\n\
<title>OGN-Tracker configuration</title>\n\
");
httpd_resp_sendstr_chunk(Req, "<h1>OGN-Tracker configuration</h1>\n");
httpd_resp_sendstr_chunk(Req, "<b>CPU ID: ");
Len=Format_Hex(Line, getUniqueID());
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "</b><br />\n");
httpd_resp_sendstr_chunk(Req, "<table>\n<tr><td>\n");
ParmForm_Acft(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
ParmForm_Other(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
ParmForm_Info(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
ParmForm_AP(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"submit\" value=\"Reset to defaults\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"hidden\" name=\"Defaults\" value=\"1\">\n");
httpd_resp_sendstr_chunk(Req, "</form>\n");
httpd_resp_sendstr_chunk(Req, "</td></tr>\n</table>\n");
httpd_resp_sendstr_chunk(Req, "</body>\n</html>\n");
/*
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"submit\" value=\"Restart\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"hidden\" name=\"Restart\" value=\"1\">");
httpd_resp_sendstr_chunk(Req, "</form>\n");
*/
httpd_resp_sendstr_chunk(Req, 0);
return ESP_OK; }
static esp_err_t top_get_handler(httpd_req_t *Req)
{
httpd_resp_set_status(Req, "307 Temporary Redirect");
httpd_resp_set_hdr(Req, "Location", "/parm.html");
httpd_resp_send(Req, 0, 0);
/*
httpd_resp_sendstr_chunk(Req, "\
<!DOCTYPE html>\n\
<html><body>\n\
<title>OGN-Tracker status</title>\n\
");
httpd_resp_sendstr_chunk(Req, "<h1>OGN-Tracker</h1>\n");
httpd_resp_sendstr_chunk(Req, "<a href=\"parm.html\">Configuration page</a>\n");
httpd_resp_sendstr_chunk(Req, "</body></html>\n");
httpd_resp_sendstr_chunk(Req, 0);
*/
return ESP_OK; }
static const httpd_uri_t HTTPtop =
{ .uri = "/",
.method = HTTP_GET,
.handler = top_get_handler,
.user_ctx = 0 };
static const httpd_uri_t HTTPparm =
{ .uri = "/parm.html",
.method = HTTP_GET,
.handler = parm_get_handler,
.user_ctx = 0 };
static httpd_handle_t HTTPserver = 0;
static esp_err_t HTTP_Start(int MaxSockets=4, int Port=80)
{ httpd_config_t Config = HTTPD_DEFAULT_CONFIG();
Config.server_port = Port;
Config.task_priority = tskIDLE_PRIORITY+3;
Config.max_open_sockets = MaxSockets;
esp_err_t Err=httpd_start(&HTTPserver, &Config); if(Err!=ESP_OK) return Err;
httpd_register_uri_handler(HTTPserver, &HTTPtop);
httpd_register_uri_handler(HTTPserver, &HTTPparm);
return Err; }
static void HTTP_Stop(void)
{ if(HTTPserver) httpd_stop(HTTPserver); HTTPserver=0; }
// ============================================================================================================
DataServer PortServer;
static FIFO<char, 1024> AP_TxFIFO;

385
main/http.cpp 100644
Wyświetl plik

@ -0,0 +1,385 @@
#include <ctype.h>
#include <dirent.h>
#include <sys/stat.h>
#include <time.h>
#include "hal.h"
// #include "tcpip_adapter.h"
// #include "esp_wifi.h"
// #include "esp_event_loop.h"
#include "esp_http_server.h"
#include "format.h"
// #include "fifo.h"
// #include "socket.h"
#include "proc.h"
// #include "wifi.h"
#include "log.h"
#include "http.h"
// #define DEBUG_PRINT
#ifdef WITH_HTTP
// ============================================================================================================
static void SelectList(httpd_req_t *Req, const char *Name, const char **List, int Size, int Sel=0)
{ char Line[8];
httpd_resp_sendstr_chunk(Req, "<select name=\"");
httpd_resp_sendstr_chunk(Req, Name);
httpd_resp_sendstr_chunk(Req, "\">\n");
for(int Idx=0; Idx<Size; Idx++)
{ httpd_resp_sendstr_chunk(Req, "<option value=\"");
int Len=Format_UnsDec(Line, (uint16_t)Idx);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"");
if(Idx==Sel) httpd_resp_sendstr_chunk(Req, " selected>");
else httpd_resp_sendstr_chunk(Req, ">");
httpd_resp_sendstr_chunk(Req, List[Idx]);
httpd_resp_sendstr_chunk(Req, "</option>\n");
}
httpd_resp_sendstr_chunk(Req, "</select>\n"); }
static void ParmForm_Info(httpd_req_t *Req) // produce HTML form for aircraft parameters
{
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"Info\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Info</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Pilot</td><td><input type=\"text\" name=\"Pilot\" size=\"10\" value=\"");
if(Parameters.Pilot[0]) httpd_resp_sendstr_chunk(Req, Parameters.Pilot);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Crew</td><td><input type=\"text\" name=\"Crew\" size=\"10\" value=\"");
if(Parameters.Crew[0]) httpd_resp_sendstr_chunk(Req, Parameters.Crew);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Base airfield</td><td><input type=\"text\" name=\"Base\" size=\"10\" value=\"");
if(Parameters.Base[0]) httpd_resp_sendstr_chunk(Req, Parameters.Base);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Registration</td><td><input type=\"text\" name=\"Reg\" size=\"10\" value=\"");
if(Parameters.Reg[0]) httpd_resp_sendstr_chunk(Req, Parameters.Reg);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Manufacturer</td><td><input type=\"text\" name=\"Manuf\" size=\"10\" value=\"");
if(Parameters.Manuf[0]) httpd_resp_sendstr_chunk(Req, Parameters.Manuf);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Model</td><td><input type=\"text\" name=\"Model\" size=\"10\" value=\"");
if(Parameters.Model[0]) httpd_resp_sendstr_chunk(Req, Parameters.Model);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Type</td><td><input type=\"text\" name=\"Type\" size=\"10\" value=\"");
if(Parameters.Type[0]) httpd_resp_sendstr_chunk(Req, Parameters.Type);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
static void ParmForm_Acft(httpd_req_t *Req) // produce HTML form for aircraft parameters
{ char Line[16];
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"Acft\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Aircraft</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Address</td><td><input type=\"text\" name=\"Address\" size=\"10\" value=\"0x");
Format_Hex(Line, (uint8_t)(Parameters.Address>>16)); Format_Hex(Line+2, (uint16_t)Parameters.Address);
httpd_resp_send_chunk(Req, Line, 6);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
const char *AddrTypeTable[4] = { "Random", "ICAO", "FLARM", "OGN" } ;
httpd_resp_sendstr_chunk(Req, "<tr><td>Addr-Type</td><td>\n");
SelectList(Req, "AddrType", AddrTypeTable, 4, Parameters.AddrType);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
const char *AcftTypeTable[16] = { "Unknown", "(moto)Glider", "Tow-plane", "Helicopter", "Parachute", "Drop-plane", "Hang-glider", "Para-glider",
"Powered-aircraft", "Jet-aircraft", "UFO", "Balloon", "Airship", "UAV/drone", "Ground support", "Static object" } ;
httpd_resp_sendstr_chunk(Req, "<tr><td>Acft-Type</td><td>\n");
SelectList(Req, "AcftType", AcftTypeTable, 16, Parameters.AcftType);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
static void ParmForm_Other(httpd_req_t *Req) // produce HTML form for aircraft parameters
{ char Line[16]; int Len;
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"Other\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Other</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
const char *FreqPlanTable[16] = { "Auto", "Europe/Africa", "USA/Canada", "Australia/Chile", "New Zeeland", "Izrael" };
httpd_resp_sendstr_chunk(Req, "<tr><td>Freq. plan</td><td>\n");
SelectList(Req, "FreqPlan", FreqPlanTable, 6, Parameters.FreqPlan);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Tx power [dBm]</td><td><input type=\"text\" name=\"TxPower\" size=\"10\" value=\"");
Len=Format_SignDec(Line, (int16_t)Parameters.getTxPower());
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Freq.corr. [ppm]</td><td><input type=\"text\" name=\"RFchipFreqCorr\" size=\"10\" value=\"");
Len=Format_SignDec(Line, Parameters.RFchipFreqCorr, 2, 1);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Console baud</td><td><input type=\"text\" name=\"CONbaud\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, Parameters.CONbaud);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Verbose</td><td><input type=\"text\" name=\"Verbose\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, (uint16_t)Parameters.Verbose);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Page sel. mask</td><td><input type=\"text\" name=\"PageMask\" size=\"10\" value=\"0x");
Len=Format_Hex(Line, Parameters.PageMask);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
#ifdef WITH_AP
static void ParmForm_AP(httpd_req_t *Req) // Wi-Fi access point parameters { char Line[16]; int Len;
{ char Line[16]; int Len;
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\" id=\"AP\">\n<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">\n");
httpd_resp_sendstr_chunk(Req, "<tr><th><b>Wi-Fi</th><td><input type=\"submit\" value=\"Apply\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>SSID</td><td><input type=\"text\" name=\"APname\" size=\"10\" value=\"");
if(Parameters.APname[0]) httpd_resp_sendstr_chunk(Req, Parameters.APname);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Password</td><td><input type=\"text\" name=\"APpass\" size=\"10\" value=\"");
if(Parameters.APpass[0]) httpd_resp_sendstr_chunk(Req, Parameters.APpass);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Data port</td><td><input type=\"text\" name=\"APport\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, Parameters.APport);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "<tr><td>Tx [dBm]</td><td><input type=\"text\" name=\"APtxPwr\" size=\"10\" value=\"");
Len=Format_UnsDec(Line, (10*Parameters.APtxPwr+2)>>2, 2, 1);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "\"></td></tr>\n");
httpd_resp_sendstr_chunk(Req, "</table></form>\n"); }
#endif
static esp_err_t parm_get_handler(httpd_req_t *Req)
{ char Line[32]; int Len;
uint16_t URLlen=httpd_req_get_url_query_len(Req);
if(URLlen)
{ char *URL = (char *)malloc(URLlen+1);
httpd_req_get_url_query_str(Req, URL, URLlen+1);
#ifdef DEBUG_PRINT
xSemaphoreTake(CONS_Mutex, portMAX_DELAY);
Format_String(CONS_UART_Write, "parm_get_handler() => [");
Format_SignDec(CONS_UART_Write, URLlen);
Format_String(CONS_UART_Write, "] ");
Format_String(CONS_UART_Write, URL);
Format_String(CONS_UART_Write, "\n");
xSemaphoreGive(CONS_Mutex);
#endif
char *Line=URL;
for( ; ; )
{ Parameters.ReadLine(Line);
Line = strchr(Line, '&'); if(Line==0) break;
Line++; }
free(URL);
Parameters.WriteToNVS(); }
httpd_resp_sendstr_chunk(Req, "\
<!DOCTYPE html>\n\
<html>\n\
<head>\n\
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n\
</head>\n\
<body>\n\
<title>OGN-Tracker configuration</title>\n\
");
httpd_resp_sendstr_chunk(Req, "<h2>OGN-Tracker configuration</h2>\n");
httpd_resp_sendstr_chunk(Req, "<b>CPU ID: ");
Len=Format_Hex(Line, getUniqueID());
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "</b><br />\n");
httpd_resp_sendstr_chunk(Req, "<table>\n<tr><td>\n");
ParmForm_Acft(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
ParmForm_Info(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
#ifdef WITH_AP
ParmForm_AP(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
#endif
ParmForm_Other(Req);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n<tr><td>\n");
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"submit\" value=\"Reset to defaults\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"hidden\" name=\"Defaults\" value=\"1\">\n");
httpd_resp_sendstr_chunk(Req, "</form>\n");
httpd_resp_sendstr_chunk(Req, "</td></tr>\n</table>\n");
httpd_resp_sendstr_chunk(Req, "</body>\n</html>\n");
/*
httpd_resp_sendstr_chunk(Req, "<form action=\"/parm.html\" method=\"get\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"submit\" value=\"Restart\">\n");
httpd_resp_sendstr_chunk(Req, "<input type=\"hidden\" name=\"Restart\" value=\"1\">");
httpd_resp_sendstr_chunk(Req, "</form>\n");
*/
// httpd_resp_sendstr_chunk(Req, 0);
httpd_resp_send_chunk(Req, 0, 0);
return ESP_OK; }
static esp_err_t top_get_handler(httpd_req_t *Req)
{
httpd_resp_set_status(Req, "307 Temporary Redirect");
httpd_resp_set_hdr(Req, "Location", "/parm.html");
httpd_resp_send(Req, 0, 0);
/*
httpd_resp_sendstr_chunk(Req, "\
<!DOCTYPE html>\n\
<html><body>\n\
<title>OGN-Tracker status</title>\n\
");
httpd_resp_sendstr_chunk(Req, "<h1>OGN-Tracker</h1>\n");
httpd_resp_sendstr_chunk(Req, "<a href=\"parm.html\">Configuration page</a>\n");
httpd_resp_sendstr_chunk(Req, "</body></html>\n");
httpd_resp_sendstr_chunk(Req, 0);
*/
return ESP_OK; }
static int Format_DateTime(char *Out, time_t Time)
{ struct tm *TM = gmtime(&Time);
int Len=Format_UnsDec(Out, (uint16_t)1900+TM->tm_year, 4);
Out[Len++]='.';
Len+=Format_UnsDec(Out+Len, (uint16_t)1+TM->tm_mon, 2);
Out[Len++]='.';
Len+=Format_UnsDec(Out+Len, (uint16_t)TM->tm_mday, 2);
Out[Len++]=' ';
Len+=Format_UnsDec(Out+Len, (uint16_t)TM->tm_hour, 2);
Out[Len++]=':';
Len+=Format_UnsDec(Out+Len, (uint16_t)TM->tm_min, 2);
Out[Len++]=':';
Len+=Format_UnsDec(Out+Len, (uint16_t)TM->tm_sec, 2);
return Len; }
static esp_err_t SendLog(httpd_req_t *Req, const char *FileName, uint32_t FileTime, bool Bin=0)
{ char Line[128];
httpd_resp_set_type(Req, "text/plain");
FILE *File = fopen(FileName, "rb"); if(File==0) { httpd_resp_send_chunk(Req, 0, 0); return ESP_OK; }
OGN_LogPacket<OGN_Packet> Packet;
for( ; ; )
{ if(fread(&Packet, Packet.Bytes, 1, File)!=1) break; // read the next packet
if(!Packet.isCorrect()) continue;
uint32_t Time = Packet.getTime(FileTime); // [sec] get exact time from short time in the packet and the file start time
uint8_t Len=Packet.Packet.WriteAPRS(Line, Time); // print the packet in the APRS format
if(Len==0) continue; // if cannot be printed for whatever reason
httpd_resp_send_chunk(Req, Line, Len);
vTaskDelay(1); }
fclose(File);
httpd_resp_send_chunk(Req, 0, 0);
return ESP_OK; }
static esp_err_t log_get_handler(httpd_req_t *Req)
{ char FullName[32]; char Line[32]; struct stat Stat;
// httpd_resp_set_status(Req, "307 Temporary Redirect");
// httpd_resp_set_hdr(Req, "Location", "/parm.html");
const char *Path= "/spiffs";
uint16_t URLlen=httpd_req_get_url_query_len(Req);
if(URLlen)
{ char *URL = (char *)malloc(URLlen+1);
httpd_req_get_url_query_str(Req, URL, URLlen+1);
char Name[16];
bool SendFile = httpd_query_key_value(URL, "File", Name, 16)==ESP_OK;
free(URL);
if(SendFile)
{ AddPath(FullName, Name, Path);
uint32_t Time=FlashLog_ReadShortFileTime(Name);
if(Time) return SendLog(Req, FullName, Time); }
}
httpd_resp_sendstr_chunk(Req, "\
<!DOCTYPE html>\n\
<html>\n\
<head>\n\
<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">\n\
</head>\n\
<body>\n\
<title>OGN-Tracker log files</title>\n\
");
httpd_resp_sendstr_chunk(Req, "<h2>OGN-Tracker log files</h2>\n");
DIR *Dir=opendir(Path);
if(Dir)
{ httpd_resp_sendstr_chunk(Req, "<table>\n<tr><th>File</th><th>[KB]</th><th>Date</th></tr>\n");
for( ; ; )
{ struct dirent *Ent = readdir(Dir); if(!Ent) break; // read next directory entry, break if all read
if(Ent->d_type != DT_REG) continue; // skip non-regular files
char *Name = Ent->d_name;
uint32_t Time=FlashLog_ReadShortFileTime(Name); // read time from the file name
if(Time==0) continue; // skip if not .TLG format
AddPath(FullName, Name, Path);
uint32_t Size=0;
if(stat(FullName, &Stat)>=0) // get file info
Size = Stat.st_size;
httpd_resp_sendstr_chunk(Req, "<tr><td><a href=\"/log.html?File=");
httpd_resp_sendstr_chunk(Req, Name);
httpd_resp_sendstr_chunk(Req, "\">");
httpd_resp_sendstr_chunk(Req, Name);
httpd_resp_sendstr_chunk(Req, "</a></td><td align=\"center\">");
int Len=Format_UnsDec(Line, (Size+512)>>10);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "</td><td>");
Len=Format_DateTime(Line, Time);
httpd_resp_send_chunk(Req, Line, Len);
httpd_resp_sendstr_chunk(Req, "</td></tr>\n");
vTaskDelay(1); }
httpd_resp_sendstr_chunk(Req, "</table>\n");
closedir(Dir);
} else httpd_resp_sendstr_chunk(Req, "<p>Cannot open the log directory !</p>\n");
httpd_resp_sendstr_chunk(Req, "</body>\n</html>\n");
httpd_resp_send_chunk(Req, 0, 0);
return ESP_OK; }
static const httpd_uri_t HTTPtop =
{ .uri = "/",
.method = HTTP_GET,
.handler = top_get_handler,
.user_ctx = 0 };
static const httpd_uri_t HTTPparm =
{ .uri = "/parm.html",
.method = HTTP_GET,
.handler = parm_get_handler,
.user_ctx = 0 };
static const httpd_uri_t HTTPlog =
{ .uri = "/log.html",
.method = HTTP_GET,
.handler = log_get_handler,
.user_ctx = 0 };
static httpd_handle_t HTTPserver = 0;
esp_err_t HTTP_Start(int MaxSockets, int Port)
{ httpd_config_t Config = HTTPD_DEFAULT_CONFIG();
Config.server_port = Port;
Config.task_priority = tskIDLE_PRIORITY+3;
Config.max_open_sockets = MaxSockets;
esp_err_t Err=httpd_start(&HTTPserver, &Config); if(Err!=ESP_OK) return Err;
httpd_register_uri_handler(HTTPserver, &HTTPtop); // top URL
httpd_register_uri_handler(HTTPserver, &HTTPparm); // parameters URL
httpd_register_uri_handler(HTTPserver, &HTTPlog); // log files URL
return Err; }
void HTTP_Stop(void)
{ if(HTTPserver) httpd_stop(HTTPserver); HTTPserver=0; }
// ============================================================================================================
#endif // WITH_HTTP

4
main/http.h 100644
Wyświetl plik

@ -0,0 +1,4 @@
esp_err_t HTTP_Start(int MaxSockets=4, int Port=80);
void HTTP_Stop(void);

Wyświetl plik

@ -15,7 +15,7 @@
// #define DEBUG_PRINT
static void AddPath(char *Name, const char *FileName, const char *Path)
void AddPath(char *Name, const char *FileName, const char *Path)
{ if(Path==0) { strcpy(Name, FileName); return; }
strcpy(Name, Path);
int Len=strlen(Name); if(Name[Len-1]!='/') Name[Len++]='/';

Wyświetl plik

@ -3,6 +3,8 @@
extern FIFO<OGN_LogPacket<OGN_Packet>, 32> FlashLog_FIFO;
void AddPath(char *Name, const char *FileName, const char *Path);
extern bool FlashLog_SaveReq;
extern uint32_t FlashLog_FileTime; // [sec] start time of the current log file
extern char FlashLog_FileName[32]; // current log file name if open