From 3680e99634199157ecbd76ce97bb79d199eb16ef Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 20 Jun 2021 01:54:38 +0200 Subject: [PATCH 1/6] Fix temperature position, closes #52 --- examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp index 7ce9207..8bbf362 100644 --- a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp +++ b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp @@ -102,8 +102,8 @@ void Watchy7SEG::drawWeather(){ display.setFont(&DSEG7_Classic_Regular_39); int16_t x1, y1; uint16_t w, h; - display.getTextBounds(String(temperature), 100, 150, &x1, &y1, &w, &h); - display.setCursor(155 - w, 150); + display.getTextBounds(String(temperature), 0, 0, &x1, &y1, &w, &h); + display.setCursor(159 - w - x1, 150); display.println(temperature); display.drawBitmap(165, 110, strcmp(TEMP_UNIT, "metric") == 0 ? celsius : fahrenheit, 26, 20, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK); const unsigned char* weatherIcon; From 2f6cad2fc2508d8988d5ce30ff06d94e7cafe220 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Tue, 22 Jun 2021 18:23:19 +0200 Subject: [PATCH 2/6] Use smaller font when temperature does not fit, closes #52 This is the case for negative temperatures (-10 for example). --- examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp index 8bbf362..ba1da15 100644 --- a/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp +++ b/examples/WatchFaces/7_SEG/Watchy_7_SEG.cpp @@ -103,7 +103,13 @@ void Watchy7SEG::drawWeather(){ int16_t x1, y1; uint16_t w, h; display.getTextBounds(String(temperature), 0, 0, &x1, &y1, &w, &h); - display.setCursor(159 - w - x1, 150); + if(159 - w - x1 > 87){ + display.setCursor(159 - w - x1, 150); + }else{ + display.setFont(&DSEG7_Classic_Bold_25); + display.getTextBounds(String(temperature), 0, 0, &x1, &y1, &w, &h); + display.setCursor(159 - w - x1, 136); + } display.println(temperature); display.drawBitmap(165, 110, strcmp(TEMP_UNIT, "metric") == 0 ? celsius : fahrenheit, 26, 20, DARKMODE ? GxEPD_WHITE : GxEPD_BLACK); const unsigned char* weatherIcon; From 6c2e613e073b5c4cf3f740911faff76a36eec71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Sat, 17 Jul 2021 20:29:04 +0200 Subject: [PATCH 3/6] Fix "Please [Vv]isit" typo in firmware update screen --- src/Watchy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Watchy.cpp b/src/Watchy.cpp index 032df37..40bdfa0 100644 --- a/src/Watchy.cpp +++ b/src/Watchy.cpp @@ -841,7 +841,7 @@ void Watchy::showUpdateFW(){ display.setFont(&FreeMonoBold9pt7b); display.setTextColor(GxEPD_WHITE); display.setCursor(0, 30); - display.println("Please Visit"); + display.println("Please visit"); display.println("watchy.sqfmi.com"); display.println("with a Bluetooth"); display.println("enabled device"); From 6744ff5a5b3ff564b7da960c253a30f57c54cab9 Mon Sep 17 00:00:00 2001 From: -k Date: Tue, 3 Aug 2021 17:36:52 -0700 Subject: [PATCH 4/6] Create CONTRIBUTING.md --- CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..e183ebe --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,11 @@ +# How to contribute + +### Check out the issue tracker + +Search through [Issue tracker](https://github.com/sqfmi/Watchy/issues) for matching topics. It is also recommended to check with current [Pull requests](https://github.com/sqfmi/Watchy/pulls). + +### Issue Pull Request + +- Fork this repo and branch out from `dev`. +- Push commits. +- Issue pull request. From 19fad2f9c7bb8aea7de161b025282c1cdc07dd75 Mon Sep 17 00:00:00 2001 From: -k Date: Wed, 4 Aug 2021 11:11:10 -0700 Subject: [PATCH 5/6] Update CONTRIBUTING.md --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e183ebe..13a8895 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,6 +6,6 @@ Search through [Issue tracker](https://github.com/sqfmi/Watchy/issues) for match ### Issue Pull Request -- Fork this repo and branch out from `dev`. -- Push commits. -- Issue pull request. +1. Fork this repo and branch out from `dev`. +2. Push commits. +3. Issue pull request. From 4e8f766dad7c31e8ea8136c91ba64cff901c1cdf Mon Sep 17 00:00:00 2001 From: -k Date: Wed, 4 Aug 2021 11:11:20 -0700 Subject: [PATCH 6/6] Add Community block --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13a8895..d194433 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,3 +9,7 @@ Search through [Issue tracker](https://github.com/sqfmi/Watchy/issues) for match 1. Fork this repo and branch out from `dev`. 2. Push commits. 3. Issue pull request. + +## Community + +- [Discord](https://discord.gg/ZXDegGV8E7)