jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-04-24 23:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Berry: add content_response() to webserver

Browse Source
This commit is contained in:
Christian Baars 2022-05-08 18:00:15 +02:00
parent a027c99a53
commit 0e87f06ba6
5 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libesp32/berry/generate/be_const_strtab.h
View File

@ -370,6 +370,7 @@ extern const bcstring be_const_str_consume_stereo;
extern const bcstring be_const_str_contains;
extern const bcstring be_const_str_content_button;
extern const bcstring be_const_str_content_flush;
extern const bcstring be_const_str_content_response;
extern const bcstring be_const_str_content_send;
extern const bcstring be_const_str_content_send_style;
extern const bcstring be_const_str_content_start;

5
lib/libesp32/berry/generate/be_const_strtab_def.h
View File

@ -362,6 +362,7 @@ be_define_const_str(consume_stereo, "consume_stereo", 1834661098u, 0, 14, &be_co
be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_power_off);
be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_fast_loop);
be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_min);
be_define_const_str(content_response, "content_response", 3881475860u, 0, 16, &be_const_str_detect);
be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_members);
be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, NULL);
be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_json_append);
@ -1443,7 +1444,7 @@ static const bstring* const m_string_table[] = {
(const bstring *)&be_const_str_cb_obj,
(const bstring *)&be_const_str__X23,
(const bstring *)&be_const_str_add_cmd,
(const bstring *)&be_const_str_detect,
(const bstring *)&be_const_str_content_response,
(const bstring *)&be_const_str_content_stop,
(const bstring *)&be_const_str__X22,
(const bstring *)&be_const_str_gpio,
@ -1542,6 +1543,6 @@ static const bstring* const m_string_table[] = {
static const struct bconststrtab m_const_string_table = {
.size = 505,
.count = 1033,
.count = 1034,
.table = m_string_table
};

27
lib/libesp32/berry/generate/be_fixed_webserver.h
View File

@ -1,26 +1,27 @@
#include "be_constobj.h"
static be_define_const_map_slots(m_libwebserver_map) {
{ be_const_key(state, 5), be_const_func(w_webserver_state) },
{ be_const_key(member, 9), be_const_func(w_webserver_member) },
{ be_const_key(content_button, -1), be_const_func(w_webserver_content_button) },
{ be_const_key(content_start, -1), be_const_func(w_webserver_content_start) },
{ be_const_key(content_send, -1), be_const_func(w_webserver_content_send) },
{ be_const_key(content_flush, -1), be_const_func(w_webserver_content_flush) },
{ be_const_key(redirect, 8), be_const_func(w_webserver_redirect) },
{ be_const_key(check_privileged_access, 8), be_const_func(w_webserver_check_privileged_access) },
{ be_const_key(content_send, 14), be_const_func(w_webserver_content_send) },
{ be_const_key(content_send_style, -1), be_const_func(w_webserver_content_send_style) },
{ be_const_key(member, -1), be_const_func(w_webserver_member) },
{ be_const_key(content_response, -1), be_const_func(w_webserver_content_response) },
{ be_const_key(arg, -1), be_const_func(w_webserver_arg) },
{ be_const_key(content_stop, -1), be_const_func(w_webserver_content_stop) },
{ be_const_key(arg_name, -1), be_const_func(w_webserver_arg_name) },
{ be_const_key(has_arg, -1), be_const_func(w_webserver_has_arg) },
{ be_const_key(state, -1), be_const_func(w_webserver_state) },
{ be_const_key(content_button, 5), be_const_func(w_webserver_content_button) },
{ be_const_key(has_arg, 12), be_const_func(w_webserver_has_arg) },
{ be_const_key(arg_size, -1), be_const_func(w_webserver_argsize) },
{ be_const_key(check_privileged_access, 11), be_const_func(w_webserver_check_privileged_access) },
{ be_const_key(on, 3), be_const_func(w_webserver_on) },
{ be_const_key(content_flush, -1), be_const_func(w_webserver_content_flush) },
{ be_const_key(arg_name, 10), be_const_func(w_webserver_arg_name) },
{ be_const_key(on, -1), be_const_func(w_webserver_on) },
{ be_const_key(content_start, -1), be_const_func(w_webserver_content_start) },
{ be_const_key(redirect, -1), be_const_func(w_webserver_redirect) },
{ be_const_key(content_stop, 2), be_const_func(w_webserver_content_stop) },
};
static be_define_const_map(
m_libwebserver_map,
15
16
);
static be_define_const_module(

2
lib/libesp32/berry_tasmota/src/be_webserver_lib.c
View File

@ -17,6 +17,7 @@ extern int w_webserver_check_privileged_access(bvm *vm);
extern int w_webserver_redirect(bvm *vm);
extern int w_webserver_content_start(bvm *vm);
extern int w_webserver_content_send(bvm *vm);
extern int w_webserver_content_response(bvm *vm);
extern int w_webserver_content_send_style(bvm *vm);
extern int w_webserver_content_flush(bvm *vm);
extern int w_webserver_content_stop(bvm *vm);
@ -38,6 +39,7 @@ module webserver (scope: global) {
check_privileged_access, func(w_webserver_check_privileged_access)
redirect, func(w_webserver_redirect)
content_send, func(w_webserver_content_send)
content_response, func(w_webserver_content_response)
content_send_style, func(w_webserver_content_send_style)
content_flush, func(w_webserver_content_flush)
content_start, func(w_webserver_content_start)

13
tasmota/xdrv_52_3_berry_webserver.ino
View File

@ -172,6 +172,19 @@ extern "C" {
be_raise(vm, kTypeError, nullptr);
}
// Berry: `webserver.content_response(string) -> nil`
//
int32_t w_webserver_content_response(struct bvm *vm);
int32_t w_webserver_content_response(struct bvm *vm) {
int32_t argc = be_top(vm); // Get the number of arguments
if (argc >= 1 && be_isstring(vm, 1)) {
const char * response = be_tostring(vm, 1);
WSReturnSimpleString(response);
be_return_nil(vm);
}
be_raise(vm, kTypeError, nullptr);
}
// Berry: `webserver.content_send_style() -> nil`
//
int32_t w_webserver_content_send_style(struct bvm *vm);