mirror
/
esp_mqtt
kopia lustrzana https://github.com/martin-ger/esp_mqtt
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

some cleanup

pull/16/head
Martin Ger 2017-08-19 12:08:48 +02:00
rodzic f45d8fdb09
commit a6078d3caa
3 zmienionych plików z 70 dodań i 37 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

64
user/lang.c
Wyświetl plik

@ -4,12 +4,16 @@
#include "lang.h"
#include "user_config.h"
#include "mqtt_topics.h"
#ifdef NTP
#include "ntp.h"
#endif
#ifdef GPIO
#include "easygpio.h"
#define lang_debug //os_printf
#define lang_info //os_printf
#endif
#define lang_debug //os_printf
//bool lang_logging = true;
//#define lang_log(...) {if (lang_logging){char log_buffer[256]; os_sprintf (log_buffer, "%s: ", get_timestr()); con_print(log_buffer); os_sprintf (log_buffer, __VA_ARGS__); con_print(log_buffer);}}
#define lang_log //os_printf
extern uint8_t *my_script;
extern void do_command(char *t1, char *t2, char *t3);
@ -118,7 +122,7 @@ void ICACHE_FLASH_ATTR check_timestamps(uint8_t * curr_time) {
if (os_strcmp(curr_time, timestamps[i].ts) >= 0) {
if (timestamps[i].happened)
continue;
lang_info("timerstamp %s happened\r\n", timestamps[i].ts);
lang_debug("timerstamp %s happened\r\n", timestamps[i].ts);
interpreter_topic = interpreter_data = "";
interpreter_data_len = 0;
@ -444,6 +448,8 @@ int ICACHE_FLASH_ATTR parse_event(int next_token, bool * happend) {
lang_debug("event init\r\n");
*happend = (interpreter_status == INIT);
if (*happend)
lang_log("on init\r\n");
return next_token + 1;
}
@ -451,6 +457,8 @@ int ICACHE_FLASH_ATTR parse_event(int next_token, bool * happend) {
lang_debug("event mqttconnect\r\n");
*happend = (interpreter_status == MQTT_CLIENT_CONNECT);
if (*happend)
lang_log("on init\r\n");
return next_token + 1;
}
@ -480,7 +488,7 @@ int ICACHE_FLASH_ATTR parse_event(int next_token, bool * happend) {
*happend = Topics_matches(topic, true, interpreter_topic);
if (*happend)
lang_info("topic %s %s match\r\n", my_token[lr_token],
lang_log("on topic %s %s matched %s\r\n", my_token[lr_token],
topic, interpreter_topic);
return next_token;
@ -494,7 +502,7 @@ int ICACHE_FLASH_ATTR parse_event(int next_token, bool * happend) {
if (timer_no == 0 || timer_no > MAX_TIMERS)
return syntax_error(next_token + 1, "invalid timer number");
if (interpreter_status == TIMER && interpreter_timer == --timer_no) {
lang_info("timer %s expired\r\n", my_token[next_token + 1]);
lang_log("on timer %s\r\n", my_token[next_token + 1]);
*happend = true;
}
return next_token + 2;
@ -522,7 +530,7 @@ int ICACHE_FLASH_ATTR parse_event(int next_token, bool * happend) {
gpio_counter++;
}
if (interpreter_status == GPIO_INT && interpreter_gpio == gpio_no) {
lang_info("gpio %s interrupt\r\n", my_token[next_token + 1]);
lang_log("on gpio_interrupt %s\r\n", my_token[next_token + 1]);
*happend = true;
}
return next_token + 3;
@ -540,6 +548,8 @@ int ICACHE_FLASH_ATTR parse_event(int next_token, bool * happend) {
timestamps[ts_counter++].ts = my_token[next_token + 1];
}
*happend = (interpreter_status == CLOCK && os_strcmp(interpreter_timestamp, my_token[next_token + 1]) == 0);
if (*happend)
lang_log("on clock %s\r\n", my_token[next_token + 1]);
return next_token + 2;
}
@ -581,6 +591,7 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
if ((next_token = parse_expression(next_token + 1, &p_char, &p_len, &p_type, doit)) == -1)
return -1;
if (doit) {
lang_log("system '%s'\r\n", p_char);
do_command(p_char, "", "");
}
}
@ -615,15 +626,23 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
#ifdef MQTT_CLIENT
if (is_token(lr_token, "remote")) {
if (doit && mqtt_connected) {
if (data_type == STRING_T) {
lang_log("publish remote %s %s\r\n", topic, data);
} else {
lang_log("publish remote %s binary (%d bytes)\r\n", topic, data_len);
}
MQTT_Publish(&mqttClient, topic, data, data_len, 0, retained);
lang_info("published remote %s len: %d\r\n", topic, data_len);
}
} else
#endif
if (is_token(lr_token, "local")) {
if (doit) {
if (data_type == STRING_T) {
lang_log("publish local %s %s\r\n", topic, data);
} else {
lang_log("publish local %s binary (%d bytes)\r\n", topic, data_len);
}
MQTT_local_publish(topic, data, data_len, 0, retained);
lang_info("published local %s len: %d\r\n", topic, data_len);
}
} else {
return syntax_error(lr_token, "'local' or 'remote' expected");
@ -643,15 +662,15 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
#ifdef MQTT_CLIENT
if (is_token(rl_token, "remote")) {
if (doit && mqtt_connected) {
lang_log("subscribe remote %s\r\n", topic);
retval = MQTT_Subscribe(&mqttClient, topic, 0);
lang_info("subscribe remote %s %s\r\n", topic, retval ? "success" : "failed");
}
} else
#endif
if (is_token(rl_token, "local")) {
if (doit) {
lang_log("subscribe local %s\r\n", topic);
retval = MQTT_local_subscribe(topic, 0);
lang_info("subscribe local %s %s\r\n", topic, retval ? "success" : "failed");
}
} else {
return syntax_error(next_token + 1, "'local' or 'remote' expected");
@ -671,15 +690,15 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
#ifdef MQTT_CLIENT
if (is_token(rl_token, "remote")) {
if (doit && mqtt_connected) {
lang_log("unsubscribe remote %s\r\n", topic);
retval = MQTT_UnSubscribe(&mqttClient, topic);
lang_info("unsubsrcibe remote %s %s\r\n", topic, retval ? "success" : "failed");
}
} else
#endif
if (is_token(rl_token, "local")) {
if (doit) {
lang_log("subscribe local %s\r\n", topic);
retval = MQTT_local_unsubscribe(topic);
lang_info("unsubsrcibe local %s %s\r\n", topic, retval ? "success" : "failed");
}
} else {
return syntax_error(next_token + 1, "'local' or 'remote' expected");
@ -700,7 +719,7 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
if (doit) {
if_val = atoi(if_char);
lang_info("if %s\r\n", if_val != 0 ? "done" : "not done");
lang_log("if %s\r\n", if_val != 0 ? "(done)" : "(not done)");
}
if ((next_token = parse_action(next_token + 1, doit && if_val != 0)) == -1)
return -1;
@ -721,9 +740,9 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
if (doit) {
timer_val = atoi(timer_char);
lang_info("settimer %d %d\r\n", timer_no, timer_val);
timer_no--;
lang_log("settimer %d %d\r\n", timer_no, timer_val);
timer_no--;
os_timer_disarm(&timers[timer_no]);
if (timer_val != 0) {
os_timer_setfn(&timers[timer_no], (os_timer_func_t *) lang_timers_timeout, timer_no);
@ -762,6 +781,11 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
return -1;
if (doit) {
if (var_type == STRING_T) {
lang_log("setvar %s = %s\r\n", this_var->name, var_data);
} else {
lang_log("setvar %s = binary (%d bytes)\r\n", this_var->name, var_len);
}
lang_debug("setvar $%s\r\n", this_var->name);
if (var_len > this_var->buffer_len - 1) {
os_free(this_var->data);
@ -801,8 +825,7 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
}
if (doit) {
lang_info("gpio_pinmode %d %s\r\n", gpio_no, inout == EASYGPIO_INPUT ? "input" : "output");
lang_log("gpio_pinmode %d %s\r\n", gpio_no, inout == EASYGPIO_INPUT ? "input" : "output");
easygpio_pinMode(gpio_no, pullup, inout);
}
next_token += 3;
@ -822,8 +845,7 @@ int ICACHE_FLASH_ATTR parse_action(int next_token, bool doit) {
return -1;
if (doit) {
lang_info("gpio_out %d %d\r\n", gpio_no, atoi(gpio_data) != 0);
lang_log("gpio_out %d %d\r\n", gpio_no, atoi(gpio_data) != 0);
if (easygpio_pinMode(gpio_no, EASYGPIO_NOPULL, EASYGPIO_OUTPUT))
easygpio_outputSet(gpio_no, atoi(gpio_data) != 0);
}

28
user/user_config.h
Wyświetl plik

@ -1,11 +1,6 @@
#ifndef _USER_CONFIG_
#define _USER_CONFIG_
typedef enum {SIG_DO_NOTHING=0, SIG_START_SERVER=1, SIG_UART0, SIG_TOPIC_RECEIVED, SIG_SCRIPT_LOADED, SIG_CONSOLE_TX_RAW, SIG_CONSOLE_TX, SIG_CONSOLE_RX} USER_SIGNALS;
#define LOCAL_ACCESS 0x01
#define REMOTE_ACCESS 0x02
#define WIFI_SSID "ssid"
#define WIFI_PASSWORD "password"
@ -33,8 +28,7 @@ typedef enum {SIG_DO_NOTHING=0, SIG_START_SERVER=1, SIG_UART0, SIG_TOPIC_RECEIVE
// Define this if you want to have script support.
//
#define SCRIPTED 1
// Define this if you want to have GPIO OUT support in scripts.
#define GPIO 1
// Some params for scripts
#define MAX_SCRIPT_SIZE 0x1000
@ -49,11 +43,8 @@ typedef enum {SIG_DO_NOTHING=0, SIG_START_SERVER=1, SIG_UART0, SIG_TOPIC_RECEIVE
//
#define NTP 1
//
// Size of the console buffers
//
#define MAX_CON_SEND_SIZE 1024
#define MAX_CON_CMD_SIZE 80
// Define this if you want to have GPIO OUT support in scripts.
#define GPIO 1
//
// Define this to support the "scan" command for AP search
@ -67,4 +58,15 @@ typedef enum {SIG_DO_NOTHING=0, SIG_START_SERVER=1, SIG_UART0, SIG_TOPIC_RECEIVE
#define REMOTE_CONFIG 1
#define CONSOLE_SERVER_PORT 7777
#endif
//
// Size of the console buffers
//
#define MAX_CON_SEND_SIZE 1024
#define MAX_CON_CMD_SIZE 80
typedef enum {SIG_DO_NOTHING=0, SIG_START_SERVER=1, SIG_UART0, SIG_TOPIC_RECEIVED, SIG_SCRIPT_LOADED, SIG_CONSOLE_TX_RAW, SIG_CONSOLE_TX, SIG_CONSOLE_RX} USER_SIGNALS;
#define LOCAL_ACCESS 0x01
#define REMOTE_ACCESS 0x02
#endif /* _USER_CONFIG_ */

15
user/user_main.c
Wyświetl plik

@ -461,9 +461,12 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) {
os_sprintf(response, "System uptime: %d:%02d:%02d\r\n", time / 3600, (time % 3600) / 60, time % 60);
to_console(response);
os_sprintf(response, "Free mem: %d\r\nInterpreter loop: %d us\r\n", system_get_free_heap_size(), loop_time);
os_sprintf(response, "Free mem: %d\r\n", system_get_free_heap_size());
to_console(response);
#ifdef SCRIPTED
os_sprintf(response, "Interpreter loop: %d us\r\n", loop_time);
to_console(response);
#endif
if (connected) {
os_sprintf(response, "External IP-address: " IPSTR "\r\n", IP2STR(&my_ip));
} else {
@ -596,7 +599,7 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) {
#endif
#ifdef NTP
if (strcmp(tokens[0], "time") == 0) {
os_sprintf(response, "%s\r\n", get_timestr(config.ntp_timezone));
os_sprintf(response, "%s\r\n", get_timestr());
goto command_handled;
}
#endif
@ -640,8 +643,10 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) {
}
if (strcmp(tokens[1], "delete") == 0) {
#ifdef SCRIPTED
#ifdef GPIO
stop_gpios();
#endif
#endif
script_enabled = false;
if (my_script != NULL)
@ -657,8 +662,10 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) {
goto command_handled;
}
// delete and disable existing script
#ifdef SCRIPTED
#ifdef GPIO
stop_gpios();
#endif
#endif
script_enabled = false;
if (my_script != NULL)
@ -1131,7 +1138,9 @@ static void ICACHE_FLASH_ATTR user_procTask(os_event_t * events) {
}
// Check queued messages on any signal
#ifdef SCRIPTED
pub_process();
#endif
}
/* Callback called when the connection state of the module with an Access Point changes */