Minimize contract, add ADC read and send its data to coonsole

esp32/main/CMakeLists.txt

@@ -1,7 +1,7 @@
 idf_component_register(
-        SRCS "main.cpp" "protocol.cpp" "wifi_manager.cpp" "system_init.cpp" "time_sync.cpp"
+        SRCS "main.cpp" "protocol.cpp" "wifi_manager.cpp" "system_init.cpp" "time_sync.cpp" "adc_reader.cpp" "ringbuf.cpp" "sampler_task.cpp" "sender_task.cpp"
         INCLUDE_DIRS "."
-        REQUIRES nvs_flash esp_wifi esp_netif freertos log cjson esp_timer
+        REQUIRES nvs_flash esp_wifi esp_netif freertos log cjson esp_timer esp_adc
 )
 # добавляем кастомный Kconfig
 set(COMPONENT_KCONFIG "Kconfig")

esp32/main/adc_reader.cpp

@@ -0,0 +1,26 @@
+#include "adc_reader.h"
+
+extern "C" {
+#include "esp_adc/adc_oneshot.h"
+}
+
+static adc_oneshot_unit_handle_t adc_handle;
+
+void adc_reader_init() {
+    adc_oneshot_unit_init_cfg_t init_config = {};
+    init_config.unit_id = ADC_UNIT_1;
+
+    adc_oneshot_new_unit(&init_config, &adc_handle);
+
+    adc_oneshot_chan_cfg_t config = {};
+    config.atten = ADC_ATTEN_DB_12;
+    config.bitwidth = ADC_BITWIDTH_DEFAULT;
+
+    adc_oneshot_config_channel(adc_handle, ADC_CHANNEL_7, &config); // GPIO35
+}
+
+int adc_reader_read() {
+    int val = 0;
+    adc_oneshot_read(adc_handle, ADC_CHANNEL_7, &val);
+    return val;
+}

esp32/main/adc_reader.h

@@ -0,0 +1,7 @@
+#pragma once
+
+// Инициализация ADC
+void adc_reader_init();
+
+// Прочитать значение (GPIO35)
+int adc_reader_read();

esp32/main/main.cpp

@@ -4,6 +4,8 @@
 #include "freertos/projdefs.h"
 #include "freertos/task.h"
 #include "protocol.h"
+#include "sampler_task.h"
+#include "sender_task.h"
 
 static const char* TAG = "iot_fish";
 
@@ -11,16 +13,8 @@ extern "C" void app_main(void)
 {
     system_init();
 
-    for (int i=0; i<5; i++)
-    {
-        char buf[512];
-        int len = build_telemetry_single(buf, sizeof(buf), "123", "dev1", 123456, "temperature", 22.5, "C", nullptr, 0);
-
-        if (len > 0) {
-            ESP_LOGI("protocol", "%s\n", buf);
-        }
-        vTaskDelay(pdMS_TO_TICKS(1000));
-    }
+    sampler_task_start();
+    sender_task_start();
 
     system_finalize();
 }

esp32/main/ringbuf.cpp

@@ -0,0 +1,21 @@
+#include "ringbuf.h"
+
+void ringbuf_init(ringbuf_t *rb) {
+    rb->head = 0;
+    for (int i = 0; i < RINGBUF_SIZE; i++) {
+        rb->values[i] = 0;
+    }
+}
+
+void ringbuf_push(ringbuf_t *rb, int v) {
+    rb->values[rb->head] = v;
+    rb->head = (rb->head + 1) % RINGBUF_SIZE;
+}
+
+void ringbuf_copy(const ringbuf_t *rb, int *out) {
+    int idx = rb->head;
+
+    for (int i = 0; i < RINGBUF_SIZE; i++) {
+        out[i] = rb->values[(idx + i) % RINGBUF_SIZE];
+    }
+}

esp32/main/ringbuf.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <stdint.h>
+
+#define RINGBUF_SIZE 10
+
+typedef struct {
+    int values[RINGBUF_SIZE];
+    int head;
+} ringbuf_t;
+
+// Инициализация
+void ringbuf_init(ringbuf_t *rb);
+
+// Добавить значение
+void ringbuf_push(ringbuf_t *rb, int v);
+
+// Скопировать данные (в порядке времени)
+void ringbuf_copy(const ringbuf_t *rb, int *out);

esp32/main/sampler_task.cpp

@@ -0,0 +1,39 @@
+#include "sampler_task.h"
+#include "adc_reader.h"
+#include "ringbuf.h"
+
+extern "C" {
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+}
+
+// буфер объявим здесь (глобальный для простоты)
+static ringbuf_t rb;
+
+// дать доступ другим модулям (sender потом возьмёт)
+ringbuf_t* sampler_get_buffer() {
+    return &rb;
+}
+
+static void sampler_task(void *arg) {
+    while (1) {
+        int val = adc_reader_read();
+        ringbuf_push(&rb, val);
+
+        vTaskDelay(pdMS_TO_TICKS(100)); // 10 Гц
+    }
+}
+
+void sampler_task_start() {
+    ringbuf_init(&rb);
+    adc_reader_init();
+
+    xTaskCreate(
+        sampler_task,
+        "sampler",
+        2048,
+        NULL,
+        5,
+        NULL
+    );
+}

esp32/main/sampler_task.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "ringbuf.h"
+
+void sampler_task_start();
+ringbuf_t* sampler_get_buffer();   // ← ВОТ ЭТО

esp32/main/sender_task.cpp

@@ -0,0 +1,48 @@
+#include "sender_task.h"
+#include "sampler_task.h"
+#include "ringbuf.h"
+
+#include <stdio.h>
+#include <time.h>
+
+extern "C" {
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+}
+
+static uint32_t msg_id = 1;
+
+static void sender_task(void *arg) {
+    int data[RINGBUF_SIZE];
+
+    while (1) {
+        vTaskDelay(pdMS_TO_TICKS(1000)); // 1 Гц
+
+        ringbuf_t *rb = sampler_get_buffer();
+        ringbuf_copy(rb, data);
+
+        time_t now = time(NULL);
+
+        // формируем JSON
+        printf("{\"v\":1,\"t\":\"t\",\"id\":%lu,\"ts\":%lld,\"d\":1,\"p\":{",
+       (unsigned long)msg_id++, (long long)now);
+        printf("\"m\":\"v\",\"s\":\"adc35\",\"u\":\"raw\",\"v\":[");
+
+        for (int i = 0; i < RINGBUF_SIZE; i++) {
+            printf("[%d,%d]%s", i, data[i], (i < RINGBUF_SIZE - 1) ? "," : "");
+        }
+
+        printf("]}}\n");
+    }
+}
+
+void sender_task_start() {
+    xTaskCreate(
+        sender_task,
+        "sender",
+        4096,
+        NULL,
+        5,
+        NULL
+    );
+}

esp32/main/sender_task.h

@@ -0,0 +1,4 @@
+#pragma once
+
+// Запуск задачи отправки (1 Гц)
+void sender_task_start();