ise-senior-iot
/
iot-firmware
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Serial Output adjustment

This commit is contained in:
Siwat Sirichai 2023-08-26 12:53:25 +07:00
parent bfc4bc37eb
commit 3bf9c6600d
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platformio.ini
View File

@ -12,8 +12,9 @@
platform = espressif32 platform = espressif32
board = wt32-eth01 board = wt32-eth01
framework = arduino framework = arduino
lib_deps = siwats/espmegapror3 lib_deps = siwats/espmegapror3@^1.0.2
knolleary/PubSubClient@^2.8 knolleary/PubSubClient@^2.8
ivanseidel/ArduinoThread@^2.1.1 ivanseidel/ArduinoThread@^2.1.1
arduino-libraries/Arduino_BuiltIn@^1.0.0 arduino-libraries/Arduino_BuiltIn@^1.0.0
dersimn/PubSubClientTools@^0.6 dersimn/PubSubClientTools@^0.6
monitor_speed = 115200

31
src/main.cpp
View File

@ -44,6 +44,7 @@ void mqtt_connect();
void mqtt_subscribe(); void mqtt_subscribe();
void thread_initialization(); void thread_initialization();
void mqtt_callback(String topic, String message); void mqtt_callback(String topic, String message);
void io_begin();
void publish_pwm_states(); void publish_pwm_states();
void publish_pwm_state(int id); void publish_pwm_state(int id);
@ -63,17 +64,12 @@ StaticThreadController<1> thread_controller(&mqtt_reconnector);
void setup() void setup()
{ {
ESPMega_begin();
Serial.begin(115200); Serial.begin(115200);
Serial.println("ESPMega R3 Initializing . . ."); Serial.println("ESPMega R3 Initializing . . .");
Serial.println("Initializing I/O . . ."); ESPMega_begin();
memset(pwm_states, 0, PWM_COUNT);
memset(pwm_values, 255, PWM_COUNT);
Serial.println("Initializing Network . . .");
network_begin(); network_begin();
Serial.println("Initializing MQTT . . ."); Serial.println("Initializing MQTT . . .");
mqtt_connect(); mqtt_connect();
Serial.println("Initializing Threads . . .");
thread_initialization(); thread_initialization();
} }
@ -82,13 +78,28 @@ void loop()
virtual_interrupt_loop(); virtual_interrupt_loop();
mqtt_client.loop(); mqtt_client.loop();
ESPMega_loop(); ESPMega_loop();
thread_controller.run();
}
void io_begin()
{
Serial.println("Initializing I/O . . .");
memset(pwm_states, 0, PWM_COUNT);
memset(pwm_values, 255, PWM_COUNT);
} }
void network_begin() void network_begin()
{ {
ETH.setHostname(HOSTNAME); Serial.print("Initializing Network ");
ETH.config(IP, GATEWAY, SUBNET, DNS);
ETH.begin(); ETH.begin();
ETH.setHostname(HOSTNAME);
ETH.config(IP, GATEWAY, SUBNET, DNS, DNS);
for (int i = 0; i < 3; i++)
{
delay(2500);
Serial.print(" .");
}
Serial.println();
} }
void mqtt_connect() void mqtt_connect()
@ -120,7 +131,8 @@ void mqtt_subscribe()
void thread_initialization() void thread_initialization()
{ {
Serial.print("Initializing MQTT Thread\n"); Serial.println("Initializing Threads . . .");
Serial.println("Initializing MQTT Thread . . .");
mqtt_reconnector.onRun(mqtt_connect); mqtt_reconnector.onRun(mqtt_connect);
mqtt_reconnector.setInterval(30000); mqtt_reconnector.setInterval(30000);
} }
@ -131,6 +143,7 @@ void mqtt_callback(String topic, String message)
void virtual_interrupt_callback(int pin, int state) void virtual_interrupt_callback(int pin, int state)
{ {
Serial.printf("Pin %d changed to %d\n", pin, state);
} }
void virtual_interrupt_loop() void virtual_interrupt_loop()