mirror of https://github.com/sqfmi/Watchy.git
Merge branch 'master' into patch-1
commit
b0ff996341
|
@ -0,0 +1,15 @@
|
|||
# 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
|
||||
|
||||
1. Fork this repo and branch out from `dev`.
|
||||
2. Push commits.
|
||||
3. Issue pull request.
|
||||
|
||||
## Community
|
||||
|
||||
- [Discord](https://discord.gg/ZXDegGV8E7)
|
|
@ -106,12 +106,13 @@ 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);
|
||||
if (temperature >= 10 && temperature < 20) {
|
||||
display.setCursor(135 - w, 150);
|
||||
}
|
||||
else {
|
||||
display.setCursor(155 - w, 150);
|
||||
display.getTextBounds(String(temperature), 0, 0, &x1, &y1, &w, &h);
|
||||
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);
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Reference in New Issue