Merge branch 'master' of 192.168.1.250:/home/git/AHome into master

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

MYS_Home.code-workspace

@@ -73,6 +73,10 @@
 		{
 			"name": "MainDoorMyS",
 			"path": "MainDoorMyS"
+		},
+		{
+			"name": "Rozetka",
+			"path": "Rozetka"
 		}
 	],
 	"settings": {

MidRoomNLight/platformio.ini

@@ -13,3 +13,4 @@ platform = atmelavr
 board = pro8MHzatmega328
 framework = arduino
 monitor_speed = 115200
+lib_deps = mysensors/MySensors@^2.3.2

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));
     }

Rozetka/.gitignore

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

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"
+    ]
+}

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

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 <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

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

Rozetka/src/main.cpp

@@ -0,0 +1,73 @@
+#include <Arduino.h>
+#define MY_DEBUG
+#define MY_RADIO_RF24
+#define MY_RF24_CHANNEL (105)
+#define MY_RF24_PA_LEVEL RF24_PA_HIGH
+#include <MySensors.h>
+
+#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);
+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;
+  }
+}

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