emgauwa/controller-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add: pulse mode

Browse source 
add: editorconfig
This commit is contained in:
Tobias Reisinger 2020-06-27 18:27:49 +02:00
parent 679175f1a9
commit 0f342b4aa8
13 changed files with 151 additions and 70 deletions

104
src/handlers/command.c
View file

@ -18,6 +18,22 @@
#include <mpack.h>
#include <models/schedule.h>
static void
handler_command_pulse(mpack_node_t map, controller_t *controller)
{
uint8_t relay_num = mpack_node_u8(mpack_node_map_uint(map, COMMAND_MAPPING_RELAY_NUM));
relay_t *target_relay = controller->relays[relay_num];
(void)target_relay;
uint8_t duration = mpack_node_u8(mpack_node_map_uint(map, COMMAND_MAPPING_PULSE_DURATION));
if(duration == 0)
{
duration = global_config.relay_configs[relay_num].pulse_duration;
}
target_relay->pulse_timer = duration;
}
static void
handler_command_set_name(mpack_node_t map, controller_t *controller)
{
@ -72,56 +88,60 @@ void
handler_command(struct mg_connection *c, int ev, void *ev_data)
{
(void)ev_data;
if(ev == MG_EV_RECV)
if(ev != MG_EV_RECV)
{
uint32_t payload_length = *((uint32_t*)c->recv_mbuf.buf);
LOG_DEBUG("payload_length %d\n", payload_length);
return;
}
uint32_t payload_length = *((uint32_t*)c->recv_mbuf.buf);
LOG_DEBUG("payload_length %d\n", payload_length);
if(c->recv_mbuf.len < payload_length + sizeof(payload_length))
{
return;
}
if(c->recv_mbuf.len < payload_length + sizeof(payload_length))
{
return;
}
char *payload = c->recv_mbuf.buf + sizeof(payload_length);
char *payload = c->recv_mbuf.buf + sizeof(payload_length);
mpack_tree_t tree;
mpack_tree_init_data(&tree, payload, payload_length);
mpack_tree_parse(&tree);
mpack_node_t root = mpack_tree_root(&tree);
mpack_tree_t tree;
mpack_tree_init_data(&tree, payload, payload_length);
mpack_tree_parse(&tree);
mpack_node_t root = mpack_tree_root(&tree);
uint8_t command_code = mpack_node_u8(mpack_node_map_uint(root, COMMAND_MAPPING_CODE));
uint8_t command_code = mpack_node_u8(mpack_node_map_uint(root, COMMAND_MAPPING_CODE));
LOG_INFO("received command %d\n", command_code);
LOG_INFO("received command %d\n", command_code);
switch(command_code)
{
case COMMAND_CODE_GET_TIME:
break;
case COMMAND_CODE_GET_ID:
break;
case COMMAND_CODE_SET_NAME:
handler_command_set_name(root, global_controller);
break;
case COMMAND_CODE_GET_NAME:
break;
case COMMAND_CODE_SET_SCHEDULE:
handler_command_set_schedule(root, global_controller);
break;
case COMMAND_CODE_GET_SCHEDULE:
break;
case COMMAND_CODE_SET_RELAY_NAME:
handler_command_set_relay_name(root, global_controller);
break;
case COMMAND_CODE_GET_RELAY_NAME:
break;
default:
LOG_ERROR("received invalid command\n");
}
switch(command_code)
{
case COMMAND_CODE_GET_TIME:
break;
case COMMAND_CODE_GET_ID:
break;
case COMMAND_CODE_SET_NAME:
handler_command_set_name(root, global_controller);
break;
case COMMAND_CODE_GET_NAME:
break;
case COMMAND_CODE_SET_SCHEDULE:
handler_command_set_schedule(root, global_controller);
break;
case COMMAND_CODE_GET_SCHEDULE:
break;
case COMMAND_CODE_SET_RELAY_NAME:
handler_command_set_relay_name(root, global_controller);
break;
case COMMAND_CODE_GET_RELAY_NAME:
break;
case COMMAND_CODE_PULSE:
handler_command_pulse(root, global_controller);
break;
default:
LOG_ERROR("received invalid command\n");
}
if(mpack_tree_destroy(&tree) != mpack_ok)
{
LOG_WARN("error when destroying mpack tree\n");
}
if(mpack_tree_destroy(&tree) != mpack_ok)
{
LOG_WARN("error when destroying mpack tree\n");
}
controller_save(global_controller, global_mdb_env);
}

48
src/handlers/loop.c
View file

@ -21,43 +21,65 @@ handler_loop(struct mg_connection *c_mqtt)
char controller_uid[UUID_STR_LEN];
uuid_unparse(global_controller->id, controller_uid);
time_t timestamp = time(NULL);
struct tm *time_struct = localtime(&timestamp);
LOG_DEBUG("===== IDLE LOOP START =====\n");
struct tm time_last, time_now;
time_t timestamp;
timestamp = time(NULL) - 1;
localtime_r(&timestamp, &time_last);
timestamp = time(NULL);
localtime_r(&timestamp, &time_now);
LOG_TRACE("===== IDLE LOOP START =====\n");
for(uint_fast8_t i = 0; i < global_controller->relay_count; ++i)
{
relay_t *relay = global_controller->relays[i];
int is_active = 0;
if(relay_is_active(relay, time_struct))
int is_on = 0;
int is_on_schedule = relay_is_on_schedule(relay, &time_now);
if(relay->is_on_schedule != is_on_schedule && relay->is_on_schedule != -1)
{
LOG_DEBUG("relay %d is active\n", i);
is_active = 1;
relay->pulse_timer = global_config.relay_configs[i].pulse_duration;
}
if(is_on_schedule && !global_config.relay_configs[i].pulse_duration)
{
is_on = 1;
}
if(relay->pulse_timer > 0)
{
is_on = 1;
--relay->pulse_timer;
}
if(relay->is_on != is_active)
if(is_on)
{
LOG_DEBUG("relay %d is active\n", i);
}
if(relay->is_on != is_on)
{
relay->sent_to_broker = 0;
}
if(!relay->sent_to_broker && c_mqtt)
{
sprintf(topic_buf, "controller/%s/relay/%u", controller_uid, i);
sprintf(payload_buf, "%u", is_active);
sprintf(payload_buf, "%u", is_on);
mg_mqtt_publish(c_mqtt, topic_buf, 0, MG_MQTT_QOS(0), payload_buf, strlen(payload_buf));
relay->sent_to_broker = 1;
}
relay->is_on = is_active;
relay->is_on = is_on;
relay->is_on_schedule = is_on_schedule;
if(global_config.relay_configs[i].inverted)
{
is_active = !is_active;
is_on = !is_on;
}
switch(global_config.relay_configs[i].driver)
{
case RELAY_DRIVER_GPIO:
driver_gpio_set(global_config.relay_configs[i].pin, is_active);
driver_gpio_set(global_config.relay_configs[i].pin, is_on);
break;
case RELAY_DRIVER_PIFACE:
driver_piface_set(global_config.relay_configs[i].pin, is_active);
driver_piface_set(global_config.relay_configs[i].pin, is_on);
break;
default:
LOG_WARN("relay %d is not using a driver\n", i);

10
src/helpers/load_config.c
View file

@ -81,7 +81,10 @@ helper_load_config(IniDispatch *disp, void *config_void)
config->relay_configs = malloc(sizeof(config_relay_t) * config->relay_count);
for(uint8_t i = 0; i < config->relay_count; ++i)
{
config->relay_configs[i].driver= RELAY_DRIVER_NONE;
config->relay_configs[i].driver = RELAY_DRIVER_NONE;
config->relay_configs[i].inverted = 0;
config->relay_configs[i].pin = 0;
config->relay_configs[i].pulse_duration = 0;
}
LOG_TRACE("config relay-count set to %u\n", config->relay_count);
return 0;
@ -99,6 +102,11 @@ helper_load_config(IniDispatch *disp, void *config_void)
config->relay_configs[i].inverted = atoi(disp->value);
return 0;
}
if(CONFINI_IS_KEY(relay_section_name, "pulse-duration"))
{
config->relay_configs[i].pulse_duration = atoi(disp->value);
return 0;
}
if(CONFINI_IS_KEY(relay_section_name, "driver"))
{
if(strcasecmp(disp->value, "gpio") == 0)

17
src/main.c
View file

@ -140,15 +140,20 @@ main(int argc, const char** argv)
/******************** START MAIN LOOP ********************/
for(;;)
time_t timer = time(NULL);
for (;;)
{
mg_mgr_poll(&mgr, 1000);
if(!global_connection_mqtt)
mg_mgr_poll(&mgr, 200);
if(time(NULL) - timer >= 1)
{
LOG_DEBUG("mqtt connection is not open\n");
connection_mqtt_connect(&mgr);
if(!global_connection_mqtt)
{
connection_mqtt_connect(&mgr);
}
handler_loop(global_connection_mqtt);
timer = time(NULL);
}
handler_loop(global_connection_mqtt);
}
terminate(0);

4
src/models/relay.c
View file

@ -15,6 +15,8 @@ relay_create(uint8_t number)
new_relay->name[0] = '\0';
new_relay->is_on = -1;
new_relay->is_on_schedule = -1;
new_relay->pulse_timer = 0;
new_relay->sent_to_broker = 0;
uuid_t off_id;
@ -37,7 +39,7 @@ relay_set_name(relay_t *relay, const char *name)
}
int
relay_is_active(relay_t *relay, struct tm *time_struct)
relay_is_on_schedule(relay_t *relay, struct tm *time_struct)
{
schedule_t *schedule = relay->schedules[helper_get_weekday(time_struct)];
if(schedule->length == 0)

4
src/models/relay_load.c
View file

@ -65,7 +65,11 @@ relay_load(MDB_env *mdb_env, uint8_t num)
new_relay = malloc(sizeof(relay_t));
new_relay->number = num;
new_relay->is_on = -1;
new_relay->is_on_schedule = -1;
new_relay->pulse_timer = 0;
new_relay->sent_to_broker = 0;
MDB_val value;