Skip to content

Commit

Permalink
[TerkinTelemetry] Renovations to improve the library interface
Browse files Browse the repository at this point in the history
... and to make things work.
  • Loading branch information
amotl committed Jun 6, 2023
1 parent d734efa commit fb031d1
Show file tree
Hide file tree
Showing 19 changed files with 886 additions and 288 deletions.
1 change: 1 addition & 0 deletions doc/source/TerkinTelemetry
1 change: 1 addition & 0 deletions doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Hiveeyes Arduino Firmwares
firmware/overview
BERadio/README
TerkinData/README
TerkinTelemetry/README
firmware-builder
project/index

Expand Down
20 changes: 18 additions & 2 deletions doc/source/resources.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
.. _scale-adjust-hx711.ino: https://github.com/hiveeyes/arduino/blob/main/openhive/scale-adjust/HX711/scale-adjust-hx711.ino

.. BERadio
.. _BERadio C++: https://github.com/hiveeyes/arduino/tree/main/libraries/BERadio
.. _BERadio C++: https://hiveeyes.org/docs/arduino/BERadio/README.html

.. Mois
.. _beescale-yun.ino: https://github.com/hiveeyes/arduino/blob/main/moislabs/beescale-yun/beescale-yun.ino
Expand All @@ -69,7 +69,7 @@
.. _bienenwaage-esp32.cpp: https://github.com/hiveeyes/arduino/blob/main/ringlabs/bienenwaage-5.0/bienenwaage-esp32.cpp

.. Kotori
.. _Kotori: https://getkotori.org/docs/
.. _Kotori: https://getkotori.org/



Expand Down Expand Up @@ -191,6 +191,8 @@
.. _GSM: https://en.wikipedia.org/wiki/GSM
.. _ISM: https://en.wikipedia.org/wiki/ISM_radio_band
.. _ISM radio: https://en.wikipedia.org/wiki/ISM_radio_band
.. _Hashids: https://hashids.org/
.. _Home Assistant MQTT device discovery: https://www.home-assistant.io/integrations/mqtt/#mqtt-discovery
.. _HTTP: https://en.wikipedia.org/wiki/HTTP
.. _multi-hop: https://en.wikipedia.org/wiki/Multi-hop_routing
.. _LICENSE: https://github.com/hiveeyes/arduino/blob/main/LICENSE.txt
Expand All @@ -200,13 +202,27 @@
.. _LoRaWAN: https://en.wikipedia.org/wiki/LoRaWAN#LoRaWAN
.. _LTE Cat M1: https://en.wikipedia.org/wiki/LTE-M
.. _LTE Cat NB1: https://en.wikipedia.org/wiki/Narrowband_IoT
.. _multi-tenancy: https://en.wikipedia.org/wiki/Multitenancy
.. _Online UUID Generator: https://www.uuidgenerator.net/
.. _picocom: https://github.com/npat-efault/picocom
.. _pipa-espressif.ino: https://github.com/hiveeyes/arduino/blob/main/backdoor/node-pipa/examples/pipa-espressif/pipa-espressif.ino
.. _PlatformIO Registry: https://registry.platformio.org/
.. _RFM69: https://www.hoperf.com/modules/rf_transceiver/RFM69W.html
.. _RFM69 - microcontroller.net: https://www.mikrocontroller.net/articles/RFM69
.. _RFM95: https://www.hoperf.com/modules/lora/RFM95.html
.. _sensor node: https://en.wikipedia.org/wiki/Sensor_node
.. _sensor nodes: https://en.wikipedia.org/wiki/Sensor_node
.. _sensor network: https://en.wikipedia.org/wiki/Wireless_sensor_network
.. _sensor networks: https://en.wikipedia.org/wiki/Wireless_sensor_network
.. _Sparkplug: https://sparkplug.eclipse.org/
.. _Terkin MicroPython Datalogger: https://github.com/hiveeyes/terkin-datalogger
.. _TerkinData: https://hiveeyes.org/docs/arduino/TerkinData/README.html
.. _TerkinData C++: https://hiveeyes.org/docs/arduino/TerkinData/README.html
.. _TerkinTelemetry: https://hiveeyes.org/docs/arduino/TerkinTelemetry/README.html
.. _TerkinTelemetry C++: https://hiveeyes.org/docs/arduino/TerkinTelemetry/README.html
.. _Terrine: https://github.com/hiveeyes/arduino/tree/main/libraries/Terrine
.. _TTGO T-Call: https://community.hiveeyes.org/t/ttgo-t-call-sim800x/2690
.. _Vasuki: https://api.hiveeyes.org/vasuki/
.. _Wi-Fi: https://en.wikipedia.org/wiki/Wi-Fi
.. _yak shaving: http://www.catb.org/jargon/html/Y/yak-shaving.html

Expand Down
3 changes: 2 additions & 1 deletion libraries/OpenHive/OpenHiveTemperatureArray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
*
**/
#include "OpenHiveTemperatureArray.h"
#include "TerkinData.h"

using namespace OpenHive;

Expand Down Expand Up @@ -108,7 +109,7 @@ JsonObject& OpenHiveTemperatureArray::read_demo() {
// inside the data container for each frame
const char * OpenHiveTemperatureArray::get_name(int frame_number) {
/* Frame name builder, e.g. "frame-42" */
return (String("frame-") + String(frame_number)).c_str();
return (std::string("frame-") + TerkinUtil::to_string(frame_number)).c_str();
}

// Create the data container root object
Expand Down
1 change: 0 additions & 1 deletion libraries/Terkin/Terkin.h

This file was deleted.

166 changes: 0 additions & 166 deletions libraries/Terkin/TerkinTelemetry.h

This file was deleted.

Loading

0 comments on commit fb031d1

Please sign in to comment.