From a35bee53b118ee551586a64941dbd3fec0fda91a Mon Sep 17 00:00:00 2001
From: cyberman54 <cyberman@obh.snafu.de>
Date: Sat, 20 May 2023 15:45:18 +0200
Subject: [PATCH] remove usage of PSRAM, to free IRAM, bump to 3.6.0

---
 platformio_orig.ini    | 20 +++++++++-----------
 platformio_orig_s3.ini | 20 +++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/platformio_orig.ini b/platformio_orig.ini
index 112a618f..40a23edb 100644
--- a/platformio_orig.ini
+++ b/platformio_orig.ini
@@ -46,7 +46,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 3.5.0
+release_version = 3.6.0
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3
@@ -54,7 +54,7 @@ extra_scripts = pre:src/build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@6.0.1
+platform_espressif32 = espressif32@6.3.0
 monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 lib_deps_lora =
@@ -91,19 +91,17 @@ lib_deps_all =
     ${common.lib_deps_gps}
     ${common.lib_deps_sensors}
     ${common.lib_deps_ledmatrix}
-build_flags_basic =
+build_flags_all =
     -include "src/paxcounter.conf"
-    '-DCORE_DEBUG_LEVEL=${common.debug_level}'
-    '-DLOG_LOCAL_LEVEL=${common.debug_level}'
-    '-DPROGVERSION="${common.release_version}"'
+    '-D CORE_DEBUG_LEVEL=${common.debug_level}'
+    '-D LOG_LOCAL_LEVEL=${common.debug_level}'
+    '-D PROGVERSION="${common.release_version}"'
     '-D LIBPAX_WIFI'
     '-D LIBPAX_BLE'
     '-D LIBPAX_ARDUINO'
-    '-DUSE_ESP_IDF_LOG'
-    '-DTAG=__FILE__'
-build_flags_all =
-    ${common.build_flags_basic}
-    -mfix-esp32-psram-cache-issue
+    '-D USE_ESP_IDF_LOG'
+    '-D TAG=__FILE__'
+    '-U BOARD_HAS_PSRAM'
 
 [env]
 framework = arduino
diff --git a/platformio_orig_s3.ini b/platformio_orig_s3.ini
index d4cc59b5..3d27725c 100644
--- a/platformio_orig_s3.ini
+++ b/platformio_orig_s3.ini
@@ -10,7 +10,7 @@ description = Paxcounter is a device for metering passenger flows in realtime. I
 
 [common]
 ; for release_version use max. 10 chars total, use any decimal format like "a.b.c"
-release_version = 3.5.0
+release_version = 3.6.0
 ; DEBUG LEVEL: For production run set to 0, otherwise device will leak RAM while running!
 ; 0=None, 1=Error, 2=Warn, 3=Info, 4=Debug, 5=Verbose
 debug_level = 3
@@ -18,7 +18,7 @@ extra_scripts = pre:src/build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@6.0.1
+platform_espressif32 = espressif32@6.3.0
 monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 lib_deps_all =
@@ -31,19 +31,17 @@ lib_deps_all =
     mathertel/OneButton @ ^2.0.3
     256dpi/MQTT @ ^2.5.1
     ricmoo/QRCode @ ^0.0.1
-build_flags_basic =
+build_flags_all =
     -include "src/paxcounter.conf"
-    '-DCORE_DEBUG_LEVEL=${common.debug_level}'
-    '-DLOG_LOCAL_LEVEL=${common.debug_level}'
-    '-DPROGVERSION="${common.release_version}"'
+    '-D CORE_DEBUG_LEVEL=${common.debug_level}'
+    '-D LOG_LOCAL_LEVEL=${common.debug_level}'
+    '-D PROGVERSION="${common.release_version}"'
     '-D LIBPAX_WIFI'
     '-D LIBPAX_BLE'
     '-D LIBPAX_ARDUINO'
-    '-DUSE_ESP_IDF_LOG'
-    '-DTAG=__FILE__'
-build_flags_all =
-    ${common.build_flags_basic}
-    -mfix-esp32-psram-cache-issue
+    '-D USE_ESP_IDF_LOG'
+    '-D TAG=__FILE__'
+    '-U BOARD_HAS_PSRAM'
 
 [env]
 framework = arduino