Home Accessory Architect v12.14.13 Merlin

Author: RavenSystem

HAA/HAA_Installer/main/header.h

@@ -11,6 +11,6 @@
 #include "../../common/common_headers.h"
 
 #define INSTALLER_BETA_REVISION     ""      // Format: "b01"
-#define INSTALLER_VERSION           "7.12.7"INSTALLER_BETA_REVISION
+#define INSTALLER_VERSION           "7.12.8"INSTALLER_BETA_REVISION
 
 #endif  // __HAA_OTA_HEADER_H__

HAA/HAA_Main/main/header.h

@@ -11,7 +11,7 @@
 #include "../../common/common_headers.h"
 
 // Version
-#define HAA_FIRMWARE_VERSION                "12.14.12"
+#define HAA_FIRMWARE_VERSION                "12.14.13"
 #define HAA_FIRMWARE_BETA_REVISION          ""          // Format: "b01"
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
@@ -663,6 +663,8 @@
 #define HIST_DATA_ARRAY_SET                 "h"
 #define HIST_READ_ON_CLOCK_READY_SET        "x"
 #define HIST_LAST_REGISTER                  ch_group->num_f[0]
+#define HIST_SERVICE                        ch_group->num_f[1]
+#define HIST_CH                             ch_group->num_i[0]
 #define HIST_TIME_SIZE                      (4)     // (sizeof(uint32_t))
 #define HIST_DATA_SIZE                      (4)     // (sizeof(int32_t))
 #define HIST_REGISTER_SIZE                  (HIST_TIME_SIZE + HIST_DATA_SIZE)
@@ -791,16 +793,13 @@
 #define SETUP_MODE_ACTIVATE_COUNT           "z"
 #define SETUP_MODE_DEFAULT_ACTIVATE_COUNT   (8)
 #define SETUP_MODE_TOGGLE_TIME_MS           (1050)
-#define CUSTOM_HAA_COMMAND                  "ks"
+#define CUSTOM_HAA_COMMAND                  "mc"
 #define CUSTOM_HAA_ADVANCED_COMMAND_LEN     (2)
 #define HAA_SETUP_ACCESSORY_SET             "s"
 
 #define IRRF_CAPTURE_BUFFER_SIZE            (2048)
 
-#define ACTION_TASK_TYPE_UART               (0)
-#define ACTION_TASK_TYPE_NETWORK            (1)
-#define ACTION_TASK_TYPE_IRRF               (2)
-#define ACTION_TASK_MAX_ERRORS              (10)
+#define FORCE_ALLOC_MAX_ERRORS              (10)
 
 #define SAVE_STATES_TIMER                   ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE)->timer
 #define WIFI_WATCHDOG_TIMER                 ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE)->timer2

HAA/HAA_Main/main/main.c

@@ -140,6 +140,7 @@ main_config_t main_config = {
 
     .clock_ready = false,
     .timetable_ready = false,
+    .timetable_last_minute = 60,
 
     //.used_gpio = 0,
 
@@ -821,9 +822,15 @@ void save_data_history(homekit_characteristic_t* ch_target) {
 
     ch_group_t* ch_group = main_config.ch_groups;
     while (ch_group) {
-        if (ch_group->serv_type == SERV_TYPE_DATA_HISTORY && ch_group->ch[ch_group->chs - 1] == ch_target && ch_group->main_enabled) {
+        if (ch_group->serv_type == SERV_TYPE_DATA_HISTORY &&
+            ch_group_find_by_serv(HIST_SERVICE)->ch[HIST_CH] == ch_target &&
+            ch_group->main_enabled) {
             float value = get_hkch_value(ch_target);
 
+            if (value != value) {
+                continue;
+            }
+            
             uint32_t final_time = time;
             int32_t final_data = value * FLOAT_FACTOR_SAVE_AS_INT;
 
@@ -834,7 +841,7 @@ void save_data_history(homekit_characteristic_t* ch_target) {
             uint32_t current_ch = last_register / HIST_BLOCK_SIZE;
             uint32_t current_pos = last_register % HIST_BLOCK_SIZE;
 
-            if (current_ch + 1 >= ch_group->chs) {
+            if (current_ch >= ch_group->chs) {
                 current_ch = 0;
                 current_pos = 0;
             }
@@ -856,8 +863,8 @@ void save_data_history(homekit_characteristic_t* ch_target) {
 }
 
 void data_history_timer_worker(TimerHandle_t xTimer) {
-    homekit_characteristic_t* ch = (homekit_characteristic_t*) pvTimerGetTimerID(xTimer);
-    save_data_history(ch);
+    ch_group_t* ch_group = (ch_group_t*) pvTimerGetTimerID(xTimer);
+    save_data_history(ch_group_find_by_serv(HIST_SERVICE)->ch[HIST_CH]);
 }
 
 void wifi_resend_arp() {
@@ -986,7 +993,7 @@ void ntp_task() {
                     ch_group_t* ch_group = main_config.ch_groups;
                     while (ch_group) {
                         if (ch_group->serv_type == SERV_TYPE_DATA_HISTORY && ch_group->child_enabled) {
-                            save_data_history(ch_group->ch[ch_group->chs - 1]);
+                            save_data_history(ch_group_find_by_serv(HIST_SERVICE)->ch[HIST_CH]);
                         }
 
                         ch_group = ch_group->next;
@@ -1412,18 +1419,6 @@ void hkc_custom_setup_setter(homekit_characteristic_t* ch, const homekit_value_t
     }
 }
 
-void hk_destroy_value_timer_worker(TimerHandle_t xTimer) {
-    homekit_value_t* value = (homekit_value_t*) pvTimerGetTimerID(xTimer);
-    
-    homekit_value_destruct(value);
-    
-    rs_esp_timer_delete(xTimer);
-}
-
-void hk_destroy_value_delayed(homekit_value_t* value) {
-    rs_esp_timer_start_forced(rs_esp_timer_create(10000, pdTRUE, (void*) value, hk_destroy_value_timer_worker));
-}
-
 void hkc_custom_setup_advanced_setter(homekit_characteristic_t* ch, const homekit_value_t value) {
     value.data_value[value.data_size - 1] = 0;
     char* string_value = (char*) value.data_value;
@@ -1445,14 +1440,13 @@ void hkc_custom_setup_advanced_setter(homekit_characteristic_t* ch, const homeki
         }
 
         if (selected_advanced_opt == 1) {
+            homekit_value_destruct(&ch->value);
             char* txt_config = NULL;
             sysparam_get_string(HAA_SCRIPT_SYSPARAM, &txt_config);
             if (txt_config) {
-                ch->value.data_size = strlen(txt_config);
                 ch->value.data_value = (uint8_t*) txt_config;
+                ch->value.data_size = strlen(txt_config);
                 ch->value.is_null = false;
-                
-                hk_destroy_value_delayed(&ch->value);
             }
 
         } else if (selected_advanced_opt == 2 ||
@@ -5087,7 +5081,7 @@ void* force_alloc(const unsigned int len) {
     unsigned int errors = 0;
     void* new_char = NULL;
 
-    while (errors < ACTION_TASK_MAX_ERRORS) {
+    while (errors < FORCE_ALLOC_MAX_ERRORS) {
         new_char = malloc(len);
         if (new_char) {
             break;
@@ -7446,7 +7440,7 @@ void do_actions(ch_group_t* ch_group, uint8_t action) {
 
                         case SERV_TYPE_DATA_HISTORY:
                             //if (value_int == 0) {
-                                save_data_history(ch_group->ch[ch_group->chs - 1]);
+                                save_data_history(ch_group_find_by_serv(HIST_SERVICE)->ch[HIST_CH]);
                             //}
                             break;
 
@@ -7559,8 +7553,14 @@ void do_actions(ch_group_t* ch_group, uint8_t action) {
     action_set_ch_t* action_set_ch = ch_group->action_set_ch;
     while (action_set_ch) {
         if (action_set_ch->action == action) {
-            INFO("<%i> SetCh %i.%i->%i.%i", ch_group->serv_index, action_set_ch->source_serv, action_set_ch->source_ch, action_set_ch->target_serv, action_set_ch->target_ch);
-            const float value = get_hkch_value(ch_group_find_by_serv(action_set_ch->source_serv)->ch[action_set_ch->source_ch]);
+            INFO("<%i> SetCh %g.%i->%i.%i", ch_group->serv_index, action_set_ch->source_serv, action_set_ch->source_ch, action_set_ch->target_serv, action_set_ch->target_ch);
+            float value;
+            if (action_set_ch->source_ch < 15) {
+                value = get_hkch_value(ch_group_find_by_serv(action_set_ch->source_serv)->ch[action_set_ch->source_ch]);
+            } else {
+                value = action_set_ch->source_serv;
+            }
+            
             set_hkch_value(ch_group_find_by_serv(action_set_ch->target_serv)->ch[action_set_ch->target_ch], value);
         }
 
@@ -7681,6 +7681,12 @@ void timetable_actions_timer_worker(TimerHandle_t xTimer) {
         }
     }
 
+    if (main_config.timetable_last_minute == timeinfo->tm_min) {
+        return;
+    }
+    
+    main_config.timetable_last_minute = timeinfo->tm_min;
+    
     ch_group_t* ch_group = ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE);
 
     if (ch_group->main_enabled) {
@@ -8246,29 +8252,33 @@ void normal_mode_init() {
                         last_action = action_set_ch;
 
                         cJSON_rsf* json_set_ch = cJSON_rsf_GetArrayItem(json_set_chs, i);
-                        for (unsigned int j = 0; j < 4; j++) {
-                            const int value = (int16_t) cJSON_rsf_GetArrayItem(json_set_ch, j)->valuefloat;
+                        for (int j = 3; j >= 0; j--) {
+                            const float value = cJSON_rsf_GetArrayItem(json_set_ch, j)->valuefloat;
 
                             switch (j) {
-                                case 0:
-                                    action_set_ch->source_serv = get_absolut_index(ch_group->serv_index, value);
-                                    break;
-                                    
-                                case 1:
-                                    action_set_ch->source_ch = value;
+                                case 3:
+                                    action_set_ch->target_ch = value;
                                     break;
 
                                 case 2:
                                     action_set_ch->target_serv = get_absolut_index(ch_group->serv_index, value);
                                     break;
 
-                                case 3:
-                                    action_set_ch->target_ch = value;
+                                case 1:
+                                    action_set_ch->source_ch = value;
+                                    break;
+                                    
+                                case 0:
+                                    if (action_set_ch->source_ch < 15) {
+                                        action_set_ch->source_serv = get_absolut_index(ch_group->serv_index, value);
+                                    } else {
+                                        action_set_ch->source_serv = value;
+                                    }
                                     break;
                             }
                         }
 
-                        INFO("A%i SetCh %i.%i->%i.%i", new_int_action, action_set_ch->source_serv, action_set_ch->source_ch, action_set_ch->target_serv, action_set_ch->target_ch);
+                        INFO("A%i SetCh %g.%i->%i.%i", new_int_action, action_set_ch->source_serv, action_set_ch->source_ch, action_set_ch->target_serv, action_set_ch->target_ch);
                     }
                 }
             }
@@ -12908,17 +12918,20 @@ void normal_mode_init() {
     void new_data_history(const uint16_t accessory, uint16_t service, const uint16_t total_services, cJSON_rsf* json_context) {
         cJSON_rsf* data_array = cJSON_rsf_GetObjectItemCaseSensitive(json_context, HIST_DATA_ARRAY_SET);
 
-        const unsigned int hist_accessory = get_absolut_index(service_numerator, cJSON_rsf_GetArrayItem(data_array, 0)->valuefloat);
+        const unsigned int hist_service = get_absolut_index(service_numerator, cJSON_rsf_GetArrayItem(data_array, 0)->valuefloat);
         const unsigned int hist_ch = cJSON_rsf_GetArrayItem(data_array, 1)->valuefloat;
         const unsigned int hist_size = cJSON_rsf_GetArrayItem(data_array, 2)->valuefloat;
 
-        INFO("Serv %i, Ch %i, Size %i", hist_accessory, hist_ch, hist_size * HIST_REGISTERS_BY_BLOCK);
+        INFO("Serv %i, Ch %i, Size %i", hist_service, hist_ch, hist_size * HIST_REGISTERS_BY_BLOCK);
 
-        ch_group_t* ch_group = new_ch_group(hist_size + 1, 0, 1, 0);
+        ch_group_t* ch_group = new_ch_group(hist_size, 1, 2, 0);
         ch_group->serv_type = SERV_TYPE_DATA_HISTORY;
         ch_group->serv_index = service_numerator;
         ch_group->homekit_enabled = true;
 
+        HIST_SERVICE = hist_service;
+        HIST_CH = hist_ch;
+        
         if (cJSON_rsf_GetObjectItemCaseSensitive(json_context, HIST_READ_ON_CLOCK_READY_SET) != NULL) {
             ch_group->child_enabled = (bool) cJSON_rsf_GetObjectItemCaseSensitive(json_context, HIST_READ_ON_CLOCK_READY_SET)->valuefloat;
         }
@@ -12929,8 +12942,6 @@ void normal_mode_init() {
 
         service++;
 
-        ch_group->ch[hist_size] = ch_group_find_by_serv(hist_accessory)->ch[hist_ch];
-        
         accessories[accessory]->services[service] = calloc(1, sizeof(homekit_service_t));
         accessories[accessory]->services[service]->id = ((service - 1) * 50) + 8;
         //accessories[accessory]->services[service]->id = service_iid;
@@ -12965,7 +12976,7 @@ void normal_mode_init() {
 
         const float poll_period = sensor_poll_period(json_context, 0);
         if (poll_period > 0.f) {
-            rs_esp_timer_start_forced(rs_esp_timer_create(poll_period * 1000, pdTRUE, (void*) ch_group->ch[hist_size], data_history_timer_worker));
+            rs_esp_timer_start_forced(rs_esp_timer_create(poll_period * 1000, pdTRUE, (void*) ch_group, data_history_timer_worker));
         }
 
         set_killswitch(ch_group, json_context);

HAA/HAA_Main/main/types.h

@@ -136,19 +136,21 @@ typedef struct _action_pwm {
 typedef struct _action_set_ch {
     uint8_t action;
 
-    uint8_t source_ch;
-    uint8_t target_ch;
+    uint8_t source_ch: 4;
+    uint8_t target_ch: 4;
 
-    uint16_t source_serv;
     uint16_t target_serv;
 
+    float source_serv;
+    
     struct _action_set_ch* next;
 } action_set_ch_t;
 
 typedef struct _wildcard_action {
     uint8_t index;
     uint8_t target_action;
     bool repeat;    // 1 bit
+    
     float value;
 
     struct _wildcard_action* next;
@@ -366,11 +368,11 @@ typedef struct _pwmh_channel {
 #endif
 
 typedef struct _main_config {
-    uint8_t wifi_status: 2;
-    uint8_t wifi_channel: 4;
+    uint8_t wifi_status: 2;             // 2 bits
+    uint8_t wifi_channel: 4;            // 4 bits
     bool ir_tx_inv: 1;
     bool rf_tx_inv: 1;
-    uint8_t ir_tx_gpio: 6;
+    uint8_t ir_tx_gpio: 6;              // 6 bits
     bool timetable_ready: 1;
     bool clock_ready: 1;
     int8_t setup_mode_toggle_counter;
@@ -386,11 +388,12 @@ typedef struct _main_config {
     uint8_t wifi_ip;
     uint8_t wifi_ping_max_errors;
     uint8_t wifi_error_count;
-    uint8_t rf_tx_gpio: 7;
+    uint8_t rf_tx_gpio: 7;              // 7 bits
     bool enable_homekit_server: 1;
 
-    uint8_t wifi_mode;  // 3 bits
-    uint8_t ir_tx_freq; // 6 bits
+    uint8_t timetable_last_minute: 6;   // 6 bits
+    uint8_t wifi_mode: 3;               // 3 bits
+    uint8_t ir_tx_freq: 7;              // 6 bits
     uint8_t wifi_arp_count;
     uint8_t wifi_arp_count_max;