From 508c14a671796070e521ad43a1a0b1eabcb71cf7 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Fri, 12 Aug 2022 09:02:04 +0200
Subject: [PATCH] Fixed modem sleep on S2 and fixed default wifi power

---
 src/AmsConfiguration.cpp | 2 ++
 src/AmsToMqttBridge.ino  | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/AmsConfiguration.cpp b/src/AmsConfiguration.cpp
index 77f47586..0d03f68c 100644
--- a/src/AmsConfiguration.cpp
+++ b/src/AmsConfiguration.cpp
@@ -63,8 +63,10 @@ void AmsConfiguration::clearWifi(WiFiConfig& config) {
 	uint16_t chipId;
 	#if defined(ESP32)
 		chipId = ESP.getEfuseMac();
+		config.power = 195;
 	#else
 		chipId = ESP.getChipId();
+		config.power = 205;
 	#endif
 	strcpy(config.hostname, (String("ams-") + String(chipId, HEX)).c_str());
 	config.mdns = true;
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index fe238749..e40d4e25 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -148,6 +148,8 @@ void setup() {
 			gpioConfig.hanPin = 3;
 			gpioConfig.ledPin = 2;
 			gpioConfig.ledInverted = true;
+		#elif defined(CONFIG_IDF_TARGET_ESP32S2)
+			gpioConfig.hanPin = 18;
 		#elif defined(ESP32)
 			gpioConfig.hanPin = 16;
 			gpioConfig.ledPin = 2;
@@ -155,6 +157,7 @@ void setup() {
 			gpioConfig.tempSensorPin = 14;
 		#endif
 	}
+
 	delay(1);
 	config.loadTempSensors();
 	hw.setup(&gpioConfig, &config);
@@ -1032,6 +1035,7 @@ void WiFi_connect() {
 			}	
 		#endif
 		WiFi.mode(WIFI_STA);
+		WiFi.setSleep(WIFI_PS_MAX_MODEM);
 		#if defined(ESP32)
 			if(wifi.power >= 195)
 				WiFi.setTxPower(WIFI_POWER_19_5dBm);
@@ -1055,6 +1059,8 @@ void WiFi_connect() {
 				WiFi.setTxPower(WIFI_POWER_5dBm);
 			else if(wifi.power >= 20)
 				WiFi.setTxPower(WIFI_POWER_2dBm);
+			else
+				WiFi.setTxPower(WIFI_POWER_MINUS_1dBm);
 		#elif defined(ESP8266)
 			WiFi.setOutputPower(wifi.power / 10.0);
 		#endif