From 3a9108674da7dd4e3e599403aff0f4f3ceb6d736 Mon Sep 17 00:00:00 2001 From: lexa Date: Sun, 4 Oct 2020 17:32:53 +0300 Subject: [PATCH] Added Koridor MyS --- KorMYS/.gitignore | 5 + KorMYS/.vscode/extensions.json | 7 ++ KorMYS/include/README | 39 ++++++++ KorMYS/lib/README | 46 ++++++++++ KorMYS/platformio.ini | 16 ++++ KorMYS/src/main.cpp | 157 ++++++++++++++++++++++++++++++++ KorMYS/test/README | 11 +++ MYS_Home.code-workspace | 4 + SerialGateWayMyS/platformio.ini | 4 +- SerialGateWayMyS/src/main.cpp | 71 ++++++++++++++- 10 files changed, 356 insertions(+), 4 deletions(-) create mode 100644 KorMYS/.gitignore create mode 100644 KorMYS/.vscode/extensions.json create mode 100644 KorMYS/include/README create mode 100644 KorMYS/lib/README create mode 100644 KorMYS/platformio.ini create mode 100644 KorMYS/src/main.cpp create mode 100644 KorMYS/test/README diff --git a/KorMYS/.gitignore b/KorMYS/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/KorMYS/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/KorMYS/.vscode/extensions.json b/KorMYS/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/KorMYS/.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/KorMYS/include/README b/KorMYS/include/README new file mode 100644 index 0000000..45496b1 --- /dev/null +++ b/KorMYS/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/KorMYS/lib/README b/KorMYS/lib/README new file mode 100644 index 0000000..8c9c29c --- /dev/null +++ b/KorMYS/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/KorMYS/platformio.ini b/KorMYS/platformio.ini new file mode 100644 index 0000000..f8c6aa7 --- /dev/null +++ b/KorMYS/platformio.ini @@ -0,0 +1,16 @@ +; 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:uno] +platform = atmelavr +board = uno +framework = arduino +lib_deps = featherfly/SoftwareSerial @ ^1.0 +monitor_speed = 115200 diff --git a/KorMYS/src/main.cpp b/KorMYS/src/main.cpp new file mode 100644 index 0000000..3d601e0 --- /dev/null +++ b/KorMYS/src/main.cpp @@ -0,0 +1,157 @@ +#include +/** +* The MySensors Arduino library handles the wireless radio link and protocol +* between your home built sensors/actuators and HA controller of choice. +* The sensors forms a self healing radio network with optional repeaters. Each +* repeater and gateway builds a routing tables in EEPROM which keeps track of the +* network topology allowing messages to be routed to nodes. +* +* Created by Henrik Ekblad +* Copyright (C) 2013-2019 Sensnology AB +* Full contributor list: https://github.com/mysensors/MySensors/graphs/contributors +* +* Documentation: http://www.mysensors.org +* Support Forum: http://forum.mysensors.org +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* version 2 as published by the Free Software Foundation. +* +******************************* +* +* DESCRIPTION +* The ArduinoGateway prints data received from sensors on the serial link. +* The gateway accepts input on serial which will be sent out on radio network. +* +* The GW code is designed for Arduino Nano 328p / 16MHz +* +* Wire connections (OPTIONAL): +* - Inclusion button should be connected between digital pin 3 and GND +* - RX/TX/ERR leds need to be connected between +5V (anode) and digital pin 6/5/4 with resistor 270-330R in a series +* +* LEDs (OPTIONAL): +* - To use the feature, uncomment any of the MY_DEFAULT_xx_LED_PINs +* - RX (green) - blink fast on radio message received. In inclusion mode will blink fast only on presentation received +* - TX (yellow) - blink fast on radio message transmitted. In inclusion mode will blink slowly +* - ERR (red) - fast blink on error during transmission error or receive crc error +* +*/ + +// Enable debug prints to serial monitor +#define MY_DEBUG + + +// Enable and select radio type attached +#define MY_RADIO_RF24 +//#define MY_RADIO_NRF5_ESB +//#define MY_RADIO_RFM69 +//#define MY_RADIO_RFM95 + +// Set LOW transmit power level as default, if you have an amplified NRF-module and +// power your radio separately with a good regulator you can turn up PA level. +#define MY_RF24_PA_LEVEL RF24_PA_HIGH + +// Enable serial gateway +//#define MY_GATEWAY_SERIAL + +// Define a lower baud rate for Arduinos running on 8 MHz (Arduino Pro Mini 3.3V & SenseBender) +#if F_CPU == 8000000L +#define MY_BAUD_RATE 38400 +#endif + +#define MY_TRANSPORT_WAIT_READY_MS 10000 +// Enable inclusion mode +//#define MY_INCLUSION_MODE_FEATURE +// Enable Inclusion mode button on gateway +//#define MY_INCLUSION_BUTTON_FEATURE + +// Inverses behavior of inclusion button (if using external pullup) +//#define MY_INCLUSION_BUTTON_EXTERNAL_PULLUP + +// Set inclusion mode duration (in seconds) +//#define MY_INCLUSION_MODE_DURATION 60 +// Digital pin used for inclusion mode button +//#define MY_INCLUSION_MODE_BUTTON_PIN 3 + +// Set blinking period +#define MY_DEFAULT_LED_BLINK_PERIOD 300 + +// Inverses the behavior of leds +#define MY_WITH_LEDS_BLINKING_INVERSE + +// Flash leds on rx/tx/err +// Uncomment to override default HW configurations +#define MY_DEFAULT_ERR_LED_PIN 4 // Error led pin +#define MY_DEFAULT_RX_LED_PIN 6 // Receive led pin +#define MY_DEFAULT_TX_LED_PIN 5 // the PCB, on board LED + +#include +//#include +#include +#include + +unsigned long cRun; +int cSec; +#define RX_PIN 2 +#define TX_PIN 3 +SoftwareSerial sSerial(RX_PIN, TX_PIN); +SDS011 sds; +//SdsDustSensor sds(sSerial); +MyMessage msgHum25(0, V_LEVEL); +MyMessage msgHum25_UN(0, V_UNIT_PREFIX); +MyMessage msgHum10(1, V_LEVEL); +MyMessage msgHum10_UN(1, V_UNIT_PREFIX); +void SDS011workmode(byte mode, SoftwareSerial *ser); + +void setup() +{ + Serial.begin(115200); + sSerial.begin(9600); + //set_per(2, &sSerial); + SDS011workmode(2, &sSerial); + sds.begin(&sSerial); + Serial.println("Begin"); + //Serial.println(sds.queryFirmwareVersion().toString()); // prints firmware version + //Serial.println(sds.setActiveReportingMode().toString()); // ensures sensor is in 'active' reporting mode + //Serial.println(sds.setCustomWorkingPeriod(3).toString()); // sensor sends data every 3 minutes + //sds.setActiveReportingMode(); + //sds.setCustomWorkingPeriod(1); + cRun = millis(); + cSec = 0; +} + +void presentation() +{ + present(0, S_DUST, "pm2.5"); + present(1, S_DUST, "pm10"); +} + +void loop() +{ + float p25, p10; + if(cRun + 999 < millis()){ + cRun = millis(); + + int error = sds.read(&p25, &p10); + if (!error) { + Serial.println(millis()/1000); + Serial.println("P2.5: " + String(p25)); + Serial.println("P10: " + String(p10)); + send(msgHum25.set(p25, 1)); + wait(100); + send(msgHum10.set(p10, 1)); + } + } +} + +////////////////// sends work mode command to SDS011 ////////////////////// + +void SDS011workmode(byte mode, SoftwareSerial *ser) +{ + byte cs = 7 + mode; + uint8_t sleep_command[] = {0xAA, 0xB4, 0x08, 0x01, mode, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, cs, 0xAB}; +// ^^ 0 for continuous, 1-30 for 1-30 min delay between turns on. ^^ checksum: 07 for 0x00, 08 for 0x01 and so on + for (uint8_t i = 0; i < 19; i++) { + ser->write(sleep_command[i]); + } +} \ No newline at end of file diff --git a/KorMYS/test/README b/KorMYS/test/README new file mode 100644 index 0000000..e7d1588 --- /dev/null +++ b/KorMYS/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 fd352f4..391558a 100644 --- a/MYS_Home.code-workspace +++ b/MYS_Home.code-workspace @@ -62,6 +62,10 @@ { "name": "MidRoomNLight", "path": "MidRoomNLight" + }, + { + "name": "KorMYS", + "path": "KorMYS" } ], "settings": { diff --git a/SerialGateWayMyS/platformio.ini b/SerialGateWayMyS/platformio.ini index ab05972..6511c31 100644 --- a/SerialGateWayMyS/platformio.ini +++ b/SerialGateWayMyS/platformio.ini @@ -10,6 +10,8 @@ [env:nanoatmega328] platform = atmelavr -board = nanoatmega328 +;board = nanoatmega328 +board = uno framework = arduino monitor_speed = 115200 +lib_deps = featherfly/SoftwareSerial @ ^1.0 diff --git a/SerialGateWayMyS/src/main.cpp b/SerialGateWayMyS/src/main.cpp index cb339df..bd897c3 100644 --- a/SerialGateWayMyS/src/main.cpp +++ b/SerialGateWayMyS/src/main.cpp @@ -85,18 +85,83 @@ #define MY_DEFAULT_TX_LED_PIN 5 // the PCB, on board LED #include +//#include +#include +#include + +unsigned long cRun; +int cSec; +#define RX_PIN 2 +#define TX_PIN 3 +SoftwareSerial sSerial(RX_PIN, TX_PIN); +SDS011 sds; +//SdsDustSensor sds(sSerial); +MyMessage msgHum25(0, V_LEVEL); +MyMessage msgHum25_UN(0, V_UNIT_PREFIX); +MyMessage msgHum10(1, V_LEVEL); +MyMessage msgHum10_UN(1, V_UNIT_PREFIX); +void set_per(uint8_t per, SoftwareSerial *ser); void setup() { - // Setup locally attached sensors + Serial.begin(115200); + sSerial.begin(9600); + set_per(2, &sSerial); + sds.begin(&sSerial); + Serial.println("Begin"); + //Serial.println(sds.queryFirmwareVersion().toString()); // prints firmware version + //Serial.println(sds.setActiveReportingMode().toString()); // ensures sensor is in 'active' reporting mode + //Serial.println(sds.setCustomWorkingPeriod(3).toString()); // sensor sends data every 3 minutes + //sds.setActiveReportingMode(); + //sds.setCustomWorkingPeriod(1); + cRun = millis(); + cSec = 0; } void presentation() { - // Present locally attached sensors + present(0, S_DUST, "pm2.5"); + present(1, S_DUST, "pm10"); } void loop() { - // Send locally attached sensor data here + float p25, p10; + if(cRun + 999 < millis()){ + cRun = millis(); + + int error = sds.read(&p25, &p10); + if (!error) { + Serial.println(millis()/1000); + Serial.println("P2.5: " + String(p25)); + Serial.println("P10: " + String(p10)); + } +/* PmResult pm = sds.readPm(); + if (pm.isOk()) { + send(msgHum25.set(pm.pm25, 2)); + wait(100); + send(msgHum10.set(pm.pm10, 2)); + } + if(++cSec == 60){ + wait(100); + send(msgHum25_UN.set("pm2.5")); + wait(100); + send(msgHum10_UN.set("pm10")); + }*/ + } +} + +void set_per(uint8_t per, SoftwareSerial *ser) +{ + ser->write(0xAA); + ser->write(0xB4); + ser->write(0x08); + ser->write(0xAA); + ser->write(0x01); + for(int i = 0; i < 10; i++) ser->print(0x00); + ser->write(0xFF); + ser->write(0xFF); + uint8_t crc = 0x07 + per; + ser->write(crc); + ser->write(0xAB); }