From aff19396fead207f191e64270db1447659cee741 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Tue, 9 Mar 2021 23:12:08 +0100
Subject: [PATCH] Rename Windows SDL environment

---
 src/dev/win32/hasp_win32.cpp                  |  6 ++++--
 tools/windows_build_extra.py                  |  2 ++
 ...ator_64bits.ini => windows_sdl_64bits.ini} | 21 ++++++++++---------
 3 files changed, 17 insertions(+), 12 deletions(-)
 rename user_setups/win32/{emulator_64bits.ini => windows_sdl_64bits.ini} (79%)

diff --git a/src/dev/win32/hasp_win32.cpp b/src/dev/win32/hasp_win32.cpp
index a1992dce..7aa1c93a 100644
--- a/src/dev/win32/hasp_win32.cpp
+++ b/src/dev/win32/hasp_win32.cpp
@@ -49,7 +49,8 @@ const char* Win32Device::get_hostname()
 void Win32Device::set_hostname(const char* hostname)
 {
     _hostname = hostname;
-    SDL_SetWindowTitle(monitor.window, hostname);
+    monitor_title(hostname);
+    // SDL_SetWindowTitle(monitor.window, hostname);
 }
 const char* Win32Device::get_core_version()
 {
@@ -94,7 +95,8 @@ bool Win32Device::get_backlight_power()
 
 void Win32Device::update_backlight()
 {
-    monitor_backlight(_backlight_power ? map(_backlight_level, 0, 100, 0, 255) : 0);
+    uint8_t level = _backlight_power ? map(_backlight_level, 0, 100, 0, 255) : 0;
+    monitor_backlight(level);
 }
 
 size_t Win32Device::get_free_max_block()
diff --git a/tools/windows_build_extra.py b/tools/windows_build_extra.py
index 4f1c18e4..72e4d78f 100644
--- a/tools/windows_build_extra.py
+++ b/tools/windows_build_extra.py
@@ -1,3 +1,5 @@
+Import("env", "projenv")
+
 env.Append(
   LINKFLAGS=[
       "-static",
diff --git a/user_setups/win32/emulator_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
similarity index 79%
rename from user_setups/win32/emulator_64bits.ini
rename to user_setups/win32/windows_sdl_64bits.ini
index d05cbad2..9245c7ca 100644
--- a/user_setups/win32/emulator_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -1,4 +1,4 @@
-[env:emulator_64bits]
+[env:windows_sdl_64bits]
 platform = native@^1.1.3
 extra_scripts = 
   tools/sdl2_build_extra.py
@@ -41,8 +41,8 @@ build_flags =
   -DCMAKE_BUILD_TYPE=Release
   -DCMAKE_VERBOSE_MAKEFILE=TRUE
   ;-D NO_PERSISTENCE
-  -I.pio/libdeps/emulator_64bits/paho/src
-  -I.pio/libdeps/emulator_64bits/ArduinoJson/src
+  -I.pio/libdeps/windows_sdl_64bits/paho/src
+  -I.pio/libdeps/windows_sdl_64bits/ArduinoJson/src
   -I lib/ArduinoJson/src
   -I lib/lv_fs_if
   !python -c "import os; print(' '.join(['-I {}'.format(i[0].replace('\x5C','/')) for i in os.walk('hal/sdl2')]))"
@@ -77,6 +77,7 @@ lib_deps =
   ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
   https://github.com/eclipse/paho.mqtt.c.git
   bblanchon/ArduinoJson@^6.17.2    ; Json(l) parser
+  https://github.com/fvanroie/lv_drivers
 
 lib_ignore =
   paho
@@ -87,12 +88,12 @@ src_filter =
   +<*>
   -<*.h>
   +<../hal/sdl2>
-  +<../.pio/libdeps/emulator_64bits/paho/src/*.c>
-  +<../.pio/libdeps/emulator_64bits/paho/src/MQTTClient.c>
-  -<../.pio/libdeps/emulator_64bits/paho/src/MQTTAsync.c>
-  -<../.pio/libdeps/emulator_64bits/paho/src/MQTTAsyncUtils.c>
-  -<../.pio/libdeps/emulator_64bits/paho/src/MQTTVersion.c>
-  -<../.pio/libdeps/emulator_64bits/paho/src/SSLSocket.c>
+  +<../.pio/libdeps/windows_sdl_64bits/paho/src/*.c>
+  +<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTClient.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsync.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTAsyncUtils.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/MQTTVersion.c>
+  -<../.pio/libdeps/windows_sdl_64bits/paho/src/SSLSocket.c>
   +<MQTTClient.c>
   -<MQTTAsync.c>
   -<MQTTAsyncUtils.c>
@@ -112,4 +113,4 @@ src_filter =
   +<lang/>
   -<log/>
   +<mqtt/>
-  +<../.pio/libdeps/emulator_64bits/ArduinoJson/src/ArduinoJson.h>
+  +<../.pio/libdeps/windows_sdl_64bits/ArduinoJson/src/ArduinoJson.h>