From 664f14612863159aaaeb9a2921c90ba4130c379b Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Fri, 5 Jul 2024 21:30:30 +1000 Subject: [PATCH 1/7] lora: sensor-lorawan: Initial commit Signed-off-by: Alistair Francis --- RadioLib/RadioLib | 2 +- examples/lora/sensor-lorawan/.gitignore | 1 + examples/lora/sensor-lorawan/CayenneLPP.cc | 217 ++++++ examples/lora/sensor-lorawan/CayenneLPP.h | 85 +++ examples/lora/sensor-lorawan/LICENSE.GPL | 674 ++++++++++++++++++ examples/lora/sensor-lorawan/Makefile | 20 + examples/lora/sensor-lorawan/README.md | 30 + examples/lora/sensor-lorawan/main.cc | 107 +++ .../lora/sensor-lorawan/radioConfig_example.h | 17 + 9 files changed, 1152 insertions(+), 1 deletion(-) create mode 100644 examples/lora/sensor-lorawan/.gitignore create mode 100644 examples/lora/sensor-lorawan/CayenneLPP.cc create mode 100644 examples/lora/sensor-lorawan/CayenneLPP.h create mode 100644 examples/lora/sensor-lorawan/LICENSE.GPL create mode 100644 examples/lora/sensor-lorawan/Makefile create mode 100644 examples/lora/sensor-lorawan/README.md create mode 100644 examples/lora/sensor-lorawan/main.cc create mode 100644 examples/lora/sensor-lorawan/radioConfig_example.h diff --git a/RadioLib/RadioLib b/RadioLib/RadioLib index 954477b0c..fffb1fae9 160000 --- a/RadioLib/RadioLib +++ b/RadioLib/RadioLib @@ -1 +1 @@ -Subproject commit 954477b0c0589e6373692ce569ca117191667c30 +Subproject commit fffb1fae9f6c43997c7ee0993e68ec7cd80ebb17 diff --git a/examples/lora/sensor-lorawan/.gitignore b/examples/lora/sensor-lorawan/.gitignore new file mode 100644 index 000000000..9029eada1 --- /dev/null +++ b/examples/lora/sensor-lorawan/.gitignore @@ -0,0 +1 @@ +radioConfig.h diff --git a/examples/lora/sensor-lorawan/CayenneLPP.cc b/examples/lora/sensor-lorawan/CayenneLPP.cc new file mode 100644 index 000000000..20d7034d4 --- /dev/null +++ b/examples/lora/sensor-lorawan/CayenneLPP.cc @@ -0,0 +1,217 @@ +/* SPDX-License-Identifier: GPL-3.0 */ +/* + * The Cayenne Low Power Payload (LPP) provides a convenient and + * easy way to send data over LPWAN networks such as LoRaWAN. The Cayenne LPP + * is compliant with the payload size restriction, which can be lowered down to + * 11 bytes, and allows the device to send multiple sensor data at one time. + * + * CayenneLPP is also support by TTN: + * https://www.thethingsindustries.com/docs/integrations/payload-formatters/cayenne/ + * + * This code is direct from: https://github.com/myDevicesIoT/CayenneLPP + * + * GPL-3.0 license, see `LICENSE.GPL` + * See https://github.com/myDevicesIoT/CayenneLPP for license details + */ + +#include "CayenneLPP.h" + +CayenneLPP::CayenneLPP(uint8_t size) : maxsize(size) { + buffer = (uint8_t*) malloc(size); + cursor = 0; +} + +CayenneLPP::~CayenneLPP(void) { + free(buffer); +} + +void CayenneLPP::reset(void) { + cursor = 0; +} + +uint8_t CayenneLPP::getSize(void) { + return cursor; +} + +uint8_t* CayenneLPP::getBuffer(void) { + return buffer; +} + +uint8_t CayenneLPP::copy(uint8_t* dst) { + memcpy(dst, buffer, cursor); + return cursor; +} + +uint8_t CayenneLPP::addDigitalInput(uint8_t channel, uint8_t value) { + if ((cursor + LPP_DIGITAL_INPUT_SIZE) > maxsize) { + return 0; + } + buffer[cursor++] = channel; + buffer[cursor++] = LPP_DIGITAL_INPUT; + buffer[cursor++] = value; + + return cursor; +} + +uint8_t CayenneLPP::addDigitalOutput(uint8_t channel, uint8_t value) { + if ((cursor + LPP_DIGITAL_OUTPUT_SIZE) > maxsize) { + return 0; + } + buffer[cursor++] = channel; + buffer[cursor++] = LPP_DIGITAL_OUTPUT; + buffer[cursor++] = value; + + return cursor; +} + +uint8_t CayenneLPP::addAnalogInput(uint8_t channel, float value) { + if ((cursor + LPP_ANALOG_INPUT_SIZE) > maxsize) { + return 0; + } + + int16_t val = value * 100; + buffer[cursor++] = channel; + buffer[cursor++] = LPP_ANALOG_INPUT; + buffer[cursor++] = val >> 8; + buffer[cursor++] = val; + + return cursor; +} + +uint8_t CayenneLPP::addAnalogOutput(uint8_t channel, float value) { + if ((cursor + LPP_ANALOG_OUTPUT_SIZE) > maxsize) { + return 0; + } + int16_t val = value * 100; + buffer[cursor++] = channel; + buffer[cursor++] = LPP_ANALOG_OUTPUT; + buffer[cursor++] = val >> 8; + buffer[cursor++] = val; + + return cursor; +} + +uint8_t CayenneLPP::addLuminosity(uint8_t channel, uint16_t lux) { + if ((cursor + LPP_LUMINOSITY_SIZE) > maxsize) { + return 0; + } + buffer[cursor++] = channel; + buffer[cursor++] = LPP_LUMINOSITY; + buffer[cursor++] = lux >> 8; + buffer[cursor++] = lux; + + return cursor; +} + +uint8_t CayenneLPP::addPresence(uint8_t channel, uint8_t value) { + if ((cursor + LPP_PRESENCE_SIZE) > maxsize) { + return 0; + } + buffer[cursor++] = channel; + buffer[cursor++] = LPP_PRESENCE; + buffer[cursor++] = value; + + return cursor; +} + +uint8_t CayenneLPP::addTemperature(uint8_t channel, float celsius) { + if ((cursor + LPP_TEMPERATURE_SIZE) > maxsize) { + return 0; + } + int16_t val = celsius * 10; + buffer[cursor++] = channel; + buffer[cursor++] = LPP_TEMPERATURE; + buffer[cursor++] = val >> 8; + buffer[cursor++] = val; + + return cursor; +} + +uint8_t CayenneLPP::addRelativeHumidity(uint8_t channel, float rh) { + if ((cursor + LPP_RELATIVE_HUMIDITY_SIZE) > maxsize) { + return 0; + } + buffer[cursor++] = channel; + buffer[cursor++] = LPP_RELATIVE_HUMIDITY; + buffer[cursor++] = rh * 2; + + return cursor; +} + +uint8_t CayenneLPP::addAccelerometer(uint8_t channel, float x, float y, float z) { + if ((cursor + LPP_ACCELEROMETER_SIZE) > maxsize) { + return 0; + } + int16_t vx = x * 1000; + int16_t vy = y * 1000; + int16_t vz = z * 1000; + + buffer[cursor++] = channel; + buffer[cursor++] = LPP_ACCELEROMETER; + buffer[cursor++] = vx >> 8; + buffer[cursor++] = vx; + buffer[cursor++] = vy >> 8; + buffer[cursor++] = vy; + buffer[cursor++] = vz >> 8; + buffer[cursor++] = vz; + + return cursor; +} + +uint8_t CayenneLPP::addBarometricPressure(uint8_t channel, float hpa) { + if ((cursor + LPP_BAROMETRIC_PRESSURE_SIZE) > maxsize) { + return 0; + } + int16_t val = hpa * 10; + + buffer[cursor++] = channel; + buffer[cursor++] = LPP_BAROMETRIC_PRESSURE; + buffer[cursor++] = val >> 8; + buffer[cursor++] = val; + + return cursor; +} + +uint8_t CayenneLPP::addGyrometer(uint8_t channel, float x, float y, float z) { + if ((cursor + LPP_GYROMETER_SIZE) > maxsize) { + return 0; + } + int16_t vx = x * 100; + int16_t vy = y * 100; + int16_t vz = z * 100; + + buffer[cursor++] = channel; + buffer[cursor++] = LPP_GYROMETER; + buffer[cursor++] = vx >> 8; + buffer[cursor++] = vx; + buffer[cursor++] = vy >> 8; + buffer[cursor++] = vy; + buffer[cursor++] = vz >> 8; + buffer[cursor++] = vz; + + return cursor; +} + +uint8_t CayenneLPP::addGPS(uint8_t channel, float latitude, float longitude, float meters) { + if ((cursor + LPP_GPS_SIZE) > maxsize) { + return 0; + } + int32_t lat = latitude * 10000; + int32_t lon = longitude * 10000; + int32_t alt = meters * 100; + + buffer[cursor++] = channel; + buffer[cursor++] = LPP_GPS; + + buffer[cursor++] = lat >> 16; + buffer[cursor++] = lat >> 8; + buffer[cursor++] = lat; + buffer[cursor++] = lon >> 16; + buffer[cursor++] = lon >> 8; + buffer[cursor++] = lon; + buffer[cursor++] = alt >> 16; + buffer[cursor++] = alt >> 8; + buffer[cursor++] = alt; + + return cursor; +} diff --git a/examples/lora/sensor-lorawan/CayenneLPP.h b/examples/lora/sensor-lorawan/CayenneLPP.h new file mode 100644 index 000000000..c7e650c2f --- /dev/null +++ b/examples/lora/sensor-lorawan/CayenneLPP.h @@ -0,0 +1,85 @@ +/* SPDX-License-Identifier: GPL-3.0 */ +/* + * The Cayenne Low Power Payload (LPP) provides a convenient and + * easy way to send data over LPWAN networks such as LoRaWAN. The Cayenne LPP + * is compliant with the payload size restriction, which can be lowered down to + * 11 bytes, and allows the device to send multiple sensor data at one time. + * + * CayenneLPP is also support by TTN: + * https://www.thethingsindustries.com/docs/integrations/payload-formatters/cayenne/ + * + * This code is direct from: https://github.com/myDevicesIoT/CayenneLPP + * + * GPL-3.0 license, see `LICENSE.GPL` + * See https://github.com/myDevicesIoT/CayenneLPP for license details + */ + +#ifndef _CAYENNE_LPP_H_ +#define _CAYENNE_LPP_H_ + +#include +#include +#include + +#define LPP_DIGITAL_INPUT 0 // 1 byte +#define LPP_DIGITAL_OUTPUT 1 // 1 byte +#define LPP_ANALOG_INPUT 2 // 2 bytes, 0.01 signed +#define LPP_ANALOG_OUTPUT 3 // 2 bytes, 0.01 signed +#define LPP_LUMINOSITY 101 // 2 bytes, 1 lux unsigned +#define LPP_PRESENCE 102 // 1 byte, 1 +#define LPP_TEMPERATURE 103 // 2 bytes, 0.1°C signed +#define LPP_RELATIVE_HUMIDITY 104 // 1 byte, 0.5% unsigned +#define LPP_ACCELEROMETER 113 // 2 bytes per axis, 0.001G +#define LPP_BAROMETRIC_PRESSURE 115 // 2 bytes 0.1 hPa Unsigned +#define LPP_GYROMETER 134 // 2 bytes per axis, 0.01 °/s +#define LPP_GPS 136 // 3 byte lon/lat 0.0001 °, 3 bytes alt 0.01 meter + + +// Data ID + Data Type + Data Size +#define LPP_DIGITAL_INPUT_SIZE 3 // 1 byte +#define LPP_DIGITAL_OUTPUT_SIZE 3 // 1 byte +#define LPP_ANALOG_INPUT_SIZE 4 // 2 bytes, 0.01 signed +#define LPP_ANALOG_OUTPUT_SIZE 4 // 2 bytes, 0.01 signed +#define LPP_LUMINOSITY_SIZE 4 // 2 bytes, 1 lux unsigned +#define LPP_PRESENCE_SIZE 3 // 1 byte, 1 +#define LPP_TEMPERATURE_SIZE 4 // 2 bytes, 0.1°C signed +#define LPP_RELATIVE_HUMIDITY_SIZE 3 // 1 byte, 0.5% unsigned +#define LPP_ACCELEROMETER_SIZE 8 // 2 bytes per axis, 0.001G +#define LPP_BAROMETRIC_PRESSURE_SIZE 4 // 2 bytes 0.1 hPa Unsigned +#define LPP_GYROMETER_SIZE 8 // 2 bytes per axis, 0.01 °/s +#define LPP_GPS_SIZE 11 // 3 byte lon/lat 0.0001 °, 3 bytes alt 0.01 meter + + +class CayenneLPP { + public: + CayenneLPP(uint8_t size); + ~CayenneLPP(); + + void reset(void); + uint8_t getSize(void); + uint8_t* getBuffer(void); + uint8_t copy(uint8_t* buffer); + + uint8_t addDigitalInput(uint8_t channel, uint8_t value); + uint8_t addDigitalOutput(uint8_t channel, uint8_t value); + + uint8_t addAnalogInput(uint8_t channel, float value); + uint8_t addAnalogOutput(uint8_t channel, float value); + + uint8_t addLuminosity(uint8_t channel, uint16_t lux); + uint8_t addPresence(uint8_t channel, uint8_t value); + uint8_t addTemperature(uint8_t channel, float celsius); + uint8_t addRelativeHumidity(uint8_t channel, float rh); + uint8_t addAccelerometer(uint8_t channel, float x, float y, float z); + uint8_t addBarometricPressure(uint8_t channel, float hpa); + uint8_t addGyrometer(uint8_t channel, float x, float y, float z); + uint8_t addGPS(uint8_t channel, float latitude, float longitude, float meters); + + private: + uint8_t *buffer; + uint8_t maxsize; + uint8_t cursor; +}; + + +#endif diff --git a/examples/lora/sensor-lorawan/LICENSE.GPL b/examples/lora/sensor-lorawan/LICENSE.GPL new file mode 100644 index 000000000..61d18602b --- /dev/null +++ b/examples/lora/sensor-lorawan/LICENSE.GPL @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/examples/lora/sensor-lorawan/Makefile b/examples/lora/sensor-lorawan/Makefile new file mode 100644 index 000000000..42a15ab95 --- /dev/null +++ b/examples/lora/sensor-lorawan/Makefile @@ -0,0 +1,20 @@ +# Makefile for user application + +# Specify this directory relative to the current application. +TOCK_USERLAND_BASE_DIR = ../../.. + +STACK_SIZE = 4096 + +# Which files to compile. +CXX_SRCS := $(wildcard *.cc) + +override CPPFLAGS += -DRADIOLIB_CLOCK_DRIFT_MS=9 + +ifneq ($(CI),) +override CPPFLAGS += "-DRADIO_CONFIG_CI=radioConfig_example.h" +endif + +# Use the libtock-c Make system +EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/RadioLib + +include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk diff --git a/examples/lora/sensor-lorawan/README.md b/examples/lora/sensor-lorawan/README.md new file mode 100644 index 000000000..9e65ffcfe --- /dev/null +++ b/examples/lora/sensor-lorawan/README.md @@ -0,0 +1,30 @@ +Sensor LoRaWAN Transmitter +========================== + +This example builds an application to transmit sensor data via LoRaWAN. + +See https://github.com/jgromes/RadioLib/blob/master/examples/LoRaWAN/LoRaWAN_Starter/notes.md +for notes on setting up the LoRaWAN device. + +The most important part is creating a radioConfig.h file with the secrets +from your LoRaWAN server and any country specific settings. There is an +existing radioConfig_example.h which can be used as a useful starting point. + +This has been tested against The Things Network. Before changing settings +make sure you consider regulatory duty cycles and TTN's Fair Usage Policy, +for example don't drop the delay in the loop, otherwise you will break the +TTN Fair Usage Policy. + +## Example Output + +The output should look something like this. + +``` +Apollo3 chip revision: B +Initialization complete. Entering main loop +[SX1261] Initialising Radio ... +success! +[SX1261] Transmitting +success! +Waiting 60 minutes before transmitting again +``` diff --git a/examples/lora/sensor-lorawan/main.cc b/examples/lora/sensor-lorawan/main.cc new file mode 100644 index 000000000..aa8b5f8ad --- /dev/null +++ b/examples/lora/sensor-lorawan/main.cc @@ -0,0 +1,107 @@ +/* + RadioLib Non-Arduino Tock Library LoRaWAN test application + + Licensed under the MIT or Apache License + + Copyright (c) 2023 Alistair Francis + */ + +// include the library +#include + +// include the hardware abstraction layer +#include "libtockHal.h" + +// Include some libtock-c helpers +#include +#include + +#include "CayenneLPP.h" + +// To get this working copy radioConfig_example.h to radioConfig.h +// and then modify it to match the LoRaWAN gateway settings. +#ifdef RADIO_CONFIG_CI +#include "radioConfig_example.h" +#else +#include "radioConfig.h" +#endif + +#define MAX_SIZE 10 + +// the entry point for the program +int main(void) { + CayenneLPP Payload(MAX_SIZE); + + printf("[SX1261] Initialising Radio ... \r\n"); + + // create a new instance of the HAL class + TockHal* hal = new TockHal(); + int state; + + // now we can create the radio module + // pinout corresponds to the SparkFun LoRa Thing Plus - expLoRaBLE + // NSS pin: 0 + // DIO1 pin: 2 + // NRST pin: 4 + // BUSY pin: 1 + SX1262 tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY); + LoRaWANNode node(&tock_module, Region, subBand); + + // Setup the radio + // The settings here work for the SparkFun LoRa Thing Plus - expLoRaBLE + node.scanGuard = 30; + tock_module.XTAL = true; + state = tock_module.begin(915.0); + + if (state != RADIOLIB_ERR_NONE) { + printf("begin failed, code %d\r\n", state); + return 1; + } + + node.beginOTAA(joinEUI, devEUI, nwkKey, appKey); + + state = node.activateOTAA(); + + if (state != RADIOLIB_LORAWAN_NEW_SESSION) { + printf("activateOTAA failed, code %d\r\n", state); + return 1; + } + + printf("success!\r\n"); + + hal->detachInterrupt(RADIO_DIO_1); + hal->pinMode(RADIO_DIO_1, PIN_INPUT); + + int temp = 0; + int humi = 0; + + // loop forever + for ( ;;) { + Payload.reset(); + + // Read some sensor data from the board + libtocksync_temperature_read(&temp); + libtocksync_humidity_read(&humi); + + Payload.addTemperature(0, temp); + Payload.addRelativeHumidity(0, humi); + + printf("[SX1261] Transmitting\r\n"); + + state = node.sendReceive(Payload.getBuffer(), Payload.getSize()); + + if (state == RADIOLIB_ERR_NONE) { + // the packet was successfully transmitted + printf("success!\r\n"); + } else { + printf("failed, code %d\r\n", state); + } + + printf("Waiting 60 minutes before transmitting again\r\n"); + for (int i = 0; i < 60; i++) { + hal->delay(60 * 1000); + } + } + + return 0; +} diff --git a/examples/lora/sensor-lorawan/radioConfig_example.h b/examples/lora/sensor-lorawan/radioConfig_example.h new file mode 100644 index 000000000..c18b4685a --- /dev/null +++ b/examples/lora/sensor-lorawan/radioConfig_example.h @@ -0,0 +1,17 @@ +/* + RadioLib Non-Arduino Tock Library LoRaWAN connection details + + Licensed under the MIT or Apache License + + Copyright (c) 2024 Alistair Francis + */ + +/* These need to be updated to use values from your LoRaWAN server */ +uint64_t joinEUI = 0x0000000000000000; +uint64_t devEUI = 0x0000000000000000; +uint8_t appKey[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; +uint8_t nwkKey[16] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + +// regional choices: EU868, US915, AU915, AS923, IN865, KR920, CN780, CN500 +const LoRaWANBand_t* Region = &AU915; +const uint8_t subBand = 2; From b77d1d3410c26457028eccd94911d3a518362e0a Mon Sep 17 00:00:00 2001 From: Pat Pannuto Date: Tue, 29 Oct 2024 09:59:19 -0700 Subject: [PATCH 2/7] sensor-lorawan: only override config if missing --- examples/build_all.sh | 2 ++ examples/lora/sensor-lorawan/Makefile | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/build_all.sh b/examples/build_all.sh index 63ec7cb2e..540f80f1b 100755 --- a/examples/build_all.sh +++ b/examples/build_all.sh @@ -2,6 +2,8 @@ NUM_JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || 4) +export TOCK_BUILDALL=1 + set -e set -u set -o pipefail diff --git a/examples/lora/sensor-lorawan/Makefile b/examples/lora/sensor-lorawan/Makefile index 42a15ab95..7e6bf3c27 100644 --- a/examples/lora/sensor-lorawan/Makefile +++ b/examples/lora/sensor-lorawan/Makefile @@ -10,9 +10,15 @@ CXX_SRCS := $(wildcard *.cc) override CPPFLAGS += -DRADIOLIB_CLOCK_DRIFT_MS=9 -ifneq ($(CI),) +# If we are building for a testing configuration (e.g. CI) then it's okay to +# use the example config header. However, if someone is doing local testing, +# especially of a different thing, we don't want to accidentally overwrite +# the build obeject here with the example config when a real one exists. +ifneq ($(TOCK_BUILDALL),) +ifeq ($(wildcard radioConfig.h),) override CPPFLAGS += "-DRADIO_CONFIG_CI=radioConfig_example.h" endif +endif # Use the libtock-c Make system EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/RadioLib From 16ec68e4b7f24105091a5d5071ecdab912341795 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 30 Oct 2024 19:55:50 +1000 Subject: [PATCH 3/7] RadioLib: Bump to 7.1+ release Bump to the 7.1 release plus a few extra commits to fix a pin disable bug in the Tock HAL. Signed-off-by: Alistair Francis --- RadioLib/Makefile.app | 2 +- RadioLib/RadioLib | 2 +- examples/lora/sensor-lorawan/main.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RadioLib/Makefile.app b/RadioLib/Makefile.app index 6f1ecb693..926df6756 100644 --- a/RadioLib/Makefile.app +++ b/RadioLib/Makefile.app @@ -2,4 +2,4 @@ override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/src # Include the Tock specific headers -override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/examples/NonArduino/Tock +override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/src/hal/Tock/ diff --git a/RadioLib/RadioLib b/RadioLib/RadioLib index fffb1fae9..72ecc275a 160000 --- a/RadioLib/RadioLib +++ b/RadioLib/RadioLib @@ -1 +1 @@ -Subproject commit fffb1fae9f6c43997c7ee0993e68ec7cd80ebb17 +Subproject commit 72ecc275af5fe8303c58cb018783919e8809544b diff --git a/examples/lora/sensor-lorawan/main.cc b/examples/lora/sensor-lorawan/main.cc index aa8b5f8ad..a0b7c0c2c 100644 --- a/examples/lora/sensor-lorawan/main.cc +++ b/examples/lora/sensor-lorawan/main.cc @@ -90,7 +90,7 @@ int main(void) { state = node.sendReceive(Payload.getBuffer(), Payload.getSize()); - if (state == RADIOLIB_ERR_NONE) { + if (state > 0) { // the packet was successfully transmitted printf("success!\r\n"); } else { From 89b4d524da31d86cb0d102c3bdd325c1d31911db Mon Sep 17 00:00:00 2001 From: Pat Pannuto Date: Mon, 4 Nov 2024 10:49:29 -0800 Subject: [PATCH 4/7] build: add explanation for TOCK_BUILDALL --- examples/build_all.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/examples/build_all.sh b/examples/build_all.sh index 540f80f1b..6cb38d3d2 100755 --- a/examples/build_all.sh +++ b/examples/build_all.sh @@ -2,6 +2,27 @@ NUM_JOBS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || 4) +# Sentinel flag to indicate to apps that a `build all` is running. +# +# Generally, apps should not be sensitive to this flag. Build all is +# usually only invoked by a user when they're looking for local, CI-like +# behavior. However, a local repo checkout is not quite the same as a +# pristine CI environment, and certain test apps may need slightly +# different behavior for a local "build all" versus CI. +# +# For example: Some apps, e.g. LoRa-based ones, require radio +# configuration that end users *must* set themselves [e.g. to select +# operating region]. For users of these apps, we *do not* want them to +# build successfully 'out of the box' without explicit user +# intervention, but we do still want them to be compile-tested in CI. An +# app may ship with a `radioConfig_example.h` but include (and +# `.gitignore`) `radioConfig.h`. CI can unconditionally swap in the +# `_example` version, but a local checkout should use a real config file +# it is available. At the same time, apps which are not used in a local +# checkout should not throw compile errors for a local "build all", and +# should thus swap in the `_example` if a real config is not present. An +# app build which is sensitive to `TOCK_BUILDALL` can capture this +# subtlety. export TOCK_BUILDALL=1 set -e From da9c1c3f2657d7ea93ae492f15d1a92048c72450 Mon Sep 17 00:00:00 2001 From: Pat Pannuto Date: Mon, 4 Nov 2024 10:49:44 -0800 Subject: [PATCH 5/7] lora: defend corner case for radioConfig --- examples/lora/sensor-lorawan/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/examples/lora/sensor-lorawan/Makefile b/examples/lora/sensor-lorawan/Makefile index 7e6bf3c27..b63b807e0 100644 --- a/examples/lora/sensor-lorawan/Makefile +++ b/examples/lora/sensor-lorawan/Makefile @@ -24,3 +24,12 @@ endif EXTERN_LIBS += $(TOCK_USERLAND_BASE_DIR)/RadioLib include $(TOCK_USERLAND_BASE_DIR)/AppMakefile.mk + +# Protect from the (unlikely) case where the app happens to have been +# built from an unrelated `build all` event, but now the user is trying +# to flash the app with an invalid configuration. +flash: radioConfig.h + +program: radioConfig.h + +install: radioConfig.h From a6994167ba99334676c981cf14362a57ada430ce Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 7 Nov 2024 12:44:54 +1000 Subject: [PATCH 6/7] RadioLib/RadioLib: Use new Tock HAL names Signed-off-by: Alistair Francis --- .gitmodules | 2 +- RadioLib/RadioLib | 2 +- examples/lora/sensor-lorawan/main.cc | 9 +++++---- examples/lora/sensor-receive/main.cc | 7 ++++--- examples/lora/sensor-transmit/main.cc | 7 ++++--- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 748d052c7..18358dcee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = https://github.com/openthread/openthread.git [submodule "RadioLib/RadioLib"] path = RadioLib/RadioLib - url = https://github.com/jgromes/RadioLib.git + url = https://github.com/alistair23/RadioLib.git diff --git a/RadioLib/RadioLib b/RadioLib/RadioLib index 72ecc275a..075d977b7 160000 --- a/RadioLib/RadioLib +++ b/RadioLib/RadioLib @@ -1 +1 @@ -Subproject commit 72ecc275af5fe8303c58cb018783919e8809544b +Subproject commit 075d977b7129bad38f7cabb3e19e3ac48299dd99 diff --git a/examples/lora/sensor-lorawan/main.cc b/examples/lora/sensor-lorawan/main.cc index a0b7c0c2c..c1e19af47 100644 --- a/examples/lora/sensor-lorawan/main.cc +++ b/examples/lora/sensor-lorawan/main.cc @@ -35,7 +35,7 @@ int main(void) { printf("[SX1261] Initialising Radio ... \r\n"); // create a new instance of the HAL class - TockHal* hal = new TockHal(); + TockRadioLibHal* hal = new TockRadioLibHal(); int state; // now we can create the radio module @@ -44,7 +44,8 @@ int main(void) { // DIO1 pin: 2 // NRST pin: 4 // BUSY pin: 1 - SX1262 tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY); + SX1262 tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET, + RADIOLIB_RADIO_BUSY); LoRaWANNode node(&tock_module, Region, subBand); // Setup the radio @@ -69,8 +70,8 @@ int main(void) { printf("success!\r\n"); - hal->detachInterrupt(RADIO_DIO_1); - hal->pinMode(RADIO_DIO_1, PIN_INPUT); + hal->detachInterrupt(RADIOLIB_RADIO_DIO_1); + hal->pinMode(RADIOLIB_RADIO_DIO_1, TOCK_RADIOLIB_PIN_INPUT); int temp = 0; int humi = 0; diff --git a/examples/lora/sensor-receive/main.cc b/examples/lora/sensor-receive/main.cc index a64046104..96abfe14e 100644 --- a/examples/lora/sensor-receive/main.cc +++ b/examples/lora/sensor-receive/main.cc @@ -21,7 +21,7 @@ int main(void) { printf("[SX1261] Initialising Radio ... \n"); // create a new instance of the HAL class - TockHal* hal = new TockHal(); + TockRadioLibHal* hal = new TockRadioLibHal(); // now we can create the radio module // pinout corresponds to the SparkFun LoRa Thing Plus - expLoRaBLE @@ -29,8 +29,9 @@ int main(void) { // DIO1 pin: 2 // NRST pin: 4 // BUSY pin: 1 - Module* tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY); - SX1262* radio = new SX1262(tock_module); + Module* tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET, + RADIOLIB_RADIO_BUSY); + SX1262* radio = new SX1262(tock_module); // Setup the radio // The settings here work for the SparkFun LoRa Thing Plus - expLoRaBLE diff --git a/examples/lora/sensor-transmit/main.cc b/examples/lora/sensor-transmit/main.cc index a5312f242..93df04308 100644 --- a/examples/lora/sensor-transmit/main.cc +++ b/examples/lora/sensor-transmit/main.cc @@ -25,7 +25,7 @@ int main(void) { printf("[SX1261] Initialising Radio ... \n"); // create a new instance of the HAL class - TockHal* hal = new TockHal(); + TockRadioLibHal* hal = new TockRadioLibHal(); // now we can create the radio module // pinout corresponds to the SparkFun LoRa Thing Plus - expLoRaBLE @@ -33,8 +33,9 @@ int main(void) { // DIO1 pin: 2 // NRST pin: 4 // BUSY pin: 1 - Module* tock_module = new Module(hal, RADIO_NSS, RADIO_DIO_1, RADIO_RESET, RADIO_BUSY); - SX1262* radio = new SX1262(tock_module); + Module* tock_module = new Module(hal, RADIOLIB_RADIO_NSS, RADIOLIB_RADIO_DIO_1, RADIOLIB_RADIO_RESET, + RADIOLIB_RADIO_BUSY); + SX1262* radio = new SX1262(tock_module); // Setup the radio // The settings here work for the SparkFun LoRa Thing Plus - expLoRaBLE From 2b8e83784e03954ce617d0ba7c519b49fdc42fee Mon Sep 17 00:00:00 2001 From: Pat Pannuto Date: Tue, 12 Nov 2024 16:23:57 -0800 Subject: [PATCH 7/7] radiolib: use our libtockHal --- .gitmodules | 2 +- RadioLib/Makefile.app | 2 +- RadioLib/RadioLib | 2 +- RadioLib/libtockHal.h | 210 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 213 insertions(+), 3 deletions(-) create mode 100644 RadioLib/libtockHal.h diff --git a/.gitmodules b/.gitmodules index 18358dcee..748d052c7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = https://github.com/openthread/openthread.git [submodule "RadioLib/RadioLib"] path = RadioLib/RadioLib - url = https://github.com/alistair23/RadioLib.git + url = https://github.com/jgromes/RadioLib.git diff --git a/RadioLib/Makefile.app b/RadioLib/Makefile.app index 926df6756..8a0c694b8 100644 --- a/RadioLib/Makefile.app +++ b/RadioLib/Makefile.app @@ -2,4 +2,4 @@ override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/src # Include the Tock specific headers -override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib/RadioLib/src/hal/Tock/ +override CPPFLAGS += -I$(TOCK_USERLAND_BASE_DIR)/RadioLib diff --git a/RadioLib/RadioLib b/RadioLib/RadioLib index 075d977b7..f3a8c6dc2 160000 --- a/RadioLib/RadioLib +++ b/RadioLib/RadioLib @@ -1 +1 @@ -Subproject commit 075d977b7129bad38f7cabb3e19e3ac48299dd99 +Subproject commit f3a8c6dc2d6b60a9269c0ce7c93031765bf68df4 diff --git a/RadioLib/libtockHal.h b/RadioLib/libtockHal.h new file mode 100644 index 000000000..99275a9ec --- /dev/null +++ b/RadioLib/libtockHal.h @@ -0,0 +1,210 @@ +/* + RadioLib Non-Arduino Tock Library helper functions + + Licensed under the MIT License + + Copyright (c) 2023 Alistair Francis + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + +#ifndef TOCK_RADIOLIB_HAL_H +#define TOCK_RADIOLIB_HAL_H + +// include RadioLib +#include + +// include all the dependencies +#include "libtock/net/lora_phy.h" +#include "libtock/net/syscalls/lora_phy_syscalls.h" +#include "libtock-sync/net/lora_phy.h" +#include "libtock/peripherals/gpio.h" +#include "libtock-sync/services/alarm.h" +#include "libtock/kernel/read_only_state.h" + +#define RADIOLIB_RADIO_BUSY 1 +#define RADIOLIB_RADIO_DIO_1 2 +#define RADIOLIB_RADIO_DIO_3 3 +#define RADIOLIB_RADIO_RESET 4 +// Skip the chips select as Tock handles this for us +#define RADIOLIB_RADIO_NSS RADIOLIB_NC + +// define Arduino-style macros +#define TOCK_RADIOLIB_PIN_LOW (0x0) +#define TOCK_RADIOLIB_PIN_HIGH (0x1) +#define TOCK_RADIOLIB_PIN_INPUT (0x01) +#define TOCK_RADIOLIB_PIN_OUTPUT (0x03) +#define TOCK_RADIOLIB_PIN_RISING (0x01) +#define TOCK_RADIOLIB_PIN_FALLING (0x02) + +typedef void (*gpioIrqFn)(void); + +gpioIrqFn gpio_funcs[4] = { NULL, NULL, NULL, NULL}; + +static void lora_phy_gpio_Callback (int gpioPin, + __attribute__ ((unused)) int arg2, + __attribute__ ((unused)) int arg3, + void* userdata) +{ + gpioIrqFn fn = gpio_funcs[gpioPin - 1]; + + if (fn != NULL ) { + fn(); + } +} + +class TockRadioLibHal : public RadioLibHal { + public: + // default constructor - initializes the base HAL and any needed private members + TockRadioLibHal() + : RadioLibHal(TOCK_RADIOLIB_PIN_INPUT, TOCK_RADIOLIB_PIN_OUTPUT, TOCK_RADIOLIB_PIN_LOW, TOCK_RADIOLIB_PIN_HIGH, TOCK_RADIOLIB_PIN_RISING, TOCK_RADIOLIB_PIN_FALLING) { + } + + void init() override { + } + + void term() override { + } + + // GPIO-related methods (pinMode, digitalWrite etc.) should check + // RADIOLIB_NC as an alias for non-connected pins + void pinMode(uint32_t pin, uint32_t mode) override { + if(pin == RADIOLIB_NC) { + return; + } + + if (mode == TOCK_RADIOLIB_PIN_OUTPUT) { + libtock_lora_phy_gpio_enable_output(pin); + } else if (mode == TOCK_RADIOLIB_PIN_INPUT) { + libtock_lora_phy_gpio_enable_input(pin, libtock_pull_down); + } + } + + void digitalWrite(uint32_t pin, uint32_t value) override { + if(pin == RADIOLIB_NC) { + return; + } + + if (value) { + libtock_lora_phy_gpio_set(pin); + } else { + libtock_lora_phy_gpio_clear(pin); + } + } + + uint32_t digitalRead(uint32_t pin) override { + int value; + + if(pin == RADIOLIB_NC) { + return 0; + } + + libtock_lora_phy_gpio_read(pin, &value); + + return value; + } + + void attachInterrupt(uint32_t interruptNum, gpioIrqFn interruptCb, uint32_t mode) override { + if(interruptNum == RADIOLIB_NC) { + return; + } + + gpio_funcs[interruptNum - 1] = interruptCb; + libtock_lora_phy_gpio_command_interrupt_callback(lora_phy_gpio_Callback, NULL); + + // set GPIO as input and enable interrupts on it + libtock_lora_phy_gpio_enable_input(interruptNum, libtock_pull_down); + libtock_lora_phy_gpio_enable_interrupt(interruptNum, libtock_change); + } + + void detachInterrupt(uint32_t interruptNum) override { + if(interruptNum == RADIOLIB_NC) { + return; + } + + gpio_funcs[interruptNum - 1] = NULL; + libtock_lora_phy_gpio_disable_interrupt(interruptNum); + libtock_lora_phy_gpio_enable_input(interruptNum, libtock_pull_down); + } + + void delay(unsigned long ms) override { +#if !defined(RADIOLIB_CLOCK_DRIFT_MS) + libtocksync_alarm_delay_ms(ms); +#else + libtocksync_alarm_delay_ms(ms * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS)); +#endif + } + + void delayMicroseconds(unsigned long us) override { +#if !defined(RADIOLIB_CLOCK_DRIFT_MS) + libtocksync_alarm_delay_ms(us / 1000); +#else + libtocksync_alarm_delay_ms((us * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS)) / 1000); +#endif + } + + unsigned long millis() override { + struct timeval tv; + unsigned long ms; + + libtock_alarm_gettimeasticks(&tv); + ms = tv.tv_sec * 1000 + tv.tv_usec / 1000; + +#if !defined(RADIOLIB_CLOCK_DRIFT_MS) + return ms; +#else + return ms * 1000 / (1000 + RADIOLIB_CLOCK_DRIFT_MS); +#endif + } + + unsigned long micros() override { + struct timeval tv; + + libtock_alarm_gettimeasticks(&tv); + return tv.tv_sec * 1000000 + tv.tv_usec; + } + + long pulseIn(uint32_t pin, uint32_t state, unsigned long timeout) override { + return 0; + } + + void spiBegin() { + } + + void spiBeginTransaction() { + } + + void spiTransfer(uint8_t* out, size_t len, uint8_t* in) { + libtocksync_lora_phy_read_write(out, in, len); + } + + void spiEndTransaction() { + } + + void spiEnd() { + } + + void yield() { + ::yield_no_wait(); + } + + private: +}; + +#endif