diff --git a/BigRoomMyS/.gitignore b/BigRoomMyS/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/BigRoomMyS/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/BigRoomMyS/.vscode/extensions.json b/BigRoomMyS/.vscode/extensions.json new file mode 100644 index 0000000..e80666b --- /dev/null +++ b/BigRoomMyS/.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/BigRoomMyS/include/README b/BigRoomMyS/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/BigRoomMyS/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/BigRoomMyS/lib/README b/BigRoomMyS/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/BigRoomMyS/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/BigRoomMyS/platformio.ini b/BigRoomMyS/platformio.ini new file mode 100644 index 0000000..5adbf43 --- /dev/null +++ b/BigRoomMyS/platformio.ini @@ -0,0 +1,19 @@ +; 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:pro8MHzatmega328] +platform = atmelavr +board = pro8MHzatmega328 +framework = arduino +monitor_speed = 115200 +lib_deps = + MySensors @ ^2.3.2 + wifwaf/MH-Z19 @ ^1.5.3 + enjoyneering/AHT10 @ ^1.1.0 \ No newline at end of file diff --git a/BigRoomMyS/src/main.cpp b/BigRoomMyS/src/main.cpp new file mode 100644 index 0000000..e4d18f8 --- /dev/null +++ b/BigRoomMyS/src/main.cpp @@ -0,0 +1,98 @@ +#include +#include +#include + +#define MY_DEBUG +#define MY_RADIO_RF24 +#define MY_RF24_CHANNEL (105) +#define MY_RF24_PA_LEVEL RF24_PA_MAX + +#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 + +#include + +#define MOTION (8) + +void presentation(); +void sendDataI(MyMessage msg, uint32_t status); +void sendDataF(MyMessage msg, float status); + +MyMessage msgTemp(0, V_TEMP); +MyMessage msgHum(1, V_HUM); +MyMessage msgMove(2, V_TRIPPED); +MyMessage msgCO2(3, V_VAR1); +MyMessage msgLight(3, V_VAR2); +MyMessage msgTimeWork(3, V_VAR3); +MyMessage msgTimeMotion(3, V_VAR4); + +void setup() { + pinMode(MOTION, INPUT_PULLUP); +} + +void loop() { + static uint32_t cRun = millis(); + uint16_t LightLev = analogRead(A0); + if((cRun + 999) < millis()){ + cRun = millis(); + sendDataI(msgTimeWork, cRun); + } +} + +void presentation() +{ + sendSketchInfo("MidRoom", "1.0"); + present(0, S_TEMP, "Temp"); + present(1, S_HUM, "Humid"); + present(2, S_MOTION, "Motion"); + present(3, S_CUSTOM, "CO2_Light_Time"); +} + +void sendDataI(MyMessage msg, uint32_t val) +{ + bool send_data = false; + uint8_t count = 0; + while(send_data == false){ + count++; + send_data = send(msg.set(val), true); + if(!send_data) + wait(500, C_SET, msg.type); + if ((count == 3) && (send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки + count = 0; // Обнуляем счётчик + send_data = 1; // Выходим из цикла + } + } +} + +void sendDataF(MyMessage msg, float val) +{ + bool send_data = false; + uint8_t count = 0; + while(send_data == false){ + count++; + send_data = send(msg.set(val, 2), true); + if(!send_data) + wait(500, C_SET, msg.type); + if ((count == 3) && (send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки + count = 0; // Обнуляем счётчик + send_data = 1; // Выходим из цикла + } + } +} + +void sendDataI(MyMessage msg, bool val) +{ + bool send_data = false; + uint8_t count = 0; + while(send_data == false){ + count++; + send_data = send(msg.set(val), true); + if(!send_data) + wait(500, C_SET, msg.type); + if ((count == 3) && (send_data == 0)){ // Если сделано 3 попытки и нет подтверждения отправки + count = 0; // Обнуляем счётчик + send_data = 1; // Выходим из цикла + } + } +} diff --git a/BigRoomMyS/test/README b/BigRoomMyS/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/BigRoomMyS/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 diff --git a/MYS_Home.code-workspace b/MYS_Home.code-workspace index 21d1c8a..449872a 100644 --- a/MYS_Home.code-workspace +++ b/MYS_Home.code-workspace @@ -74,6 +74,10 @@ { "name": "LightCtrlMyS", "path": "LightCtrlMyS" + }, + { + "name": "BigRoomMyS", + "path": "BigRoomMyS" } ], "settings": {