Browse Source

update

master
zhaohe 2 years ago
parent
commit
9afe397814
  1. 7
      components/dwin/dwin.hpp
  2. 14
      components/dwin/var_icon.cpp
  3. 2
      components/dwin/var_icon.hpp

7
components/dwin/dwin.hpp

@ -6,9 +6,10 @@
namespace iflytop {
namespace dwin {
typedef enum {
kdwin_color_green = 0x1694, // kgreen
kdwin_color_red = 0xF800, // kred
kdwin_color_blue = 0x12DC, // kblue
kdwin_color_green = 0x1694, // kgreen
kdwin_color_red = 0xF800, // kred
kdwin_color_orange = 0xFC60, // orange
kdwin_color_blue = 0x12DC, // kblue
} dwin_color_t;
#define kblue kdwin_color_blue

14
components/dwin/var_icon.cpp

@ -69,8 +69,6 @@ void VarIcon::setpos(uint16_t posx, uint16_t posy) {
flushcfg();
}
void VarIcon::dumpinfo() {
readcfg();
printf("m_VP = %04x\n", m_descript.m_VP);
@ -95,7 +93,7 @@ bool VarIcon::setVal(uint16_t val) {
}
uint16_t VarIcon::getVal() {
uint16_t val = 0xffff;
if(m_hide) return m_val;
if (m_hide) return m_val;
m_dwin_screen->read_varspace16(m_descript.m_VP, val, 100);
return val;
}
@ -107,9 +105,13 @@ void VarIcon::hide() { //
*/
m_hide = true;
};
void VarIcon::show() {
m_hide = false;
_setVal(m_val);
void VarIcon::show(bool showval) {
if (showval) {
m_hide = false;
_setVal(m_val);
} else {
hide();
}
}
VarIconDescript_t &VarIcon::getDescript() { return m_descript; }

2
components/dwin/var_icon.hpp

@ -75,7 +75,7 @@ class VarIcon {
uint16_t getVal();
void hide();
void show();
void show(bool showval = true);
VarIconDescript_t &getDescript();

Loading…
Cancel
Save