Standarize the project directory for monorepo-like developer experience

Move the clang formatter to the root of the three so all nested projects could use it

Provide README for all other projects

Refactor the code in rtt agregator

Signed-off-by: Filip Wandzio <contact@philw.dev>

5 files changed, 67 insertions, 88 deletions

diff --git a/firmware/.clang-format b/firmware/.clang-format
deleted file mode 100644
index b838e4d..0000000
--- a/firmware/.clang-format
+++ /dev/null
@@ -1,6 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 8
-UseTab: ForIndentation
-BreakBeforeBraces: Linux
-AllowShortIfStatementsOnASingleLine: false
-ColumnLimit: 80
diff --git a/firmware/.gitignore b/firmware/.gitignore
deleted file mode 100644
index 7a5e174..0000000
--- a/firmware/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-.env
-.pio/
-.vscode/
-*.elf
-*.bin
-*.hex
-*.map
-*.pyc
-__pycache__/
-*.DS_Store
-*~
-*.swp
-*.swo
-*.swn
-*.o
-*.d
-*.a
-*.so
-*.log
-.test/
diff --git a/firmware/README b/firmware/README
new file mode 100644
index 0000000..90c75fe
--- /dev/null
+++ b/firmware/README
@@ -0,0 +1 @@
+ESP 32 Free-Rtos based firmware
diff --git a/firmware/src/mqtt.c b/firmware/src/mqtt.c
index 716feec..90451bc 100644
--- a/firmware/src/mqtt.c
+++ b/firmware/src/mqtt.c
@@ -27,59 +27,62 @@
 static esp_mqtt_client_handle_t client;
 
 static void mqtt_event_handler(void *handler_args, esp_event_base_t base,
-                               int32_t event_id, void *event_data) {
-  esp_mqtt_event_handle_t event = event_data;
+                               int32_t event_id, void *event_data)
+{
+        esp_mqtt_event_handle_t event = event_data;
 
-  switch (event->event_id) {
-  case MQTT_EVENT_CONNECTED:
-    printf("MQTT connected!\n");
-    esp_mqtt_client_subscribe(event->client, SUB_TOPIC, 1);
-    break;
+        switch (event->event_id) {
+        case MQTT_EVENT_CONNECTED:
+                printf("MQTT connected!\n");
+                esp_mqtt_client_subscribe(event->client, SUB_TOPIC, 1);
+                break;
 
-  case MQTT_EVENT_DATA: {
-    char topic[event->topic_len + 1];
-    char data[event->data_len + 1];
-    memcpy(topic, event->topic, event->topic_len);
-    topic[event->topic_len] = '\0';
-    memcpy(data, event->data, event->data_len);
-    data[event->data_len] = '\0';
+        case MQTT_EVENT_DATA: {
+                char topic[event->topic_len + 1];
+                char data[event->data_len + 1];
+                memcpy(topic, event->topic, event->topic_len);
+                topic[event->topic_len] = '\0';
+                memcpy(data, event->data, event->data_len);
+                data[event->data_len] = '\0';
 
-    printf("MQTT Msg received\nTopic: %s\nData: %s\n", topic, data);
+                printf("MQTT Msg received\nTopic: %s\nData: %s\n", topic, data);
 
-    char *endptr;
-    long long sent = strtoll(data, &endptr, 10);
-    if (endptr != data) {
-      long long now = esp_timer_get_time() / 1000ULL;
-      long long rtt = now - sent;
-      printf("RTT: %lld ms\n", rtt);
-    }
-    break;
-  }
+                char *endptr;
+                long long sent = strtoll(data, &endptr, 10);
+                if (endptr != data) {
+                        long long now = esp_timer_get_time() / 1000ULL;
+                        long long rtt = now - sent;
+                        printf("RTT: %lld ms\n", rtt);
+                }
+                break;
+        }
 
-  default:
-    break;
-  }
+        default:
+                break;
+        }
 }
 
-static void publisher_task(void *pvParameters) {
-  while (1) {
-    char buf[BUFFER_SIZE];
-    snprintf(buf, BUFFER_SIZE, "%lld",
-             (long long)(esp_timer_get_time() / 1000ULL));
-    esp_mqtt_client_publish(client, PUB_TOPIC, buf, 0, 1, 0);
-    vTaskDelay(pdMS_TO_TICKS(PUBLISH_INTERVAL_MS));
-  }
+static void publisher_task(void *pvParameters)
+{
+        while (1) {
+                char buf[BUFFER_SIZE];
+                snprintf(buf, BUFFER_SIZE, "%lld",
+                         (long long)(esp_timer_get_time() / 1000ULL));
+                esp_mqtt_client_publish(client, PUB_TOPIC, buf, 0, 1, 0);
+                vTaskDelay(pdMS_TO_TICKS(PUBLISH_INTERVAL_MS));
+        }
 }
 
-void mqtt_app_start(void) {
-  esp_mqtt_client_config_t mqtt_cfg = {
-      .broker.address.uri = MQTT_URI,
-  };
-  client = esp_mqtt_client_init(&mqtt_cfg);
-  esp_mqtt_client_register_event(client, ESP_EVENT_ANY_ID, mqtt_event_handler,
-                                 NULL);
-  esp_mqtt_client_start(client);
+void mqtt_app_start(void)
+{
+        esp_mqtt_client_config_t mqtt_cfg = {
+            .broker.address.uri = MQTT_URI,
+        };
+        client = esp_mqtt_client_init(&mqtt_cfg);
+        esp_mqtt_client_register_event(client, ESP_EVENT_ANY_ID,
+                                       mqtt_event_handler, NULL);
+        esp_mqtt_client_start(client);
 
-  xTaskCreate(publisher_task, "publisher_task", PUBLISHER_TASK_STACK_SIZE, NULL,
-              PUBLISHER_TASK_PRIORITY, NULL);
+        xTaskCreate(publisher_task, "publisher_task", PUBLISHER_TASK_STACK_SIZE,
+                    NULL, PUBLISHER_TASK_PRIORITY, NULL);
 }
diff --git a/firmware/src/wifi.c b/firmware/src/wifi.c
index 8d6b29d..ea76f24 100644
--- a/firmware/src/wifi.c
+++ b/firmware/src/wifi.c
@@ -24,26 +24,27 @@
  *
  * The SSID and password are defined in the configuration headers.
  */
-void wifi_init_sta(void) {
-  esp_netif_create_default_wifi_sta();
+void wifi_init_sta(void)
+{
+        esp_netif_create_default_wifi_sta();
 
-  wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-  if (esp_wifi_init(&cfg) != ESP_OK) {
-    return;
-  }
+        wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+        if (esp_wifi_init(&cfg) != ESP_OK) {
+                return;
+        }
 
-  esp_wifi_set_mode(WIFI_MODE_STA);
-  esp_wifi_start();
+        esp_wifi_set_mode(WIFI_MODE_STA);
+        esp_wifi_start();
 
-  wifi_scan_start();
-  vTaskDelay(pdMS_TO_TICKS(WIFI_SCAN_DELAY_MS));
+        wifi_scan_start();
+        vTaskDelay(pdMS_TO_TICKS(WIFI_SCAN_DELAY_MS));
 
-  wifi_config_t wifi_config = {0};
-  strncpy((char *)wifi_config.sta.ssid, WIFI_SSID,
-          sizeof(wifi_config.sta.ssid) - 1);
-  strncpy((char *)wifi_config.sta.password, WIFI_PASS,
-          sizeof(wifi_config.sta.password) - 1);
+        wifi_config_t wifi_config = {0};
+        strncpy((char *)wifi_config.sta.ssid, WIFI_SSID,
+                sizeof(wifi_config.sta.ssid) - 1);
+        strncpy((char *)wifi_config.sta.password, WIFI_PASS,
+                sizeof(wifi_config.sta.password) - 1);
 
-  esp_wifi_set_config(WIFI_IF_STA, &wifi_config);
-  esp_wifi_connect();
+        esp_wifi_set_config(WIFI_IF_STA, &wifi_config);
+        esp_wifi_connect();
 }