From a51a13daa0129df5abb4db922f6fd3e8aec520d2 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Fri, 21 Oct 2022 14:51:05 +0800 Subject: [PATCH] enabled IR in init phase --- platformio.ini | 4 ++-- src/IRbaby.cpp | 11 ++++++++++- src/defines.h | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index 1586fc9..92940c0 100644 --- a/platformio.ini +++ b/platformio.ini @@ -18,8 +18,8 @@ platform = espressif8266 framework = arduino monitor_speed = 115200 upload_speed = 115200 -upload_port = COM6 -monitor_port = COM6 +upload_port = COM5 +monitor_port = COM5 board_build.flash_mode = dout build_flags = -Wno-unused-function diff --git a/src/IRbaby.cpp b/src/IRbaby.cpp index de3abb0..fc3c894 100644 --- a/src/IRbaby.cpp +++ b/src/IRbaby.cpp @@ -176,7 +176,16 @@ void setup() { saveSettings(); delay(SYSTEM_DELAY); - loadIRPin(ConfigData["pin"]["ir_send"], ConfigData["pin"]["ir_receive"]); + uint8_t send_pin = ConfigData["pin"]["ir_send"]; + uint8_t recv_pin = ConfigData["pin"]["ir_receive"]; + if (send_pin == 0) { + send_pin = ir_send_pin; + } + if (recv_pin == 0) { + recv_pin = ir_receive_pin; + } + INFOF("IR pin config get : %d, %d\n", send_pin, recv_pin); + loadIRPin(send_pin, recv_pin); connectToAliyunIoT(); alinkCheckTask.attach_scheduled(MQTT_CHECK_INTERVALS, checkAlinkMQTT); diff --git a/src/defines.h b/src/defines.h index 717f146..1346182 100644 --- a/src/defines.h +++ b/src/defines.h @@ -65,8 +65,8 @@ typedef unsigned char uint8_t; #define RESET_PIN 2 /* 315 RF pin */ -#define T_315 5 -#define R_315 4 +// #define T_315 5 +// #define R_315 4 /* 433 RF pin */ #define T_433 14 @@ -74,7 +74,7 @@ typedef unsigned char uint8_t; /* IR pin */ #define T_IR 14 -#define R_IR 12 +#define R_IR 4 /* ----------------- lsoc setting --------------- */ /* lsoc heart beat cycle */