Merge pull request #914 from cyberman54/development

Development
This commit is contained in:
Verkehrsrot 2022-11-06 18:04:30 +01:00 committed by GitHub
commit 3045088588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View File

@ -46,6 +46,8 @@ void button_init(void) {
button.setPressTicks(1000); button.setPressTicks(1000);
button.attachClick(singleClick); button.attachClick(singleClick);
button.attachLongPressStart(longPressStart); button.attachLongPressStart(longPressStart);
attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), readButton, CHANGE);
}; };
#endif #endif

View File

@ -344,11 +344,11 @@ void dp_refresh(bool nextPage) {
#if (HAS_BME) #if (HAS_BME)
dp_setFont(MY_FONT_STRETCHED); dp_setFont(MY_FONT_STRETCHED);
dp->setCursor(0, 0); dp->setCursor(0, 0);
dp->printf("TMP: %-6.1f\r\n", bme_status.temperature); dp->printf("TMP %-6.1f\r\n", bme_status.temperature);
dp->printf("HUM: %-6.1f\r\n", bme_status.humidity); dp->printf("HUM %-6.1f\r\n", bme_status.humidity);
dp->printf("PRE: %-6.1f\r\n", bme_status.pressure); dp->printf("PRS %-6.1f\r\n", bme_status.pressure);
#ifdef HAS_BME680 #ifdef HAS_BME680
dp->printf("IAQ: %-6.0f", bme_status.iaq); dp->printf("IAQ %-6.0f", bme_status.iaq);
#endif #endif
dp_dump(); dp_dump();
break; break;