Curved-stats : fix for loop

Open-Smartwatch · May 26, 2022 · b11ae0e · b11ae0e
1 parent c84d7af
commit b11ae0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/include/apps/tools/OswAppKcalStats.h b/include/apps/tools/OswAppKcalStats.h
@@ -18,7 +18,7 @@ class OswAppKcalStats : public OswApp {
     uint8_t cursorPos = 6;  // WeekDay position
     void drawCurvedChart();
     void showCurvedChart();
-    void readyValue(int type = 0, uint8_t cursor = 7, uint32_t* cursorValue = nullptr);
+    void readyValue(int type = 0, uint8_t cursor = 6, uint32_t* cursorValue = nullptr);
     uint16_t weekValue[7] = {};
     OswUI* ui;
 };

diff --git a/src/apps/tools/OswAppKcalStats.cpp b/src/apps/tools/OswAppKcalStats.cpp
@@ -24,9 +24,8 @@ void OswAppKcalStats::readyValue(int type, uint8_t cursor, uint32_t* cursorValue
   int curvedIdx = 0;
   uint8_t graphRange = MIN_VALUE - MAX_VALUE;
   uint16_t kcalGoal = OswConfigAllKeys::kcalPerDay.get();
-  for (int Index = ((weekday + 1 > 6) ? 0 : weekday + 1); Index != weekday; Index++, curvedIdx++) {
+  for (int Index = ((weekday + 1 > 6) ? 0 : weekday + 1); curvedIdx<7; Index++, curvedIdx++) {
     if (Index > 6) Index = 0;
-
     uint32_t weekDayValue = 0;
     if (type == 0) {
       weekDayValue = OswAppWatchfaceFitness::calculateKcalorie(hal->environment->getStepsOnDay(Index));
@@ -38,21 +37,11 @@ void OswAppKcalStats::readyValue(int type, uint8_t cursor, uint32_t* cursorValue
     } else if (type == 3) {
     weekDayValue = OswAppWatchfaceFitness::calculateKcalorie(hal->environment->getStepsOnDay(Index));
     }
-    weekValue[curvedIdx] = weekDayValue;   
+    weekValue[curvedIdx] = weekDayValue;
   }
-   Serial.print(String(__FILE__) + ": Current weekValue - ");
- for(size_t i = 0; i < 7; i++) {
-   Serial.print(weekValue[i]);
-   if(i!=6){
-     Serial.print(",");
-    }
-    else {
-      Serial.println(" -");
-    }
   if (cursorValue != nullptr){
     *cursorValue = weekValue[cursor];
   }
-  }
 }
 
 void OswAppKcalStats::drawCurvedChart() {