8: Support active high/low lights, reduce memory allocations

CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.18)
 project(ganymede VERSION 0.0.1)
 
+set(CMAKE_SYSTEM_NAME Generic)
+
 include($ENV{IDF_PATH}/tools/cmake/idf.cmake)
 
 set(GANYMEDE_COMPONENTS "${GANYMEDE_COMPONENTS}" CACHE INTERNAL "GANYMEDE_COMPONENTS")

src/api/ganymede/v2/device.proto

@@ -12,6 +12,8 @@ service DeviceService {
     rpc ListDevice(ListDeviceRequest) returns (ListDeviceResponse);
     rpc DeleteDevice(DeleteDeviceRequest) returns (google.protobuf.Empty);
 
+    rpc Poll(PollRequest) returns (PollResponse);
+
     rpc CreateConfig(CreateConfigRequest) returns (Config);
     rpc UpdateConfig(UpdateConfigRequest) returns (Config);
     rpc GetConfig(GetConfigRequest) returns (Config);
@@ -29,10 +31,7 @@ message UpdateDeviceRequest {
 }
 
 message GetDeviceRequest {
-    oneof filter {
-        string device_uid = 1;
-        string device_mac = 2;
-    }
+    string device_uid = 1;
 }
 
 message ListDeviceRequest {
@@ -51,6 +50,23 @@ message DeleteDeviceRequest {
     string reason = 2;
 }
 
+message PollRequest {
+    string device_mac = 1;
+}
+
+message PollResponse {
+    string device_uid = 1;
+    string device_display_name = 2;
+
+    string config_uid = 11;
+    string config_display_name = 12;
+
+    // Current device's offset from UTC (including DST if applicable)
+    int64 timezone_offset_minutes = 20;
+
+    LightConfig light_config = 101;
+}
+
 message CreateConfigRequest {
     Config config = 1;
 }
@@ -97,9 +113,6 @@ message Device {
     // Device timezone in IANA <zone>/<city> format
     string timezone = 12;
 
-    // Output only. Current device's offset from UTC (including DST if applicable)
-    int64 timezone_offset_minutes = 13;
-
     string config_uid = 20;
 }
 
@@ -119,7 +132,7 @@ message Luminaire {
     }
 
     uint32 port = 1;
-    bool use_pwm = 2;
+    bool active_high = 2;
 
     repeated DailySchedule photo_period = 3;
 }

src/app/lights.c

@@ -44,8 +44,21 @@ static void lights_recompute(struct tm* timeinfo, Ganymede__V2__LightConfig* lig
             }
         }
 
-        gpio_set_level(luminaire->port, !active);
-        ESP_LOGD(TAG, "%02d:%02d:%02d port=%lu active=%s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, luminaire->port, active ? "true" : "false");
+        if (luminaire->active_high == 0) {
+            active = !active;
+        }
+
+        gpio_set_level(luminaire->port, active);
+        ESP_LOGD(
+            TAG,
+            "%02d:%02d:%02d port=%lu signal=%s (%s)",
+            timeinfo->tm_hour,
+            timeinfo->tm_min,
+            timeinfo->tm_sec,
+            luminaire->port,
+            active ? "high" : "low",
+            luminaire->active_high ? "active_high" : "active_low"
+        );
     }
 }
 
@@ -90,7 +103,7 @@ static int lights_reconfigure_gpio(Ganymede__V2__LightConfig* old_config, Ganyme
                 .pull_down_en = GPIO_PULLDOWN_DISABLE
             };
 
-            ERROR_CHECK(gpio_set_level(port, true));
+            ERROR_CHECK(gpio_set_level(port, false));
             ERROR_CHECK(gpio_config(&pin_config));
 
             ESP_LOGD(TAG, "enabled gpio port %lu", port);
@@ -146,10 +159,10 @@ int app_lights_notify_device(Ganymede__V2__Device* device)
     return ESP_OK;
 }
 
-int app_lights_notify_config(Ganymede__V2__Config* config)
+int app_lights_notify_poll(Ganymede__V2__PollResponse* response)
 {
     // FIXME: This is a hack to quickly deep-clone, but it is not performance efficient
-    size_t size = protobuf_c_message_pack((ProtobufCMessage*) config->light_config, buffer);
+    size_t size = protobuf_c_message_pack((ProtobufCMessage*) response->light_config, buffer);
     incoming_light_config = (Ganymede__V2__LightConfig*) protobuf_c_message_unpack(&ganymede__v2__light_config__descriptor, NULL, size, buffer);
     return ESP_OK;
 }

src/app/lights.h

@@ -5,7 +5,6 @@
 
 int app_lights_init(void);
 
-int app_lights_notify_device(Ganymede__V2__Device* device);
-int app_lights_notify_config(Ganymede__V2__Config* config);
+int app_lights_notify_poll(Ganymede__V2__PollResponse* config);
 
 #endif

src/app/poll.c

@@ -1,3 +1,4 @@
+#include <stdint.h>
 #include <string.h>
 #include <time.h>
 
@@ -28,6 +29,7 @@ static const char* TAG = "poll";
 static EventGroupHandle_t _poll_event_group = NULL;
 static esp_timer_handle_t _poll_refresh_timer = NULL;
 
+static char _token[1024] = { 0 };
 static uint8_t _payload_buffer[2048] = { 0 };
 static uint8_t _response_buffer[2048] = { 0 };
 
@@ -70,7 +72,7 @@ static size_t _pack_protobuf(ProtobufCMessage* request, uint8_t* buffer)
     _copy_32bit_bigendian((uint32_t*)&buffer[1], &length);
     protobuf_c_message_pack(request, &buffer[5]);
 
-    return length;
+    return length + 5;
 }
 
 static esp_err_t _poll_get_mac(char* dest)
@@ -87,95 +89,62 @@ static esp_err_t _poll_get_mac(char* dest)
     return ESP_OK;
 }
 
-static Ganymede__V2__Device* poll_fetch_device(http2_session_t* session, const struct http_perform_options* options)
+static Ganymede__V2__PollResponse* poll_perform(http2_session_t* session, const struct http_perform_options* options)
 {
-    char mac[17] = { 0 };
+    char mac_buffer[17] = { 0 };
 
-    Ganymede__V2__GetDeviceRequest request;
-    ganymede__v2__get_device_request__init(&request);
-    request.filter_case = GANYMEDE__V2__GET_DEVICE_REQUEST__FILTER_DEVICE_MAC;
-    request.device_mac = mac;
+    Ganymede__V2__PollRequest request;
+    ganymede__v2__poll_request__init(&request);
+    request.device_mac = mac_buffer;
 
-    if (_poll_get_mac(mac) != ESP_OK) {
+    if (_poll_get_mac(request.device_mac) != ESP_OK) {
         return NULL;
     }
 
     uint32_t length = _pack_protobuf((ProtobufCMessage*)&request, _payload_buffer);
 
-    int status = http2_perform(session, "POST", CONFIG_GANYMEDE_AUTHORITY, "/ganymede.v2.DeviceService/GetDevice", (const char*) _payload_buffer, length + 5, (char*) _response_buffer, sizeof(_response_buffer), *options);
+    int status = http2_perform(session, "POST", CONFIG_GANYMEDE_AUTHORITY, "/ganymede.v2.DeviceService/Poll", (const char*) _payload_buffer, length, (char*) _response_buffer, sizeof(_response_buffer), *options);
 
     if (status != 0) {
-        ESP_LOGE(TAG, "GetDevice: status=%d", status);
+        ESP_LOGE(TAG, "Poll: status=%d", status);
         return NULL;
     }
 
     _copy_32bit_bigendian(&length, (uint32_t*)&_response_buffer[1]);
-    return (Ganymede__V2__Device*) protobuf_c_message_unpack(&ganymede__v2__device__descriptor, NULL, length, &_response_buffer[5]);
+    return (Ganymede__V2__PollResponse*) protobuf_c_message_unpack(&ganymede__v2__poll_response__descriptor, NULL, length, &_response_buffer[5]);
 }
 
-static Ganymede__V2__Config* poll_fetch_config(http2_session_t* session, const struct http_perform_options* options, char* uid)
+static int poll_set_timezone(const int64_t timezone_offset_minutes)
 {
-    Ganymede__V2__GetConfigRequest request;
-    ganymede__v2__get_config_request__init(&request);
-    request.config_uid = uid;
-
-    uint32_t length = _pack_protobuf((ProtobufCMessage*)&request, _payload_buffer);
-
-    int status = http2_perform(session, "POST", CONFIG_GANYMEDE_AUTHORITY, "/ganymede.v2.DeviceService/GetConfig", (const char*) _payload_buffer, length + 5, (char*) _response_buffer, sizeof(_response_buffer), *options);
-
-    if (status != 0) {
-        ESP_LOGE(TAG, "GetConfig: status=%d", status);
-        return NULL;
-    }
-
-    _copy_32bit_bigendian(&length, (uint32_t*)&_response_buffer[1]);
-    return (Ganymede__V2__Config*) protobuf_c_message_unpack(&ganymede__v2__config__descriptor, NULL, length, &_response_buffer[5]);
-}
-
-static int poll_set_timezone(const Ganymede__V2__Device* device)
-{
-    if (device == NULL) {
-        return ESP_FAIL;
-    }
-
     // Ganymede returns the usual TZ offset (UTC - offset = local) but the
     // GNU implementation expects the opposite, so we invert the sign.
-    int offset = -(device->timezone_offset_minutes);
+    int offset = -(timezone_offset_minutes);
     int min = offset % 60;
     int hour = (offset - min) / 60;
 
     char tzbuf[32] = { 0 };
     sprintf(tzbuf, "XXX%+03d:%02d", hour, min);
 
-    ESP_LOGI("main", "Set timezone: %s", tzbuf);
     setenv("TZ", tzbuf, 1);
     tzset();
 
+    ESP_LOGI(TAG, "Set timezone: %s", tzbuf);
     return ESP_OK;
 }
 
 static void poll_refresh()
 {
-    Ganymede__V2__Device* device = NULL;
-    Ganymede__V2__Config* config = NULL;
-
+    Ganymede__V2__PollResponse* response = NULL;
     http2_session_t* session = NULL;
-    char* token = NULL;
-    size_t token_len = 1024;
-
-    if ((token = malloc(token_len)) == NULL) {
-        ESP_LOGE(TAG, "Memory allocation for token failed");
-        return;
-    }
-
-    strcpy(token, "Bearer ");
+    size_t token_len = sizeof(_token) - 7;
 
-    if (auth_get_token(&token[7], &token_len) != ESP_OK) {
+    strcpy(_token, "Bearer ");
+    if (auth_get_token(&_token[7], &token_len) != ESP_OK) {
         goto cleanup;
     }
 
     struct http_perform_options options = {
-        .authorization = token,
+        .authorization = _token,
         .content_type = "application/grpc+proto",
         .use_grpc_status = true
     };
@@ -185,34 +154,24 @@ static void poll_refresh()
         goto cleanup;
     }
 
-    if (http2_session_connect(session, CONFIG_GANYMEDE_HOST, 443, NULL) != ESP_OK) {
+    if (http2_session_connect(session, CONFIG_GANYMEDE_HOST, 443, CONFIG_GANYMEDE_AUTHORITY) != ESP_OK) {
         ESP_LOGE(TAG, "failed to connect to %s:443", CONFIG_GANYMEDE_HOST);
         goto cleanup;
     }
 
-    if ((device = poll_fetch_device(session, &options)) == NULL) {
-        ESP_LOGE(TAG, "failed to fetch device");
+    if ((response = poll_perform(session, &options)) == NULL) {
+        ESP_LOGE(TAG, "failed to fetch response");
         goto cleanup;
     }
+    ESP_LOGI(TAG, "device=%s", response->device_display_name);
+    ESP_LOGI(TAG, "config=%s", response->config_display_name);
 
-    ESP_LOGI("main", "device.displayName=%s", device->display_name);
-    poll_set_timezone(device);
-    app_lights_notify_device(device);
-
-    if ((config = poll_fetch_config(session, &options, device->config_uid)) == NULL) {
-        ESP_LOGE(TAG, "failed to fetch config");
-        goto cleanup;
-    }
-
-    ESP_LOGI("main", "config.displayName=%s", config->display_name);
-    app_lights_notify_config(config);
+    poll_set_timezone(response->timezone_offset_minutes);
+    app_lights_notify_poll(response);
 
 cleanup:
-    protobuf_c_message_free_unpacked((ProtobufCMessage*) config, NULL);
-    protobuf_c_message_free_unpacked((ProtobufCMessage*) device, NULL);
+    protobuf_c_message_free_unpacked((ProtobufCMessage*) response, NULL);
     http2_session_release(session);
-    free(token);
-    return;
 }
 
 static void poll_task(void* args)
@@ -226,13 +185,9 @@ static void poll_task(void* args)
     ERROR_CHECK(esp_event_handler_instance_register(WIFI_EVENT, WIFI_EVENT_STA_DISCONNECTED, &poll_event_handler, NULL, &wifi_event_handler));
 
     while (1) {
-        xEventGroupWaitBits(_poll_event_group, POLL_CONNECTED_BIT, pdFALSE, pdFALSE, portMAX_DELAY);
-
-        EventBits_t event = xEventGroupWaitBits(_poll_event_group, POLL_REFRESH_REQUEST_BIT, pdFALSE, pdFALSE, portMAX_DELAY);
-        if (event & POLL_CONNECTED_BIT) {
+        xEventGroupWaitBits(_poll_event_group, POLL_CONNECTED_BIT | POLL_REFRESH_REQUEST_BIT, pdFALSE, pdTRUE, portMAX_DELAY);
             poll_refresh();
             xEventGroupClearBits(_poll_event_group, POLL_REFRESH_REQUEST_BIT);
-        }
     }
 }
 

src/net/auth/auth.c

@@ -17,7 +17,7 @@
 #include <api/error.h>
 #include <net/http2/http2.h>
 
-#define AUTH_TASK_STACK_DEPTH (1024 * 2)
+#define AUTH_TASK_STACK_DEPTH (1024 * 4)
 
 #define AUTH_CONNECTED_BIT BIT0
 #define AUTH_REFRESH_REQUEST_BIT BIT1