Merge branch 'master' of https://github.com/maragelis/ParadoxMqtt32

Author: Panagiotis Maragelis

.vscode/arduino.json

@@ -1,5 +1,11 @@
 {
+<<<<<<< HEAD
     "board": "esp8266:esp8266:d1_mini_pro",
     "configuration": "CpuFrequency=80,VTable=flash,FlashSize=16M15M,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,FlashErase=none,UploadSpeed=921600",
     "port": "COM8"
+=======
+    "board": "esp32:esp32:esp32",
+    "configuration": "PSRAM=disabled,PartitionScheme=default,CPUFreq=240,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=none",
+    "port": "COM9"
+>>>>>>> f8661f6b56d2583029996a5c30fd780bbc9ce5ce
 }

.vscode/settings.json

@@ -1,6 +1,52 @@
 {
     "files.associations": {
         "*.tpp": "cpp",
+<<<<<<< HEAD
         "random": "cpp"
+=======
+        "system_error": "cpp",
+        "string": "cpp",
+        "array": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "numeric": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "regex": "cpp",
+        "utility": "cpp",
+        "typeinfo": "cpp"
+>>>>>>> f8661f6b56d2583029996a5c30fd780bbc9ce5ce
     }
 }

src/GsmUtilities.h

@@ -0,0 +1,121 @@
+
+
+
+#include <Wire.h>
+
+#if defined(SIM800L_IP5306_VERSION_20190610)
+
+#define MODEM_RST             5
+#define MODEM_PWRKEY          4
+#define MODEM_POWER_ON       23
+#define MODEM_TX             27
+#define MODEM_RX             26
+
+#define I2C_SDA              21
+#define I2C_SCL              22
+#define LED_GPIO             13
+#define LED_ON               HIGH
+#define LED_OFF              LOW
+
+#define IP5306_ADDR          0x75
+#define IP5306_REG_SYS_CTL0  0x00
+
+// setPowerBoostKeepOn
+bool setupPMU()
+{
+    bool en = true;
+    Wire.beginTransmission(IP5306_ADDR);
+    Wire.write(IP5306_REG_SYS_CTL0);
+    if (en) {
+        Wire.write(0x37); // Set bit1: 1 enable 0 disable boost keep on
+    } else {
+        Wire.write(0x35); // 0x37 is default reg value
+    }
+    return Wire.endTransmission() == 0;
+}
+
+
+#elif defined(SIM800L_AXP192_VERSION_20200327)
+
+#define MODEM_RST            5
+#define MODEM_PWRKEY          4
+#define MODEM_POWER_ON       23
+#define MODEM_TX             27
+#define MODEM_RX             26
+#define MODEM_DTR            32
+#define MODEM_RI             33
+
+#define I2C_SDA              21
+#define I2C_SCL              22
+#define LED_GPIO             13
+#define LED_ON               HIGH
+#define LED_OFF              LOW
+
+
+#elif defined(SIM800C_AXP192_VERSION_20200609)
+// pin definitions
+#define MODEM_PWRKEY          4
+#define MODEM_POWER_ON       25
+#define MODEM_TX             27
+#define MODEM_RX             26
+#define MODEM_DTR            32
+#define MODEM_RI             33
+
+#define I2C_SDA              21
+#define I2C_SCL              22
+#define LED_GPIO             12
+#define LED_ON               LOW
+#define LED_OFF              HIGH
+
+#else
+#error "Please select the corresponding model"
+#endif
+
+
+#if defined(SIM800L_AXP192_VERSION_20200327) || defined(SIM800C_AXP192_VERSION_20200609)
+#include <axp20x.h>         //https://github.com/lewisxhe/AXP202X_Library
+
+AXP20X_Class axp;
+
+bool setupPMU()
+{
+// For more information about the use of AXP192, please refer to AXP202X_Library https://github.com/lewisxhe/AXP202X_Library
+    Wire.begin(I2C_SDA, I2C_SCL);
+    int ret = axp.begin(Wire, AXP192_SLAVE_ADDRESS);
+
+    if (ret == AXP_FAIL) {
+        Serial.println("AXP Power begin failed");
+        return false;
+    }
+
+    //! Turn off unused power
+    axp.setPowerOutPut(AXP192_DCDC1, AXP202_OFF);
+    axp.setPowerOutPut(AXP192_LDO2, AXP202_OFF);
+    axp.setPowerOutPut(AXP192_LDO3, AXP202_OFF);
+    axp.setPowerOutPut(AXP192_DCDC2, AXP202_OFF);
+    axp.setPowerOutPut(AXP192_EXTEN, AXP202_OFF);
+
+    //! Do not turn off DC3, it is powered by esp32
+    // axp.setPowerOutPut(AXP192_DCDC3, AXP202_ON);
+
+    // Set the charging indicator to turn off
+    // Turn it off to save current consumption
+    // axp.setChgLEDMode(AXP20X_LED_OFF);
+
+    // Set the charging indicator to flash once per second
+    // axp.setChgLEDMode(AXP20X_LED_BLINK_1HZ);
+
+
+    //! Use axp192 adc get voltage info
+    axp.adc1Enable(AXP202_VBUS_VOL_ADC1 | AXP202_VBUS_CUR_ADC1 | AXP202_BATT_CUR_ADC1 | AXP202_BATT_VOL_ADC1, true);
+
+    float vbus_v = axp.getVbusVoltage();
+    float vbus_c = axp.getVbusCurrent();
+    float batt_v = axp.getBattVoltage();
+    // axp.getBattPercentage();   // axp192 is not support percentage
+    Serial.printf("VBUS:%.2f mV %.2f mA ,BATTERY: %.2f\n", vbus_v, vbus_c, batt_v);
+
+    return true;
+}
+
+#endif

include/README renamed to src/README

@@ -1386,7 +1386,7 @@ void setup() {
   serial_flush_buffer();
   configTime(gmtOffset_sec, 0, ntpServer);
   PanelStatus1();
-  sendMQTT(root_topicStatus, "{\"status\":\"Program ready\"}" , false);
+  sendMQTT(root_topicStatus, "{\"status\":\"Panel Ready\"}" , false);
 
 }
 

src/main.cpp

@@ -6,6 +6,7 @@
 #include <ArduinoJson.h>
 #include <FS.h>   
 #include <SPIFFS.h>
+#include <SPI.h>
 #include <esp_wifi.h>
 #include <WiFi.h>
 #include <WiFiClient.h>
@@ -43,6 +44,7 @@
 #define timezone 2 //for setdate command
 const char* ntpServer = "pool.ntp.org";
 
+
 #define Stay_Arm  0x01
 #define Stay_Arm2 0x02
 #define Sleep_Arm 0x03
@@ -57,19 +59,23 @@ const char* ntpServer = "pool.ntp.org";
 #define LED LED_BUILTIN
 
 #define Uart0_RX 
+#define TTLCD 
+
+
 
 //If esp is dev kit then set to 1 else 0
 bool ESPDEVKit = 1;
 
 bool Hassio= 1; // 1 enables 0 disables Hassio-Openhab support
 bool HomeKit= 1 ;// enables homekit topic
 bool SendAllE0events =1 ;//If you need all events set to 1 else 0 
-bool usePartitions= 1; //If you use partitions enable this to get partition number in Hassio topic 
+bool usePartitions= 0; //If you use partitions enable this to get partition number in Hassio topic 
 
 int ArmStateRefresh = 30 ; //will send arm state every 30 seconds dont use smaller then 30, 0 to disable;
 
 bool TRACE = 0;
 bool OTAUpdate = 0;
+bool HasTFTScreen  = 0;
 
 #define def_topicOut "out" 
 #define def_topicStatus "status"
@@ -82,6 +88,16 @@ bool OTAUpdate = 0;
 
 //#define ParadoxGSMInstalled  // Comment out to use PARADOX GSMModule
 //#define Sim800Instaled //
+//#define HasTFTScreen //
+
+
+
+#ifdef HasTFTScreen
+#include <tftScreen.h>
+HasTFTScreen =1;
+#endif
+
+
 
 
 #ifdef ParadoxGSMInstalled