Thomas Chef %!s(int64=2) %!d(string=hai) anos
pai
achega
0a7d0d7bdc
Modificáronse 3 ficheiros con 16 adicións e 14 borrados
  1. 1 2
      main/config.h
  2. 13 3
      main/mqtt.c
  3. 2 9
      main/receiver.c

+ 1 - 2
main/config.h

@@ -7,7 +7,6 @@
 
 // These defines configures which code to generate (to save download time during development)
 //#define WIFI_ENABLED
-//#define HTTP_ENABLED
 //#define MQTT_ENABLED
 //#define ENABLE_DS18B20
 
@@ -15,7 +14,7 @@
 
 #define ONE_WIRE_BUS_IO           GPIO_NUM_16   // Temp sensors
 
-#define GPIO_RX_DATA       26       // IR Receiver
+#define GPIO_RX_DATA              GPIO_NUM_26   // IR Receiver
 
 
 #endif

+ 13 - 3
main/mqtt.c

@@ -43,19 +43,29 @@ static bool connected = false;
 
 static esp_err_t mqtt_event_handler_cb(esp_mqtt_event_handle_t event)
 {
-    //esp_mqtt_client_handle_t client = event->client;
-    //int msg_id;
+    
+    esp_mqtt_client_handle_t client = event->client;
+
+    int msg_id;
     // your_context_t *context = event->context;
     switch (event->event_id) {
         case MQTT_EVENT_CONNECTED:
             connected = true;
             ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED");
+            msg_id = esp_mqtt_client_subscribe(client, "#", 0);
+            ESP_LOGI(TAG, "Sent subscribe successful, msg_id=%d", msg_id);
             break;
         case MQTT_EVENT_DISCONNECTED:
             connected = false;
             ESP_LOGI(TAG, "MQTT_EVENT_DISCONNECTED");
             break;
-
+        
+        case MQTT_EVENT_SUBSCRIBED:
+            ESP_LOGI(TAG, "MQTT_EVENT_SUBSCRIBED, msg_id=%d", event->msg_id);
+            break;
+        case MQTT_EVENT_UNSUBSCRIBED:
+            ESP_LOGI(TAG, "MQTT_EVENT_UNSUBSCRIBED, msg_id=%d", event->msg_id);
+            break;
         case MQTT_EVENT_PUBLISHED:
             ESP_LOGI(TAG, "MQTT_EVENT_PUBLISHED, msg_id=%d", event->msg_id);
             break;

+ 2 - 9
main/receiver.c

@@ -34,10 +34,7 @@ void receiverTask(void *pvParameter)
 
         while( xQueueReceive( rxQueue, &width, portMAX_DELAY ) == pdTRUE ) {
 
-            //ESP_LOGI("D", "%u", width);
-
-            //dataArr[dataArrIdx++] = width;
-            //if( dataArrIdx == 1000 ) dataArrIdx=0;
+            ESP_LOGI("D", "%u", width);
 
             // Receive the Toshiba IR
             union ToshibaProtocolU* data = (union ToshibaProtocolU*)nextPulseToshiba_ir(width);
@@ -49,14 +46,10 @@ void receiverTask(void *pvParameter)
                 const uint8_t power = (data->data.Mode == 3) ? 1 : 0;
                 ESP_LOGI("TOSHIBA","Mode:%u Temp:%u Fan:%u",power,data->data.Temp+17u,fan);
 
-
 #ifdef WIFI_ENABLED
-                sendUDPMessage(dataStr, true);
+                //sendUDPMessage(dataStr, true);
 #endif
             }
-            
-
-
         }
     }
     vTaskDelete(NULL);