mirror of
https://github.com/cesanta/mongoose.git
synced 2026-10-19 11:09:42 +00:00
Change mg_file_read() signature: return mg_str
This commit is contained in:
1 parent
d128d2146a
commit
0e2f3de154
24 files changed
+95
-1052
No files matched your search
@@ -5,9 +5,11 @@
|
||||
|
||||
const char *s_listening_url = "http://0.0.0.0:80";
|
||||
|
||||
#if 0
|
||||
char *config_read(void) {
|
||||
return mg_file_read(&mg_fs_posix, FS_ROOT "/config.json", NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
void config_write(struct mg_str config) {
|
||||
mg_file_write(&mg_fs_posix, FS_ROOT "/config.json", config.ptr, config.len);
|
||||
@@ -21,14 +23,14 @@ void app_main(void) {
|
||||
MG_INFO(("FS at %s initialised, status: %d", conf.base_path, res));
|
||||
|
||||
// Try to connect to wifi by using saved WiFi credentials
|
||||
char *json = mg_file_read(&mg_fs_posix, WIFI_FILE, NULL);
|
||||
if (json != NULL) {
|
||||
char *ssid = mg_json_get_str(mg_str(json), "$.ssid");
|
||||
char *pass = mg_json_get_str(mg_str(json), "$.pass");
|
||||
struct mg_str json = mg_file_read(&mg_fs_posix, WIFI_FILE);
|
||||
if (json.ptr != NULL) {
|
||||
char *ssid = mg_json_get_str(json, "$.ssid");
|
||||
char *pass = mg_json_get_str(json, "$.pass");
|
||||
while (!wifi_init(ssid, pass)) (void) 0;
|
||||
free(ssid);
|
||||
free(pass);
|
||||
free(json);
|
||||
free((void *) json.ptr);
|
||||
} else {
|
||||
// If WiFi is not configured, run CLI until configured
|
||||
MG_INFO(("WiFi is not configured, running CLI. Press enter"));
|
||||
@@ -45,6 +47,6 @@ void app_main(void) {
|
||||
mg_mgr_init(&mgr);
|
||||
mg_log_set(MG_LL_DEBUG); // Set log level
|
||||
MG_INFO(("Mongoose v%s on %s", MG_VERSION, s_listening_url));
|
||||
mg_http_listen(&mgr, s_listening_url, uart_bridge_fn, &mgr);
|
||||
mg_http_listen(&mgr, s_listening_url, uart_bridge_fn, NULL);
|
||||
for (;;) mg_mgr_poll(&mgr, 10); // Infinite event loop
|
||||
}
|
||||
@@ -11,7 +11,7 @@
|
||||
#define WIFI_FILE FS_ROOT "/wifi.json"
|
||||
#define UART_NO 1
|
||||
|
||||
void uart_bridge_fn(struct mg_connection *, int, void *, void *);
|
||||
void uart_bridge_fn(struct mg_connection *, int, void *);
|
||||
int uart_read(void *buf, size_t len);
|
||||
bool wifi_init(const char *ssid, const char *pass);
|
||||
void cli(uint8_t ch);
|
||||
|
||||
Reference in new issue
Block a user