From 26ce12f6d2bc783f06be483eb7566d84bad3c267 Mon Sep 17 00:00:00 2001 From: redgl0w Date: Fri, 6 Dec 2019 19:34:36 +0100 Subject: [PATCH 1/8] Applied and modified https://github.com/0b101/epsilon/commit/d50bd08444cc6e108363011b80a99bcb189639aa\#diff-4f54cda3940834a07cd7f83ea12ebd85 --- apps/apps_container.cpp | 6 ++++++ ion/include/ion/events.h | 3 +++ ion/include/ion/keyboard/layout_B2/layout_events.h | 4 ++-- ion/include/ion/keyboard/layout_B3/layout_events.h | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index 776153935..64dae4972 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -218,6 +218,12 @@ bool AppsContainer::processEvent(Ion::Events::Event event) { suspend(true); return true; } + if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus) { + int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates; + int direction = (event == Ion::Events::BrightnessPlus) ? delta : -delta; + GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction); + return true; + } return false; } diff --git a/ion/include/ion/events.h b/ion/include/ion/events.h index 1ce72c76d..d8ea02f70 100644 --- a/ion/include/ion/events.h +++ b/ion/include/ion/events.h @@ -139,6 +139,9 @@ constexpr Event Equal = Event::ShiftKey(Keyboard::Key::Pi); constexpr Event Lower = Event::ShiftKey(Keyboard::Key::Sqrt); constexpr Event Greater = Event::ShiftKey(Keyboard::Key::Square); +constexpr Event BrightnessPlus = Event::ShiftKey(Keyboard::Key::LeftParenthesis); +constexpr Event BrightnessMinus = Event::ShiftKey(Keyboard::Key::RightParenthesis); + constexpr Event ShiftSeven = Event::ShiftKey(Keyboard::Key::Seven); constexpr Event ShiftEight = Event::ShiftKey(Keyboard::Key::Eight); constexpr Event ShiftNine = Event::ShiftKey(Keyboard::Key::Nine); diff --git a/ion/include/ion/keyboard/layout_B2/layout_events.h b/ion/include/ion/keyboard/layout_B2/layout_events.h index a0d877cd5..be88b3ba9 100644 --- a/ion/include/ion/keyboard/layout_B2/layout_events.h +++ b/ion/include/ion/keyboard/layout_B2/layout_events.h @@ -27,7 +27,7 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = { T("asin(\x11)"), T("acos(\x11)"), T("atan(\x11)"), T("="), T("<"), T(">"), TL(), TL(), TL(), U(), U(), U(), TL(), TL(), TL(), U(), U(), U(), - TL(), TL(), TL(), U(), U(), U(), + TL(), TL(), TL(), TL(), TL(), U(), U(), U(), U(), U(), U(), U(), // Alpha U(), U(), U(), U(), U(), U(), @@ -72,7 +72,7 @@ static constexpr const char * s_nameForEvent[255] = { "Arcsine", "Arccosine", "Arctangent", "Equal", "Lower", "Greater", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, "BrightnessPlus", "BrightnessMinus", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //Alpha, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, diff --git a/ion/include/ion/keyboard/layout_B3/layout_events.h b/ion/include/ion/keyboard/layout_B3/layout_events.h index 1783ff7a3..a1f9502fa 100644 --- a/ion/include/ion/keyboard/layout_B3/layout_events.h +++ b/ion/include/ion/keyboard/layout_B3/layout_events.h @@ -27,7 +27,7 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = { T("asin(\x11)"), T("acos(\x11)"), T("atan(\x11)"), T("="), T("<"), T(">"), TL(), TL(), TL(), U(), U(), U(), TL(), TL(), TL(), U(), U(), U(), - TL(), TL(), TL(), U(), U(), U(), + TL(), TL(), TL(), TL(), TL(), U(), U(), U(), U(), U(), U(), U(), // Alpha U(), U(), U(), U(), U(), U(), @@ -72,7 +72,7 @@ static constexpr const char * s_nameForEvent[255] = { "Arcsine", "Arccosine", "Arctangent", "Equal", "Lower", "Greater", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, - nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, "BrightnessPlus", "BrightnessMinus", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //Alpha, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, From 5cd3fa92c3f59317485effb5c5f740a8a12bae37 Mon Sep 17 00:00:00 2001 From: redgl0w Date: Fri, 6 Dec 2019 19:48:51 +0100 Subject: [PATCH 2/8] Corrected last commit --- ion/include/ion/events.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ion/include/ion/events.h b/ion/include/ion/events.h index d8ea02f70..9e4edc24b 100644 --- a/ion/include/ion/events.h +++ b/ion/include/ion/events.h @@ -139,8 +139,8 @@ constexpr Event Equal = Event::ShiftKey(Keyboard::Key::Pi); constexpr Event Lower = Event::ShiftKey(Keyboard::Key::Sqrt); constexpr Event Greater = Event::ShiftKey(Keyboard::Key::Square); -constexpr Event BrightnessPlus = Event::ShiftKey(Keyboard::Key::LeftParenthesis); -constexpr Event BrightnessMinus = Event::ShiftKey(Keyboard::Key::RightParenthesis); +constexpr Event BrightnessPlus = Event::ShiftKey(Keyboard::Key::Plus); +constexpr Event BrightnessMinus = Event::ShiftKey(Keyboard::Key::Minus); constexpr Event ShiftSeven = Event::ShiftKey(Keyboard::Key::Seven); constexpr Event ShiftEight = Event::ShiftKey(Keyboard::Key::Eight); From 2568a852e7b5ba90c55d515bed4537f30603d2b0 Mon Sep 17 00:00:00 2001 From: redgl0w Date: Fri, 6 Dec 2019 20:21:50 +0100 Subject: [PATCH 3/8] Changed settings reloading --- apps/settings/main_controller.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 59ac61ca8..5bf462beb 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -36,6 +36,10 @@ void MainController::didBecomeFirstResponder() { bool MainController::handleEvent(Ion::Events::Event event) { GlobalPreferences * globalPreferences = GlobalPreferences::sharedGlobalPreferences(); + if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus){ + m_selectableTableView.reloadData(); + return false; + } if (model()->children(selectedRow())->numberOfChildren() == 0) { if (model()->children(selectedRow())->label() == promptMessage()) { if (event == Ion::Events::OK || event == Ion::Events::EXE) { From 8d3e1c2154c065b50c465a0be3c5cb0de9218f64 Mon Sep 17 00:00:00 2001 From: redgl0w Date: Fri, 6 Dec 2019 20:30:55 +0100 Subject: [PATCH 4/8] Added and corrected https://github.com/Omega-Numworks/Omega/pull/80 --- ion/include/ion/events.h | 2 ++ ion/include/ion/keyboard/layout_B2/layout_events.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ion/include/ion/events.h b/ion/include/ion/events.h index 9e4edc24b..92905e9ca 100644 --- a/ion/include/ion/events.h +++ b/ion/include/ion/events.h @@ -142,6 +142,8 @@ constexpr Event Greater = Event::ShiftKey(Keyboard::Key::Square); constexpr Event BrightnessPlus = Event::ShiftKey(Keyboard::Key::Plus); constexpr Event BrightnessMinus = Event::ShiftKey(Keyboard::Key::Minus); +constexpr Event DoubleParenthesis = Event::ShiftKey(Keyboard::Key::LeftParenthesis); + constexpr Event ShiftSeven = Event::ShiftKey(Keyboard::Key::Seven); constexpr Event ShiftEight = Event::ShiftKey(Keyboard::Key::Eight); constexpr Event ShiftNine = Event::ShiftKey(Keyboard::Key::Nine); diff --git a/ion/include/ion/keyboard/layout_B2/layout_events.h b/ion/include/ion/keyboard/layout_B2/layout_events.h index be88b3ba9..3a1f75260 100644 --- a/ion/include/ion/keyboard/layout_B2/layout_events.h +++ b/ion/include/ion/keyboard/layout_B2/layout_events.h @@ -25,7 +25,7 @@ static constexpr EventData s_dataForEvent[4*Event::PageSize] = { U(), U(), TL(), TL(), TL(), TL(), T("["), T("]"), T("{"), T("}"), T("_"), T("→"), T("asin(\x11)"), T("acos(\x11)"), T("atan(\x11)"), T("="), T("<"), T(">"), - TL(), TL(), TL(), U(), U(), U(), + TL(), TL(), TL(), T("(\x11)"), U(), U(), TL(), TL(), TL(), U(), U(), U(), TL(), TL(), TL(), TL(), TL(), U(), U(), U(), U(), U(), U(), U(), @@ -70,7 +70,7 @@ static constexpr const char * s_nameForEvent[255] = { nullptr, "AlphaLock", "Cut", "Copy", "Paste", "Clear", "LeftBracket", "RightBracket", "LeftBrace", "RightBrace", "Underscore", "Sto", "Arcsine", "Arccosine", "Arctangent", "Equal", "Lower", "Greater", - nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, + nullptr, nullptr, nullptr, nullptr, "DoubleParenthesis", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, "BrightnessPlus", "BrightnessMinus", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, From 094dff8518c9acbdca0983df2c83b489f3026757 Mon Sep 17 00:00:00 2001 From: RedGl0w Date: Sat, 7 Dec 2019 12:49:58 +0100 Subject: [PATCH 5/8] https://github.com/Omega-Numworks/Omega/pull/81\#issuecomment-561861710 --- apps/apps_container.cpp | 2 +- apps/apps_container.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index 64dae4972..b659db945 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -220,7 +220,7 @@ bool AppsContainer::processEvent(Ion::Events::Event event) { } if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus) { int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates; - int direction = (event == Ion::Events::BrightnessPlus) ? delta : -delta; + int direction = (event == Ion::Events::BrightnessPlus) ? NumberOfStepsForShiftPlusMinus*delta : -delta*NumberOfStepsForShiftPlusMinus; GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction); return true; } diff --git a/apps/apps_container.h b/apps/apps_container.h index 87c0adea6..60efccdd9 100644 --- a/apps/apps_container.h +++ b/apps/apps_container.h @@ -78,6 +78,7 @@ private: OnBoarding::App::Snapshot m_onBoardingSnapshot; HardwareTest::App::Snapshot m_hardwareTestSnapshot; USB::App::Snapshot m_usbConnectedSnapshot; + const int NumberOfStepsForShiftPlusMinus = 3; }; #endif From d3215a5e3047b3fdfb26e7ad71854cff19ee61e3 Mon Sep 17 00:00:00 2001 From: RedGl0w Date: Sat, 7 Dec 2019 12:53:21 +0100 Subject: [PATCH 6/8] Corrected shift --- apps/apps_container.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index b659db945..4a9afed0b 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -222,7 +222,6 @@ bool AppsContainer::processEvent(Ion::Events::Event event) { int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates; int direction = (event == Ion::Events::BrightnessPlus) ? NumberOfStepsForShiftPlusMinus*delta : -delta*NumberOfStepsForShiftPlusMinus; GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction); - return true; } return false; } From f6aab242a2777d59ddfa2e6bd587da9ab1bf7d59 Mon Sep 17 00:00:00 2001 From: RedGl0w Date: Sun, 8 Dec 2019 11:09:57 +0100 Subject: [PATCH 7/8] Corrected settings update --- apps/settings/main_controller.cpp | 7 +++++-- apps/settings/main_controller.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 5bf462beb..59d5075ec 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -37,8 +37,11 @@ void MainController::didBecomeFirstResponder() { bool MainController::handleEvent(Ion::Events::Event event) { GlobalPreferences * globalPreferences = GlobalPreferences::sharedGlobalPreferences(); if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus){ - m_selectableTableView.reloadData(); - return false; + int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates; + int direction = (event == Ion::Events::BrightnessPlus) ? NumberOfStepsForShiftPlusMinus*delta : -delta*NumberOfStepsForShiftPlusMinus; + GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction); + m_selectableTableView.reloadCellAtLocation(m_selectableTableView.selectedColumn(), 1); + return true; } if (model()->children(selectedRow())->numberOfChildren() == 0) { if (model()->children(selectedRow())->label() == promptMessage()) { diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 2a371b0c9..b6bf9c7d6 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -42,6 +42,7 @@ private: AccessibilityController m_accessibilityController; ExamModeController m_examModeController; AboutController m_aboutController; + const int NumberOfStepsForShiftPlusMinus = 3; }; } From 1442e6977d847c98f66e722aa5a6fa15d87fd5e4 Mon Sep 17 00:00:00 2001 From: RedGl0w Date: Sun, 8 Dec 2019 18:18:28 +0100 Subject: [PATCH 8/8] Simplified code --- apps/apps_container.cpp | 3 ++- apps/apps_container.h | 1 - apps/settings/main_controller.cpp | 3 ++- apps/settings/main_controller.h | 1 - ion/include/ion/backlight.h | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index 4a9afed0b..c352f44c4 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -4,6 +4,7 @@ #include #include #include +#include extern "C" { #include @@ -220,7 +221,7 @@ bool AppsContainer::processEvent(Ion::Events::Event event) { } if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus) { int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates; - int direction = (event == Ion::Events::BrightnessPlus) ? NumberOfStepsForShiftPlusMinus*delta : -delta*NumberOfStepsForShiftPlusMinus; + int direction = (event == Ion::Events::BrightnessPlus) ? Ion::Backlight::NumberOfStepsPerShortcut*delta : -delta*Ion::Backlight::NumberOfStepsPerShortcut; GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction); } return false; diff --git a/apps/apps_container.h b/apps/apps_container.h index 60efccdd9..87c0adea6 100644 --- a/apps/apps_container.h +++ b/apps/apps_container.h @@ -78,7 +78,6 @@ private: OnBoarding::App::Snapshot m_onBoardingSnapshot; HardwareTest::App::Snapshot m_hardwareTestSnapshot; USB::App::Snapshot m_usbConnectedSnapshot; - const int NumberOfStepsForShiftPlusMinus = 3; }; #endif diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 59d5075ec..12419bc55 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -2,6 +2,7 @@ #include "../global_preferences.h" #include #include +#include using namespace Poincare; @@ -38,7 +39,7 @@ bool MainController::handleEvent(Ion::Events::Event event) { GlobalPreferences * globalPreferences = GlobalPreferences::sharedGlobalPreferences(); if (event == Ion::Events::BrightnessPlus || event == Ion::Events::BrightnessMinus){ int delta = Ion::Backlight::MaxBrightness/GlobalPreferences::NumberOfBrightnessStates; - int direction = (event == Ion::Events::BrightnessPlus) ? NumberOfStepsForShiftPlusMinus*delta : -delta*NumberOfStepsForShiftPlusMinus; + int direction = (event == Ion::Events::BrightnessPlus) ? Ion::Backlight::NumberOfStepsPerShortcut*delta : -delta*Ion::Backlight::NumberOfStepsPerShortcut; GlobalPreferences::sharedGlobalPreferences()->setBrightnessLevel(GlobalPreferences::sharedGlobalPreferences()->brightnessLevel()+direction); m_selectableTableView.reloadCellAtLocation(m_selectableTableView.selectedColumn(), 1); return true; diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index b6bf9c7d6..2a371b0c9 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -42,7 +42,6 @@ private: AccessibilityController m_accessibilityController; ExamModeController m_examModeController; AboutController m_aboutController; - const int NumberOfStepsForShiftPlusMinus = 3; }; } diff --git a/ion/include/ion/backlight.h b/ion/include/ion/backlight.h index cd69ee888..89a19687c 100644 --- a/ion/include/ion/backlight.h +++ b/ion/include/ion/backlight.h @@ -12,6 +12,7 @@ bool isInitialized(); void shutdown(); void setBrightness(uint8_t b); uint8_t brightness(); +const int NumberOfStepsPerShortcut = 4; } }