kicer/ws2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

优先显示co2数据

Browse Source
This commit is contained in:
kicer
2026-01-30 14:12:22 +08:00
parent 1a95d6c005
commit d4186c38be
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rom/display.py
View File

@@ -173,6 +173,7 @@ class Display:
if envdat is not None: if envdat is not None:
t,rh = envdat.get('t'),envdat.get('rh') t,rh = envdat.get('t'),envdat.get('rh')
pm,ap = envdat.get('pm'),envdat.get('ap') pm,ap = envdat.get('pm'),envdat.get('ap')
co2 = envdat.get('co2')
# 填充后再更新文本 # 填充后再更新文本
if t is not None and t != self.ui_data.get('t'): if t is not None and t != self.ui_data.get('t'):
self.ui_data['t'] = t self.ui_data['t'] = t
@@ -186,7 +187,16 @@ class Display:
self.ui_data['pm'] = pm self.ui_data['pm'] = pm
self.tft.fill_rect(35,213,40,16,0) self.tft.fill_rect(35,213,40,16,0)
self.tft.draw(self.vector_font, str(pm), 35,221,0xFFFF,0.5) self.tft.draw(self.vector_font, str(pm), 35,221,0xFFFF,0.5)
if ap is not None and ap != self.ui_data.get('ap'): if co2 is not None and co2 != self.ui_data.get('co2'):
# 如果co2数据存在，优先显示co2
if self.ui_data.get('ap'):
self.ui_data['ap'] = None
self.tft.jpg("/rom/images/co2.jpg",85,209,st7789.SLOW)
self.ui_data['co2'] = co2
self.tft.fill_rect(110,213,40,16,0)
self.tft.draw(self.vector_font, str(co2), 110,221,0xFFFF,0.5)
elif self.ui_data.get('co2') is None and ap is not None and ap != self.ui_data.get('ap'):
# 没co2时候才会显示大气压
self.ui_data['ap'] = ap self.ui_data['ap'] = ap
self.tft.fill_rect(110,213,40,16,0) self.tft.fill_rect(110,213,40,16,0)
self.tft.draw(self.vector_font, str(ap), 110,221,0xFFFF,0.5) self.tft.draw(self.vector_font, str(ap), 110,221,0xFFFF,0.5)
@@ -231,7 +241,7 @@ class Display:
self.tft.jpg("/rom/images/t.jpg",11,177,st7789.SLOW) self.tft.jpg("/rom/images/t.jpg",11,177,st7789.SLOW)
self.tft.jpg("/rom/images/rh.jpg",85,177,st7789.SLOW) self.tft.jpg("/rom/images/rh.jpg",85,177,st7789.SLOW)
self.tft.jpg("/rom/images/pm.jpg",11,209,st7789.SLOW) self.tft.jpg("/rom/images/pm.jpg",11,209,st7789.SLOW)
self.tft.jpg("/rom/images/ap.jpg",85,208,st7789.SLOW) self.tft.jpg("/rom/images/ap.jpg",85,209,st7789.SLOW)
# 更新其他默认数据 # 更新其他默认数据
self.update_ui() self.update_ui()