From 553448b5e8a58199717bd8d1c3b069e3ca363e05 Mon Sep 17 00:00:00 2001 From: Ruffalo-sunghwan Date: Wed, 15 Jun 2022 01:32:49 +0900 Subject: [PATCH 1/4] OswAppKcalStats : remove comment (copy) --- src/apps/tools/OswAppKcalStats.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apps/tools/OswAppKcalStats.cpp b/src/apps/tools/OswAppKcalStats.cpp index 22a74ca63..9477bb71d 100644 --- a/src/apps/tools/OswAppKcalStats.cpp +++ b/src/apps/tools/OswAppKcalStats.cpp @@ -87,16 +87,16 @@ void OswAppKcalStats::showCurvedChart() { hal->gfx()->setTextCursor(DISP_W / 2 - 7, 185); hal->gfx()->print(String(OswAppWatchfaceFitness::calculateDistance(hal->environment->getStepsTotalWeek()) / 7 )); hal->gfx()->setTextCursor(DISP_W / 2 - 7, 195); - hal->gfx()->print(hal->environment->getStepsTotalWeek()/7); // total step counter + hal->gfx()->print(hal->environment->getStepsTotalWeek()/7); hal->gfx()->setTextCursor(DISP_W / 2 - 7, 205); - hal->gfx()->print(OswAppWatchfaceFitness::calculateKcalorie(hal->environment->getStepsTotalWeek())/7); // total step counter + hal->gfx()->print(OswAppWatchfaceFitness::calculateKcalorie(hal->environment->getStepsTotalWeek())/7); hal->gfx()->setTextLeftAligned(); hal->gfx()->setTextCursor(DISP_W / 2 + 7, 185); hal->gfx()->print(OswAppWatchfaceFitness::calculateDistance(hal->environment->getStepsOnDay(wDay))+String(" m")); hal->gfx()->setTextCursor(DISP_W / 2 + 7, 195); - hal->gfx()->print(hal->environment->getStepsOnDay(wDay) + String(" ") + String(LANG_KCAL_STEP)); // total step counter + hal->gfx()->print(hal->environment->getStepsOnDay(wDay) + String(" ") + String(LANG_KCAL_STEP)); hal->gfx()->setTextCursor(DISP_W / 2 + 7, 205); - hal->gfx()->print(OswAppWatchfaceFitness::calculateKcalorie(hal->environment->getStepsOnDay(wDay))+String(" kcal")); // total step counter + hal->gfx()->print(OswAppWatchfaceFitness::calculateKcalorie(hal->environment->getStepsOnDay(wDay))+String(" kcal")); } void OswAppKcalStats::setup() {} From 4892de5624c75e9a40cde777c2b369b44bf65a11 Mon Sep 17 00:00:00 2001 From: Ruffalo-sunghwan Date: Wed, 15 Jun 2022 01:33:31 +0900 Subject: [PATCH 2/4] OswAppStepStats : remove comment (copy) --- src/apps/tools/OswAppStepStats.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/tools/OswAppStepStats.cpp b/src/apps/tools/OswAppStepStats.cpp index 882175030..bfd1d4bf6 100644 --- a/src/apps/tools/OswAppStepStats.cpp +++ b/src/apps/tools/OswAppStepStats.cpp @@ -19,7 +19,7 @@ void OswAppStepStats::drawChart() { hal->getLocalDate(&dayOfMonth, &weekDay); for (uint8_t index = 0; index < 7; index++) { - uint32_t weekDayStep = hal->environment->getStepsOnDay(index); // virtual step simulation + uint32_t weekDayStep = hal->environment->getStepsOnDay(index); uint16_t chartStickValue = ((float)(weekDayStep > goalValue ? goalValue : weekDayStep) / goalValue) * chartStickHeight; uint16_t barColor = OswConfigAllKeys::stepsPerDay.get() <= weekDayStep ? ui->getSuccessColor() : changeColor(ui->getSuccessColor(),2.85); From f295a20324294f36927173fe07e40c668199a6c5 Mon Sep 17 00:00:00 2001 From: Ruffalo-sunghwan Date: Wed, 15 Jun 2022 01:34:57 +0900 Subject: [PATCH 3/4] OswAppStepStats : remove comment --- src/apps/tools/OswAppStepStats.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/apps/tools/OswAppStepStats.cpp b/src/apps/tools/OswAppStepStats.cpp index bfd1d4bf6..c3a52376d 100644 --- a/src/apps/tools/OswAppStepStats.cpp +++ b/src/apps/tools/OswAppStepStats.cpp @@ -25,7 +25,6 @@ void OswAppStepStats::drawChart() { uint16_t barColor = OswConfigAllKeys::stepsPerDay.get() <= weekDayStep ? ui->getSuccessColor() : changeColor(ui->getSuccessColor(),2.85); chartStickValue = chartStickValue < 2 ? 0 : chartStickValue; - // step bars if (index == weekDay) { hal->gfx()->drawThickTick(60 + index * interval, 147, 0, chartStickHeight, 0, 5, ui->getForegroundColor()); From b4e4b0793c63f9b318edb4bc951e6ba4af95c639 Mon Sep 17 00:00:00 2001 From: Ruffalo-sunghwan Date: Wed, 15 Jun 2022 01:52:02 +0900 Subject: [PATCH 4/4] OswAppWatchfaceDual : clean comment --- include/apps/watchfaces/OswAppWatchfaceDual.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/apps/watchfaces/OswAppWatchfaceDual.h b/include/apps/watchfaces/OswAppWatchfaceDual.h index 722d1433c..517d01273 100644 --- a/include/apps/watchfaces/OswAppWatchfaceDual.h +++ b/include/apps/watchfaces/OswAppWatchfaceDual.h @@ -14,12 +14,11 @@ class OswAppWatchfaceDual : public OswApp { virtual void loop() override; virtual void stop() override; ~OswAppWatchfaceDual() {}; + //for dual-time - static void drawProgressBar(OswUI* ui,uint8_t cx, uint8_t cy, uint8_t jump, uint8_t length, uint8_t value,float angle, uint8_t radius, uint16_t color, uint8_t* goal=nullptr); void drawAnimSec(); private: OswUI* ui; - // Blank to make the 2 clocks easier to recognize }; \ No newline at end of file