[SYS] Update arduino core to 3.1.1 + refactor ino to cpp (#2177)
* Update arduino core to 3.1.1 * Fix Blufi build * Update arduinojson, fix build errors with idf * Fix narrowing * fix RF builds * WIP-Convert ino files to cpp * Fix pilight build * Fix Somfy actuator build. * Update esp32dev-rf partition * Fix Weatherstation build * Fix GFSunInverter build * Fix esp32dev-ir build * Fix ble-aws build * Fix eth builds * Fix m5Stack missing pins_arduino.h * Fix build errors for M5 stack/tough, others are upstream issues. * Fix RTL 433 build - remaining errors are from radolib * Fix nodemcu build * fix 2g builds * Fix serial build * Fix actuator on off builds * Fix SSD1306 build - remaining errors are from radiolib * Fix multiple definition of OTAserver_cert * Fix nodemcu rf2 build * Fix ADC builds * Fix sensor builds * Fix LORA builds * Fix multi-receiver builds - remaining errors are in radiolib * Fix fastled builds * Fix theegns board builds * Fix broker builds * Update fastled - old version failed all-test build * Fix RN8209 builds * Fix max temp actuator builds * Fix PWM builds * Fix C37 sensor builds * Fix HTU21 builds * Fix INA266 builds * Fix undefined variables in mqtt discovery * Fix webui build * Fix fastled invalid pin error * Fix wifi manual setup builds * Fix onewire/all-test build - bin too big error remaining * Fix theengs plug build * Fix rfbridge builds * Fix blufi builds * Fix undefined functions in serial * Fix preprocessor definition checks * Set IDF log level to erre * Add delay in loop to prevent watchdog timeout * Use xTaskCreateUniveral to support single core processors * Remove old HTTPUpdate files - upsteam fixed. * Cleanup and move common declarations to header file * Use custom partiton table to fix builds where bin is too large * Update M5StickC - fixs esp32-m5stick-c-ble build * Revert to Arduino core 2.x for builds with incompatible libs * Remove "Z" from file names and rename omg_common to TheengsCommon * Fix gateway name when using MAC with new Arduino core * Update IDF config to reduce loop task stack use * Update esp-nimble-cpp version, corrects BLE uppercase ID's * Update wifi manager to fix watchdog timeout error
This commit is contained in:
1 parent
6e77efb11b
commit
585df9a420
83 files changed
+1275
-1293
No files matched your search
+16
-9
@@ -26,8 +26,7 @@
|
||||
#ifndef config_RF_h
|
||||
#define config_RF_h
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <ArduinoJson.h>
|
||||
#include "TheengsCommon.h"
|
||||
|
||||
#ifdef ZgatewayRF
|
||||
extern void setupRF();
|
||||
@@ -47,14 +46,10 @@ extern void enableRF2Receive();
|
||||
#ifdef ZgatewayPilight
|
||||
extern void setupPilight();
|
||||
extern void PilighttoX();
|
||||
extern void XtoPilight(const char* topicOri, const char* datacallback);
|
||||
extern void XtoPilight(const char* topicOri, JsonObject& RFdata);
|
||||
extern void disablePilightReceive();
|
||||
extern void enablePilightReceive();
|
||||
#endif
|
||||
#ifdef ZgatewayRTL_433
|
||||
# include <rtl_433_ESP.h>
|
||||
rtl_433_ESP rtl_433;
|
||||
|
||||
extern void RTL_433Loop();
|
||||
extern void setupRTL_433();
|
||||
@@ -217,7 +212,19 @@ struct RFConfig_s {
|
||||
#define ACTIVE_RTL 3
|
||||
#define ACTIVE_RF2 4
|
||||
|
||||
RFConfig_s RFConfig;
|
||||
#ifdef ZgatewayRF
|
||||
# define ACTIVE_RECEIVER ACTIVE_RF
|
||||
#elif defined(ZgatewayRF2)
|
||||
# define ACTIVE_RECEIVER ACTIVE_RF2
|
||||
#elif defined(ZgatewayPilight)
|
||||
# define ACTIVE_RECEIVER ACTIVE_PILIGHT
|
||||
#elif defined(ZgatewayRTL_433)
|
||||
# define ACTIVE_RECEIVER ACTIVE_RTL
|
||||
#else
|
||||
# define ACTIVE_RECEIVER ACTIVE_NONE
|
||||
#endif
|
||||
|
||||
extern RFConfig_s RFConfig;
|
||||
|
||||
/*-------------------CC1101 DefaultTXPower----------------------*/
|
||||
//Adjust the default TX-Power for sending radio if ZradioCC1101 is used.
|
||||
@@ -230,7 +237,7 @@ RFConfig_s RFConfig;
|
||||
#ifndef RF_RECEIVER_GPIO
|
||||
# ifdef ESP8266
|
||||
# define RF_RECEIVER_GPIO 0 // D3 on nodemcu // put 4 with rf bridge direct mod
|
||||
# elif ESP32
|
||||
# elif defined(ESP32)
|
||||
# define RF_RECEIVER_GPIO 27 // D27 on DOIT ESP32
|
||||
# endif
|
||||
#endif
|
||||
@@ -238,7 +245,7 @@ RFConfig_s RFConfig;
|
||||
#ifndef RF_EMITTER_GPIO
|
||||
# ifdef ESP8266
|
||||
# define RF_EMITTER_GPIO 3 // RX on nodemcu if it doesn't work with 3, try with 4 (D2) // put 5 with rf bridge direct mod
|
||||
# elif ESP32
|
||||
# elif defined(ESP32)
|
||||
# define RF_EMITTER_GPIO 12 // D12 on DOIT ESP32
|
||||
# else
|
||||
//IMPORTANT NOTE: On arduino UNO connect IR emitter pin to D9 , comment #define IR_USE_TIMER2 and uncomment #define IR_USE_TIMER1 on library <library>IRremote/boarddefs.h so as to free pin D3 for RF RECEIVER PIN
|
||||
|
||||
Reference in new issue
Block a user