gitproxy/RTLPlayground
1
0
Fork 0
mirror of https://github.com/logicog/RTLPlayground.git synced 2026-08-30 14:52:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove flash_read_bulk(), refactor website and execute_config().

Browse Source 
flash_read_bulk() is kind of a printf function. But did not work as well.
flash_read_bulk() was used in the http generation so this needed to be changed as well.

For the website we decided that we are going to use CSR(Client Side Rendering).
So every HTML and JS files are now static.
Variables are fetched via json calls and output is render on the client side.
Also usefull for the future when we want a REST like API.

execute_config() was also using flash_read_bulk().
This have been replaced with flash_read_bulk() and parsing the flash_buf buffer.
This commit is contained in:
René van Dorst
2025-10-05 15:47:14 +02:00
parent 7a87b79871
commit 884bc18a61
10 changed files with 132 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
httpd/httpd.c
+9 -41
View File
@@ -15,7 +15,6 @@
#pragma codeseg BANK1
extern __code struct f_data f_data[];
extern __code fcall_ptr f_calls[];
extern __code char * __code mime_strings[];
extern __xdata struct flash_region_t flash_region;
@@ -407,6 +406,8 @@ void httpd_appcall(void)
print_string("Not file entry\n");
if (!strcmp(q, "/status.json")) {
send_status();
} else if (!strcmp(q, "/information.json")) {
send_basic_info();
} else if (!strcmp(q, "/vlan.json")) {
parse_short(q + 15);
send_vlan(short_parsed);
@@ -419,47 +420,14 @@ void httpd_appcall(void)
print_string("Have entry\n");
slen = strtox(outbuf, "HTTP/1.1 200 OK\r\nContent-Type: ");
slen += strtox(outbuf + slen, mime_strings[f_data[entry].mime]);
slen += strtox(outbuf + slen, "\r\nCache-Control: max-age=2592000");
slen += strtox(outbuf + slen, "\r\n\r\n");
slen += strtox(outbuf + slen, "\r\nCache-Control: max-age=2592000\r\n\r\n");
len_left = f_data[entry].len;
if (f_data[entry].mime == mime_HTML) {
print_string("MIME is html len is "); print_short(len_left); write_char('\n');
mpos = 0;
flash_addr = f_data[entry].start;
flash_find_mark("#{", len_left);
print_string("mpos: "); print_short(mpos); write_char('\n');
while (mpos != 0xffff) {
print_string("Entry-len:"); print_short(len_left); write_char('\n');
mpos = len_left - mpos;
print_string("l/pos: "); print_short(mpos); write_char('\n');
flash_addr = f_data[entry].start + f_data[entry].len - len_left;
flash_read_bulk(outbuf + slen, mpos + CMARK_S); // call marker is e.g. #{001}
slen += mpos;
write_char('@'); write_char(outbuf[slen + 2]); write_char(outbuf[slen + 3]); write_char(outbuf[slen + 4]);
fcall_ptr ptr = f_calls[(outbuf[slen + 2] - '0') * 100 + (outbuf[slen + 3]-'0') * 10 + outbuf[slen + 4] - '0'];
slen -= CMARK_S; // Overwrite marker with generated html
print_string("Call location is: "); print_short((uint16_t)ptr); write_char('\n');
// f_calls[outbuf[slen + 2] * 100 + outbuf[slen + 3] * 10 + outbuf[slen + 4]]();
ptr();
print_string("call done\n");
mpos += CMARK_S;
len_left -= mpos;
flash_region.addr = f_data[entry].start + mpos;
flash_addr = f_data[entry].start + f_data[entry].len - len_left;
flash_find_mark("#{");
print_string("mpos now: "); print_short(mpos); write_char('\n');
}
print_string("At end mpos: "); print_short(mpos); write_char('\n');
flash_addr = f_data[entry].start + f_data[entry].len - len_left;
flash_read_bulk(outbuf + slen, len_left);
slen += len_left;
} else {
print_string("MIME: "); print_string(mime_strings[f_data[entry].mime]); write_char('\n');
flash_region.addr = f_data[entry].start;
flash_region.len = len_left;
flash_read_bulk(outbuf + slen, len_left);
slen += len_left;
}
print_string("MIME: "); print_string(mime_strings[f_data[entry].mime]); write_char('\n');
flash_region.addr = f_data[entry].start;
flash_region.len = len_left;
flash_read_bulk(outbuf + slen);
slen += len_left;
}
do_send:
print_string("slen: "); print_short(slen); write_char('\n');