From d8db4449bebd7484f254c65498d57602ab657953 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Mon, 15 Jun 2020 07:04:03 -0700
Subject: [PATCH] 0.7.6

---
 bin/version.sh           |  2 +-
 docs/software/TODO.md    | 10 +++++++++-
 src/esp32/main-esp32.cpp |  3 +++
 src/sleep.cpp            |  6 +++---
 src/sleep.h              |  4 +++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bin/version.sh b/bin/version.sh
index b918e13a..1ff41ed0 100644
--- a/bin/version.sh
+++ b/bin/version.sh
@@ -1,3 +1,3 @@
 
 
-export VERSION=0.7.5
\ No newline at end of file
+export VERSION=0.7.6
\ No newline at end of file
diff --git a/docs/software/TODO.md b/docs/software/TODO.md
index e2694801..e01d525b 100644
--- a/docs/software/TODO.md
+++ b/docs/software/TODO.md
@@ -1,11 +1,19 @@
 # High priority
 
 - why is the net so chatty now?
-- CONFIG_CLASSIC_BT_ENABLED=n
+- modem sleep should work if we lower serial rate to 115kb?
 - device wakes, turns BLE on and phone doesn't notice (while phone was sitting in auto-connect)
 - E22 bringup
 - encryption review findings writeup
+
 - turn on modem-sleep mode - https://github.com/espressif/arduino-esp32/issues/1142#issuecomment-512428852
+last EDF release in arduino is: https://github.com/espressif/arduino-esp32/commit/1977370e6fc069e93ffd8818798fbfda27ae7d99
+IDF release/v3.3 46b12a560
+IDF release/v3.3 367c3c09c
+https://docs.espressif.com/projects/esp-idf/en/release-v3.3/get-started/linux-setup.html
+kevinh@kevin-server:~/development/meshtastic/esp32-arduino-lib-builder$ python /home/kevinh/development/meshtastic/esp32-arduino-lib-builder/esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dout --flash_freq 40m --flash_size detect 0x1000 /home/kevinh/development/meshtastic/esp32-arduino-lib-builder/build/bootloader/bootloader.bin
+cp -a out/tools/sdk/* components/arduino/tools/sdk
+cp -ar components/arduino/* ~/.platformio/packages/framework-arduinoespressif32@src-fba9d33740f719f712e9f8b07da6ea13/
 
 # Medium priority
 
diff --git a/src/esp32/main-esp32.cpp b/src/esp32/main-esp32.cpp
index cf02ebeb..45e2a123 100644
--- a/src/esp32/main-esp32.cpp
+++ b/src/esp32/main-esp32.cpp
@@ -4,6 +4,7 @@
 #include "configuration.h"
 #include "main.h"
 #include "power.h"
+#include "sleep.h"
 #include "target_specific.h"
 
 bool bluetoothOn;
@@ -177,6 +178,8 @@ void esp32Setup()
     DEBUG_MSG("Total PSRAM: %d\n", ESP.getPsramSize());
     DEBUG_MSG("Free PSRAM: %d\n", ESP.getFreePsram());
 
+    // enableModemSleep();
+
 #ifdef AXP192_SLAVE_ADDRESS
     axp192Init();
 #endif
diff --git a/src/sleep.cpp b/src/sleep.cpp
index 8cb0f679..2dfee04f 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -291,7 +291,7 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
 }
 #endif
 
-#if 0
+
 // not legal on the stock android ESP build
 
 /**
@@ -306,8 +306,8 @@ void enableModemSleep()
   static esp_pm_config_esp32_t config; // filled with zeros because bss
 
   config.max_freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
-  config.min_freq_mhz = 10; // 10Mhz is minimum recommended
+  config.min_freq_mhz = 20; // 10Mhz is minimum recommended
   config.light_sleep_enable = false;
   DEBUG_MSG("Sleep request result %x\n", esp_pm_configure(&config));
 }
-#endif
+
diff --git a/src/sleep.h b/src/sleep.h
index 66eafa61..80010011 100644
--- a/src/sleep.h
+++ b/src/sleep.h
@@ -34,4 +34,6 @@ extern Observable<void *> preflightSleep;
 extern Observable<void *> notifySleep;
 
 /// Called to tell observers we are now entering (deep) sleep and you should prepare.  Must return 0
-extern Observable<void *> notifyDeepSleep;
\ No newline at end of file
+extern Observable<void *> notifyDeepSleep;
+
+void enableModemSleep();
\ No newline at end of file