diff --git a/devices/presence_ticker/.gitignore b/devices/presence_ticker/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/devices/presence_ticker/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/devices/presence_ticker/README.md b/devices/presence_ticker/README.md new file mode 100644 index 0000000..11a8e19 --- /dev/null +++ b/devices/presence_ticker/README.md @@ -0,0 +1,5 @@ +# Presence ticker + +It sends state on regular intervals, so that presence of the bearer can be tracked. + +![Schematics](docs/presence_sensor_bb.png) diff --git a/devices/presence_ticker/docs/presence_sensor.fzz b/devices/presence_ticker/docs/presence_sensor.fzz new file mode 100644 index 0000000..2cdd17a --- /dev/null +++ b/devices/presence_ticker/docs/presence_sensor.fzz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09a14fc2865ec4834054f390ba1b4683c393835ac0aed6e68e30e19e7dae4982 +size 6814 diff --git a/devices/presence_ticker/docs/presence_sensor_bb.png b/devices/presence_ticker/docs/presence_sensor_bb.png new file mode 100644 index 0000000..13c3656 --- /dev/null +++ b/devices/presence_ticker/docs/presence_sensor_bb.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1603cb8e433a7ee1fd0a2300dfaf574386b5e681dd17ccebe104cfc635ed038e +size 120232 diff --git a/devices/presence_ticker/include/README b/devices/presence_ticker/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/devices/presence_ticker/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/devices/presence_ticker/lib/README b/devices/presence_ticker/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/devices/presence_ticker/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/devices/presence_ticker/platformio.ini b/devices/presence_ticker/platformio.ini new file mode 100644 index 0000000..0025c14 --- /dev/null +++ b/devices/presence_ticker/platformio.ini @@ -0,0 +1,24 @@ +; 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:attiny85] +platform = atmelavr +board = attiny85 +framework = arduino +lib_deps = + sui77/rc-switch @ ^2.6.4 +lib_extra_dirs = + ../../lib +upload_protocol = stk500v1 +upload_flags = + -P$UPLOAD_PORT + -b$UPLOAD_SPEED +upload_port = /dev/ttyACM0 +upload_speed = 19200 diff --git a/devices/presence_ticker/src/presence_ticker.cpp b/devices/presence_ticker/src/presence_ticker.cpp new file mode 100644 index 0000000..172d121 --- /dev/null +++ b/devices/presence_ticker/src/presence_ticker.cpp @@ -0,0 +1,36 @@ +#include +#include +#include "ContactSensor.h" + +#define MINUTES(value) (uint16_t)(value*60/8) // minutes*60(seconds)/8s(WDT) +#define HOURS(value) MINUTES(value)*60 + +#define SEND_INTERVAL MINUTES(2) +#define SEND_VCC_INTERVAL HOURS(6) + +// Pins +#define SENDER_PIN PIN_B2 + +volatile uint16_t counter = 0; +ContactSensor sensor(PRESENCE_SENSOR); + +void setup() { + + TinySwitch::setup(SENDER_PIN); + TinyPower::setup(); + TinyPower::enableWdt(WDTO_8S); +} + +void loop() { + if (counter % SEND_VCC_INTERVAL == 0) { + sensor.sendStateAndVoltage(true); + counter = 0; + } else if (counter % SEND_INTERVAL == 0) { + sensor.sendState(true); + } + TinyPower::sleep(); +} + +ISR(WDT_vect) { + counter++; +} diff --git a/devices/presence_ticker/test/README b/devices/presence_ticker/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/devices/presence_ticker/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/lib/Tiny/Tiny.h b/lib/Tiny/Tiny.h index 653be12..748d4d9 100644 --- a/lib/Tiny/Tiny.h +++ b/lib/Tiny/Tiny.h @@ -35,5 +35,6 @@ enum SensorId : unsigned short { TEMP_SENSOR = 4, LIGHT_SENSOR = 5, MOVEMENT_SENSOR = 6, - OIL_SENSOR = 7 + OIL_SENSOR = 7, + PRESENCE_SENSOR = 8 }; diff --git a/rc-gateway.code-workspace b/rc-gateway.code-workspace index 5e605b8..db5bd71 100644 --- a/rc-gateway.code-workspace +++ b/rc-gateway.code-workspace @@ -1,13 +1,20 @@ { "folders": [ { + "name": "rc-gateway", "path": "." }, { + "name": "temp_sensor", "path": "devices/temp_sensor" }, { + "name": "oil_sensor", "path": "devices/oil_sensor" + }, + { + "name": "presence_ticker", + "path": "devices/presence_ticker" } ], "settings": { @@ -46,7 +53,39 @@ "iterator": "cpp", "memory": "cpp", "variant": "cpp", - "string_view": "cpp" + "string_view": "cpp", + "regex": "cpp", + "cstdint": "cpp", + "bit": "cpp", + "cctype": "cpp", + "clocale": "cpp", + "compare": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstdio": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "map": "cpp", + "set": "cpp", + "unordered_map": "cpp", + "exception": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "initializer_list": "cpp", + "iosfwd": "cpp", + "mutex": "cpp", + "new": "cpp", + "ranges": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeinfo": "cpp" } } } \ No newline at end of file