mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-29 21:56:35 +00:00
display update
This commit is contained in:
parent
cb0de03df7
commit
eb7ca618c7
@ -534,9 +534,4 @@
|
|||||||
#error "Select either USE_DISCOVERY or USE_MQTT_AWS_IOT, mDNS takes too much code space and is not needed for AWS IoT"
|
#error "Select either USE_DISCOVERY or USE_MQTT_AWS_IOT, mDNS takes too much code space and is not needed for AWS IoT"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define USE_DISPLAY_ILI9488
|
|
||||||
#define USE_DISPLAY
|
|
||||||
#define USE_SPI
|
|
||||||
#define USE_DISPLAY_ILI9488
|
|
||||||
|
|
||||||
#endif // _MY_USER_CONFIG_H_
|
#endif // _MY_USER_CONFIG_H_
|
||||||
|
@ -122,12 +122,12 @@ void ILI9488_InitDriver()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef USE_TOUCH_BUTTONS
|
||||||
void ILI9488_MQTT(uint8_t count,const char *cp) {
|
void ILI9488_MQTT(uint8_t count,const char *cp) {
|
||||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
|
||||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"RA8876\":{\"%s%d\":\"%d\"}}"), mqtt_data,cp,count+1,(buttons[count]->vpower&0x80)>>7);
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"RA8876\":{\"%s%d\":\"%d\"}}"), mqtt_data,cp,count+1,(buttons[count]->vpower&0x80)>>7);
|
||||||
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
|
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
|
||||||
}
|
}
|
||||||
|
|
||||||
// check digitizer hit
|
// check digitizer hit
|
||||||
void FT6236Check() {
|
void FT6236Check() {
|
||||||
uint16_t temp;
|
uint16_t temp;
|
||||||
@ -210,6 +210,7 @@ if (2 == ctouch_counter) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif // USE_TOUCH_BUTTONS
|
||||||
/*********************************************************************************************/
|
/*********************************************************************************************/
|
||||||
/*********************************************************************************************\
|
/*********************************************************************************************\
|
||||||
* Interface
|
* Interface
|
||||||
@ -228,7 +229,9 @@ bool Xdsp08(byte function)
|
|||||||
result = true;
|
result = true;
|
||||||
break;
|
break;
|
||||||
case FUNC_DISPLAY_EVERY_50_MSECOND:
|
case FUNC_DISPLAY_EVERY_50_MSECOND:
|
||||||
|
#ifdef USE_TOUCH_BUTTONS
|
||||||
if (FT6236_found) FT6236Check();
|
if (FT6236_found) FT6236Check();
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -107,6 +107,7 @@ void RA8876_InitDriver()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef USE_TOUCH_BUTTONS
|
||||||
void RA8876_MQTT(uint8_t count,const char *cp) {
|
void RA8876_MQTT(uint8_t count,const char *cp) {
|
||||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
|
||||||
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"RA8876\":{\"%s%d\":\"%d\"}}"), mqtt_data,cp,count+1,(buttons[count]->vpower&0x80)>>7);
|
snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"RA8876\":{\"%s%d\":\"%d\"}}"), mqtt_data,cp,count+1,(buttons[count]->vpower&0x80)>>7);
|
||||||
@ -210,7 +211,7 @@ if (2 == ctouch_counter) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif USE_TOUCH_BUTTONS
|
||||||
/*
|
/*
|
||||||
void testall() {
|
void testall() {
|
||||||
ra8876->clearScreen(0);
|
ra8876->clearScreen(0);
|
||||||
@ -408,7 +409,9 @@ bool Xdsp10(byte function)
|
|||||||
result = true;
|
result = true;
|
||||||
break;
|
break;
|
||||||
case FUNC_DISPLAY_EVERY_50_MSECOND:
|
case FUNC_DISPLAY_EVERY_50_MSECOND:
|
||||||
|
#ifdef USE_TOUCH_BUTTONS
|
||||||
if (FT5316_found) FT5316Check();
|
if (FT5316_found) FT5316Check();
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,7 +131,7 @@ void Vl53l0Show(boolean json)
|
|||||||
* Interface
|
* Interface
|
||||||
\*********************************************************************************************/
|
\*********************************************************************************************/
|
||||||
|
|
||||||
#define XSNS_45
|
#define XSNS_45 45
|
||||||
|
|
||||||
bool Xsns45(byte function)
|
bool Xsns45(byte function)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user