Updated PCB, sensprs as JSON

klaus-liebler · Oct 11, 2024 · 25d378d · 25d378d
1 parent 133f53f
commit 25d378d
Show file tree

Hide file tree

Showing 8 changed files with 27,139 additions and 28,519 deletions.
diff --git a/espidf-component-labathome/cpp/HAL.hh b/espidf-component-labathome/cpp/HAL.hh
@@ -58,4 +58,7 @@ class HAL
         virtual ErrorCode GetAirRelHumidityAHT21(float *percent)=0;
         virtual ErrorCode GetAirRelHumidityBME280(float *percent)=0;
         virtual ErrorCode GetDistanceMillimeters(uint16_t *value)=0;
+
+        virtual ErrorCode GetSensorsAsJSON(char* buffer, size_t maxLen)=0;
+
 };
diff --git a/espidf-component-labathome/cpp/HAL_labathomeV15.hh b/espidf-component-labathome/cpp/HAL_labathomeV15.hh
@@ -400,6 +400,11 @@ public:
         return ErrorCode::OK;
     }
 
+    ErrorCode GetSensorsAsJSON(char* buffer, size_t maxLen) override{
+        this->oneWireBus->FormatJSON(buffer, maxLen);
+        return ErrorCode::OK;
+    }
+
     ErrorCode GetEncoderValue(int *value)
     {
         *value = this->stm2esp_buf.Rotenc;

diff --git a/labathome_firmware/.vscode/settings.json b/labathome_firmware/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "C_Cpp.intelliSenseEngine": "default",
   "idf.flashType": "UART",
-  "idf.portWin": "COM23",
+  "idf.portWin": "COM28",
   "idf.adapterTargetName": "esp32s3",
   "idf.openOcdConfigs": [
     "board/esp32s3-builtin.cfg"

diff --git a/labathome_firmware/main/http_handlers.cc b/labathome_firmware/main/http_handlers.cc
@@ -363,6 +363,13 @@ esp_err_t handle_put_heaterexperiment(httpd_req_t *req)
     return ESP_OK;
 }
 
+esp_err_t handle_get_sensors(httpd_req_t *req){
+    DeviceManager *devicemanager = *static_cast<DeviceManager **>(req->user_ctx);
+    char *buf= static_cast<char*>(httpd_get_global_user_ctx(req->handle));
+    devicemanager->GetHAL()->GetSensorsAsJSON(buf, CONFIG_SMOPLA_HTTP_SCRATCHPAD_SIZE);
+    return ESP_OK;
+}
+
 esp_err_t handle_put_airspeedexperiment(httpd_req_t *req){
     DeviceManager *devicemanager = *static_cast<DeviceManager **>(req->user_ctx);
     int ret=0;
@@ -617,6 +624,13 @@ constexpr httpd_uri_t putptnexperiment = {
     .user_ctx = &devicemanager,
 };
 
+constexpr httpd_uri_t getsensors = {
+    .uri = "/sensors",
+    .method = HTTP_GET,
+    .handler = handle_get_sensors,
+    .user_ctx = &devicemanager,
+};
+
 
 void RegisterHandlers(){
     ESP_ERROR_CHECK(httpd_register_uri_handler(http_server, &getroot));
@@ -631,4 +645,5 @@ void RegisterHandlers(){
     ESP_ERROR_CHECK(httpd_register_uri_handler(http_server, &postfbddefaultbin));
     ESP_ERROR_CHECK(httpd_register_uri_handler(http_server, &postfbddefaultjson));
     ESP_ERROR_CHECK(httpd_register_uri_handler(http_server, &putptnexperiment));
+    ESP_ERROR_CHECK(httpd_register_uri_handler(http_server, &getsensors));
 }