Skip to content

Commit 19a2e71

Browse files
lovyan03lovyan03
authored
Merge pull request #435 from lovyan03/develop
Develop
2 parents 0cabacd + 67f8d49 commit 19a2e71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1490
-847
lines changed

‎.github/ISSUE_TEMPLATE/bug-report--------.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ assignees: ''
1717
- Bus type: [SPI|I2C|Parallel8|Parallel16|other]
1818
- LovyanGFX version: [v0.4.17|latest develop|other]
1919
- FrameWork version: [ArduinoESP32 v2.0.3|ESP-IDF v4.4|other]
20-
- Build Environment : [ArduinoIDE|PlatformIO|Eclipse|other]
20+
- Build Environment: [ArduinoIDE|PlatformIO|Eclipse|other]
2121
- Operating System: [Windows|Linux|macOS]
2222

2323
## Problem Description ( 問題の内容 )
@@ -36,6 +36,9 @@ assignees: ''
3636

3737
### Code to reproduce this issue ( 再現させるためのコード )
3838

39+
**Please submit complete source code that can reproduce your problem.**
40+
**あなたの問題を再現できる完全なソースコードを提示してください。**
41+
3942
```cpp
4043
// the code should be wrapped in the ```cpp tag so that it will be displayed better.
4144
#include "esp_log.h"

‎.github/scripts/SDL.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ file(GLOB Target_Files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} CONFIGURE_DEPENDS
1414
${LovyanGFX_DIR}/lgfx/v1/*.cpp
1515
${LovyanGFX_DIR}/lgfx/v1/misc/*.cpp
1616
${LovyanGFX_DIR}/lgfx/v1/panel/Panel_Device.cpp
17+
${LovyanGFX_DIR}/lgfx/v1/panel/Panel_FrameBufferBase.cpp
1718
${LovyanGFX_DIR}/lgfx/v1/platforms/sdl/*.cpp
1819
)
1920
add_executable (${PROJECT_NAME} ${Target_Files})

‎.github/workflows/IDFBuild.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
esp-idf-fqbn:
2929
- [email protected]
30-
- [email protected]
30+
#- [email protected].5 # esp-idf tools broken by cython/openOCD
3131
- [email protected]
3232
- [email protected]
3333
- [email protected]
@@ -37,20 +37,23 @@ jobs:
3737
- [email protected]
3838
- [email protected]
3939
- [email protected]
40+
- [email protected]
41+
- [email protected] # LGFX I2C not ready yet
4042

4143
include:
4244
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v4.1 }
43-
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v4.2 }
45+
#- { esp-idf-fqbn: [email protected].5, idf-board: esp32, idf-version: v4.2.5 }
4446
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v4.3.1 }
4547
- { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v4.4.4 }
4648
- { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v4.4.4 }
47-
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v5.0 }
48-
- { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v5.0 }
49-
- { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.0 }
50-
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v5.0.1 }
51-
- { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v5.0.1 }
52-
- { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.0.1 }
53-
49+
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v5.0 }
50+
- { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v5.0 }
51+
- { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.0 }
52+
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v5.0.1 }
53+
- { esp-idf-fqbn: [email protected], idf-board: esp32s2, idf-version: v5.0.1 }
54+
- { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.0.1 }
55+
- { esp-idf-fqbn: [email protected], idf-board: esp32, idf-version: v5.1 }
56+
- { esp-idf-fqbn: [email protected], idf-board: esp32s3, idf-version: v5.1 }
5457

5558
fail-fast: false
5659

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ This library has the following advantages.
108108
- M5Stack AtomDisplay
109109

110110
- タッチスクリーン TouchScreens
111+
- I2C CST816S
111112
- I2C FT5x06 (FT5206, FT5306, FT5406, FT6206, FT6236, FT6336, FT6436)
112113
- I2C GSLx680 (GSL1680)
113114
- I2C GT911

‎examples/Sprite/ClockSample/ClockSample.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ void loop(void)
168168
{
169169
static uint32_t p_milli = 0;
170170
uint32_t milli = lgfx::millis() % 1000;
171-
if (p_milli < milli) count += (milli - p_milli);
172-
else count += 1000 + (milli - p_milli);
171+
if (p_milli > milli) count += 1000 + (milli - p_milli);
172+
else count += (milli - p_milli);
173173
p_milli = milli;
174174

175175
int32_t tmp = (count % 1000) >> 3;

‎examples/Sprite/MeterSample/MeterSample.ino‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ static float zoom; // 表示倍率
1717

1818
void setup(void)
1919
{
20-
Serial.begin(115200);
21-
2220
lcd.init();
2321
int lw = std::min(lcd.width(), lcd.height());
2422

‎examples_for_PC/CMake_SDL/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
3939

4040
# SDL2を配置したパス内の.libファイルのパスを指定する;
4141
target_link_libraries(LGFX_SDL PUBLIC "C:/SDL2/lib/x64/SDL2.lib")
42-
target_link_libraries(LGFX_SDL PUBLIC "C:/SDL2/lib/x64/SDL2main.lib")
4342

4443

4544
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")

‎examples_for_PC/CMake_SDL/CMakeSettings.json‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1-
{
2-
"configurations": [
3-
{
4-
"name": "x64-Debug",
5-
"generator": "Ninja",
6-
"configurationType": "Debug",
7-
"inheritEnvironments": [ "clang_cl_x64_x64" ],
8-
"buildRoot": "${projectDir}\\out\\build\\${name}",
9-
"installRoot": "${projectDir}\\out\\install\\${name}",
10-
"cmakeCommandArgs": "",
11-
"buildCommandArgs": "",
12-
"ctestCommandArgs": ""
13-
}
14-
]
1+
{
2+
"configurations": [
3+
{
4+
"name": "x64-Debug",
5+
"generator": "Ninja",
6+
"configurationType": "Debug",
7+
"inheritEnvironments": [ "clang_cl_x64_x64" ],
8+
"buildRoot": "${projectDir}\\.out\\build\\${name}",
9+
"installRoot": "${projectDir}\\.out\\install\\${name}",
10+
"cmakeCommandArgs": "",
11+
"buildCommandArgs": "",
12+
"ctestCommandArgs": ""
13+
},
14+
{
15+
"name": "x64-Release",
16+
"generator": "Ninja",
17+
"configurationType": "Release",
18+
"buildRoot": "${projectDir}\\.out\\build\\${name}",
19+
"installRoot": "${projectDir}\\.out\\install\\${name}",
20+
"cmakeCommandArgs": "",
21+
"buildCommandArgs": "",
22+
"ctestCommandArgs": "",
23+
"inheritEnvironments": [ "clang_cl_x64_x64" ],
24+
"variables": []
25+
}
26+
]
1527
}

‎examples_for_PC/CMake_SDL/LGFX_SDL.cpp‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎examples_for_PC/CMake_SDL/sdl_main.cpp‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include <lgfx/v1/platforms/sdl/Panel_sdl.hpp>
2+
#if defined ( SDL_h_ )
3+
4+
void setup(void);
5+
void loop(void);
6+
7+
__attribute__((weak))
8+
int user_func(bool* running)
9+
{
10+
setup();
11+
do
12+
{
13+
loop();
14+
} while (*running);
15+
return 0;
16+
}
17+
18+
int main(int, char**)
19+
{
20+
return lgfx::Panel_sdl::main(user_func);
21+
}
22+
23+
#endif

0 commit comments

Comments
 (0)