This commit is contained in:
Siwat Sirichai 2023-09-30 15:42:44 +07:00
parent 3409ed8fb7
commit 9d96b2b5b3
1438 changed files with 117700 additions and 18 deletions

View file

@ -48,7 +48,7 @@ char PWM_SET_VALUE_TOPIC[70];
// Infrared Transciever
#define IR_RECIEVE_PIN 35
#define IR_SEND_PIN 15
#define IR_SEND_PIN 17
#define MARK_EXCESS_MICROS 20
#define RAW_BUFFER_LENGTH 750
@ -56,9 +56,6 @@ char PWM_SET_VALUE_TOPIC[70];
int lcd_current_page = 1;
int lcd_pwmAdj_id = 0;
EasyNex panel(Serial);
#ifdef ENABLE_EXTERNAL_LCD
EasyNex ESPMega_EXTLCD(Serial2);
#endif
// Air Conditioner Control
/*
@ -119,8 +116,7 @@ void setup()
{
Serial.begin(115200);
#ifdef ENABLE_EXTERNAL_LCD
Serial2.begin(115200);
ESPMega_EXTLCD.begin(115200);
Serial2.begin(115200,SERIAL_8N1,RXD2,TXD2);
#endif
panel.begin(115200);
Serial.println("ESPMega R3 Initializing");
@ -166,8 +162,6 @@ void loop()
lcd_loop();
user_loop();
otaserver.handleClient();
}
void eeprom_retrieve_init()
@ -470,6 +464,7 @@ void pwm_set_state(int id, int state)
else if (lcd_current_page == 5 && id == lcd_pwmAdj_id)
panel.writeStr("pwm_state.txt", pwm_states[lcd_pwmAdj_id] ? "ON" : "OFF");
publish_pwm_state(id);
pwm_changed_user_callback(id);
}
}
@ -483,6 +478,7 @@ void pwm_set_value(int id, int value)
else if (lcd_current_page == 5 && id == lcd_pwmAdj_id)
panel.writeNum("pwm_value.val", pwm_values[lcd_pwmAdj_id]);
publish_pwm_state(id);
pwm_changed_user_callback(id);
}
void pwm_toggle(int id)
@ -726,9 +722,6 @@ void lcd_loop()
{
lcd_thread_controller.run();
panel.NextionListen();
#ifdef ENABLE_EXTERNAL_LCD
ESPMega_EXTLCD.NextionListen();
#endif
if (panel.currentPageId != lcd_current_page)
{
lcd_current_page = panel.currentPageId;

View file

@ -24,10 +24,11 @@ This code will run after every component is initialized
void user_init()
{
timer1.begin();
ESPMega_EXTLCD_Serial.print("page home");
ESPMega_EXTLCD_Serial.write(0xFF);
ESPMega_EXTLCD_Serial.write(0xFF);
ESPMega_EXTLCD_Serial.write(0xFF);
ESPMega_EXTLCD.print("page home");
ESPMega_EXTLCD.write(0xFF);
ESPMega_EXTLCD.write(0xFF);
ESPMega_EXTLCD.write(0xFF);
}
/*
@ -35,6 +36,9 @@ This code will run once every event loop
*/
void user_loop()
{
if(Serial2.available()) {
Serial.println(Serial2.read());
}
}
/*
@ -44,6 +48,10 @@ void virtual_interrupt_user_callback(int pin, int state)
{
}
void pwm_changed_user_callback(int pin) {
}
/*
This code will run every 15 seconds
*/

View file

@ -11,7 +11,7 @@
#define RXD2 17
#ifdef ENABLE_EXTERNAL_LCD
extern EasyNex user_panel;
#define ESPMega_EXTLCD Serial2
#endif
// User Defined Functions
@ -19,9 +19,9 @@ void user_pre_init();
void user_init();
void user_loop();
void virtual_interrupt_user_callback(int pin, int state);
void pwm_changed_user_callback(int pin);
void timer_tick_callback();
void external_lcd_callback(int touch_hex);
void timer_tick_callback();
void bt0PopCallback(void *ptr);
// ESPMega IoT Core Build-in Functions