haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 23:21:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse source
This commit is contained in:
liamcharger 2024-06-02 14:49:25 -04:00 committed by GitHub
parent de35e38bba 9e406c70f9
commit 75f6556d3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/displayapp/DisplayApp.cpp
View file

@ -125,6 +125,7 @@ void DisplayApp::Start(System::BootErrors error) {
bootError = error; bootError = error;
lvgl.Init(); lvgl.Init();
motorController.Init();
if (error == System::BootErrors::TouchController) { if (error == System::BootErrors::TouchController) {
LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None); LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None);
@ -150,7 +151,6 @@ void DisplayApp::Process(void* instance) {
void DisplayApp::InitHw() { void DisplayApp::InitHw() {
brightnessController.Init(); brightnessController.Init();
ApplyBrightness(); ApplyBrightness();
motorController.Init();
lcd.Init(); lcd.Init();
} }

7
src/drivers/Bma421.cpp
View file

@ -126,13 +126,6 @@ Bma421::Values Bma421::Process() {
uint32_t steps = 0; uint32_t steps = 0;
bma423_step_counter_output(&steps, &bma); bma423_step_counter_output(&steps, &bma);
int32_t temperature;
bma4_get_temperature(&temperature, BMA4_DEG, &bma);
temperature = temperature / 1000;
uint8_t activity = 0;
bma423_activity_output(&activity, &bma);
// X and Y axis are swapped because of the way the sensor is mounted in the PineTime // X and Y axis are swapped because of the way the sensor is mounted in the PineTime
return {steps, data.y, data.x, data.z}; return {steps, data.y, data.x, data.z};
} }