tronnet/pico-bmc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement async handlers for pulsing pw_sw

Browse Source
This commit is contained in:
Arthur Lu 2024-02-13 21:05:01 -08:00
parent c0e774c08c
commit 426c04116f
10 changed files with 176 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
**/build/* **/build/*
**/secret.h **/secret.h
**/htmldata.c **/wwwdata.c

17
Makefile
View File

@ -1,16 +1,13 @@
#TOPTARGETS := all clean .PHONY: all clean build makefsdata
SUBDIRS := build all: clean makefsdata build
all: makefsdata $(SUBDIRS) clean:
$(MAKE) -C build/ clean
rm -rf wwwdata.c
makefsdata: makefsdata:
python3 makefsdata.py python3 makefsdata.py
clean: $(SUBDIRS) build:
rm -rf htmldata.c $(MAKE) -C build/
$(SUBDIRS):
$(MAKE) -C $@ $(MAKECMDGOALS)
.PHONY: all makefsdata clean $(SUBDIRS)

54
cgi.h
View File

@ -1,32 +1,40 @@
#ifndef CGI_H
#define CGI_H
#include "lwip/apps/httpd.h" #include "lwip/apps/httpd.h"
#include "pico/cyw43_arch.h" #include "pico/cyw43_arch.h"
#include "handlers.h"
// CGI handler which is run when a request for /led.cgi is detected const char * cgi_power_handler (int iIndex, int iNumParams, char *pcParam[], char *pcValue[]) {
const char * cgi_led_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[]) // Check if an request for power has been made (/power?requested_state=x)
{ if (strcmp(pcParam[0] , "requested_state") == 0){
// Check if an request for LED has been made (/led.cgi?led=x) // Look at the argument to check if LED is to be turned on (x=1) or off (x=0)
if (strcmp(pcParam[0] , "led") == 0){ if(strcmp(pcValue[0], "0") == 0) {
// Look at the argument to check if LED is to be turned on (x=1) or off (x=0) bmc_power_handler(false);
if(strcmp(pcValue[0], "0") == 0) }
cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 0); else if(strcmp(pcValue[0], "1") == 0) {
else if(strcmp(pcValue[0], "1") == 0) bmc_power_handler(true);
cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 1); }
} }
// Send the index page back to the user
// Send the index page back to the user return "/power.ssi";
return "/index.shtml"; }
const char * cgi_status_handler (int iIndex, int iNumParams, char *pcParam[], char *pcValue[]) {
return "/status.ssi";
} }
// tCGI Struct
// Fill this with all of the CGI requests and their respective handlers
static const tCGI cgi_handlers[] = { static const tCGI cgi_handlers[] = {
{ {
// Html request for "/led.cgi" triggers cgi_handler "/power", cgi_power_handler
"/led.cgi", cgi_led_handler },
}, {
"/status", cgi_status_handler
}
}; };
void cgi_init(void) void cgi_init(void) {
{ http_set_cgi_handlers(cgi_handlers, 2);
http_set_cgi_handlers(cgi_handlers, 1);
} }
#endif

38
handlers.h Normal file
View File

@ -0,0 +1,38 @@
#ifndef HANDLERS_H
#define HANDLERS_H
#include "pico/stdlib.h"
#define PW_SW_DELAY_MS 100
#define STATE_UPDATE_REPEAT_DELAY_MS 100
bool current_state = false;
int64_t pw_sw_on_async (alarm_id_t id, void * user_data) {
cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 1);
return 0; // do not reschedule alarm
}
int64_t pw_sw_off_async (alarm_id_t id, void * user_data) {
cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, 0);
return 0; // do not reschedule alarm
}
bool update_current_state_async (repeating_timer_t * rt) {
return true; // continue repeating alarm
}
bool bmc_power_handler (bool requested_state) {
if (requested_state != current_state) {
add_alarm_in_ms(0, pw_sw_on_async, NULL, true);
add_alarm_in_ms(PW_SW_DELAY_MS, pw_sw_off_async, NULL, true);
}
}
struct repeating_timer * bmc_handler_init () {
struct repeating_timer * timer = malloc(sizeof(struct repeating_timer));
add_repeating_timer_ms(STATE_UPDATE_REPEAT_DELAY_MS, update_current_state_async, NULL, timer);
return timer;
}
#endif

20
html_files/index.shtml
View File

@ -1,20 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>PicoW Webserver</title>
</head>
<body> <h1>PicoW Webserver Tutorial</h1>
<br>
<h2>This bit is SSI:</h2>
<p>Voltage: <!--#volt--></p>
<p>Temp: <!--#temp--> C</p>
<p>LED is: <!--#led--></p>
<br>
<h2>This bit is CGI:</h2>
<a href="/led.cgi?led=1"><button>LED ON</button></a>
<a href="/led.cgi?led=0"><button>LED OFF</button></a>
<br>
<br>
<a href="/index.shtml">Refresh</a>
</body>
</html>

2
lwipopts.h
View File

@ -90,4 +90,4 @@
#define LWIP_HTTPD_CGI 1 #define LWIP_HTTPD_CGI 1
#define LWIP_HTTPD_SSI_INCLUDE_TAG 0 #define LWIP_HTTPD_SSI_INCLUDE_TAG 0
#define HTTPD_SERVER_PORT 80 #define HTTPD_SERVER_PORT 80
#define HTTPD_FSDATA_FILE "htmldata.c" #define HTTPD_FSDATA_FILE "wwwdata.c"

142
makefsdata.py
View File

@ -8,13 +8,13 @@ import os
import binascii import binascii
#Create file to write output into #Create file to write output into
output = open('htmldata.c', 'w') output = open('wwwdata.c', 'w')
#Traverse directory, generate list of files #Traverse directory, generate list of files
files = list() files = list()
os.chdir('./html_files') os.chdir('./www')
for(dirpath, dirnames, filenames) in os.walk('.'): for(dirpath, dirnames, filenames) in os.walk('.'):
files += [os.path.join(dirpath, file) for file in filenames] files += [os.path.join(dirpath, file) for file in filenames]
filenames = list() filenames = list()
varnames = list() varnames = list()
@ -22,85 +22,87 @@ varnames = list()
#Generate appropriate HTTP headers #Generate appropriate HTTP headers
for file in files: for file in files:
if '404' in file: if '404' in file:
header = "HTTP/1.0 404 File not found\r\n" header = "HTTP/1.0 404 File not found\r\n"
else: else:
header = "HTTP/1.0 200 OK\r\n" header = "HTTP/1.0 200 OK\r\n"
header += "Server: lwIP/pre-0.6 (http://www.sics.se/~adam/lwip/)\r\n" header += "Server: lwIP/pre-0.6 (http://www.sics.se/~adam/lwip/)\r\n"
if '.html' in file: if '.html' in file:
header += "Content-type: text/html\r\n" header += "Content-type: text/html\r\n"
elif '.shtml' in file: elif '.shtml' in file:
header += "Content-type: text/html\r\n" header += "Content-type: text/html\r\n"
elif '.jpg' in file: elif '.jpg' in file:
header += "Content-type: image/jpeg\r\n" header += "Content-type: image/jpeg\r\n"
elif '.gif' in file: elif '.gif' in file:
header += "Content-type: image/gif\r\n" header += "Content-type: image/gif\r\n"
elif '.png' in file: elif '.png' in file:
header += "Content-type: image/png\r\n" header += "Content-type: image/png\r\n"
elif '.class' in file: elif '.class' in file:
header += "Content-type: application/octet-stream\r\n" header += "Content-type: application/octet-stream\r\n"
elif '.js' in file: elif '.js' in file:
header += "Content-type: text/javascript\r\n" header += "Content-type: text/javascript\r\n"
elif '.css' in file: elif '.css' in file:
header += "Content-type: text/css\r\n" header += "Content-type: text/css\r\n"
elif '.svg' in file: elif '.svg' in file:
header += "Content-type: image/svg+xml\r\n" header += "Content-type: image/svg+xml\r\n"
else: elif ".ssi" in file:
header += "Content-type: text/plain\r\n" header += "Content-type: application/json\r\n"
else:
header += "Content-type: text/plain\r\n"
header += "\r\n" header += "\r\n"
fvar = file[1:] #remove leading dot in filename fvar = file[1:] #remove leading dot in filename
fvar = fvar.replace('/', '_') #replace *nix path separator with underscore fvar = fvar.replace('/', '_') #replace *nix path separator with underscore
fvar = fvar.replace('\\', '_') #replace DOS path separator with underscore fvar = fvar.replace('\\', '_') #replace DOS path separator with underscore
fvar = fvar.replace('.', '_') #replace file extension dot with underscore fvar = fvar.replace('.', '_') #replace file extension dot with underscore
output.write("static const unsigned char data{}[] = {{\n".format(fvar)) output.write("static const unsigned char data{}[] = {{\n".format(fvar))
output.write("\t/* {} */\n\t".format(file)) output.write("\t/* {} */\n\t".format(file))
#first set of hex data encodes the filename #first set of hex data encodes the filename
b = bytes(file[1:].replace('\\', '/'), 'utf-8') #change DOS path separator to forward slash b = bytes(file[1:].replace('\\', '/'), 'utf-8') #change DOS path separator to forward slash
for byte in binascii.hexlify(b, b' ', 1).split(): for byte in binascii.hexlify(b, b' ', 1).split():
output.write("0x{}, ".format(byte.decode())) output.write("0x{}, ".format(byte.decode()))
output.write("0,\n\t") output.write("0,\n\t")
#second set of hex data is the HTTP header/mime type we generated above #second set of hex data is the HTTP header/mime type we generated above
b = bytes(header, 'utf-8') b = bytes(header, 'utf-8')
count = 0 count = 0
for byte in binascii.hexlify(b, b' ', 1).split(): for byte in binascii.hexlify(b, b' ', 1).split():
output.write("0x{}, ".format(byte.decode())) output.write("0x{}, ".format(byte.decode()))
count = count + 1 count = count + 1
if(count == 10): if(count == 10):
output.write("\n\t") output.write("\n\t")
count = 0 count = 0
output.write("\n\t") output.write("\n\t")
#finally, dump raw hex data from files #finally, dump raw hex data from files
with open(file, 'rb') as f: with open(file, 'rb') as f:
count = 0 count = 0
while(byte := f.read(1)): while(byte := f.read(1)):
byte = binascii.hexlify(byte) byte = binascii.hexlify(byte)
output.write("0x{}, ".format(byte.decode())) output.write("0x{}, ".format(byte.decode()))
count = count + 1 count = count + 1
if(count == 10): if(count == 10):
output.write("\n\t") output.write("\n\t")
count = 0 count = 0
output.write("};\n\n") output.write("};\n\n")
filenames.append(file[1:]) filenames.append(file[1:])
varnames.append(fvar) varnames.append(fvar)
for i in range(len(filenames)): for i in range(len(filenames)):
prevfile = "NULL" prevfile = "NULL"
if(i > 0): if(i > 0):
prevfile = "file" + varnames[i-1] prevfile = "file" + varnames[i-1]
output.write("const struct fsdata_file file{0}[] = {{{{ {1}, data{2}, ".format(varnames[i], prevfile, varnames[i])) output.write("const struct fsdata_file file{0}[] = {{{{ {1}, data{2}, ".format(varnames[i], prevfile, varnames[i]))
output.write("data{} + {}, ".format(varnames[i], len(filenames[i]) + 1)) output.write("data{} + {}, ".format(varnames[i], len(filenames[i]) + 1))
output.write("sizeof(data{}) - {}, ".format(varnames[i], len(filenames[i]) + 1)) output.write("sizeof(data{}) - {}, ".format(varnames[i], len(filenames[i]) + 1))
output.write("FS_FILE_FLAGS_HEADER_INCLUDED | FS_FILE_FLAGS_HEADER_PERSISTENT}};\n") output.write("FS_FILE_FLAGS_HEADER_INCLUDED | FS_FILE_FLAGS_HEADER_PERSISTENT}};\n")
output.write("\n#define FS_ROOT file{}\n".format(varnames[-1])) output.write("\n#define FS_ROOT file{}\n".format(varnames[-1]))
output.write("#define FS_NUMFILES {}\n".format(len(filenames))) output.write("#define FS_NUMFILES {}\n".format(len(filenames)))

38
ssi.h
View File

@ -1,51 +1,49 @@
#ifndef SSI_H
#define SSI_H
#include "lwip/apps/httpd.h" #include "lwip/apps/httpd.h"
#include "pico/cyw43_arch.h" #include "pico/cyw43_arch.h"
#include "hardware/adc.h" #include "hardware/adc.h"
#include "handlers.h"
// SSI tags - tag length limited to 8 bytes by default const char * ssi_tags[] = {"volt", "temp", "power"};
const char * ssi_tags[] = {"volt","temp","led"};
u16_t ssi_handler(int iIndex, char *pcInsert, int iInsertLen) { u16_t ssi_handler(int iIndex, char *pcInsert, int iInsertLen) {
size_t printed; size_t printed;
switch (iIndex) { switch (iIndex) {
case 0: // volt case 0: // volt
{ {
const float voltage = adc_read() * 3.3f / (1 << 12); const float voltage = adc_read() * 3.3f / (1 << 12);
printed = snprintf(pcInsert, iInsertLen, "%f", voltage); printed = snprintf(pcInsert, iInsertLen, "%f", voltage);
} }
break; break;
case 1: // temp case 1: // temp
{ {
const float voltage = adc_read() * 3.3f / (1 << 12); const float voltage = adc_read() * 3.3f / (1 << 12);
const float tempC = 27.0f - (voltage - 0.706f) / 0.001721f; const float tempC = 27.0f - (voltage - 0.706f) / 0.001721f;
printed = snprintf(pcInsert, iInsertLen, "%f", tempC); printed = snprintf(pcInsert, iInsertLen, "%f", tempC);
} }
break; break;
case 2: // led case 2: // power
{ {
bool led_status = cyw43_arch_gpio_get(CYW43_WL_GPIO_LED_PIN); printed = snprintf(pcInsert, iInsertLen, "%d", current_state);
if(led_status == true){
printed = snprintf(pcInsert, iInsertLen, "ON");
}
else{
printed = snprintf(pcInsert, iInsertLen, "OFF");
}
} }
break; break;
default: default:
printed = 0; {
printed = 0;
}
break; break;
} }
return (u16_t)printed; return (u16_t) printed;
} }
// Initialise the SSI handler
void ssi_init() { void ssi_init() {
// Initialise ADC (internal pin)
adc_init(); adc_init();
adc_set_temp_sensor_enabled(true); adc_set_temp_sensor_enabled(true);
adc_select_input(4); adc_select_input(4);
http_set_ssi_handler(ssi_handler, ssi_tags, LWIP_ARRAYSIZE(ssi_tags)); http_set_ssi_handler(ssi_handler, ssi_tags, LWIP_ARRAYSIZE(ssi_tags));
} }
#endif

1
www/power.ssi Normal file
View File

@ -0,0 +1 @@
{}

5
www/status.ssi Normal file
View File

@ -0,0 +1,5 @@
{
"volt": <!--#volt-->,
"temp": <!--#temp-->,
"power": <!--#power-->
}