From 959e2989ab7454060638e6cd347687628d149cfd Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Tue, 4 Jun 2024 21:56:44 +0200 Subject: [PATCH] latest code changes --- platformio.ini | 20 +++++++++++++++++++- src/gfx/lgfx.cpp | 2 +- src/gfx/lgfx.h | 2 +- src/gfx/lv_setup.cpp | 2 +- src/gfx/lv_setup.h | 2 +- src/main.cpp | 4 ++-- src/services/ble_service.cpp | 2 +- src/services/ble_service.h | 2 +- src/services/esp_now_service.cpp | 2 +- src/services/esp_now_service.h | 2 +- src/ui/screens/launch_screen.cpp | 2 +- src/ui/screens/launch_screen.h | 2 +- src/ui/screens/search_screen.cpp | 2 +- src/ui/screens/search_screen.h | 2 +- src/ui/widgets/status_bar_widget.cpp | 2 +- src/ui/widgets/status_bar_widget.h | 2 +- 16 files changed, 35 insertions(+), 17 deletions(-) diff --git a/platformio.ini b/platformio.ini index f5a39ba..6497405 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,7 +14,7 @@ name = OS-Railway Remote Control default_envs = wt32-sc01_plus [env] -platform = espressif32 @ ^6.3.2 +platform = espressif32 @ ^6.5.0 framework = arduino [env:wt32-sc01_plus] @@ -35,3 +35,21 @@ lib_deps = lovyan03/LovyanGFX @ ^1.1.8 lvgl/lvgl @ ^8.3.9 me-no-dev/AsyncTCP @ ^1.1.1 + +[env:waveshare-esp32s3-43] +board = wt32-sc01_plus +board_build.partitions = partitions.csv +build_flags = + -D CORE_DEBUG_LEVEL=4 + -D SCREEN_WIDTH=800 + -D SCREEN_HEIGHT=480 + -D ESP32S3 + -D BOARD_HAS_PSRAM + -D ARDUINO_USB_CDC_ON_BOOT + -D LV_CONF_INCLUDE_SIMPLE + -I include/ +lib_ldf_mode = deep +lib_deps = + lovyan03/LovyanGFX @ ^1.1.8 + lvgl/lvgl @ ^8.3.9 + me-no-dev/AsyncTCP @ ^1.1.1 diff --git a/src/gfx/lgfx.cpp b/src/gfx/lgfx.cpp index 9b1c5b6..a473e84 100644 --- a/src/gfx/lgfx.cpp +++ b/src/gfx/lgfx.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/gfx/lgfx.h b/src/gfx/lgfx.h index 029b3b3..4ae2490 100644 --- a/src/gfx/lgfx.h +++ b/src/gfx/lgfx.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/gfx/lv_setup.cpp b/src/gfx/lv_setup.cpp index e7d0f61..290b07f 100644 --- a/src/gfx/lv_setup.cpp +++ b/src/gfx/lv_setup.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/gfx/lv_setup.h b/src/gfx/lv_setup.h index 031c35c..be24fb5 100644 --- a/src/gfx/lv_setup.h +++ b/src/gfx/lv_setup.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/main.cpp b/src/main.cpp index 17370cc..159c7fa 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by @@ -52,5 +52,5 @@ void loop() { lv_handler(); - check_display_off(); + // check_display_off(); } diff --git a/src/services/ble_service.cpp b/src/services/ble_service.cpp index 019b2f4..1a1399e 100644 --- a/src/services/ble_service.cpp +++ b/src/services/ble_service.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/services/ble_service.h b/src/services/ble_service.h index 0cb5d9d..324e2a5 100644 --- a/src/services/ble_service.h +++ b/src/services/ble_service.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/services/esp_now_service.cpp b/src/services/esp_now_service.cpp index 8691991..56e1145 100644 --- a/src/services/esp_now_service.cpp +++ b/src/services/esp_now_service.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/services/esp_now_service.h b/src/services/esp_now_service.h index efb5d4f..6d49be8 100644 --- a/src/services/esp_now_service.h +++ b/src/services/esp_now_service.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/ui/screens/launch_screen.cpp b/src/ui/screens/launch_screen.cpp index 29adcfe..cfa2f17 100644 --- a/src/ui/screens/launch_screen.cpp +++ b/src/ui/screens/launch_screen.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/ui/screens/launch_screen.h b/src/ui/screens/launch_screen.h index 8841787..982de0a 100644 --- a/src/ui/screens/launch_screen.h +++ b/src/ui/screens/launch_screen.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/ui/screens/search_screen.cpp b/src/ui/screens/search_screen.cpp index a0bc595..12b5041 100644 --- a/src/ui/screens/search_screen.cpp +++ b/src/ui/screens/search_screen.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/ui/screens/search_screen.h b/src/ui/screens/search_screen.h index 38d1002..6eb5cce 100644 --- a/src/ui/screens/search_screen.h +++ b/src/ui/screens/search_screen.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/ui/widgets/status_bar_widget.cpp b/src/ui/widgets/status_bar_widget.cpp index 9da53ae..fe08ac5 100644 --- a/src/ui/widgets/status_bar_widget.cpp +++ b/src/ui/widgets/status_bar_widget.cpp @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by diff --git a/src/ui/widgets/status_bar_widget.h b/src/ui/widgets/status_bar_widget.h index 11da677..402ad29 100644 --- a/src/ui/widgets/status_bar_widget.h +++ b/src/ui/widgets/status_bar_widget.h @@ -1,6 +1,6 @@ //---------------------------------------------------------------------------- // OS-Railway - Remote Control -// Copyright (C) 2023 Peter Siegmund (https://mars3142.dev) +// Copyright (C) 2023-2024 Peter Siegmund (https://mars3142.dev) // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU Affero General Public License as published by