From 8739a4b47fbc6c2ab50e96e36f0df5581e82d8b6 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Mon, 5 Dec 2022 13:30:08 +0100 Subject: dummy mesh connector implemented --- confui/mesh_connector.cpp | 88 +++++++++++++++++++++++++++++++++++++++-------- confui/mesh_connector.h | 13 ++++--- 2 files changed, 81 insertions(+), 20 deletions(-) diff --git a/confui/mesh_connector.cpp b/confui/mesh_connector.cpp index ffddde1..f2d5ca2 100644 --- a/confui/mesh_connector.cpp +++ b/confui/mesh_connector.cpp @@ -1,11 +1,47 @@ +#include #include +#include +#include + #include "mesh_connector.h" +using std::pair; + +cd_link_t CDMeshConnector::get_new_map_id() { + return _fresh_map_id++; +} + CDMeshConnector::CDMeshConnector() { + printf("adding dummy node and automation...\n"); + + char* temp_node_berta_name = (char*) malloc(5); + strncpy(temp_node_berta_name, "berta", 5); + + cd_s_node* temp_node_berta = (cd_s_node*) malloc(sizeof(cd_s_node)); + temp_node_berta->name = temp_node_berta_name; + temp_node_berta->name_len = 5; + temp_node_berta->light_on = false; + temp_node_berta->provisioned = false; + cd_mac_addr_t temp_node_berta_address = { 0x00, 0xff, 0x21, 0x69, 0xf2, 0x31 }; + strncpy((char*)temp_node_berta->address, (char*)&temp_node_berta_address, 6); + + _nodes.push_back(temp_node_berta); + set_link(temp_node_berta, temp_node_berta, CD_AUTOMATION_TYPE_TOGGLE); return; } CDMeshConnector::~CDMeshConnector() { + map links = get_links(); + vector nodes = get_nodes(); + + // free all automation structs + for (pair link : links) + remove_link(link.first); + + // free all node structs + for (cd_s_node* node : nodes) + if (node != nullptr) free(node); + return; } @@ -17,43 +53,65 @@ void CDMeshConnector::refresh_nodes_sync() { return; } -vector CDMeshConnector::get_nodes() { - return {}; +vector CDMeshConnector::get_nodes() { + return _nodes; } -vector CDMeshConnector::get_config() { - return {}; +map CDMeshConnector::get_links() { + return _links; } -cd_link_t CDMeshConnector::set_link(cd_mac_addr_t button, cd_mac_addr_t light) { - (void) button; - (void) light; - return 0; +vector CDMeshConnector::get_config() { + vector automations; + map links = get_links(); + for (pair link : links) + automations.push_back(link.second); + return automations; +} + +cd_link_t CDMeshConnector::set_link(cd_s_node* button, cd_s_node* light, enum cd_e_automation_type action) { + cd_s_automation* automation = (cd_s_automation*) malloc(sizeof(cd_s_automation)); + automation->button = button; + automation->light = light; + automation->type = action; + + cd_link_t link = get_new_map_id(); + _links[link] = automation; + + printf("new link[%d]: %.*s %s %.*s\n", link, (int) button->name_len, button->name, action == CD_AUTOMATION_TYPE_TOGGLE ? "toggles" : action == CD_AUTOMATION_TYPE_TURN_OFF ? "turns off" : "turns on", (int) light->name_len, light->name); + return link; } void CDMeshConnector::remove_link(cd_link_t link_handle) { - (void) link_handle; + printf("remove link[%d]\n", link_handle); + if (_links[link_handle] != nullptr) free(_links[link_handle]); + _links.erase(link_handle); return; } cd_s_node* CDMeshConnector::get_node_by_id(cd_mac_addr_t address) { - (void) address; - return nullptr; + cd_s_node* node = std::find_if(_nodes.begin(), _nodes.end(), + [address] (const cd_s_node* n) { + return strncmp((char*)n->address, (char*)address, 6); + })[0]; + return node; } void CDMeshConnector::set_node(cd_s_node* node_ptr, bool light_status) { - (void) node_ptr; - (void) light_status; + node_ptr->light_on = light_status; + printf("turning %.*s %s\n", (int) node_ptr->name_len, node_ptr->name, node_ptr->light_on ? "on" : "off"); return; } void CDMeshConnector::node_join_network(cd_s_node* node_ptr) { - (void) node_ptr; + node_ptr->provisioned = true; + printf("join %.*s into network\n", (int) node_ptr->name_len, node_ptr->name); return; } void CDMeshConnector::node_remove_network(cd_s_node* node_ptr) { - (void) node_ptr; + node_ptr->provisioned = false; + printf("remove %.*s from network\n", (int) node_ptr->name_len, node_ptr->name); return; } diff --git a/confui/mesh_connector.h b/confui/mesh_connector.h index 238414c..3de6eca 100644 --- a/confui/mesh_connector.h +++ b/confui/mesh_connector.h @@ -35,16 +35,19 @@ typedef struct { class CDMeshConnector { private: - vector _nodes; - map _links; + vector _nodes; + map _links; + cd_link_t _fresh_map_id; + virtual cd_link_t get_new_map_id(); public: CDMeshConnector(); virtual ~CDMeshConnector(); virtual void refresh_nodes_sync(); virtual void refresh_config_sync(); - virtual vector get_nodes(); - virtual vector get_config(); - virtual cd_link_t set_link(cd_mac_addr_t button, cd_mac_addr_t light); + virtual vector get_nodes(); + virtual map get_links(); + virtual vector get_config(); + virtual cd_link_t set_link(cd_s_node* button, cd_s_node* light, enum cd_e_automation_type action); virtual void remove_link(cd_link_t link_handle); virtual cd_s_node* get_node_by_id(cd_mac_addr_t address); virtual void set_node(cd_s_node* node_ptr, bool light_status); -- cgit v1.2.3