From ef3c93c3479f4d36191a736d29baf8dd799ba8b2 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Fri, 28 Jan 2022 17:58:44 +0100
Subject: [PATCH] Update ini files and formatting

---
 include/lv_conf_v7.h                         | 12 ++++--------
 user_setups/darwin_sdl/darwin_sdl_64bits.ini |  2 --
 user_setups/esp8266/_esp8266.ini             |  1 -
 user_setups/linux_sdl/linux_sdl_64bits.ini   |  2 --
 user_setups/win32/windows_sdl_64bits.ini     |  2 --
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/include/lv_conf_v7.h b/include/lv_conf_v7.h
index 41b7f824..c4f8fdab 100644
--- a/include/lv_conf_v7.h
+++ b/include/lv_conf_v7.h
@@ -82,27 +82,23 @@ typedef int16_t lv_coord_t;
 /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
 
 #ifndef LV_MEM_SIZE
-
 #if defined(ARDUINO_ARCH_ESP8266)
-#  define LV_MEM_SIZE    (10 * 1024U) // Minimum 10 Kb
+#  define LV_MEM_SIZE    (12 * 1024U) // Minimum 12 Kb
 #elif defined(ARDUINO_ARCH_ESP32)
 #  define LV_MEM_SIZE    (48 * 1024U)  // 48Kb is much better
 #else
-#  define LV_MEM_SIZE    (64 * 1024U)  // native app
+#  define LV_MEM_SIZE    (256 * 1024U) // native app
 #endif
-
 #endif // LV_MEM_SIZE
 
 #ifndef LV_VDB_SIZE
-
 #if defined(ARDUINO_ARCH_ESP8266)
-#  define LV_VDB_SIZE    (10 * 1024U) // Minimum 10 Kb
+#  define LV_VDB_SIZE    (8 * 1024U)   // Minimum 8 Kb
 #elif defined(ARDUINO_ARCH_ESP32)
 #  define LV_VDB_SIZE    (32 * 1024U)  // 32kB draw buffer
 #else
-#  define LV_VDB_SIZE    (64 * 1024U)  // native app
+#  define LV_VDB_SIZE    (128 * 1024U) // native app
 #endif
-
 #endif // LV_VDB_SIZE
 
 
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
index 1401c160..38bdb0ad 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
@@ -14,8 +14,6 @@ build_flags =
   ; SDL drivers options
   ;-D LV_LVGL_H_INCLUDE_SIMPLE
   ;-D LV_DRV_NO_CONF
-  -D LV_MEM_SIZE=262144U           ; 256kB lvgl memory
-  -D LV_VDB_SIZE=131072U           ; 128kB draw buffer
   -D USE_MONITOR
   -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
   -D USE_MOUSE
diff --git a/user_setups/esp8266/_esp8266.ini b/user_setups/esp8266/_esp8266.ini
index a9ca8a3f..e191f939 100644
--- a/user_setups/esp8266/_esp8266.ini
+++ b/user_setups/esp8266/_esp8266.ini
@@ -21,7 +21,6 @@ build_flags=
     ;-D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
     -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
 ; -- lvgl build options -----------------------------
-    -D LV_MEM_SIZE=12288U              ; 12kB lvgl memory
     -D LV_ATTRIBUTE_FAST_MEM=
     -D LV_ATTRIBUTE_TASK_HANDLER=
 ; -- ArduinoJson build options ----------------------------
diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini
index 452cb979..0c316008 100644
--- a/user_setups/linux_sdl/linux_sdl_64bits.ini
+++ b/user_setups/linux_sdl/linux_sdl_64bits.ini
@@ -13,8 +13,6 @@ build_flags =
   ; SDL drivers options
   ;-D LV_LVGL_H_INCLUDE_SIMPLE
   ;-D LV_DRV_NO_CONF
-  -D LV_MEM_SIZE=262144U           ; 256kB lvgl memory
-  -D LV_VDB_SIZE=131072U           ; 128kB draw buffer
   -D USE_MONITOR
   -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
   -D USE_MOUSE
diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
index 71794884..529f6fec 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -13,8 +13,6 @@ build_flags =
   ; SDL drivers options
   ;-D LV_LVGL_H_INCLUDE_SIMPLE
   ;-D LV_DRV_NO_CONF
-  -D LV_MEM_SIZE=262144U           ; 256kB lvgl memory
-  -D LV_VDB_SIZE=131072U           ; 128kB draw buffer
   -D USE_MONITOR
   -D MONITOR_ZOOM=1  ; can be fractional like 1.5 or 2
   -D USE_MOUSE