lexa/AHome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove output to Serial1

Browse Source
This commit is contained in:
unknown
2020-08-01 16:13:56 +03:00
parent cdfcc2cc42
commit e2cb599e20
1 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
ESP_MidRoom/src/main.cpp
View File

@@ -36,10 +36,10 @@ void onWifiConnect(const WiFiEventStationModeGotIP& event);
void onWifiDisconnect(const WiFiEventStationModeDisconnected& event); void onWifiDisconnect(const WiFiEventStationModeDisconnected& event);
void onMqttConnect(bool sessionPresent); void onMqttConnect(bool sessionPresent);
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason); void onMqttDisconnect(AsyncMqttClientDisconnectReason reason);
void onMqttSubscribe(uint16_t packetId, uint8_t qos); /* void onMqttSubscribe(uint16_t packetId, uint8_t qos);
void onMqttUnsubscribe(uint16_t packetId); void onMqttUnsubscribe(uint16_t packetId);
void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total); void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total);
void onMqttPublish(uint16_t packetId); void onMqttPublish(uint16_t packetId); */
//leds b_led(B_LED); //leds b_led(B_LED);
leds g_led(G_LED, 100); leds g_led(G_LED, 100);
@@ -47,8 +47,8 @@ leds g_led(G_LED, 100);
void setup() { void setup() {
Serial.begin(9600, SERIAL_8N1); Serial.begin(9600, SERIAL_8N1);
Serial1.begin(9600); //Serial1.begin(9600);
Serial1.println("Booting"); // "Загрузка" //Serial1.println("Booting"); // "Загрузка"
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.hostname("MidRoom"); WiFi.hostname("MidRoom");
@@ -81,10 +81,10 @@ void setup() {
mqttClient.onConnect(onMqttConnect); mqttClient.onConnect(onMqttConnect);
mqttClient.onDisconnect(onMqttDisconnect); mqttClient.onDisconnect(onMqttDisconnect);
mqttClient.onSubscribe(onMqttSubscribe); /* mqttClient.onSubscribe(onMqttSubscribe);
mqttClient.onUnsubscribe(onMqttUnsubscribe); mqttClient.onUnsubscribe(onMqttUnsubscribe);
mqttClient.onMessage(onMqttMessage); mqttClient.onMessage(onMqttMessage);
mqttClient.onPublish(onMqttPublish); mqttClient.onPublish(onMqttPublish); */
mqttClient.setServer(mqtt_server, 1883); mqttClient.setServer(mqtt_server, 1883);
pinMode(MOV_SENS, INPUT_PULLUP); pinMode(MOV_SENS, INPUT_PULLUP);
@@ -96,7 +96,7 @@ void setup() {
digitalWrite(P_SENS, HIGH); digitalWrite(P_SENS, HIGH);
digitalWrite(B_LED, HIGH); digitalWrite(B_LED, HIGH);
digitalWrite(R_LED, HIGH); digitalWrite(R_LED, HIGH);
Serial1.println(F("Begin MH-Z19")); //Serial1.println(F("Begin MH-Z19"));
for(int i = 0; i < 5; i++){ for(int i = 0; i < 5; i++){
Serial1.print('.'); Serial1.print('.');
delay(1000); delay(1000);
@@ -125,30 +125,30 @@ void setup() {
//Serial1.println(F("End Begin MH-Z19")); //Serial1.println(F("End Begin MH-Z19"));
Wire.begin(); Wire.begin();
Serial1.println(F("Begin BME")); //Serial1.println(F("Begin BME"));
bool status = bme.begin(BME280_ADDRESS_ALTERNATE); bool status = bme.begin(BME280_ADDRESS_ALTERNATE);
if (!status) { if (!status) {
Serial1.println(F("Could not find a valid BME280 sensor, check wiring, address, sensor ID!")); //Serial1.println(F("Could not find a valid BME280 sensor, check wiring, address, sensor ID!"));
} }
else{ else{
delay(100); delay(100);
p = bme.readPressure(); p = bme.readPressure();
t = bme.readTemperature(); t = bme.readTemperature();
h = bme.readHumidity(); h = bme.readHumidity();
Serial1.print(F("T: ")); /* Serial1.print(F("T: "));
Serial1.print(t); Serial1.print(t);
Serial1.print(F("\tH: ")); Serial1.print(F("\tH: "));
Serial1.print(h); Serial1.print(h);
Serial1.print(F("\tP: ")); Serial1.print(F("\tP: "));
Serial1.println(p); Serial1.println(p); */
} }
connectToWifi(); connectToWifi();
cRun = millis(); cRun = millis();
Serial1.println(F("Start Loop")); //Serial1.println(F("Start Loop"));
//(R_LED, HIGH); //(R_LED, HIGH);
} }
@@ -161,7 +161,7 @@ void loop() {
//r_led.tick(); //r_led.tick();
if (digitalRead(MOV_SENS) != old_mov){ if (digitalRead(MOV_SENS) != old_mov){
old_mov = digitalRead(MOV_SENS); old_mov = digitalRead(MOV_SENS);
Serial1.println(F("Change mov detected")); //Serial1.println(F("Change mov detected"));
mqttClient.publish("/home/midroom/move", 1, false, old_mov ? "1" : "0"); mqttClient.publish("/home/midroom/move", 1, false, old_mov ? "1" : "0");
} }
@@ -169,8 +169,8 @@ void loop() {
cRun = millis(); cRun = millis();
//if(mqttClient.connected()) digitalWrite(R_LED, LOW); else digitalWrite(R_LED, HIGH); //if(mqttClient.connected()) digitalWrite(R_LED, LOW); else digitalWrite(R_LED, HIGH);
adc = analogRead(A0); adc = analogRead(A0);
Serial1.print(F("ADC: "));Serial1.println(adc); // Serial1.print(F("ADC: "));Serial1.println(adc);
Serial1.print(F("MQTT: "));Serial1.println(mqttClient.connected()); // Serial1.print(F("MQTT: "));Serial1.println(mqttClient.connected());
if(abs(adc - lastADC) > 50){ if(abs(adc - lastADC) > 50){
lastADC = adc; lastADC = adc;
itoa(adc, v, 10); itoa(adc, v, 10);
@@ -178,7 +178,7 @@ void loop() {
} }
if(meas){ if(meas){
//Serial1.println(adc); //Serial1.println(adc);
Serial1.println("Measure"); // Serial1.println("Measure");
pt = bme.readPressure(); pt = bme.readPressure();
tt = bme.readTemperature(); tt = bme.readTemperature();
@@ -188,13 +188,13 @@ void loop() {
Serial1.print(F("\tH: ")); Serial1.print(F("\tH: "));
Serial1.print(ht); Serial1.print(ht);
Serial1.print(F("\tP: ")); Serial1.print(F("\tP: "));
Serial1.println(pt); Serial1.println(pt); */
*/ if(!isnan(pt)) if(!isnan(pt))
p += (pt - p) / 60.0f ; p += (pt - p) / 60.0f ;
else /* else
{ {
Serial1.println(F("Error BME")); Serial1.println(F("Error BME"));
} } */
if(!isnan(tt)) if(!isnan(tt))
t += (tt - t) / 30.0f ; t += (tt - t) / 30.0f ;
@@ -206,8 +206,8 @@ void loop() {
else{ else{
if(minCnt % 5 == 0){ if(minCnt % 5 == 0){
co2 = mhz19.getCO2(); co2 = mhz19.getCO2();
Serial1.print("CO2: "); /* Serial1.print("CO2: ");
Serial1.println(co2); Serial1.println(co2); */
digitalWrite(P_SENS, HIGH); digitalWrite(P_SENS, HIGH);
bme.begin(BME280_ADDRESS_ALTERNATE); bme.begin(BME280_ADDRESS_ALTERNATE);
meas = true; meas = true;
@@ -252,28 +252,28 @@ void loop() {
} }
void connectToWifi() { void connectToWifi() {
Serial1.println(F("Connecting to Wi-Fi...")); // Serial1.println(F("Connecting to Wi-Fi..."));
//Serial1.flush(); //Serial1.flush();
WiFi.begin(ssid, password); WiFi.begin(ssid, password);
} }
void connectToMqtt() { void connectToMqtt() {
Serial1.println(F("Connecting to MQTT...")); // Serial1.println(F("Connecting to MQTT..."));
//Serial1.flush(); //Serial1.flush();
mqttClient.connect(); mqttClient.connect();
} }
void onWifiConnect(const WiFiEventStationModeGotIP& event) { void onWifiConnect(const WiFiEventStationModeGotIP& event) {
Serial1.println(F("Connected to Wi-Fi.")); /* Serial1.println(F("Connected to Wi-Fi."));
Serial1.print(F("IP: ")); Serial1.print(F("IP: "));
//Serial1.flush(); //Serial1.flush();
Serial1.println(WiFi.localIP()); Serial1.println(WiFi.localIP()); */
digitalWrite(R_LED, LOW); digitalWrite(R_LED, LOW);
connectToMqtt(); connectToMqtt();
} }
void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) { void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
Serial1.println(F("Disconnected from Wi-Fi.")); // Serial1.println(F("Disconnected from Wi-Fi."));
//Serial1.flush(); //Serial1.flush();
mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
wifiReconnectTimer.once(2, connectToWifi); wifiReconnectTimer.once(2, connectToWifi);
@@ -281,10 +281,10 @@ void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
} }
void onMqttConnect(bool sessionPresent) { void onMqttConnect(bool sessionPresent) {
Serial1.println(F("Connected to MQTT.")); /* Serial1.println(F("Connected to MQTT."));
Serial1.print(F("Session present: ")); Serial1.print(F("Session present: "));
//Serial1.flush(); //Serial1.flush();
Serial1.println(sessionPresent); Serial1.println(sessionPresent); */
//digitalWrite(B_LED, HIGH); //digitalWrite(B_LED, HIGH);
//digitalWrite(R_LED, LOW); //digitalWrite(R_LED, LOW);
//uint16_t packetIdSub = //uint16_t packetIdSub =
@@ -300,7 +300,7 @@ void onMqttConnect(bool sessionPresent) {
} }
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) { void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
Serial1.println("Disconnected from MQTT."); // Serial1.println("Disconnected from MQTT.");
//digitalWrite(B_LED, LOW); //digitalWrite(B_LED, LOW);
//digitalWrite(R_LED, HIGH); //digitalWrite(R_LED, HIGH);
if (WiFi.isConnected()) { if (WiFi.isConnected()) {
@@ -309,7 +309,7 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
digitalWrite(B_LED, HIGH); digitalWrite(B_LED, HIGH);
} }
void onMqttSubscribe(uint16_t packetId, uint8_t qos) { /* void onMqttSubscribe(uint16_t packetId, uint8_t qos) {
// //Serial1.println("Subscribe acknowledged."); // //Serial1.println("Subscribe acknowledged.");
// //Serial1.print(" packetId: "); // //Serial1.print(" packetId: ");
// //Serial1.println(packetId); // //Serial1.println(packetId);
@@ -335,3 +335,4 @@ void onMqttPublish(uint16_t packetId) {
//g_led.start(); //g_led.start();
} }
*/