Compare commits

...

4 commits

Author SHA1 Message Date
Ellis Judge 362a39adda
Merge 28ae37b02e into 8598142c27 2024-10-13 17:05:38 +02:00
NeroBurner 8598142c27
Remove unused submodule QCBOR (#2138)
Some checks failed
CI / build-firmware (push) Successful in 5m57s
CI / build-simulator (push) Failing after 3s
CI / get-base-ref-size (push) Has been skipped
CI / Compare build size (push) Has been skipped
The submodule isn't used anymore. Remove the submodule reference
completely.
2024-10-09 20:26:08 +02:00
Ellis Judge 28ae37b02e
Merge branch 'InfiniTimeOrg:main' into main 2023-08-16 18:45:11 +01:00
Ellis Judge 6853215ec0 Heart Rate: Updated UI
Updated start button in Heart Rate app to match timer app.
Fixes Issue #1246
2023-08-14 18:56:48 +01:00
3 changed files with 3 additions and 5 deletions

3
.gitmodules vendored
View file

@ -4,9 +4,6 @@
[submodule "src/libs/littlefs"] [submodule "src/libs/littlefs"]
path = src/libs/littlefs path = src/libs/littlefs
url = https://github.com/littlefs-project/littlefs.git url = https://github.com/littlefs-project/littlefs.git
[submodule "src/libs/QCBOR"]
path = src/libs/QCBOR
url = https://github.com/laurencelundblade/QCBOR.git
[submodule "src/libs/arduinoFFT"] [submodule "src/libs/arduinoFFT"]
path = src/libs/arduinoFFT path = src/libs/arduinoFFT
url = https://github.com/kosme/arduinoFFT.git url = https://github.com/kosme/arduinoFFT.git

View file

@ -56,7 +56,9 @@ HeartRate::HeartRate(Controllers::HeartRateController& heartRateController, Syst
btn_startStop = lv_btn_create(lv_scr_act(), nullptr); btn_startStop = lv_btn_create(lv_scr_act(), nullptr);
btn_startStop->user_data = this; btn_startStop->user_data = this;
lv_obj_set_height(btn_startStop, 50); lv_obj_set_size(btn_startStop, lv_obj_get_width(lv_scr_act()), 50);
lv_obj_set_style_local_radius(btn_startStop, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
lv_obj_set_style_local_bg_color(btn_startStop, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
lv_obj_set_event_cb(btn_startStop, btnStartStopEventHandler); lv_obj_set_event_cb(btn_startStop, btnStartStopEventHandler);
lv_obj_align(btn_startStop, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0); lv_obj_align(btn_startStop, nullptr, LV_ALIGN_IN_BOTTOM_MID, 0, 0);

@ -1 +0,0 @@
Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e