From dbffd0ea700783f420c5453115a29b8a19d215f3 Mon Sep 17 00:00:00 2001 From: lexa Date: Sun, 13 Dec 2020 17:28:22 +0300 Subject: [PATCH 1/4] Change time cycle --- MidRoomNLight/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MidRoomNLight/src/main.cpp b/MidRoomNLight/src/main.cpp index eb73745..c92a233 100644 --- a/MidRoomNLight/src/main.cpp +++ b/MidRoomNLight/src/main.cpp @@ -39,7 +39,7 @@ void presentation() void loop() { static uint32_t cRun = millis(); - if((cRun + 10000) < millis()){ + if((cRun + 10000) <= millis()){ cRun = millis(); send(msgMillis.set(cRun)); } From e147274178b471bc6fad4c39f4931efe4ea0949d Mon Sep 17 00:00:00 2001 From: Alexey Cherkasov Date: Thu, 17 Dec 2020 11:22:15 +0300 Subject: [PATCH 2/4] Add libdeps ExtSens --- ExtSens/platformio.ini | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ExtSens/platformio.ini b/ExtSens/platformio.ini index bd66ae7..b835a88 100644 --- a/ExtSens/platformio.ini +++ b/ExtSens/platformio.ini @@ -13,4 +13,6 @@ platform = atmelavr board = pro8MHzatmega328 framework = arduino monitor_speed = 115200 -lib_deps = enjoyneering/AHT10@^1.1.0 +lib_deps = + enjoyneering/AHT10@^1.1.0 + mysensors/MySensors @ ^2.3.2 From 3a188f5bbb3e1a55c54417394e0af97251d08768 Mon Sep 17 00:00:00 2001 From: Alexey Cherkasov Date: Thu, 17 Dec 2020 13:03:12 +0300 Subject: [PATCH 3/4] Added Rozetka --- MYS_Home.code-workspace | 4 ++ MidRoomNLight/platformio.ini | 3 +- Rozetka/.gitignore | 5 +++ Rozetka/.vscode/extensions.json | 7 ++++ Rozetka/include/README | 39 ++++++++++++++++++ Rozetka/lib/README | 46 ++++++++++++++++++++++ Rozetka/platformio.ini | 15 +++++++ Rozetka/src/main.cpp | 70 +++++++++++++++++++++++++++++++++ Rozetka/test/README | 11 ++++++ 9 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 Rozetka/.gitignore create mode 100644 Rozetka/.vscode/extensions.json create mode 100644 Rozetka/include/README create mode 100644 Rozetka/lib/README create mode 100644 Rozetka/platformio.ini create mode 100644 Rozetka/src/main.cpp create mode 100644 Rozetka/test/README diff --git a/MYS_Home.code-workspace b/MYS_Home.code-workspace index 3e9f062..88a659c 100644 --- a/MYS_Home.code-workspace +++ b/MYS_Home.code-workspace @@ -73,6 +73,10 @@ { "name": "MainDoorMyS", "path": "MainDoorMyS" + }, + { + "name": "Rozetka", + "path": "Rozetka" } ], "settings": { diff --git a/MidRoomNLight/platformio.ini b/MidRoomNLight/platformio.ini index ca7701a..47be950 100644 --- a/MidRoomNLight/platformio.ini +++ b/MidRoomNLight/platformio.ini @@ -12,4 +12,5 @@ platform = atmelavr board = pro8MHzatmega328 framework = arduino -monitor_speed = 115200 \ No newline at end of file +monitor_speed = 115200 +lib_deps = mysensors/MySensors@^2.3.2 diff --git a/Rozetka/.gitignore b/Rozetka/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/Rozetka/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/Rozetka/.vscode/extensions.json b/Rozetka/.vscode/extensions.json new file mode 100644 index 0000000..e80666b --- /dev/null +++ b/Rozetka/.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/Rozetka/include/README b/Rozetka/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/Rozetka/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/Rozetka/lib/README b/Rozetka/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/Rozetka/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/Rozetka/platformio.ini b/Rozetka/platformio.ini new file mode 100644 index 0000000..d1037d9 --- /dev/null +++ b/Rozetka/platformio.ini @@ -0,0 +1,15 @@ +; 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 +lib_deps = mysensors/MySensors@^2.3.2 diff --git a/Rozetka/src/main.cpp b/Rozetka/src/main.cpp new file mode 100644 index 0000000..2ad1504 --- /dev/null +++ b/Rozetka/src/main.cpp @@ -0,0 +1,70 @@ +#include +#define MY_DEBUG +#define MY_RADIO_RF24 +#define MY_RF24_CHANNEL (105) +#define MY_RF24_PA_LEVEL RF24_PA_HIGH +#include + +#define SOCK1 2 +#define SOCK2 3 + +void presentation(); +void sendData(MyMessage msg, bool status); +void receive(const MyMessage &message); + +MyMessage msgMillis(2, V_VAR1); +MyMessage msgSock1(2, V_VAR2); +MyMessage msgSock2(2, V_VAR3); + +void setup() { + pinMode(SOCK1, OUTPUT); + pinMode(SOCK2, OUTPUT); +} + +void loop() { + static uint32_t cRun = millis(); + if((cRun + 10000) <= millis()){ + cRun = millis(); + send(msgMillis.set(cRun)); + } +} + +void presentation() +{ + sendSketchInfo("Rozetka", "1.0"); + present(0, S_BINARY, "Socket1"); + present(1, S_BINARY, "Socket2"); + present(2, S_CUSTOM, "ESMillis"); +} + +void sendData(MyMessage msg, bool status) +{ + bool send_data = false; + uint8_t count = 0; + while(send_data == false){ + count++; + send_data = send(msg.set(status)); + wait(100, C_SET, V_STATUS); + if ((count == 3 )&&(send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки + count = 0; // Обнуляем счётчик + send_data = 1; // Выходим из цикла + } + } +} + +void receive(const MyMessage &message) +{ + switch (message.sensor) + { + case 0: + digitalWrite(SOCK1, message.getBool()); + sendData(msgSock1, digitalRead(SOCK1)); + break; + case 1: + digitalWrite(SOCK1, message.getBool()); + sendData(msgSock2, digitalRead(SOCK2)); + break; + default: + break; + } +} diff --git a/Rozetka/test/README b/Rozetka/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/Rozetka/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 From ce2e36c8fdac5df3e23ade4c870759a57a6963b2 Mon Sep 17 00:00:00 2001 From: Alexey Cherkasov Date: Thu, 17 Dec 2020 13:33:05 +0300 Subject: [PATCH 4/4] Added Leds --- Rozetka/src/main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rozetka/src/main.cpp b/Rozetka/src/main.cpp index 2ad1504..1d885bc 100644 --- a/Rozetka/src/main.cpp +++ b/Rozetka/src/main.cpp @@ -7,6 +7,9 @@ #define SOCK1 2 #define SOCK2 3 +#define MY_DEFAULT_ERR_LED_PIN 4 // Error led pin +#define MY_DEFAULT_RX_LED_PIN 5 // Receive led pin +#define MY_DEFAULT_TX_LED_PIN 6 // the PCB, on board LED void presentation(); void sendData(MyMessage msg, bool status);