josh/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add bird app to build and switch calculator to weather in quickring

Browse Source
This commit is contained in:
Josh 2024-05-08 23:34:22 -04:00
parent e9ec7d4816
commit 5fc07724b6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/displayapp/DisplayApp.cpp
View File

@ -317,7 +317,7 @@ void DisplayApp::Refresh() {
}; };
if (!currentScreen->OnTouchEvent(gesture)) { if (!currentScreen->OnTouchEvent(gesture)) {
if (currentApp == Apps::Clock || currentApp == Apps::Music || currentApp == Apps::Calculator || currentApp == Apps::QuickSettings) { if (currentApp == Apps::Clock || currentApp == Apps::Music || currentApp == Apps::Weather || currentApp == Apps::QuickSettings) {
switch (gesture) { switch (gesture) {
case TouchEvents::SwipeUp: case TouchEvents::SwipeUp:
if (currentApp == Apps::Clock) { if (currentApp == Apps::Clock) {
@ -333,8 +333,8 @@ void DisplayApp::Refresh() {
if (currentApp == Apps::Clock) { if (currentApp == Apps::Clock) {
LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim); LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
} else if (currentApp == Apps::QuickSettings) { } else if (currentApp == Apps::QuickSettings) {
LoadNewScreen(Apps::Calculator, DisplayApp::FullRefreshDirections::RightAnim); LoadNewScreen(Apps::Weather, DisplayApp::FullRefreshDirections::RightAnim);
} else if (currentApp == Apps::Calculator) { } else if (currentApp == Apps::Weather) {
LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::RightAnim); LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::RightAnim);
} else { } else {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::RightAnim); LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::RightAnim);
@ -344,8 +344,8 @@ void DisplayApp::Refresh() {
if (currentApp == Apps::Clock) { if (currentApp == Apps::Clock) {
LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::LeftAnim); LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::LeftAnim);
} else if (currentApp == Apps::Music) { } else if (currentApp == Apps::Music) {
LoadNewScreen(Apps::Calculator, DisplayApp::FullRefreshDirections::LeftAnim); LoadNewScreen(Apps::Weather, DisplayApp::FullRefreshDirections::LeftAnim);
} else if (currentApp == Apps::Calculator) { } else if (currentApp == Apps::Weather) {
LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::LeftAnim); LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::LeftAnim);
} else { } else {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::LeftAnim); LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::LeftAnim);

1
src/displayapp/apps/CMakeLists.txt
View File

@ -17,6 +17,7 @@ else ()
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather") set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
#set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Calculator") #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Calculator")
#set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion") #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Bird")
set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware") set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware")
endif () endif ()