First commit

This commit is contained in:
2020-08-01 13:47:02 +03:00
commit ac18805ff4
142 changed files with 8325 additions and 0 deletions

5
Sw_MidlRoom/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
.pio
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch

67
Sw_MidlRoom/.travis.yml Normal file
View File

@@ -0,0 +1,67 @@
# Continuous Integration (CI) is the practice, in software
# engineering, of merging all developer working copies with a shared mainline
# several times a day < https://docs.platformio.org/page/ci/index.html >
#
# Documentation:
#
# * Travis CI Embedded Builds with PlatformIO
# < https://docs.travis-ci.com/user/integration/platformio/ >
#
# * PlatformIO integration with Travis CI
# < https://docs.platformio.org/page/ci/travis.html >
#
# * User Guide for `platformio ci` command
# < https://docs.platformio.org/page/userguide/cmd_ci.html >
#
#
# Please choose one of the following templates (proposed below) and uncomment
# it (remove "# " before each line) or use own configuration according to the
# Travis CI documentation (see above).
#
#
# Template #1: General project. Test it using existing `platformio.ini`.
#
# language: python
# python:
# - "2.7"
#
# sudo: false
# cache:
# directories:
# - "~/.platformio"
#
# install:
# - pip install -U platformio
# - platformio update
#
# script:
# - platformio run
#
# Template #2: The project is intended to be used as a library with examples.
#
# language: python
# python:
# - "2.7"
#
# sudo: false
# cache:
# directories:
# - "~/.platformio"
#
# env:
# - PLATFORMIO_CI_SRC=path/to/test/file.c
# - PLATFORMIO_CI_SRC=examples/file.ino
# - PLATFORMIO_CI_SRC=path/to/test/directory
#
# install:
# - pip install -U platformio
# - platformio update
#
# script:
# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N

7
Sw_MidlRoom/.vscode/extensions.json vendored Normal file
View File

@@ -0,0 +1,7 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"platformio.platformio-ide"
]
}

View File

@@ -0,0 +1,39 @@
This directory is intended for project header files.
A header file is a file containing C declarations and macro definitions
to be shared between several project source files. You request the use of a
header file in your project source file (C, C++, etc) located in `src` folder
by including it, with the C preprocessing directive `#include'.
```src/main.c
#include "header.h"
int main (void)
{
...
}
```
Including a header file produces the same results as copying the header file
into each source file that needs it. Such copying would be time-consuming
and error-prone. With a header file, the related declarations appear
in only one place. If they need to be changed, they can be changed in one
place, and programs that include the header file will automatically use the
new version when next recompiled. The header file eliminates the labor of
finding and changing all the copies as well as the risk that a failure to
find one copy will result in inconsistencies within a program.
In C, the usual convention is to give header files names that end with `.h'.
It is most portable to use only letters, digits, dashes, and underscores in
header file names, and at most one dot.
Read more about using header files in official GCC documentation:
* Include Syntax
* Include Operation
* Once-Only Headers
* Computed Includes
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

46
Sw_MidlRoom/lib/README Normal file
View File

@@ -0,0 +1,46 @@
This directory is intended for project specific (private) libraries.
PlatformIO will compile them to static libraries and link into executable file.
The source code of each library should be placed in a an own separate directory
("lib/your_library_name/[here are source files]").
For example, see a structure of the following two libraries `Foo` and `Bar`:
|--lib
| |
| |--Bar
| | |--docs
| | |--examples
| | |--src
| | |- Bar.c
| | |- Bar.h
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
| |
| |--Foo
| | |- Foo.c
| | |- Foo.h
| |
| |- README --> THIS FILE
|
|- platformio.ini
|--src
|- main.c
and a contents of `src/main.c`:
```
#include <Foo.h>
#include <Bar.h>
int main (void)
{
...
}
```
PlatformIO Library Dependency Finder will find automatically dependent
libraries scanning project source files.
More information about PlatformIO Library Dependency Finder
- https://docs.platformio.org/page/librarymanager/ldf.html

View File

@@ -0,0 +1,17 @@
; PlatformIO Project Configuration File
;
; Build options: build flags, source filter
; Upload options: custom upload port, speed and extra flags
; Library options: dependencies, extra library storages
; Advanced options: extra scripting
;
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html
[env:nodemcuv2]
platform = espressif8266
board = nodemcuv2
framework = arduino
board_build.ldscript = eagle.flash.2m.ld
upload_protocol = espota
upload_port = 192.168.1.9

393
Sw_MidlRoom/src/main.cpp Normal file
View File

@@ -0,0 +1,393 @@
#include <Arduino.h>
#include <ArduinoOTA.h>
#include <Ticker.h>
#include <AsyncMqttClient.h>
#include <ESP_EEPROM.h>
#include <Bounce2.h>
const char* ssid = "wf-home";
const char* password = "0ndthnrf";
const char* mqtt_server = "192.168.1.250";
AsyncMqttClient mqttClient;
Ticker mqttReconnectTimer;
WiFiEventHandler wifiConnectHandler;
WiFiEventHandler wifiDisconnectHandler;
Ticker wifiReconnectTimer;
bool lStat1, oldLStat1;
bool lStat2, oldLStat2;
unsigned long cRun;
#define B_LED (16)
#define R_LED1 (4)
#define R_LED2 (13)
#define BUTT1 (14)
#define BUTT2 (12)
bool led = false;
Bounce l1 = Bounce();
Bounce l2 = Bounce();
void connectToWifi() {
WiFi.begin(ssid, password);
}
void connectToMqtt() {
mqttClient.connect();
}
void onWifiConnect(const WiFiEventStationModeGotIP& event) {
connectToMqtt();
}
void onWifiDisconnect(const WiFiEventStationModeDisconnected& event) {
mqttReconnectTimer.detach(); // ensure we don't reconnect to MQTT while reconnecting to Wi-Fi
wifiReconnectTimer.once(2, connectToWifi);
}
void onMqttConnect(bool sessionPresent) {
mqttClient.subscribe("/home/midroom/lamp1_set", 1);
mqttClient.subscribe("/home/midroom/lamp2_set", 1);
mqttClient.publish("/home/midroom/lamp1", 1, false, lStat1 ? "1" : "0");
mqttClient.publish("/home/midroom/lamp2", 1, false, lStat2 ? "1" : "0");
digitalWrite(B_LED, LOW);
}
void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
if (WiFi.isConnected()) {
mqttReconnectTimer.once(2, connectToMqtt);
}
digitalWrite(B_LED, HIGH);
}
void onMqttSubscribe(uint16_t packetId, uint8_t qos) {
}
void onMqttUnsubscribe(uint16_t packetId) {
}
void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
if(strcmp(topic, "/home/midroom/lamp1_set") == 0){
if ((char)payload[0] == '1') lStat1 = true;
else lStat1 = false;
}
if(strcmp(topic, "/home/midroom/lamp2_set") == 0){
if ((char)payload[0] == '1') lStat2 = true;
else lStat2 = false;
}
}
void onMqttPublish(uint16_t packetId) {
}
void setup() {
WiFi.mode(WIFI_STA);
WiFi.hostname("SW-MidRoom");
ArduinoOTA.onStart([]() {
});
ArduinoOTA.onEnd([]() {
});
ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
// Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
});
ArduinoOTA.onError([](ota_error_t error) {
// Serial.printf("Error[%u]: ", error);
// if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
// // "Ошибка при аутентификации"
// else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
// // "Ошибка при начале OTA-апдейта"
// else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
// // "Ошибка при подключении"
// else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
// // "Ошибка при получении данных"
// else if (error == OTA_END_ERROR) Serial.println("End Failed");
// // "Ошибка при завершении OTA-апдейта"
});
ArduinoOTA.begin();
//pinMode(B_LED, FUNCTION_3);
pinMode(B_LED, OUTPUT);
digitalWrite(B_LED, HIGH);
pinMode(R_LED1, OUTPUT);
pinMode(BUTT1, INPUT_PULLUP);
pinMode(R_LED2, OUTPUT);
pinMode(BUTT2, FUNCTION_3);
pinMode(BUTT2, INPUT_PULLUP);
l1.attach(BUTT1);
l2.attach(BUTT2);
EEPROM.begin(16);
EEPROM.get(0, lStat1);
EEPROM.get(1, lStat2);
oldLStat1 = lStat1;
oldLStat2 = lStat2;
// Serial.print("Lamp1: ");
// Serial.println(lStat1);
digitalWrite(R_LED1, lStat1);
digitalWrite(R_LED2, lStat2);
//oldLStat2 = lStat2;
wifiConnectHandler = WiFi.onStationModeGotIP(onWifiConnect);
wifiDisconnectHandler = WiFi.onStationModeDisconnected(onWifiDisconnect);
mqttClient.onConnect(onMqttConnect);
mqttClient.onDisconnect(onMqttDisconnect);
mqttClient.onSubscribe(onMqttSubscribe);
mqttClient.onUnsubscribe(onMqttUnsubscribe);
mqttClient.onMessage(onMqttMessage);
mqttClient.onPublish(onMqttPublish);
mqttClient.setServer(mqtt_server, 1883);
connectToWifi();
cRun = millis();
}
void loop() {
ArduinoOTA.handle();
l1.update();
l2.update();
if(l1.fell()){
lStat1 = !lStat1;
}
if(l2.fell()){
lStat2 = !lStat2;
}
if(lStat1 != oldLStat1){
digitalWrite(R_LED1, lStat1);
oldLStat1 = lStat1;
mqttClient.publish("/home/midroom/lamp1", 1, false, lStat1 ? "1" : "0");
EEPROM.put(0, lStat1);
EEPROM.commit();
}
if(lStat2 != oldLStat2){
digitalWrite(R_LED2, lStat2);
oldLStat2 = lStat2;
mqttClient.publish("/home/midroom/lamp2", 1, false, lStat2 ? "1" : "0");
EEPROM.put(1, lStat2);
EEPROM.commit();
}
}
/////////////////////////////////////////////////////
// /*********
// Руи Сантос (Rui Santos)
// Более подробно о проекте на: http://randomnerdtutorials.com
// Пример в IDE Arduino: File > Examples > Arduino OTA > BasicOTA.ino
// (Файл > Примеры > Arduino OTA > BasicOTA.ino)
// *********/
// #include <Arduino.h>
// #include <ESP8266WiFi.h>
// #include <ESP8266mDNS.h>
// #include <WiFiUdp.h>
// #include <ArduinoOTA.h>
// #include <Bounce2.h>
// #include <PubSubClient.h>
// #include <ESP_EEPROM.h>
// // замените значения в этих константах на те,
// // что соответствуют вашей сети:
// const char* ssid = "wf-home";
// const char* password = "0ndthnrf";
// const char* mqtt_server = "192.168.1.250";
// //unsigned long int cRun;
// bool lStat1;
// bool lStat2;
// #define B_LED 16
// //bool led = false;
// Bounce l1 = Bounce();
// Bounce l2 = Bounce();
// WiFiClient espClient;
// PubSubClient client(espClient);
// void callback(char* topic, byte* payload, unsigned int length) {
// Serial.print("Message arrived [");
// Serial.print(topic);
// Serial.print("] ");
// for (unsigned int i = 0; i < length; i++) {
// Serial.print((char)payload[i]);
// }
// Serial.println();
// if(strcmp(topic, "/home/midroom/lamp1_set") == 0){
// if ((char)payload[0] == '1') lStat1 = true;
// else lStat1 = false;
// EEPROM.put(0, lStat1);
// EEPROM.commit();
// Serial.print("Lamp 1: ");
// Serial.println(lStat1);
// if (client.connected())
// client.publish("/home/midroom/lamp1", lStat1 ? "1" : "0");
// //setLamp(0);
// }
// if(strcmp(topic, "/home/midroom/lamp2_set") == 0){
// if ((char)payload[0] == '1') lStat2 = true;
// else lStat2 = false;
// //setLamp(1);
// EEPROM.put(1, lStat2);
// EEPROM.commit();
// Serial.print("Lamp 2: ");
// Serial.println(lStat2);
// if (client.connected())
// client.publish("/home/midroom/lamp2", lStat2 ? "1" : "0");
// }
// // Switch on the LED if an 1 was received as first character
// //if ((char)payload[0] == '1') {
// //digitalWrite(LED_BUILTIN, LOW); // Turn the LED on (Note that LOW is the voltage level
// // but actually the LED is on; this is because
// // it is active low on the ESP-01)
// //} else {
// //digitalWrite(LED_BUILTIN, HIGH); // Turn the LED off by making the voltage HIGH
// //}
// }
// void reconnect() {
// // Loop until we're reconnected
// int cntConn = 0;
// while (!client.connected() && cntConn < 5) {
// Serial.print("Attempting MQTT connection...");
// // Create a random client ID
// String clientId = "SwitchMidRoom";
// //clientId += String(random(0xffff), HEX);
// // Attempt to connect
// if (client.connect(clientId.c_str())) {
// Serial.println("connected");
// // Once connected, publish an announcement...
// //client.publish("outTopic", "hello world");
// // ... and resubscribe
// client.subscribe("/home/midroom/lamp1_set");
// client.subscribe("/home/midroom/lamp2_set");
// digitalWrite(B_LED, LOW);
// } else {
// Serial.print("failed, rc=");
// Serial.print(client.state());
// Serial.println(" try again in 5 seconds");
// digitalWrite(B_LED, HIGH);
// // Wait 5 seconds before retrying
// //delay(5000);
// }
// cntConn++;
// }
// }
// void setup() {
// Serial.begin(9600);
// Serial.println("Booting"); // "Загрузка"
// WiFi.mode(WIFI_STA);
// WiFi.hostname("SW-MidRoom");
// WiFi.begin(ssid, password);
// int cntConn = 0;
// while ((WiFi.waitForConnectResult() != WL_CONNECTED) && cntConn < 5) {
// Serial.println("Connection Failed! Rebooting...");
// // "Соединиться не удалось! Перезагрузка..."
// delay(1000);
// cntConn++;
// ESP.restart();
// }
// // строчка для номера порта по умолчанию
// // можно вписать «8266»:
// // ArduinoOTA.setPort(8266);
// // строчка для названия хоста по умолчанию;
// // можно вписать «esp8266-[ID чипа]»:
// // ArduinoOTA.setHostname("myesp8266");
// // строчка для аутентификации
// // (по умолчанию никакой аутентификации не будет):
// // ArduinoOTA.setPassword((const char *)"123");
// ArduinoOTA.onStart([]() {
// Serial.println("Start"); // "Начало OTA-апдейта"
// });
// ArduinoOTA.onEnd([]() {
// Serial.println("\nEnd"); // "Завершение OTA-апдейта"
// });
// ArduinoOTA.onProgress([](unsigned int progress, unsigned int total) {
// Serial.printf("Progress: %u%%\r", (progress / (total / 100)));
// });
// ArduinoOTA.onError([](ota_error_t error) {
// Serial.printf("Error[%u]: ", error);
// if (error == OTA_AUTH_ERROR) Serial.println("Auth Failed");
// // "Ошибка при аутентификации"
// else if (error == OTA_BEGIN_ERROR) Serial.println("Begin Failed");
// // "Ошибка при начале OTA-апдейта"
// else if (error == OTA_CONNECT_ERROR) Serial.println("Connect Failed");
// // "Ошибка при подключении"
// else if (error == OTA_RECEIVE_ERROR) Serial.println("Receive Failed");
// // "Ошибка при получении данных"
// else if (error == OTA_END_ERROR) Serial.println("End Failed");
// // "Ошибка при завершении OTA-апдейта"
// });
// ArduinoOTA.begin();
// Serial.println("Ready"); // "Готово"
// Serial.print("IP address: "); // "IP-адрес: "
// Serial.println(WiFi.localIP());
// //pinMode(0, INPUT_PULLUP);
// //l1.attach(0);
// pinMode(B_LED, OUTPUT);
// pinMode(4, OUTPUT);
// pinMode(13, OUTPUT);
// pinMode(14, INPUT);
// l1.attach(14);
// pinMode(12, INPUT);
// l2.attach(12);
// lStat1 = false;
// lStat2 = false;
// client.setServer(mqtt_server, 1883);
// client.setCallback(callback);
// EEPROM.begin(16);
// EEPROM.get(0, lStat1);
// EEPROM.get(1, lStat2);
// //cRun = millis();
// }
// void loop() {
// ArduinoOTA.handle();
// digitalWrite(4, lStat1);
// digitalWrite(13, lStat2);
// if (!client.connected()) {
// reconnect();
// }
// client.loop();
// l1.update();
// l2.update();
// if(l1.fell()){
// lStat1 = !lStat1;
// //digitalWrite(4, lStat1);
// EEPROM.put(0, lStat1);
// EEPROM.commit();
// Serial.print("Lamp 1: ");
// Serial.println(lStat1);
// if (client.connected())
// client.publish("/home/midroom/lamp1", String(lStat1).c_str());
// }
// if(l2.fell()){
// lStat2 = !lStat2;
// //digitalWrite(13, lStat2);
// EEPROM.put(1, lStat2);
// EEPROM.commit();
// Serial.print("Lamp 2: ");
// Serial.println(lStat2);
// if (client.connected())
// client.publish("/home/midroom/lamp2", String(lStat2).c_str());
// }
// // if(cRun + 500 < millis()){
// // digitalWrite(B_LED, led);
// // led = !led;
// // cRun = millis();
// // }
// }

11
Sw_MidlRoom/test/README Normal file
View File

@@ -0,0 +1,11 @@
This directory is intended for PIO Unit Testing and project tests.
Unit Testing is a software testing method by which individual units of
source code, sets of one or more MCU program modules together with associated
control data, usage procedures, and operating procedures, are tested to
determine whether they are fit for use. Unit testing finds problems early
in the development cycle.
More information about PIO Unit Testing:
- https://docs.platformio.org/page/plus/unit-testing.html