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

switched red flash light off night default
Some checks failed
Code formatting / test-format (pull_request) Failing after 20s
Details
Code formatting / test-clang-tidy (pull_request) Successful in 7m31s
Details
CI / build-firmware (pull_request) Successful in 5m39s
Details
CI / build-simulator (pull_request) Failing after 5s
Details
CI / get-base-ref-size (pull_request) Successful in 15m27s
Details
CI / Compare build size (pull_request) Successful in 5s
Details
PR comment / comment (pull_request) Failing after 17s
Details

Browse Source
This commit is contained in:
tofasthacker 2023-10-14 22:55:41 -04:00
parent bf8c4dfef8
commit 270d15a8ea
3 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/displayapp/DisplayApp.cpp
View File

@ -556,7 +556,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
touchPanel); touchPanel);
break; break;
case Apps::FlashLight: case Apps::FlashLight:
currentScreen = std::make_unique<Screens::FlashLight>(*systemTask, brightnessController, dateTimeController); currentScreen = std::make_unique<Screens::FlashLight>(*systemTask, brightnessController);
break; break;
case Apps::StopWatch: case Apps::StopWatch:
currentScreen = std::make_unique<Screens::StopWatch>(*systemTask); currentScreen = std::make_unique<Screens::StopWatch>(*systemTask);

31
src/displayapp/screens/FlashLight.cpp
View File

@ -15,24 +15,11 @@ namespace {
} }
} }
FlashLight::FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightnessController, Controllers::DateTime& dateTimeController) FlashLight::FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightnessController)
: systemTask {systemTask}, brightnessController {brightnessController}, dateTimeController {dateTimeController} { : systemTask {systemTask}, brightnessController {brightnessController} {
brightnessController.Set(Controllers::BrightnessController::Levels::Low); brightnessController.Set(Controllers::BrightnessController::Levels::Low);
int time_var = dateTimeController.Hours();
if(time_var > 21 || time_var < 6){
State_l = 1;
NRF_LOG_INFO("Loop Hour Red: %d", time_var);
}
else {
State_l = 0;
NRF_LOG_INFO("Loop Hour White: %d", time_var);
}
flashLight = lv_label_create(lv_scr_act(), nullptr); flashLight = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(flashLight, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48); lv_obj_set_style_local_text_font(flashLight, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_48);
lv_label_set_text_static(flashLight, Symbols::flashlight); lv_label_set_text_static(flashLight, Symbols::flashlight);
@ -152,16 +139,4 @@ bool FlashLight::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
} }
return false; return false;
} }
/*
time_var = dateTimeController.Minutes();
if (time_var == 30){
NRF_LOG_INFO("Short: %d", time_var);
motorController.RunForDuration(25);
}
else
{
NRF_LOG_INFO("Long: %d", time_var);
motorController.RunForDuration(200);
}
*/

7
src/displayapp/screens/FlashLight.h
View File

@ -2,7 +2,6 @@
#include "displayapp/screens/Screen.h" #include "displayapp/screens/Screen.h"
#include "components/brightness/BrightnessController.h" #include "components/brightness/BrightnessController.h"
#include "components/datetime/DateTimeController.h"
#include "systemtask/SystemTask.h" #include "systemtask/SystemTask.h"
#include <cstdint> #include <cstdint>
#include <lvgl/lvgl.h> #include <lvgl/lvgl.h>
@ -14,7 +13,7 @@ namespace Pinetime {
class FlashLight : public Screen { class FlashLight : public Screen {
public: public:
FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightness, Controllers::DateTime& dateTimeController); FlashLight(System::SystemTask& systemTask, Controllers::BrightnessController& brightness);
~FlashLight() override; ~FlashLight() override;
bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override; bool OnTouchEvent(Pinetime::Applications::TouchEvents event) override;
@ -26,14 +25,14 @@ namespace Pinetime {
Pinetime::System::SystemTask& systemTask; Pinetime::System::SystemTask& systemTask;
Controllers::BrightnessController& brightnessController; Controllers::BrightnessController& brightnessController;
Controllers::DateTime& dateTimeController;
Controllers::BrightnessController::Levels brightnessLevel = Controllers::BrightnessController::Levels::High; Controllers::BrightnessController::Levels brightnessLevel = Controllers::BrightnessController::Levels::High;
lv_obj_t* flashLight; lv_obj_t* flashLight;
lv_obj_t* backgroundAction; lv_obj_t* backgroundAction;
lv_obj_t* indicators[3]; lv_obj_t* indicators[3];
int State_l = 1; int State_l = 0;
}; };
} }
} }