Merge effced8bda into 8598142c27

Remove unused submodule QCBOR (#2138 )
The submodule isn't used anymore. Remove the submodule reference completely.
2024-10-22 15:11:51 +02:00 · 2024-10-12 15:28:34 +02:00 · 2024-10-09 20:26:08 +02:00 · 2024-05-07 03:38:17 +00:00 · 2024-05-07 03:37:09 +00:00
3 changed files with 9 additions and 7 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -4,9 +4,6 @@
 [submodule "src/libs/littlefs"]
 	path = src/libs/littlefs
 	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"]
 	path = src/libs/arduinoFFT
 	url = https://github.com/kosme/arduinoFFT.git
--- a/src/displayapp/screens/StopWatch.cpp
+++ b/src/displayapp/screens/StopWatch.cpp
@ -87,19 +87,21 @@ void StopWatch::SetInterfacePaused() {
  lv_obj_set_style_local_bg_color(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Colors::blue);
  lv_label_set_text_static(txtPlayPause, Symbols::play);
  lv_label_set_text_static(txtStopLap, Symbols::stop);
+  lv_obj_set_state(btnStopLap, LV_STATE_DEFAULT);
+  lv_obj_set_state(txtStopLap, LV_STATE_DEFAULT);
 }

 void StopWatch::SetInterfaceRunning() {
  lv_obj_set_state(time, LV_STATE_DEFAULT);
  lv_obj_set_state(msecTime, LV_STATE_DEFAULT);
  lv_obj_set_style_local_bg_color(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
-  lv_obj_set_style_local_bg_color(btnStopLap, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
+  lv_obj_set_style_local_bg_color(btnStopLap, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, (lapsDone == maxLapCount) ? Colors::bgDark : Colors::bgAlt);

  lv_label_set_text_static(txtPlayPause, Symbols::pause);
  lv_label_set_text_static(txtStopLap, Symbols::lapsFlag);

-  lv_obj_set_state(btnStopLap, LV_STATE_DEFAULT);
-  lv_obj_set_state(txtStopLap, LV_STATE_DEFAULT);
+  lv_obj_set_state(btnStopLap, (lapsDone == maxLapCount) ? LV_STATE_DISABLED : LV_STATE_DEFAULT);
+  lv_obj_set_state(txtStopLap, (lapsDone == maxLapCount) ? LV_STATE_DISABLED : LV_STATE_DEFAULT);
 }

 void StopWatch::SetInterfaceStopped() {
@ -191,6 +193,10 @@ void StopWatch::stopLapBtnEventHandler() {
  if (currentState == States::Running) {
    lv_label_set_text(lapText, "");
    lapsDone = std::min(lapsDone + 1, maxLapCount);
+    if (lapsDone == maxLapCount) {
+      lv_obj_set_state(btnStopLap, LV_STATE_DISABLED);
+      lv_obj_set_state(txtStopLap, LV_STATE_DISABLED);
+    }
    for (int i = lapsDone - displayedLaps; i < lapsDone; i++) {
      if (i < 0) {
        lv_label_ins_text(lapText, LV_LABEL_POS_LAST, "\n");
--- a/src/libs/QCBOR
+++ b/src/libs/QCBOR
@ -1 +0,0 @@
-Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e
Author	SHA1	Message	Date
joshoshosh	78156b4502	Merge `effced8bda` into `8598142c27`	2024-10-12 15:28:34 +02:00
NeroBurner	8598142c27	Remove unused submodule QCBOR (#2138 ) Some checks failed CI / build-firmware (push) Successful in 5m57s Details CI / build-simulator (push) Failing after 3s Details CI / get-base-ref-size (push) Has been skipped Details CI / Compare build size (push) Has been skipped Details The submodule isn't used anymore. Remove the submodule reference completely.	2024-10-09 20:26:08 +02:00
Josh	effced8bda	stopwatch: disable laps at maxLapCount	2024-05-07 03:38:17 +00:00
Josh	56799d27d0	stopwatch: disable laps at maxLapCount	2024-05-07 03:37:09 +00:00
				`@ -1 +0,0 @@`
				`Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e`