From 59234cd1456bfc22f6bb41cd304db08e16f9f5a6 Mon Sep 17 00:00:00 2001 From: "kkoenig1@optonline.com" Date: Wed, 25 Aug 2021 07:15:58 -0400 Subject: [PATCH 01/10] Modified mask_key_backspace.png. These bitmaps should have no extra padding around them. IMHO Modified horus target to add SOFTWARE_KEYBOARD. --- .../src/bitmaps/480x272/mask_key_backspace.png | Bin 427 -> 373 bytes radio/src/targets/horus/CMakeLists.txt | 11 +++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/radio/src/bitmaps/480x272/mask_key_backspace.png b/radio/src/bitmaps/480x272/mask_key_backspace.png index a8361a9f26a1207be5e1135f7538cab8bbd95ab0..f1cb0529bf145e340a390e3e83f5caa04a07ab4d 100644 GIT binary patch literal 373 zcmV-*0gC>KP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5dZ)S5dnW>Uy%R+0SZY(K~yMHm6Fd< z!cY*#KT<#%;2~#d04x9+kkR1?b^ypp;v{khEC35gxZpTr67OmO!~*gPAZZ}D>w8S% zAH?73?KitSyZgOT_5l=Wnqq1@5EY@6!^l_y)IifczsQm#QPJNlX0yyt%`kNwOl~Zg zrpd9C5@8VVTk{@8tmokdRNQK}QLEQkB!mzM{QxV^rWJldkNxx<;_c;izfJ+VX0+L4 zx3f9O}iQlIafn2>}?EupA-H=!A5eSaoWWFa;cQ#DEvf%yrm#N00000NkvXXu0mjf3;~)O literal 427 zcmV;c0aX5pP)KQ&CRBKoETxzUu*84`8pMi3gB~dI-|Az(19LO8@cG zXj%_Ixd0xZ+XE~Ya4#@^Y+1Hti(oJ&#`iTd`{vEe?re*Qu*L}hDP17vM2td#CKtySh5K%mxT1IHpvV`od z?Unj9uizZOBFnU`$Jp@3VR+%X02pHcIOn_i(*g=-jNNoP2h8!K^B#fMHl1P6XXng} z^gOS$XpP6wh=_y`%GHKK$y4j1Fz^GFW1{TObzNP{Id$ZRtT(7LviY2vQMuCfgkWZKR`|)O_HbCtm(8#?thKHk5AS* V(Yq Date: Wed, 25 Aug 2021 14:57:08 -0400 Subject: [PATCH 02/10] updatedd submodule to my branch --- .gitmodules | 2 +- radio/src/thirdparty/libopenui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1da1a8370..730cb2dd1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "libopenui"] path = radio/src/thirdparty/libopenui - url = https://github.com/EdgeTX/libopenui.git + url = https://github.com/kevinkoenig/libopenui.git branch = master [submodule "radio/src/thirdparty/AccessDenied"] path = radio/src/thirdparty/AccessDenied diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 5c708913e..a20b7000c 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 5c708913e7e2fe370c61e1b1cc13df0a4003501d +Subproject commit a20b7000ccc4521d3ececc6fbfb6b595d85d9970 From aacd54ad777ef18142cd429cc9a4a6e343abdf17 Mon Sep 17 00:00:00 2001 From: "kkoenig1@optonline.com" Date: Thu, 26 Aug 2021 17:26:46 -0400 Subject: [PATCH 03/10] trying to fix scrolling to correct positon when keyboard pops up --- radio/src/thirdparty/libopenui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index a20b7000c..cdf0270be 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit a20b7000ccc4521d3ececc6fbfb6b595d85d9970 +Subproject commit cdf0270be665f254b8c55eeba7792dce256e86da From 2b23087ebf3d5c53002957d2a6081d6f50f7af19 Mon Sep 17 00:00:00 2001 From: "kkoenig1@optonline.com" Date: Thu, 26 Aug 2021 17:27:39 -0400 Subject: [PATCH 04/10] fix issues with scrolling --- radio/src/thirdparty/libopenui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index cdf0270be..85dc6fc24 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit cdf0270be665f254b8c55eeba7792dce256e86da +Subproject commit 85dc6fc240fc5120d6c5a981b70d454b5ca167bb From 7ce9ec401fdcb7642428636b59f7b4268b115a4c Mon Sep 17 00:00:00 2001 From: kevinkoenig Date: Sat, 28 Aug 2021 08:15:13 -0400 Subject: [PATCH 05/10] just committing --- radio/src/thirdparty/libopenui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 85dc6fc24..86c914a9a 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 85dc6fc240fc5120d6c5a981b70d454b5ca167bb +Subproject commit 86c914a9a18c2d74f8085dd6d9c8af7d3df22d26 From 4d66260d393015149da5f5d740d7f3639fa495df Mon Sep 17 00:00:00 2001 From: kevinkoenig Date: Sun, 29 Aug 2021 09:01:24 -0400 Subject: [PATCH 06/10] updated branch in gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 730cb2dd1..9113792ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "libopenui"] path = radio/src/thirdparty/libopenui url = https://github.com/kevinkoenig/libopenui.git - branch = master + branch = software-keyboard [submodule "radio/src/thirdparty/AccessDenied"] path = radio/src/thirdparty/AccessDenied url = https://github.com/raphaelcoeffic/AccessDenied.git From 8b5dd5a4ba9f301f72365d26ab416fb0bba41b22 Mon Sep 17 00:00:00 2001 From: kevinkoenig Date: Mon, 30 Aug 2021 04:36:20 -0400 Subject: [PATCH 07/10] fixed potential compilation issues --- radio/src/thirdparty/libopenui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 86c914a9a..cd0c54b3d 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 86c914a9a18c2d74f8085dd6d9c8af7d3df22d26 +Subproject commit cd0c54b3d818aef5c22d97070395f0a6e4fe370e From a710614d9bbc7414358d0bb9e1863d9b260379e4 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Mon, 30 Aug 2021 21:24:10 +1000 Subject: [PATCH 08/10] Reattach to EdgeTX libopenui master and udpate --- .gitmodules | 4 ++-- radio/src/thirdparty/libopenui | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9113792ed..1da1a8370 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "libopenui"] path = radio/src/thirdparty/libopenui - url = https://github.com/kevinkoenig/libopenui.git - branch = software-keyboard + url = https://github.com/EdgeTX/libopenui.git + branch = master [submodule "radio/src/thirdparty/AccessDenied"] path = radio/src/thirdparty/AccessDenied url = https://github.com/raphaelcoeffic/AccessDenied.git diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index cd0c54b3d..88ff6b8e7 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit cd0c54b3d818aef5c22d97070395f0a6e4fe370e +Subproject commit 88ff6b8e7152537804497f86202a2b92c17187ad From 2b457637e66e10374cbb63ce0c5ae9a2c22c16a0 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Mon, 30 Aug 2021 21:26:18 +1000 Subject: [PATCH 09/10] Manually re-add #617 build options --- radio/src/targets/horus/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 8a9c6c256..5d4a48f5f 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -1,6 +1,7 @@ option(DISK_CACHE "Enable SD card disk cache" ON) option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON) option(FLYSKY_HALL_STICKS "Enable FlySky Hall Sticks" OFF) +option(IMU_LSM6DS33 "Enable I2C2 and LSM6DS33 IMU" OFF) option(PXX1 "PXX1 protocol support" ON) option(PXX2 "PXX2 protocol support" OFF) option(AFHDS3 "AFHDS3 TX Module" ON) @@ -191,6 +192,12 @@ if(FLYSKY_HALL_STICKS) set(FLYSKY_HALL_STICKS_DRIVER flyskyHallStick_driver.cpp) endif() +if(IMU_LSM6DS33) + add_definitions(-DIMU_LSM6DS33) + set(AUX_SERIAL OFF) + set(IMU_LSM6DS33_DRIVER imu_lsm6ds33.cpp) +endif() + if(HARDWARE_EXTERNAL_MODULE) add_definitions(-DHARDWARE_EXTERNAL_MODULE) endif() @@ -280,6 +287,7 @@ set(FIRMWARE_TARGET_SRC ${LCD_DRIVER} ${AUX_SERIAL_DRIVER} ${FLYSKY_HALL_STICKS_DRIVER} + ${IMU_LSM6DS33_DRIVER} ${TOUCH_DRIVER} board.cpp backlight_driver.cpp From bc8c3c60e18ca1c7d1763fdc9db42dce3d34d7a5 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Mon, 30 Aug 2021 22:56:01 +1000 Subject: [PATCH 10/10] Revert to 5c70891 of libopenui --- radio/src/thirdparty/libopenui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 88ff6b8e7..5c708913e 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 88ff6b8e7152537804497f86202a2b92c17187ad +Subproject commit 5c708913e7e2fe370c61e1b1cc13df0a4003501d