From e735f1d05584b5614f362d5a3eeedf3639ef318c Mon Sep 17 00:00:00 2001 From: lexa Date: Sun, 15 Nov 2020 17:21:35 +0300 Subject: [PATCH] Add Main Door Mysensors --- ESP12SmallRoom/src/main.cpp | 4 +- MYS_Home.code-workspace | 4 + MainDoorMyS/.gitignore | 5 ++ MainDoorMyS/.vscode/extensions.json | 7 ++ MainDoorMyS/include/README | 39 ++++++++++ MainDoorMyS/lib/README | 46 ++++++++++++ MainDoorMyS/platformio.ini | 25 +++++++ MainDoorMyS/src/main.cpp | 109 ++++++++++++++++++++++++++++ MainDoorMyS/test/README | 11 +++ 9 files changed, 249 insertions(+), 1 deletion(-) create mode 100644 MainDoorMyS/.gitignore create mode 100644 MainDoorMyS/.vscode/extensions.json create mode 100644 MainDoorMyS/include/README create mode 100644 MainDoorMyS/lib/README create mode 100644 MainDoorMyS/platformio.ini create mode 100644 MainDoorMyS/src/main.cpp create mode 100644 MainDoorMyS/test/README diff --git a/ESP12SmallRoom/src/main.cpp b/ESP12SmallRoom/src/main.cpp index 95f265e..60e4246 100644 --- a/ESP12SmallRoom/src/main.cpp +++ b/ESP12SmallRoom/src/main.cpp @@ -149,7 +149,7 @@ void reconnect() { // подписываемся или переподписываемся на топик; // можно подписаться не только на один, а на несколько топиков char v[6]; - ltoa(delta, v, 10); + itoa(delta, v, 10); client.publish("/home/smallroom/ldelta", v); client.subscribe("/home/smallroom/ldelta"); } else { @@ -179,6 +179,8 @@ void publishMin() client.publish("/home/smallroom/light", strFVal); ultoa(cRun, strFVal, 10); client.publish("/home/smallroom/millis", strFVal); + itoa(delta, strFVal, 10); + client.publish("/home/smallroom/ldelta", strFVal); //digitalWrite(LED_BLUE, LOW); } } diff --git a/MYS_Home.code-workspace b/MYS_Home.code-workspace index 6272b00..3e9f062 100644 --- a/MYS_Home.code-workspace +++ b/MYS_Home.code-workspace @@ -69,6 +69,10 @@ { "name": "ExtSens", "path": "ExtSens" + }, + { + "name": "MainDoorMyS", + "path": "MainDoorMyS" } ], "settings": { diff --git a/MainDoorMyS/.gitignore b/MainDoorMyS/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/MainDoorMyS/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/MainDoorMyS/.vscode/extensions.json b/MainDoorMyS/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/MainDoorMyS/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} diff --git a/MainDoorMyS/include/README b/MainDoorMyS/include/README new file mode 100644 index 0000000..45496b1 --- /dev/null +++ b/MainDoorMyS/include/README @@ -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 diff --git a/MainDoorMyS/lib/README b/MainDoorMyS/lib/README new file mode 100644 index 0000000..8c9c29c --- /dev/null +++ b/MainDoorMyS/lib/README @@ -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 +#include + +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 diff --git a/MainDoorMyS/platformio.ini b/MainDoorMyS/platformio.ini new file mode 100644 index 0000000..88f3f38 --- /dev/null +++ b/MainDoorMyS/platformio.ini @@ -0,0 +1,25 @@ +; 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:pro16MHzatmega328] +platform = atmelavr +board = pro16MHzatmega328 +framework = arduino +monitor_speed = 115200 +lib_deps = + MySensors @ ^2.3.2 + +;[env:pro8MHzatmega168] +;platform = atmelavr +;board = pro8MHzatmega168 +;framework = arduino +;monitor_speed = 115200 +;lib_deps = +; MySensors @ ^2.3.2 \ No newline at end of file diff --git a/MainDoorMyS/src/main.cpp b/MainDoorMyS/src/main.cpp new file mode 100644 index 0000000..443d1f6 --- /dev/null +++ b/MainDoorMyS/src/main.cpp @@ -0,0 +1,109 @@ +#include +#define MY_DEBUG + +// Enable and select radio type attached +#define MY_RF24_PA_LEVEL RF24_PA_HIGH +#define MY_RADIO_RF24 +#if F_CPU == 8000000L +#define MY_BAUD_RATE 38400 +#endif + +#define MY_DEFAULT_LED_BLINK_PERIOD 300 +#define MY_WITH_LEDS_BLINKING_INVERSE +#define MY_DEFAULT_ERR_LED_PIN 2 // Error led pin +#define MY_DEFAULT_TX_LED_PIN 3 // the PCB, on board LED +#define MY_DEFAULT_RX_LED_PIN 4 // Receive led pin + +#include + +#define TOP_LOCK A0 +#define INT_LOCK A1 +#define DOWN_LOCK A2 +#define SMALL_LOCK A3 +#define DOOR A4 + +#define TOP_LOCK_ID 0 +#define INT_LOCK_ID 1 +#define DOWN_LOCK_ID 2 +#define SMALL_LOCK_ID 3 +#define DOOR_ID 4 + +bool bpTop, bpInt, bpDown, bpSmall, bpDoor; + +MyMessage msgTop(TOP_LOCK_ID, V_LOCK_STATUS); +MyMessage msgInt(INT_LOCK_ID, V_LOCK_STATUS); +MyMessage msgDown(DOWN_LOCK_ID, V_LOCK_STATUS); +MyMessage msgSmall(SMALL_LOCK_ID, V_LOCK_STATUS); +MyMessage msgDoor(DOOR_ID, V_LOCK_STATUS); + +void before() +{ + pinMode(TOP_LOCK, INPUT); + pinMode(INT_LOCK, INPUT); + pinMode(DOWN_LOCK, INPUT); + pinMode(SMALL_LOCK, INPUT); +} + +void presentation() +{ + // Send the sketch version information to the gateway and Controller + sendSketchInfo("Main Door", "1.0"); + present(0, S_LOCK, "Top"); + present(1, S_LOCK, "Int"); + present(2, S_LOCK, "Down"); + present(3, S_LOCK, "Small"); + present(4, S_LOCK, "Door"); +} + +void setup() { + // put your setup code here, to run once: +} + +void loop() { + bool bTop, bInt, bDown, bSmall, bDoor; + bTop = digitalRead(TOP_LOCK); + bInt = digitalRead(INT_LOCK); + bDown = digitalRead(DOWN_LOCK); + bSmall = digitalRead(SMALL_LOCK); + bDoor = digitalRead(DOOR); + if(bTop != bpTop){ + bpTop = bTop; + sendData(msgTop, bDoor); + } + if(bInt != bpInt){ + bpInt = bInt; + sendData(msgInt, bInt); + } + if(bDown != bpDown){ + bpDown = bDown; + sendData(msgDown, bDown); + } + if(bSmall != bpSmall){ + bpSmall = bSmall; + sendData(msgSmall, bSmall); + } + if(bDoor != bpDoor){ + bpDoor = bDoor; + sendData(msgDoor, bDoor); + } +} + +void sendData(MyMessage msg, bool status) +{ + bool send_data = false; + uint8_t count = 0; + while(send_data == false){ + count++; + Serial.print("Sending a message, try No."); // Выводим в монитор порта попытку отправки + Serial.println(count); // и её номер + send_data = send(msg.set(status)); + wait(1000, C_SET, V_STATUS); + if(send_data) + Serial.println("Message sent"); + if ((count == 3 )&&(send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки + count = 0; // Обнуляем счётчик + send_data = 1; // Выходим из цикла + Serial.println("Send failed"); // Выводим сообщение "Отправка не удалась" + } + } +} diff --git a/MainDoorMyS/test/README b/MainDoorMyS/test/README new file mode 100644 index 0000000..e7d1588 --- /dev/null +++ b/MainDoorMyS/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PlatformIO 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 PlatformIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html