瀏覽代碼

Transmit works with HW to the AC

Thomas Chef 2 年之前
父節點
當前提交
5714faf972
共有 4 個文件被更改,包括 23 次插入11 次删除
  1. 4 4
      main/config.h
  2. 3 3
      main/ir_transmit.c
  3. 13 3
      main/main.c
  4. 3 1
      main/mqtt.c

+ 4 - 4
main/config.h

@@ -6,16 +6,16 @@
 #define SW_VERSION "1.0"
 
 // These defines configures which code to generate (to save download time during development)
-//#define WIFI_ENABLED
-//#define MQTT_ENABLED
+#define WIFI_ENABLED
+#define MQTT_ENABLED
 //#define ENABLE_DS18B20
 
-#define MQTT_DEBUG              // Add an extra debug string to the topic-string
+//#define MQTT_DEBUG              // Add an extra debug string to the topic-string
 
 #define RX_TIMER
 #define IR_RECEIVER
 
-#define ONE_WIRE_BUS_IO           GPIO_NUM_16   // Temp sensors
+#define ONE_WIRE_BUS_IO           GPIO_NUM_32   // Temp sensors
 
 #define GPIO_IR_RX_DATA              GPIO_NUM_25   // IR Receiver
 #define GPIO_IR_TX_DATA              GPIO_NUM_26   // IR Transmitter

+ 3 - 3
main/ir_transmit.c

@@ -20,13 +20,13 @@ QueueHandle_t toshibaTxQueue = NULL;
 
 void toshibaTxTask(void *pvParameter)
 {
-	ESP_LOGI("TX", "toshibaTxTask() starting.");
+	ESP_LOGI("IR_TRANSMIT", "toshibaTxTask() starting.");
 
 	uint8_t data[8];
     	
 	while( true ) {
 		if( xQueueReceive( toshibaTxQueue, data, 100 ) == pdTRUE ) {
-			ESP_LOGI("TOSHIBA","Received a TX from MQTT");
+			ESP_LOGI("IR_TRANSMIT","Received a TX from MQTT");
 
 			uint8_t irPair = 1;
 			for(uint8_t b=0;b<kToshibaNumberOfBits;b++) {
@@ -84,5 +84,5 @@ void initIrTransmit() {
     toshibaTxQueue = xQueueCreate( 5, kToshibaNumberOfBytes );
 	xTaskCreatePinnedToCore(toshibaTxTask, "toshibaTxTask", 1024*10, NULL, 2, NULL,0);
 
-	ESP_LOGI("IR_TX","Init done.");
+	ESP_LOGI("IR_TRANSMIT","Init done.");
 }

+ 13 - 3
main/main.c

@@ -8,11 +8,20 @@
 #include "rxTimer.h"
 #include "receiver.h"
 #include "ir_transmit.h"
+#include "toshiba_ir.h"
 
 
 // Chip info:
 // This is esp32 chip with 2 CPU cores, WiFi/BT/BLE, silicon revision 1, 4MB external flash
 
+/*
+I (43709) TOSHIBA: MQTT: F20D03FC0170A300D2
+I (43709) TOSHIBA: Data: F2 0D 03 FC 01 70 A3 00 D2
+I (43709) TOSHIBA: Mode:1 Temp:24 Fan:4
+I (43839) TOSHIBA: MQTT: F20D03FC0170A300D2
+I (43839) TOSHIBA: Data: F2 0D 03 FC 01 70 A3 00 D2
+I (43839) TOSHIBA: Mode:1 Temp:24 Fan:4
+*/
 
 
 void app_main(void)
@@ -57,9 +66,10 @@ initIrTransmit();
 
         vTaskDelayUntil( &vLastWakeTime, 1000 / portTICK_PERIOD_MS );
 
-        ESP_LOGI("MAIN","Send IR Tx Data");
-        uint8_t data[8];
-        xQueueSend( toshibaTxQueue, &data, 0 );
+        /*ESP_LOGI("MAIN","Send a test-IR Tx Data");
+        const uint8_t data[kToshibaNumberOfBytes] = { 0xF2, 0x0D, 0x03, 0xFC, 0x01, 0x30, 0xA3, 0x00, 0x92 };
+        // F2 0D 03 FC 01 30 A3 00 92
+        xQueueSend( toshibaTxQueue, &(data[0]), 0 );*/
 
     }
 

+ 3 - 1
main/mqtt.c

@@ -32,6 +32,7 @@
 
 #include "wifi.h"
 #include "receiver.h"
+#include "ir_transmit.h"
 #include "toshiba_ir.h"
 
 static const char *TAG = "MQTT";
@@ -143,7 +144,8 @@ void mqttTask(void *pvParameters) {
     esp_mqtt_client_register_event(client, ESP_EVENT_ANY_ID, mqtt_event_handler, client);
     esp_mqtt_client_start(client);
 
-    ESP_LOGI("TX", "toshibaTxTask() starting.");
+    ESP_LOGI("MQTT", "mqttTask() started.");
+    vTaskDelete(NULL);
 }