Prepare for ESP32S2 based boards

Author: 0xCAFEDECAF

VanLiveConnect/Config.h

@@ -120,8 +120,12 @@
 //   to simulate a power-off event.
 //
 #ifdef ARDUINO_ARCH_ESP32
+ #ifdef CONFIG_IDF_TARGET_ESP32S2
+  #define LIGHT_SLEEP_WAKE_PIN GPIO_NUM_35
+ #else
   // Only GPIOs which are have RTC functionality can be used: 0,2,4,12-15,25-27,32-39.
   #define LIGHT_SLEEP_WAKE_PIN GPIO_NUM_13
+ #endif
 #else
   #define LIGHT_SLEEP_WAKE_PIN D1
 #endif // ARDUINO_ARCH_ESP32
@@ -251,9 +255,15 @@
 
   // IR receiver data pin
   #ifdef ARDUINO_ARCH_ESP32
+   #ifdef CONFIG_IDF_TARGET_ESP32S2
+    #define IR_RECV_PIN GPIO_NUM_7
+    #define IR_VCC GPIO_NUM_11
+    #define IR_GND GPIO_NUM_9
+   #else
     #define IR_RECV_PIN GPIO_NUM_18
     #define IR_VCC GPIO_NUM_23
     #define IR_GND GPIO_NUM_19
+   #endif
   #else
     #define IR_RECV_PIN D5
 
@@ -272,16 +282,23 @@
 
   // IR receiver data pin
   #ifdef ARDUINO_ARCH_ESP32
+   #ifdef CONFIG_IDF_TARGET_ESP32S2
+    #define IR_RECV_PIN GPIO_NUM_11
+    #define IR_VCC GPIO_NUM_7
+    #define IR_GND GPIO_NUM_5
+   #else
     #define IR_RECV_PIN GPIO_NUM_23
     #define IR_VCC GPIO_NUM_18
     #define IR_GND GPIO_NUM_26
+   #endif
   #else
+    #define IR_RECV_PIN D7
+
     // Using D5 as VCC and D0 as ground pin for the IR receiver. Should be possible with e.g. the
     // TSOP31238 IR receiver as it typically uses only 0.35 mA.
     #define IR_VCC D5
     #define IR_GND D0
 
-    #define IR_RECV_PIN D7
   #endif // ARDUINO_ARCH_ESP32
 
 #endif // IR_TSOP312XX

VanLiveConnect/ESP32S2_IDE.bat

@@ -0,0 +1,15 @@
+@echo off
+
+rem  This batch file sets up the Arduino IDE with all the correct board options (as found in the IDE "Tools" menu)
+
+rem   Board spec for "ESP32S2 Dev Module"
+set BOARDSPEC=esp32:esp32:esp32s2:CDCOnBoot=cdc,CPUFreq=240,FlashFreq=80,FlashMode=qio,FlashSize=4M,PartitionScheme=min_spiffs,DebugLevel=none
+
+rem  Fill in your COM port here
+set COMPORT=COM3
+
+rem  Get the full directory name of the currently running script
+set MYPATH=%~dp0
+
+rem  Launch the Arduino IDE with the specified board options
+call "%MYPATH%..\extras\Scripts\ArduinoIdeEnv.bat"

VanLiveConnect/ESP32S2_IDE.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/bash
+
+# This script sets up the Arduino IDE with all the correct board options (as found in the IDE "Tools" menu)
+
+# Board spec for "ESP32S2 Dev Module"
+BOARDSPEC=esp32:esp32:esp32s2:CDCOnBoot=cdc,CPUFreq=240,FlashFreq=80,FlashMode=qio,FlashSize=4M,PartitionScheme=min_spiffs,DebugLevel=none
+
+# Fill in your COM port here
+COMPORT=/dev/ttyUSB0
+
+# Get the full directory name of the currently running script
+\cd `dirname $0`
+MYPATH=`pwd`
+\cd - > /dev/null
+
+# Launch the Arduino IDE with the specified board options
+. "${MYPATH}/../extras/Scripts/ArduinoIdeEnv.sh"

VanLiveConnect/VanLiveConnect.ino

@@ -174,8 +174,13 @@ void SetupVanReceiver()
 
   // Define these as #defines so that the Serial.printf_P below shows the correct pin name on the console
   #ifdef ARDUINO_ARCH_ESP32
+   #ifdef CONFIG_IDF_TARGET_ESP32S2
+    #define TX_PIN GPIO_NUM_18 // GPIO pin connected to VAN bus transceiver input
+    #define RX_PIN GPIO_NUM_33 // GPIO pin connected to VAN bus transceiver output
+   #else
     #define TX_PIN GPIO_NUM_16 // GPIO pin connected to VAN bus transceiver input
     #define RX_PIN GPIO_NUM_21 // GPIO pin connected to VAN bus transceiver output
+   #endif
   #else // ! ARDUINO_ARCH_ESP32
     #define TX_PIN D3 // GPIO pin connected to VAN bus transceiver input
     #define RX_PIN D2 // GPIO pin connected to VAN bus transceiver output
@@ -329,7 +334,11 @@ void setup()
     // (see also: https://github.com/espressif/esp-azure/issues/17 )
     Serial.setDebugOutput(false);
 
-    delay(1000);
+  #if defined ARDUINO_ARCH_ESP32 && defined CONFIG_IDF_TARGET_ESP32S2
+    // Give COM port device driver time to start
+    delay(3000);
+  #endif
+
     Serial.begin(115200);
     Serial.printf_P(PSTR("\nStarting VAN bus \"Live Connect\" server version %s\n"), VAN_LIVE_CONNECT_VERSION);
 

VanLiveConnect/Wifi.ino

@@ -193,8 +193,10 @@ const char* SetupWifi()
 
     Serial.printf_P(PSTR("Setting up captive portal on Wi-Fi access point '%s', channel %d\n"), wifiSsid, WIFI_CHANNEL);
 
-    WiFi.mode(WIFI_AP);
+  #if ! defined ARDUINO_ARCH_ESP32 || ! defined CONFIG_IDF_TARGET_ESP32S2
+    // For some reason, this seems to break DHCP on ESP32S2
     WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
+  #endif
 
     // Register event handlers
   #ifdef ARDUINO_ARCH_ESP32
@@ -218,6 +220,11 @@ const char* SetupWifi()
     WiFi.softAP(wifiSsid, nullptr, WIFI_CHANNEL, WIFI_SSID_HIDDEN);
   #endif
 
+  #ifdef ARDUINO_ARCH_ESP32
+    // Set STA interface bandwidth to 20 MHz
+    esp_wifi_set_bandwidth(WIFI_IF_AP, WIFI_BW_HT20);
+  #endif
+
     softap_config config_ap;
   #ifdef ARDUINO_ARCH_ESP32
     wifi_config_t config;