From a24c35c2be9fb967daaaffc36c9d2b294ad13789 Mon Sep 17 00:00:00 2001 From: pennam Date: Tue, 2 Sep 2025 11:22:49 +0200 Subject: [PATCH] library: change license to MPL --- LICENSE | 1047 ++++++----------- README.md | 6 - extras/test/include/Arduino.h | 16 +- extras/test/include/IPAddress.h | 8 +- extras/test/include/util/CBORTestUtil.h | 30 +- extras/test/include/util/PropertyTestUtil.h | 16 +- extras/test/src/Arduino.cpp | 14 +- extras/test/src/test_CloudColor.cpp | 20 +- extras/test/src/test_CloudFloat.cpp | 19 +- extras/test/src/test_CloudLocation.cpp | 29 +- extras/test/src/test_CloudSchedule.cpp | 48 +- extras/test/src/test_CloudWrapperFloat.cpp | 21 +- extras/test/src/test_addPropertyReal.cpp | 28 +- extras/test/src/test_callback.cpp | 53 +- extras/test/src/test_command_decode.cpp | 55 +- extras/test/src/test_command_encode.cpp | 43 +- extras/test/src/test_decode.cpp | 81 +- extras/test/src/test_encode.cpp | 73 +- extras/test/src/test_main.cpp | 16 +- extras/test/src/test_publishEvery.cpp | 22 +- extras/test/src/test_publishOnChange.cpp | 21 +- .../src/test_publishOnChangeRateLimit.cpp | 22 +- extras/test/src/test_readOnly.cpp | 23 +- extras/test/src/test_writeOnChange.cpp | 21 +- extras/test/src/test_writeOnDemand.cpp | 23 +- extras/test/src/test_writeOnly.cpp | 23 +- extras/test/src/util/CBORTestUtil.cpp | 30 +- extras/test/src/util/PropertyTestUtil.cpp | 22 +- src/AIoTC_Config.h | 23 +- src/AIoTC_Const.h | 19 +- src/ArduinoBearSSLConfig.h | 17 +- src/ArduinoECCX08Config.h | 17 +- src/ArduinoIoTCloud.cpp | 26 +- src/ArduinoIoTCloud.h | 23 +- src/ArduinoIoTCloudDevice.cpp | 4 +- src/ArduinoIoTCloudDevice.h | 4 +- src/ArduinoIoTCloudLPWAN.cpp | 29 +- src/ArduinoIoTCloudLPWAN.h | 25 +- src/ArduinoIoTCloudNotecard.cpp | 16 +- src/ArduinoIoTCloudNotecard.h | 16 +- src/ArduinoIoTCloudTCP.cpp | 27 +- src/ArduinoIoTCloudTCP.h | 27 +- src/ArduinoIoTCloudThing.cpp | 6 +- src/ArduinoIoTCloudThing.h | 4 +- src/cbor/CBOR.h | 4 +- src/cbor/CBORDecoder.cpp | 31 +- src/cbor/CBORDecoder.h | 29 +- src/cbor/CBOREncoder.cpp | 23 +- src/cbor/CBOREncoder.h | 21 +- src/cbor/IoTCloudMessageDecoder.cpp | 4 +- src/cbor/IoTCloudMessageDecoder.h | 4 +- src/cbor/IoTCloudMessageEncoder.cpp | 7 +- src/cbor/IoTCloudMessageEncoder.h | 4 +- src/interfaces/CloudProcess.h | 4 +- src/interfaces/MessageStream.h | 4 +- src/message/Commands.h | 6 +- src/ota/implementation/OTAEsp32.cpp | 3 +- src/ota/implementation/OTANanoRP2040.cpp | 1 - src/ota/implementation/OTASTM32H7.cpp | 4 +- src/ota/implementation/OTASamd.cpp | 2 +- src/ota/implementation/OTAUnoR4.cpp | 2 +- src/ota/interface/OTAInterface.cpp | 4 +- src/ota/interface/OTAInterface.h | 4 +- src/property/Property.cpp | 33 +- src/property/Property.h | 37 +- src/property/PropertyContainer.cpp | 27 +- src/property/PropertyContainer.h | 29 +- src/property/math_utils.h | 1 + src/property/types/CloudBool.h | 36 +- src/property/types/CloudColor.h | 32 +- src/property/types/CloudFloat.h | 34 +- src/property/types/CloudInt.h | 35 +- src/property/types/CloudLocation.h | 31 +- src/property/types/CloudSchedule.h | 39 +- src/property/types/CloudString.h | 36 +- src/property/types/CloudUnsignedInt.h | 35 +- src/property/types/CloudWrapperBase.h | 30 +- src/property/types/CloudWrapperBool.h | 30 +- src/property/types/CloudWrapperFloat.h | 30 +- src/property/types/CloudWrapperInt.h | 30 +- src/property/types/CloudWrapperString.h | 30 +- src/property/types/CloudWrapperUnsignedInt.h | 30 +- .../types/automation/CloudColoredLight.h | 31 +- .../types/automation/CloudContactSensor.h | 34 +- .../types/automation/CloudDimmedLight.h | 31 +- src/property/types/automation/CloudLight.h | 34 +- .../types/automation/CloudMotionSensor.h | 34 +- .../types/automation/CloudSmartPlug.h | 34 +- src/property/types/automation/CloudSwitch.h | 34 +- .../types/automation/CloudTelevision.h | 31 +- .../types/automation/CloudTemperatureSensor.h | 29 +- src/tls/AIoTCSSCert.h | 22 +- src/tls/AIoTCUPCert.h | 22 +- src/tls/BearSSLClientProfile.c | 33 +- src/tls/BearSSLClientProfile.h | 32 +- src/tls/BearSSLTrustAnchors.h | 22 +- src/utility/time/NTPUtils.cpp | 35 +- src/utility/time/NTPUtils.h | 33 +- src/utility/time/RTCMillis.cpp | 29 +- src/utility/time/RTCMillis.h | 25 +- src/utility/time/TimeService.cpp | 22 +- src/utility/time/TimeService.h | 8 +- src/utility/watchdog/Watchdog.cpp | 23 +- src/utility/watchdog/Watchdog.h | 21 +- 104 files changed, 1333 insertions(+), 2145 deletions(-) diff --git a/LICENSE b/LICENSE index f288702d2..dbdb0fa8e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,373 @@ - 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 -. +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at https://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/README.md b/README.md index 93a0829a8..4b248e784 100644 --- a/README.md +++ b/README.md @@ -96,9 +96,3 @@ Boards can authenticate to the ArduinoIoTCloud servers using 3 methods: * `DEVICE_CERTIFICATE` and `PRIVATE_KEY`. This values are stored inside the board secure element during the device provisioning phase. Boards that are using this method are: [`MKR 1000`](https://store.arduino.cc/arduino-mkr1000-wifi), [`MKR WiFi 1010`](https://store.arduino.cc/arduino-mkr-wifi-1010), [`MKR GSM 1400`](https://store.arduino.cc/arduino-mkr-gsm-1400-1415), [`MKR NB 1500`](https://store.arduino.cc/arduino-mkr-nb-1500-1413), [`Nano 33 IoT`](https://store.arduino.cc/arduino-nano-33-iot), [`Portenta H7`](https://store.arduino.cc/portenta-h7), [`Nano RP2040 Connect`](https://store.arduino.cc/products/arduino-nano-rp2040-connect), [`Nicla Vision`](https://store.arduino.cc/products/nicla-vision), [`OPTA WiFi`](https://store.arduino.cc/products/opta-wifi), [`OPTA RS485`](https://store.arduino.cc/products/opta-rs485), [`OPTA Lite`](https://store.arduino.cc/products/opta-lite), [`GIGA R1 WiFi`](https://store.arduino.cc/products/giga-r1-wifi), [`Portenta C33`](https://store.arduino.cc/products/portenta-c33) * `APP_EUI` and `APP_KEY`. This values are defined in the `thingProperties.h` file and included in the Sketch. Boards that are using this method are: [`MKR WAN 1300/1310`](https://store.arduino.cc/mkr-wan-1310) - -### License - -The ArduinoIoTCloud library is licensed under the GNU General Public License v3.0. - -You can be released from the requirements of the above license by purchasing a commercial license. Buying such a license is mandatory if you want to modify or otherwise use the software for commercial activities involving the Arduino software without disclosing the source code of your own applications. To purchase a commercial license, send an email to license@arduino.cc diff --git a/extras/test/include/Arduino.h b/extras/test/include/Arduino.h index dbdcc7380..cd2097760 100644 --- a/extras/test/include/Arduino.h +++ b/extras/test/include/Arduino.h @@ -1,32 +1,38 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef TEST_ARDUINO_H_ #define TEST_ARDUINO_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include /****************************************************************************** - DEFINES + DEFINES ******************************************************************************/ #ifndef min #define min(a,b) ((a)<(b)?(a):(b)) #endif /****************************************************************************** - TYPEDEF + TYPEDEF ******************************************************************************/ typedef std::string String; /****************************************************************************** - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ******************************************************************************/ void set_millis(unsigned long const millis); diff --git a/extras/test/include/IPAddress.h b/extras/test/include/IPAddress.h index 241796caa..8926f459c 100644 --- a/extras/test/include/IPAddress.h +++ b/extras/test/include/IPAddress.h @@ -1,5 +1,11 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef TEST_IPADDRESS_H_ diff --git a/extras/test/include/util/CBORTestUtil.h b/extras/test/include/util/CBORTestUtil.h index 5e25dcc86..b24ee16a8 100644 --- a/extras/test/include/util/CBORTestUtil.h +++ b/extras/test/include/util/CBORTestUtil.h @@ -1,36 +1,38 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef INCLUDE_CBOR_TESTUTIL_H_ #define INCLUDE_CBOR_TESTUTIL_H_ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include #include -/************************************************************************************** - NAMESPACE - **************************************************************************************/ +/****************************************************************************** + NAMESPACE + ******************************************************************************/ namespace cbor { -/************************************************************************************** - PROTOTYPES - **************************************************************************************/ +/****************************************************************************** + PROTOTYPES + ******************************************************************************/ std::vector encode(PropertyContainer & property_container, bool lightPayload = false); void print(std::vector const & vect); -/************************************************************************************** - NAMESPACE - **************************************************************************************/ - } /* cbor */ #endif /* INCLUDE_CBOR_TESTUTIL_H_ */ diff --git a/extras/test/include/util/PropertyTestUtil.h b/extras/test/include/util/PropertyTestUtil.h index 62535122a..8d2e62793 100644 --- a/extras/test/include/util/PropertyTestUtil.h +++ b/extras/test/include/util/PropertyTestUtil.h @@ -1,13 +1,19 @@ /* - * Copyright (c) 2020 Arduino. All rights reserved. - */ + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2020 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef PROPERTY_TEST_UTIL_H_ #define PROPERTY_TEST_UTIL_H_ -/************************************************************************************** - FUNCTION DECLARATION - **************************************************************************************/ +/****************************************************************************** + FUNCTION DECLARATION + ******************************************************************************/ extern "C" unsigned long getTime(); diff --git a/extras/test/src/Arduino.cpp b/extras/test/src/Arduino.cpp index 74cd71252..23437db9c 100644 --- a/extras/test/src/Arduino.cpp +++ b/extras/test/src/Arduino.cpp @@ -1,21 +1,27 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include /****************************************************************************** - GLOBAL VARIABLES + GLOBAL VARIABLES ******************************************************************************/ static unsigned long current_millis = 0; /****************************************************************************** - PUBLIC FUNCTIONS + PUBLIC FUNCTIONS ******************************************************************************/ void set_millis(unsigned long const millis) diff --git a/extras/test/src/test_CloudColor.cpp b/extras/test/src/test_CloudColor.cpp index c391d8eb7..1d402d918 100644 --- a/extras/test/src/test_CloudColor.cpp +++ b/extras/test/src/test_CloudColor.cpp @@ -1,20 +1,24 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include - #include -/************************************************************************************** +/****************************************************************************** TEST CODE - **************************************************************************************/ + ******************************************************************************/ SCENARIO("Arduino Cloud Properties ", "[ArduinoCloudThing::CloudColor]") { diff --git a/extras/test/src/test_CloudFloat.cpp b/extras/test/src/test_CloudFloat.cpp index 7f6437c40..835f29c42 100644 --- a/extras/test/src/test_CloudFloat.cpp +++ b/extras/test/src/test_CloudFloat.cpp @@ -1,20 +1,24 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** +/****************************************************************************** INCLUDE - **************************************************************************************/ + ******************************************************************************/ #include - #include - #include -/************************************************************************************** +/****************************************************************************** TEST CODE - **************************************************************************************/ + ******************************************************************************/ SCENARIO("Arduino Cloud Properties ", "[ArduinoCloudThing::CloudFloat]") { @@ -108,5 +112,4 @@ SCENARIO("Arduino Cloud Properties ", "[ArduinoCloudThing::CloudFloat]") REQUIRE(prop.isDifferentFromCloud() == true); } - } diff --git a/extras/test/src/test_CloudLocation.cpp b/extras/test/src/test_CloudLocation.cpp index e150dbd40..609769c29 100644 --- a/extras/test/src/test_CloudLocation.cpp +++ b/extras/test/src/test_CloudLocation.cpp @@ -1,18 +1,23 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include -/************************************************************************************** +/****************************************************************************** TEST CODE - **************************************************************************************/ + ******************************************************************************/ SCENARIO("Testing cloud type 'Location' Ctor", "[Location::Location]") { @@ -28,7 +33,7 @@ SCENARIO("Testing cloud type 'Location' Ctor", "[Location::Location]") } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Testing cloud type 'Location' assignment operator", "[Location::operator =]") { @@ -45,7 +50,7 @@ SCENARIO("Testing cloud type 'Location' assignment operator", "[Location::operat } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Testing cloud type 'Location' operator -", "[Location::operator -]") { @@ -62,7 +67,7 @@ SCENARIO("Testing cloud type 'Location' operator -", "[Location::operator -]") } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Testing cloud type 'Location' comparison operator ==", "[Location::operator ==]") { @@ -85,7 +90,7 @@ SCENARIO("Testing cloud type 'Location' comparison operator ==", "[Location::ope } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Testing cloud type 'Location' comparison operator !=", "[Location::operator !=]") { @@ -108,7 +113,7 @@ SCENARIO("Testing cloud type 'Location' comparison operator !=", "[Location::ope } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Testing cloud type 'Location' function distance for calculating Euclidean 2d distance between two points", "[Location::distance]") { diff --git a/extras/test/src/test_CloudSchedule.cpp b/extras/test/src/test_CloudSchedule.cpp index a6afb7b1e..b253f4b37 100644 --- a/extras/test/src/test_CloudSchedule.cpp +++ b/extras/test/src/test_CloudSchedule.cpp @@ -1,38 +1,43 @@ /* - Copyright (c) 2021 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include unsigned long time_now = 1; -/************************************************************************************** - * TimeServiceClass Fake CTOR - **************************************************************************************/ +/****************************************************************************** + TimeServiceClass Fake CTOR + ******************************************************************************/ TimeServiceClass::TimeServiceClass() {} -/************************************************************************************** - * TimeServiceClass Fake Methods - **************************************************************************************/ +/****************************************************************************** + TimeServiceClass Fake Methods + ******************************************************************************/ unsigned long TimeServiceClass::getLocalTime() {return time_now;} -/************************************************************************************** - * TimeService Fake local instance - **************************************************************************************/ +/****************************************************************************** + TimeService Fake local instance + ******************************************************************************/ TimeServiceClass TimeService; -/************************************************************************************** +/****************************************************************************** TEST CODE - **************************************************************************************/ + ******************************************************************************/ SCENARIO("Testing cloud type 'Schedule' Ctor", "[Schedule::Schedule]") { @@ -54,7 +59,7 @@ SCENARIO("Testing cloud type 'Schedule' Ctor", "[Schedule::Schedule]") } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Setup a schedule that repeats each 20 minutes and test isActive Method", "[Schedule::isActive]") { @@ -138,7 +143,7 @@ SCENARIO("Setup a schedule that repeats each 20 minutes and test isActive Method } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Setup a weekly schedule and test isActive Method", "[Schedule::isActive]") { @@ -198,7 +203,7 @@ SCENARIO("Setup a weekly schedule and test isActive Method", "[Schedule::isActiv } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Setup a monthly schedule and test isActive Method", "[Schedule::isActive]") { @@ -346,7 +351,7 @@ SCENARIO("Setup a monthly schedule and test isActive Method", "[Schedule::isActi } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Setup a yearly schedule and test isActive Method", "[Schedule::isActive]") { @@ -430,7 +435,7 @@ SCENARIO("Setup a yearly schedule and test isActive Method", "[Schedule::isActiv } } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Setup a one shot schedule and test isActive Method", "[Schedule::isActive]") { @@ -512,4 +517,3 @@ SCENARIO("Setup a one shot schedule and test isActive Method", "[Schedule::isAct } } } - diff --git a/extras/test/src/test_CloudWrapperFloat.cpp b/extras/test/src/test_CloudWrapperFloat.cpp index aa4f6a295..9f04b97a8 100644 --- a/extras/test/src/test_CloudWrapperFloat.cpp +++ b/extras/test/src/test_CloudWrapperFloat.cpp @@ -1,20 +1,24 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include - #include -/************************************************************************************** +/****************************************************************************** TEST CODE - **************************************************************************************/ + ******************************************************************************/ SCENARIO("Arduino Cloud Properties ", "[ArduinoCloudThing::CloudWrapperFloat]") { @@ -114,5 +118,4 @@ SCENARIO("Arduino Cloud Properties ", "[ArduinoCloudThing::CloudWrapperFloat]") REQUIRE(prop.isDifferentFromCloud() == true); } - } diff --git a/extras/test/src/test_addPropertyReal.cpp b/extras/test/src/test_addPropertyReal.cpp index 27f647da5..299e33b95 100644 --- a/extras/test/src/test_addPropertyReal.cpp +++ b/extras/test/src/test_addPropertyReal.cpp @@ -1,23 +1,27 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include - #include #include #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("The same arduino cloud properties are added multiple times", "[ArduinoCloudThing::addPropertyToContainer]") { @@ -34,8 +38,6 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino } } - /**************************************************************************************/ - WHEN("the same int property is added multiple times") { PropertyContainer property_container; @@ -50,8 +52,6 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino } } - /**************************************************************************************/ - WHEN("the same float property is added multiple times") { PropertyContainer property_container; @@ -66,8 +66,6 @@ SCENARIO("The same arduino cloud properties are added multiple times", "[Arduino } } - /**************************************************************************************/ - WHEN("the same String property is added multiple times") { PropertyContainer property_container; diff --git a/extras/test/src/test_callback.cpp b/extras/test/src/test_callback.cpp index ae065ea66..05437b7a6 100644 --- a/extras/test/src/test_callback.cpp +++ b/extras/test/src/test_callback.cpp @@ -1,29 +1,34 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include #include #include #include "types/CloudWrapperBool.h" #include -/************************************************************************************** - GLOBAL CONSTANTS - **************************************************************************************/ +/****************************************************************************** + GLOBAL CONSTANTS + ******************************************************************************/ static bool callback_called_protocol_v1 = false; static bool callback_called_protocol_v2 = false; -/************************************************************************************** - TEST HELPER FUNCTIONS - **************************************************************************************/ +/****************************************************************************** + TEST HELPER FUNCTIONS + ******************************************************************************/ void externalCallbackV1() { @@ -35,9 +40,9 @@ void externalCallbackV2() callback_called_protocol_v2 = true; } -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("A callback is registered via 'onUpdate' to be called on property change", "[ArduinoCloudThing::decode]") { @@ -54,7 +59,7 @@ SCENARIO("A callback is registered via 'onUpdate' to be called on property chang REQUIRE(callback_called_protocol_v2 == true); } -/**************************************************************************************/ +/******************************************************************************/ static CloudBool switch_turned_on = false; static CloudBool switch_callback_called = false; @@ -90,7 +95,7 @@ SCENARIO("A (boolean) property is manipulated in the callback to its origin stat REQUIRE(actual == expected); } -/**************************************************************************************/ +/******************************************************************************/ static bool sync_callback_called = false; static bool change_callback_called = false; @@ -129,7 +134,7 @@ SCENARIO("After a connection/reconnection an incoming cbor payload is processed REQUIRE(test == true); } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback apply the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the local one.") { @@ -154,6 +159,8 @@ SCENARIO("After a connection/reconnection an incoming cbor payload is processed REQUIRE(test == false); } +/******************************************************************************/ + SCENARIO("Primitive property: After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback applies the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the cloud one.") { bool test = true; @@ -180,7 +187,7 @@ SCENARIO("Primitive property: After a connection/reconnection an incoming cbor p REQUIRE(test == true); } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Primitive property: After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback apply the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the local one.") { @@ -208,6 +215,8 @@ SCENARIO("Primitive property: After a connection/reconnection an incoming cbor p REQUIRE(test == false); } +/******************************************************************************/ + SCENARIO("Object property: After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback applies the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the cloud one.") { CloudLocation location_test = CloudLocation(0, 1); @@ -235,7 +244,7 @@ SCENARIO("Object property: After a connection/reconnection an incoming cbor payl REQUIRE(verify); } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("Object property: After a connection/reconnection an incoming cbor payload is processed and the synchronization callback is executed. The sync callback apply the AUTO_SYNC policy (the most recent value between the local one and the cloud one is finally assigned to the property). The onUpdate function is called if the cloud value is the most recent one. In this scenario the most updated value is the local one.") { @@ -264,7 +273,7 @@ SCENARIO("Object property: After a connection/reconnection an incoming cbor payl REQUIRE(verify); } -/**************************************************************************************/ +/******************************************************************************/ void force_device_sync_callback(Property& property) { @@ -293,7 +302,7 @@ SCENARIO("After a connection/reconnection an incoming cbor payload is processed REQUIRE(test == false); } -/**************************************************************************************/ +/******************************************************************************/ void force_cloud_sync_callback(Property& property) { @@ -322,7 +331,7 @@ SCENARIO("After a connection/reconnection an incoming cbor payload is processed REQUIRE(test == true); } -/**************************************************************************************/ +/******************************************************************************/ SCENARIO("After a connection/reconnection an incoming cbor payload is processed. Any synchronization function is passed to the property so the value in the incoming message is discarded") { diff --git a/extras/test/src/test_command_decode.cpp b/extras/test/src/test_command_decode.cpp index 1d47c99ee..24a39d00b 100644 --- a/extras/test/src/test_command_decode.cpp +++ b/extras/test/src/test_command_decode.cpp @@ -1,28 +1,30 @@ /* - Copyright (c) 2024 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include - #include - #include - #include #include #include /****************************************************************************** - TEST CODE + TEST CODE ******************************************************************************/ SCENARIO("Test the decoding of command messages") { - /****************************************************************************/ WHEN("Decode the ThingUpdateCmdId message") { @@ -52,7 +54,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ WHEN("Decode the ThingDetachCmd message") { CommandDown command; @@ -81,8 +82,6 @@ SCENARIO("Test the decoding of command messages") { } } - /************************************************************************************/ - WHEN("Decode the ThingUpdateCmdId message containing a number instead of a string") { CommandDown command; @@ -103,7 +102,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ WHEN("Decode the ThingDetachCmd message containing a number instead of a string") { CommandDown command; @@ -124,8 +122,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the TimezoneCommandDown message") { CommandDown command; @@ -270,8 +266,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the LastValuesUpdateCmd message") { CommandDown command; @@ -331,8 +325,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the OtaUpdateCmdDown message") { CommandDown command; @@ -421,8 +413,6 @@ SCENARIO("Test the decoding of command messages") { } } -/****************************************************************************/ - WHEN("Decode the OtaUpdateCmdDown message with out of order fields 1") { CommandDown command; @@ -485,8 +475,6 @@ SCENARIO("Test the decoding of command messages") { } } -/****************************************************************************/ - WHEN("Decode the OtaUpdateCmdDown message with out of order fields 2") { CommandDown command; @@ -549,8 +537,6 @@ SCENARIO("Test the decoding of command messages") { } } -/****************************************************************************/ - WHEN("Decode the OtaUpdateCmdDown message with corrupted fields 1") { CommandDown command; @@ -608,8 +594,6 @@ SCENARIO("Test the decoding of command messages") { } } -/****************************************************************************/ - WHEN("Decode the OtaUpdateCmdDown message with corrupted fields 2") { CommandDown command; @@ -667,8 +651,6 @@ SCENARIO("Test the decoding of command messages") { } } -/****************************************************************************/ - WHEN("Decode the OtaUpdateCmdDown message without url field") { CommandDown command; @@ -693,8 +675,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the OtaBeginUp message") { CommandDown command; @@ -719,8 +699,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the ThingBeginCmd message") { CommandDown command; @@ -742,8 +720,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the LastValuesBeginCmd message") { CommandDown command; @@ -762,8 +738,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the DeviceBeginCmd message") { CommandDown command; @@ -785,8 +759,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the OtaProgressCmdUp message") { CommandDown command; @@ -813,8 +785,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode the TimezoneCommandUp message") { CommandDown command; @@ -833,8 +803,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode a message with invalid CBOR tag") { CommandDown command; @@ -858,8 +826,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode a message not starting with a CBOR tag") { CommandDown command; @@ -882,8 +848,6 @@ SCENARIO("Test the decoding of command messages") { } } - /****************************************************************************/ - WHEN("Decode an invalid CBOR message") { CommandDown command; @@ -898,5 +862,4 @@ SCENARIO("Test the decoding of command messages") { REQUIRE(err == MessageDecoder::Status::Error); } } - } diff --git a/extras/test/src/test_command_encode.cpp b/extras/test/src/test_command_encode.cpp index 8cad13d1e..c2fc696cf 100644 --- a/extras/test/src/test_command_encode.cpp +++ b/extras/test/src/test_command_encode.cpp @@ -1,29 +1,30 @@ /* - Copyright (c) 2024 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include - #include - #include #include #include #include #include -//#include - /****************************************************************************** - TEST CODE + TEST CODE ******************************************************************************/ SCENARIO("Test the encoding of command messages") { - /****************************************************************************/ WHEN("Encode the OtaBeginUp message") { @@ -102,8 +103,6 @@ SCENARIO("Test the encoding of command messages") { REQUIRE(err == MessageEncoder::Status::Error); } - /****************************************************************************/ - WHEN("Encode the ThingBeginCmd message") { ThingBeginCmd command; @@ -179,8 +178,6 @@ SCENARIO("Test the encoding of command messages") { REQUIRE(err == MessageEncoder::Status::Error); } - /****************************************************************************/ - WHEN("Encode the LastValuesBeginCmd message") { LastValuesBeginCmd command; @@ -222,8 +219,6 @@ SCENARIO("Test the encoding of command messages") { REQUIRE(err == MessageEncoder::Status::Error); } - /**************************************************************************/ - WHEN("Encode the DeviceBeginCmd message") { DeviceBeginCmd command; @@ -298,8 +293,6 @@ SCENARIO("Test the encoding of command messages") { REQUIRE(err == MessageEncoder::Status::Error); } - /****************************************************************************/ - WHEN("Encode the OtaProgressCmdUp message") { OtaProgressCmdUp command; @@ -490,8 +483,6 @@ SCENARIO("Test the encoding of command messages") { REQUIRE(err == MessageEncoder::Status::Error); } - /****************************************************************************/ - WHEN("Encode the TimezoneCommandUp message") { TimezoneCommandUp command; @@ -533,8 +524,6 @@ SCENARIO("Test the encoding of command messages") { REQUIRE(err == MessageEncoder::Status::Error); } - /****************************************************************************/ - WHEN("Encode the ThingUpdateCmdId message") { ThingUpdateCmd command; @@ -554,8 +543,6 @@ SCENARIO("Test the encoding of command messages") { } } - /****************************************************************************/ - WHEN("Encode the TimezoneCommandDown message") { TimezoneCommandDown command; @@ -575,8 +562,6 @@ SCENARIO("Test the encoding of command messages") { } } - /****************************************************************************/ - WHEN("Encode the LastValuesUpdateCmd message") { LastValuesUpdateCmd command; @@ -598,8 +583,6 @@ SCENARIO("Test the encoding of command messages") { } } - /****************************************************************************/ - WHEN("Encode the OtaUpdateCmdDown message") { OtaUpdateCmdDown command; @@ -616,8 +599,6 @@ SCENARIO("Test the encoding of command messages") { } } - /****************************************************************************/ - WHEN("Encode the ThingDetachCmd message") { ThingDetachCmd command; @@ -634,8 +615,6 @@ SCENARIO("Test the encoding of command messages") { } } - /****************************************************************************/ - WHEN("Encode a message with unknown command Id") { OtaUpdateCmdDown command; @@ -683,7 +662,6 @@ SCENARIO("Test the encoding of command messages") { } } - WHEN("Encode the DeviceNetConfigCmdUp message with Wifi and buffer without enough space") { DeviceNetConfigCmdUp command; @@ -739,7 +717,7 @@ SCENARIO("Test the encoding of command messages") { } } - WHEN("Encode the DeviceNetConfigCmdUp message with LoRa buffer without enough space") + WHEN("Encode the DeviceNetConfigCmdUp message with LoRa buffer without enough space") { DeviceNetConfigCmdUp command; command.c.id = CommandId::DeviceNetConfigCmdUpId; @@ -1240,7 +1218,6 @@ SCENARIO("Test the encoding of command messages") { command.params.eth.netmask.type = IPType::IPv6; memcpy(command.params.eth.netmask.bytes, netmask, sizeof(netmask)); - uint8_t buffer[12]; size_t bytes_encoded = sizeof(buffer); diff --git a/extras/test/src/test_decode.cpp b/extras/test/src/test_decode.cpp index 63306af87..fb381d1a5 100644 --- a/extras/test/src/test_decode.cpp +++ b/extras/test/src/test_decode.cpp @@ -1,18 +1,21 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include #include - #include - #include - #include #include "types/CloudWrapperBool.h" #include "types/CloudWrapperFloat.h" @@ -30,9 +33,9 @@ using namespace Catch; -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") { @@ -52,8 +55,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == false); } - /************************************************************************************/ - WHEN("A boolean property is changed via CBOR message - light payload") { /*An integer identifier has been encoded instead of the name of the property in order to have a shorter payload*/ @@ -71,8 +72,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == false); } - /************************************************************************************/ - WHEN("A positive int property is changed via CBOR message") { PropertyContainer property_container; @@ -103,8 +102,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == -7); } - /************************************************************************************/ - WHEN("A float property is changed via CBOR message") { PropertyContainer property_container; @@ -120,8 +117,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == Approx(3.1459).epsilon(0.01)); } - /************************************************************************************/ - WHEN("A String property is changed via CBOR message") { PropertyContainer property_container; @@ -137,8 +132,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(str_test == "testtt"); } - /************************************************************************************/ - WHEN("A Location property is changed via CBOR message") { PropertyContainer property_container; @@ -155,8 +148,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_location_test.lon == location_compare.lon); } - /************************************************************************************/ - WHEN("A Color property is changed via CBOR message") { PropertyContainer property_container; @@ -178,8 +169,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_color_test.bri == color_compare.bri); } - /************************************************************************************/ - WHEN("A Color property is changed via CBOR message - light payload") { /*An integer identifier has been encoded instead of the name of the property in order to have a shorter payload*/ @@ -203,8 +192,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_color_test.bri == color_compare.bri); } - /************************************************************************************/ - WHEN("A ColoredLight property is changed via CBOR message") { PropertyContainer property_container; @@ -227,8 +214,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_color_test.bri == color_compare.bri); } - /************************************************************************************/ - WHEN("A Television property is changed via CBOR message") { PropertyContainer property_container; @@ -253,8 +238,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_tv_test.cha == tv_compare.cha); } - /************************************************************************************/ - WHEN("A DimmedLight property is changed via CBOR message") { PropertyContainer property_container; @@ -275,8 +258,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_light_test.bri == light_compare.bri); } - /************************************************************************************/ - WHEN("A Light property is changed via CBOR message") { PropertyContainer property_container; @@ -293,8 +274,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(light_test == true); } - /************************************************************************************/ - WHEN("A ContactSensor property is changed via CBOR message") { PropertyContainer property_container; @@ -311,8 +290,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(contact_test == true); } - /************************************************************************************/ - WHEN("A MotionSensor property is changed via CBOR message") { PropertyContainer property_container; @@ -329,8 +306,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(motion_test == true); } - /************************************************************************************/ - WHEN("A SmartPlug property is changed via CBOR message") { PropertyContainer property_container; @@ -347,8 +322,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(plug_test == true); } - /************************************************************************************/ - WHEN("A Switch property is changed via CBOR message") { PropertyContainer property_container; @@ -365,8 +338,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(switch_test == true); } - /************************************************************************************/ - WHEN("A Temperature property is changed via CBOR message") { PropertyContainer property_container; @@ -383,8 +354,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == Approx(3.1459).epsilon(0.01)); } - /************************************************************************************/ - WHEN("A Time property is changed via CBOR message") { PropertyContainer property_container; @@ -401,8 +370,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == 4294967295); } - /************************************************************************************/ - WHEN("A Schedule property is changed via CBOR message") { PropertyContainer property_container; @@ -427,8 +394,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(value_schedule_test.msk == schedule_compare.msk); } - /************************************************************************************/ - WHEN("Multiple properties is changed via CBOR message") { WHEN("Multiple properties of different type are changed via CBOR message") @@ -458,8 +423,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(str_test == "hello arduino"); } - /********************************************************************************/ - WHEN("Multiple properties of different type are synchronized via CBOR message. FORCE_CLOUD_SYNC is passed as synchronization function and as a consequence values contained in the incoming message are stored in the properties") { PropertyContainer property_container; @@ -487,8 +450,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(str_test == "hello arduino"); } - /********************************************************************************/ - WHEN("Multiple primitive properties of different type are synchronized via CBOR message. FORCE_CLOUD_SYNC is passed as synchronization function and as a consequence values contained in the incoming message are stored in the properties") { PropertyContainer property_container; @@ -523,8 +484,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(str_test == "hello arduino"); } - /********************************************************************************/ - WHEN("Multiple String properties are changed via CBOR message") { PropertyContainer property_container; @@ -552,8 +511,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") } } - /************************************************************************************/ - WHEN("A payload containing a CBOR base name is parsed") { PropertyContainer property_container; @@ -568,8 +525,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(str == "test"); } - /************************************************************************************/ - WHEN("A payload containing a CBOR base time is parsed") { PropertyContainer property_container; @@ -584,8 +539,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == 1); } - /************************************************************************************/ - WHEN("A payload containing a CBOR time is parsed") { PropertyContainer property_container; @@ -600,8 +553,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == 1); } - /************************************************************************************/ - WHEN("A payload containing a CBOR BaseVersion is parsed") { PropertyContainer property_container; @@ -616,8 +567,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == 1); } - /************************************************************************************/ - WHEN("A payload containing a CBOR BaseName, BaseTime and Time is parsed") { PropertyContainer property_container; @@ -634,8 +583,6 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == 1); } - /************************************************************************************/ - WHEN("A payload containing a invalid CBOR key is parsed") { PropertyContainer property_container; @@ -649,6 +596,4 @@ SCENARIO("Arduino Cloud Properties are decoded", "[ArduinoCloudThing::decode]") REQUIRE(test == 1); } - - /************************************************************************************/ } diff --git a/extras/test/src/test_encode.cpp b/extras/test/src/test_encode.cpp index 581d87dfa..fc60ab9ac 100644 --- a/extras/test/src/test_encode.cpp +++ b/extras/test/src/test_encode.cpp @@ -1,10 +1,16 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include @@ -16,12 +22,11 @@ #include "types/CloudWrapperInt.h" #include "types/CloudWrapperString.h" -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]") { - /************************************************************************************/ WHEN("A 'bool' property is added") { @@ -37,8 +42,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'bool' property is added - light payload") { /*An integer identifier must be instead of the name of the property in order to have a shorter payload*/ @@ -55,8 +58,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'int' property is added") { PropertyContainer property_container; @@ -71,8 +72,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'float' property is added") { PropertyContainer property_container; @@ -87,8 +86,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'String' property is added") { PropertyContainer property_container; @@ -104,8 +101,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'Location' property is added") { PropertyContainer property_container; @@ -120,8 +115,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'Color' property is added") { PropertyContainer property_container; @@ -136,8 +129,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'Color' property is added - light payload") { /*An integer identifier must be encoded instead of the name of the property in order to have a shorter payload*/ @@ -154,8 +145,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'ColoredLight' property is added") { PropertyContainer property_container; @@ -170,8 +159,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'Television' property is added") { PropertyContainer property_container; @@ -186,8 +173,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'DimmedLight' property is added") { PropertyContainer property_container; @@ -202,8 +187,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A light property is added") { PropertyContainer property_container; @@ -219,8 +202,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A contact sensor property is added") { PropertyContainer property_container; @@ -236,8 +217,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A motion sensor property is added") { PropertyContainer property_container; @@ -253,8 +232,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A smart plug property is added") { PropertyContainer property_container; @@ -270,8 +247,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A Temperature property is added") { PropertyContainer property_container; @@ -287,8 +262,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A switch property is added") { PropertyContainer property_container; @@ -304,8 +277,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A time property is added") { PropertyContainer property_container; @@ -320,8 +291,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("A 'Schedule' property is added") { PropertyContainer property_container; @@ -338,12 +307,10 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("Multiple properties are added") { PropertyContainer property_container; - + CloudInt int_test = 1; CloudBool bool_test = false; CloudFloat float_test = 2.0f; @@ -363,12 +330,10 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("Multiple primitive properties are added") { PropertyContainer property_container; - + int int_test = 1; bool bool_test = false; float float_test = 2.0f; @@ -395,8 +360,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual == expected); } - /************************************************************************************/ - WHEN("The size of the encoded properties is exceeding the CBOR buffer size") { PropertyContainer property_container; @@ -442,8 +405,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual_2 == expected_2); } - /************************************************************************************/ - WHEN("The size of the encoded properties is exceeding the CBOR buffer size and includes a multivalue property") { PropertyContainer property_container; @@ -493,9 +454,6 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" REQUIRE(actual_2 == expected_2); } - - /************************************************************************************/ - WHEN("The size of a single encoded properties is exceeding the CBOR buffer size") { PropertyContainer property_container; @@ -515,5 +473,4 @@ SCENARIO("Arduino Cloud Properties are encoded", "[ArduinoCloudThing::encode-1]" std::vector const actual_1 = cbor::encode(property_container); REQUIRE(actual_1 == expected_1); } - } diff --git a/extras/test/src/test_main.cpp b/extras/test/src/test_main.cpp index da82a1535..6cbeed6a9 100644 --- a/extras/test/src/test_main.cpp +++ b/extras/test/src/test_main.cpp @@ -1,10 +1,16 @@ /* - * Copyright (c) 2020 Arduino. All rights reserved. - */ + This file is part of the ArduinoIoTCloud library. -/************************************************************************************** - INCLUDE/MAIN - **************************************************************************************/ + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ + +/****************************************************************************** + INCLUDE/MAIN + ******************************************************************************/ #define CATCH_CONFIG_MAIN #include diff --git a/extras/test/src/test_publishEvery.cpp b/extras/test/src/test_publishEvery.cpp index 771b6263d..05099db31 100644 --- a/extras/test/src/test_publishEvery.cpp +++ b/extras/test/src/test_publishEvery.cpp @@ -1,24 +1,28 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("A Arduino cloud property is published periodically", "[ArduinoCloudThing::publishEvery]") { PropertyContainer property_container; - CloudBool test = true; unsigned long const PUBLISH_INTERVAL_SEC = 1 * SECONDS; diff --git a/extras/test/src/test_publishOnChange.cpp b/extras/test/src/test_publishOnChange.cpp index 64064b8cf..f50a5aea8 100644 --- a/extras/test/src/test_publishOnChange.cpp +++ b/extras/test/src/test_publishOnChange.cpp @@ -1,23 +1,28 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("An Arduino cloud property is published on value change", "[ArduinoCloudThing::publishOnChange]") { PropertyContainer property_container; - CloudInt test = 10; int const DELTA = 6; diff --git a/extras/test/src/test_publishOnChangeRateLimit.cpp b/extras/test/src/test_publishOnChangeRateLimit.cpp index 0f1a09073..cb98f3c97 100644 --- a/extras/test/src/test_publishOnChangeRateLimit.cpp +++ b/extras/test/src/test_publishOnChangeRateLimit.cpp @@ -1,23 +1,27 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("An Arduino cloud property is published on value change but the update rate is limited", "[ArduinoCloudThing::publishOnChange]") { PropertyContainer property_container; - CloudInt test = 0; int const MIN_DELTA = 0; unsigned long const MIN_TIME_BETWEEN_UPDATES_ms = 500; /* No updates faster than 500 ms */ diff --git a/extras/test/src/test_readOnly.cpp b/extras/test/src/test_readOnly.cpp index 826600eb7..b47f97063 100644 --- a/extras/test/src/test_readOnly.cpp +++ b/extras/test/src/test_readOnly.cpp @@ -1,26 +1,29 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include - #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("An Arduino cloud property is marked 'read only'", "[ArduinoCloudThing::decode]") { PropertyContainer property_container; - CloudInt test = 0; addPropertyToContainer(property_container, test, "test", Permission::Read); diff --git a/extras/test/src/test_writeOnChange.cpp b/extras/test/src/test_writeOnChange.cpp index 2bd63f4ff..1f523dd07 100644 --- a/extras/test/src/test_writeOnChange.cpp +++ b/extras/test/src/test_writeOnChange.cpp @@ -1,10 +1,16 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include @@ -13,14 +19,13 @@ #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("An Arduino cloud property is marked 'write on change'", "[ArduinoCloudThing::decode]") { PropertyContainer property_container; - CloudInt test = 0; addPropertyToContainer(property_container, test, "test", Permission::ReadWrite).writeOnChange(); diff --git a/extras/test/src/test_writeOnDemand.cpp b/extras/test/src/test_writeOnDemand.cpp index c882bf656..36d2ec747 100644 --- a/extras/test/src/test_writeOnDemand.cpp +++ b/extras/test/src/test_writeOnDemand.cpp @@ -1,26 +1,29 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include - #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("An Arduino cloud property is marked 'write on demand'", "[ArduinoCloudThing::decode]") { PropertyContainer property_container; - CloudInt test = 0; addPropertyToContainer(property_container, test, "test", Permission::ReadWrite).writeOnDemand(); diff --git a/extras/test/src/test_writeOnly.cpp b/extras/test/src/test_writeOnly.cpp index 79f4a6edf..26ffb8604 100644 --- a/extras/test/src/test_writeOnly.cpp +++ b/extras/test/src/test_writeOnly.cpp @@ -1,26 +1,29 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include - #include - #include #include -/************************************************************************************** - TEST CODE - **************************************************************************************/ +/****************************************************************************** + TEST CODE + ******************************************************************************/ SCENARIO("An Arduino cloud property is marked 'write only'", "[ArduinoCloudThing::encode]") { PropertyContainer property_container; - CloudInt test = 0; addPropertyToContainer(property_container, test, "test", Permission::Write); diff --git a/extras/test/src/util/CBORTestUtil.cpp b/extras/test/src/util/CBORTestUtil.cpp index ea010413e..ffb62b28e 100644 --- a/extras/test/src/util/CBORTestUtil.cpp +++ b/extras/test/src/util/CBORTestUtil.cpp @@ -1,10 +1,16 @@ /* - Copyright (c) 2019 Arduino. All rights reserved. + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include @@ -13,16 +19,16 @@ #include -/************************************************************************************** - NAMESPACE - **************************************************************************************/ +/****************************************************************************** + NAMESPACE + ******************************************************************************/ namespace cbor { -/************************************************************************************** - PUBLIC FUNCTIONS - **************************************************************************************/ +/****************************************************************************** + PUBLIC FUNCTIONS + ******************************************************************************/ std::vector encode(PropertyContainer & property_container, bool lightPayload) { @@ -51,8 +57,4 @@ void print(std::vector const & vect) std::cout << std::endl; } -/************************************************************************************** - NAMESPACE - **************************************************************************************/ - } /* cbor */ diff --git a/extras/test/src/util/PropertyTestUtil.cpp b/extras/test/src/util/PropertyTestUtil.cpp index 1bf41c437..a07d03d4e 100644 --- a/extras/test/src/util/PropertyTestUtil.cpp +++ b/extras/test/src/util/PropertyTestUtil.cpp @@ -1,18 +1,24 @@ /* - * Copyright (c) 2020 Arduino. All rights reserved. - */ + This file is part of the ArduinoIoTCloud library. -/************************************************************************************** - INCLUDE - **************************************************************************************/ + Copyright (c) 2020 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ + +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include #include #include -/************************************************************************************** - FUNCTION DEFINITION - **************************************************************************************/ +/****************************************************************************** + FUNCTION DEFINITION + ******************************************************************************/ unsigned long getTime() { diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h index b0fba96a3..4c1272eb5 100644 --- a/src/AIoTC_Config.h +++ b/src/AIoTC_Config.h @@ -1,18 +1,11 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_AIOTC_CONFIG_H_ @@ -27,7 +20,7 @@ #include /****************************************************************************** - * USER CONFIGURABLE DEFINES + USER CONFIGURABLE DEFINES ******************************************************************************/ #ifndef NTP_USE_RANDOM_PORT @@ -55,7 +48,7 @@ #endif /****************************************************************************** - * AUTOMATICALLY CONFIGURED DEFINES + AUTOMATICALLY CONFIGURED DEFINES ******************************************************************************/ #if !defined(HAS_NOTECARD) @@ -162,7 +155,7 @@ #endif /****************************************************************************** - * CONSTANTS + CONSTANTS ******************************************************************************/ #if defined(HAS_LORA) diff --git a/src/AIoTC_Const.h b/src/AIoTC_Const.h index c6249ebe8..7b4dade63 100644 --- a/src/AIoTC_Const.h +++ b/src/AIoTC_Const.h @@ -1,25 +1,18 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_AIOTC_CONST_H_ #define ARDUINO_AIOTC_CONST_H_ /****************************************************************************** - CONSTANTS + CONSTANTS ******************************************************************************/ static bool const ON = true; diff --git a/src/ArduinoBearSSLConfig.h b/src/ArduinoBearSSLConfig.h index 1d340d423..211296fd8 100644 --- a/src/ArduinoBearSSLConfig.h +++ b/src/ArduinoBearSSLConfig.h @@ -1,18 +1,11 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2024 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2024 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_BEARSSL_CONFIG_H_ diff --git a/src/ArduinoECCX08Config.h b/src/ArduinoECCX08Config.h index 41edf9708..bf0727368 100644 --- a/src/ArduinoECCX08Config.h +++ b/src/ArduinoECCX08Config.h @@ -1,18 +1,11 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_ECCX08_CONFIG_H diff --git a/src/ArduinoIoTCloud.cpp b/src/ArduinoIoTCloud.cpp index 74443ff5b..8b427cb37 100644 --- a/src/ArduinoIoTCloud.cpp +++ b/src/ArduinoIoTCloud.cpp @@ -1,28 +1,21 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2019 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include /****************************************************************************** - CTOR/DTOR + CTOR/DTOR ******************************************************************************/ ArduinoIoTCloudClass::ArduinoIoTCloudClass() @@ -40,7 +33,7 @@ ArduinoIoTCloudClass::ArduinoIoTCloudClass() } /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ void ArduinoIoTCloudClass::push() @@ -203,7 +196,7 @@ void ArduinoIoTCloudClass::addPropertyRealInternal(Property& property, String na } /****************************************************************************** - * PROTECTED MEMBER FUNCTIONS + PROTECTED MEMBER FUNCTIONS ******************************************************************************/ void ArduinoIoTCloudClass::execCloudEventCallback(ArduinoIoTCloudEvent const event) @@ -218,4 +211,3 @@ __attribute__((weak)) void setDebugMessageLevel(int const /* level */) { /* do nothing */ } - diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h index 19e94555d..e354a3adb 100644 --- a/src/ArduinoIoTCloud.h +++ b/src/ArduinoIoTCloud.h @@ -1,25 +1,18 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2019 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_IOT_CLOUD_H #define ARDUINO_IOT_CLOUD_H /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -48,7 +41,7 @@ #include "utility/time/TimeService.h" /****************************************************************************** - TYPEDEF + TYPEDEF ******************************************************************************/ typedef enum @@ -76,7 +69,7 @@ enum class ArduinoIoTCloudEvent : size_t typedef void (*OnCloudEventCallback)(void); /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class ArduinoIoTCloudClass diff --git a/src/ArduinoIoTCloudDevice.cpp b/src/ArduinoIoTCloudDevice.cpp index 3c7e2872f..9496f8b47 100644 --- a/src/ArduinoIoTCloudDevice.cpp +++ b/src/ArduinoIoTCloudDevice.cpp @@ -9,7 +9,7 @@ */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -20,7 +20,7 @@ #include "interfaces/CloudProcess.h" /****************************************************************************** - CTOR/DTOR + CTOR/DTOR ******************************************************************************/ ArduinoCloudDevice::ArduinoCloudDevice(MessageStream *ms) : CloudProcess(ms), diff --git a/src/ArduinoIoTCloudDevice.h b/src/ArduinoIoTCloudDevice.h index ae4386403..58cf09c49 100644 --- a/src/ArduinoIoTCloudDevice.h +++ b/src/ArduinoIoTCloudDevice.h @@ -12,7 +12,7 @@ #define ARDUINO_IOT_CLOUD_DEVICE_H /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -22,7 +22,7 @@ #include /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class ArduinoCloudDevice : public CloudProcess { diff --git a/src/ArduinoIoTCloudLPWAN.cpp b/src/ArduinoIoTCloudLPWAN.cpp index 2e2693460..f4eeff0be 100644 --- a/src/ArduinoIoTCloudLPWAN.cpp +++ b/src/ArduinoIoTCloudLPWAN.cpp @@ -1,22 +1,15 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2019 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -28,7 +21,7 @@ #include "cbor/CBOREncoder.h" /****************************************************************************** - CONSTANTS + CONSTANTS ******************************************************************************/ static size_t const CBOR_LORA_MSG_MAX_SIZE = 255; @@ -43,7 +36,7 @@ unsigned long getTime() } /****************************************************************************** - CTOR/DTOR + CTOR/DTOR ******************************************************************************/ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN() @@ -58,7 +51,7 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN() } /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ int ArduinoIoTCloudLPWAN::connected() @@ -94,7 +87,7 @@ void ArduinoIoTCloudLPWAN::printDebugInfo() } /****************************************************************************** - * PRIVATE MEMBER FUNCTIONS + PRIVATE MEMBER FUNCTIONS ******************************************************************************/ ArduinoIoTCloudLPWAN::State ArduinoIoTCloudLPWAN::handle_ConnectPhy() @@ -171,7 +164,7 @@ int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length) } /****************************************************************************** - * EXTERN DEFINITION + EXTERN DEFINITION ******************************************************************************/ ArduinoIoTCloudLPWAN ArduinoCloud; diff --git a/src/ArduinoIoTCloudLPWAN.h b/src/ArduinoIoTCloudLPWAN.h index 46c9e242d..588d2f4e6 100644 --- a/src/ArduinoIoTCloudLPWAN.h +++ b/src/ArduinoIoTCloudLPWAN.h @@ -1,31 +1,24 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2019 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_IOT_CLOUD_LPWAN_H #define ARDUINO_IOT_CLOUD_LPWAN_H /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass @@ -79,9 +72,9 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass }; /****************************************************************************** - * EXTERN DECLARATION + EXTERN DECLARATION ******************************************************************************/ extern ArduinoIoTCloudLPWAN ArduinoCloud; -#endif \ No newline at end of file +#endif diff --git a/src/ArduinoIoTCloudNotecard.cpp b/src/ArduinoIoTCloudNotecard.cpp index 90f00ceb5..91b9a5ed2 100644 --- a/src/ArduinoIoTCloudNotecard.cpp +++ b/src/ArduinoIoTCloudNotecard.cpp @@ -9,7 +9,7 @@ */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include "AIoTC_Config.h" @@ -29,7 +29,7 @@ #include "cbor/IoTCloudMessageEncoder.h" /****************************************************************************** - * CONSTANTS + CONSTANTS ******************************************************************************/ static size_t const CBOR_MSG_BUFFER_SIZE = 256; @@ -38,7 +38,7 @@ static size_t const DEFAULT_READ_INTERVAL_MS = 1000; // 1 second static size_t const FAILSAFE_READ_INTERVAL_MS = 15000; // 15 seconds /****************************************************************************** - * LOCAL MODULE FUNCTIONS + LOCAL MODULE FUNCTIONS ******************************************************************************/ unsigned long getTime() @@ -52,7 +52,7 @@ void ISR_dataAvailable(void) } /****************************************************************************** - * CTOR/DTOR + CTOR/DTOR ******************************************************************************/ ArduinoIoTCloudNotecard::ArduinoIoTCloudNotecard() @@ -71,7 +71,7 @@ ArduinoIoTCloudNotecard::ArduinoIoTCloudNotecard() } /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ int ArduinoIoTCloudNotecard::begin(ConnectionHandler &connection_, int interrupt_pin_) @@ -149,7 +149,7 @@ void ArduinoIoTCloudNotecard::update() } /****************************************************************************** - * PRIVATE STATE MACHINE FUNCTIONS + PRIVATE STATE MACHINE FUNCTIONS ******************************************************************************/ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_ConnectPhy() @@ -228,7 +228,7 @@ ArduinoIoTCloudNotecard::State ArduinoIoTCloudNotecard::handle_Disconnect() } /****************************************************************************** - * PRIVATE SUPPORT FUNCTIONS + PRIVATE SUPPORT FUNCTIONS ******************************************************************************/ void ArduinoIoTCloudNotecard::attachThing(String thingId) @@ -476,7 +476,7 @@ void ArduinoIoTCloudNotecard::sendThingPropertyContainerToCloud() } /****************************************************************************** - * EXTERN DEFINITION + EXTERN DEFINITION ******************************************************************************/ ArduinoIoTCloudNotecard ArduinoCloud; diff --git a/src/ArduinoIoTCloudNotecard.h b/src/ArduinoIoTCloudNotecard.h index d43147c28..699c5133c 100644 --- a/src/ArduinoIoTCloudNotecard.h +++ b/src/ArduinoIoTCloudNotecard.h @@ -12,7 +12,7 @@ #define ARDUINO_IOT_CLOUD_NOTECARD_H /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include "ArduinoIoTCloud.h" @@ -20,21 +20,13 @@ #include "ArduinoIoTCloudDevice.h" /****************************************************************************** - * DEFINES + DEFINES ******************************************************************************/ #define USE_LIGHT_PAYLOADS (false) /****************************************************************************** - * CONSTANTS - ******************************************************************************/ - -/****************************************************************************** - * TYPEDEF - ******************************************************************************/ - -/****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ /** @@ -126,7 +118,7 @@ class ArduinoIoTCloudNotecard : public ArduinoIoTCloudClass }; /****************************************************************************** - * EXTERN DECLARATION + EXTERN DECLARATION ******************************************************************************/ extern ArduinoIoTCloudNotecard ArduinoCloud; diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index 9fa9de583..1bc696555 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -1,22 +1,15 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2019 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -44,7 +37,7 @@ unsigned long getTime() } /****************************************************************************** - CTOR/DTOR + CTOR/DTOR ******************************************************************************/ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP() @@ -77,7 +70,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP() } /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, bool const enable_watchdog, String brokerAddress, uint16_t brokerPort, bool auto_reconnect) @@ -297,7 +290,7 @@ void ArduinoIoTCloudTCP::disconnect() { } /****************************************************************************** - * PRIVATE MEMBER FUNCTIONS + PRIVATE MEMBER FUNCTIONS ******************************************************************************/ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConfigPhy() @@ -723,7 +716,7 @@ int ArduinoIoTCloudTCP::updateCertificate(String authorityKeyIdentifier, String #endif /****************************************************************************** -* EXTERN DEFINITION + EXTERN DEFINITION ******************************************************************************/ ArduinoIoTCloudTCP ArduinoCloud; diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h index fd2ffab7f..1cd3c289d 100644 --- a/src/ArduinoIoTCloudTCP.h +++ b/src/ArduinoIoTCloudTCP.h @@ -1,25 +1,18 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2019 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_IOT_CLOUD_TCP_H #define ARDUINO_IOT_CLOUD_TCP_H /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -45,7 +38,7 @@ #include "cbor/IoTCloudMessageEncoder.h" /****************************************************************************** - CONSTANTS + CONSTANTS ******************************************************************************/ static constexpr char DEFAULT_BROKER_ADDRESS[] = "iot.arduino.cc"; static constexpr uint16_t DEFAULT_BROKER_PORT_SECURE_AUTH = 8885; @@ -53,13 +46,13 @@ static constexpr uint16_t DEFAULT_BROKER_PORT_USER_PASS_AUTH = 8884; static constexpr uint16_t DEFAULT_BROKER_PORT_AUTO = 0; /****************************************************************************** - * TYPEDEF + TYPEDEF ******************************************************************************/ typedef bool (*onOTARequestCallbackFunc)(void); /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass @@ -199,7 +192,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass }; /****************************************************************************** - * EXTERN DECLARATION + EXTERN DECLARATION ******************************************************************************/ extern ArduinoIoTCloudTCP ArduinoCloud; diff --git a/src/ArduinoIoTCloudThing.cpp b/src/ArduinoIoTCloudThing.cpp index 20ddc382d..46d5c84ed 100644 --- a/src/ArduinoIoTCloudThing.cpp +++ b/src/ArduinoIoTCloudThing.cpp @@ -10,7 +10,7 @@ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -23,7 +23,7 @@ #include "property/types/CloudWrapperUnsignedInt.h" /****************************************************************************** - * CTOR/DTOR + CTOR/DTOR ******************************************************************************/ ArduinoCloudThing::ArduinoCloudThing(MessageStream* ms) : CloudProcess(ms), @@ -38,7 +38,7 @@ _utcOffsetExpireTimeProperty(nullptr) { } /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ void ArduinoCloudThing::begin() { diff --git a/src/ArduinoIoTCloudThing.h b/src/ArduinoIoTCloudThing.h index 3e379be61..b3ca22ab9 100644 --- a/src/ArduinoIoTCloudThing.h +++ b/src/ArduinoIoTCloudThing.h @@ -13,7 +13,7 @@ #define ARDUINO_IOT_CLOUD_THING_H /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -21,7 +21,7 @@ #include "property/PropertyContainer.h" /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class ArduinoCloudThing : public CloudProcess { diff --git a/src/cbor/CBOR.h b/src/cbor/CBOR.h index 5200f9d60..f6a09fefd 100644 --- a/src/cbor/CBOR.h +++ b/src/cbor/CBOR.h @@ -11,13 +11,13 @@ #pragma once /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include #include /****************************************************************************** - TYPEDEF + TYPEDEF ******************************************************************************/ enum CBORCommandTag: CBORTag { diff --git a/src/cbor/CBORDecoder.cpp b/src/cbor/CBORDecoder.cpp index b4eccd8c2..cc14d5d86 100644 --- a/src/cbor/CBORDecoder.cpp +++ b/src/cbor/CBORDecoder.cpp @@ -1,22 +1,15 @@ -// -// This file is part of CBORDecoder -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of CBORDecoder. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -28,7 +21,7 @@ #include "CBORDecoder.h" /****************************************************************************** - PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ void CBORDecoder::decode(PropertyContainer & property_container, uint8_t const * const payload, size_t const length, bool isSyncMessage) @@ -76,7 +69,7 @@ void CBORDecoder::decode(PropertyContainer & property_container, uint8_t const * } /****************************************************************************** - PRIVATE MEMBER FUNCTIONS + PRIVATE MEMBER FUNCTIONS ******************************************************************************/ CBORDecoder::MapParserState CBORDecoder::handle_EnterMap(CborValue * map_iter, CborValue * value_iter) { diff --git a/src/cbor/CBORDecoder.h b/src/cbor/CBORDecoder.h index 5e9496b2a..515730750 100644 --- a/src/cbor/CBORDecoder.h +++ b/src/cbor/CBORDecoder.h @@ -1,25 +1,18 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef ARDUINO_CBOR_CBOR_DECODER_H_ #define ARDUINO_CBOR_CBOR_DECODER_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -31,7 +24,7 @@ #include "../property/PropertyContainer.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CBORDecoder diff --git a/src/cbor/CBOREncoder.cpp b/src/cbor/CBOREncoder.cpp index 74106cde7..a035cd05e 100644 --- a/src/cbor/CBOREncoder.cpp +++ b/src/cbor/CBOREncoder.cpp @@ -1,22 +1,15 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include "CBOREncoder.h" @@ -29,7 +22,7 @@ #include /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t * data, size_t const size, int & bytes_encoded, unsigned int & current_property_index, bool lightPayload) @@ -67,7 +60,7 @@ CborError CBOREncoder::encode(PropertyContainer & property_container, uint8_t * } /****************************************************************************** - PRIVATE MEMBER FUNCTIONS + PRIVATE MEMBER FUNCTIONS ******************************************************************************/ CBOREncoder::EncoderState CBOREncoder::handle_InitPropertyEncoder(PropertyContainerEncoder & propertyEncoder) diff --git a/src/cbor/CBOREncoder.h b/src/cbor/CBOREncoder.h index cbba5522d..52e6762ed 100644 --- a/src/cbor/CBOREncoder.h +++ b/src/cbor/CBOREncoder.h @@ -1,25 +1,18 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2024 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_CBOR_CBOR_ENCODER_H_ #define ARDUINO_CBOR_CBOR_ENCODER_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -31,7 +24,7 @@ #include "../property/PropertyContainer.h" /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CBOREncoder diff --git a/src/cbor/IoTCloudMessageDecoder.cpp b/src/cbor/IoTCloudMessageDecoder.cpp index 8deb9e3e5..5f6164d1e 100644 --- a/src/cbor/IoTCloudMessageDecoder.cpp +++ b/src/cbor/IoTCloudMessageDecoder.cpp @@ -9,7 +9,7 @@ */ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -19,7 +19,7 @@ #include /****************************************************************************** - MESSAGE DECODE FUNCTIONS + MESSAGE DECODE FUNCTIONS ******************************************************************************/ MessageDecoder::Status ThingUpdateCommandDecoder::decode(CborValue* iter, Message *msg) { diff --git a/src/cbor/IoTCloudMessageDecoder.h b/src/cbor/IoTCloudMessageDecoder.h index f072a2c3a..b7afa1f61 100644 --- a/src/cbor/IoTCloudMessageDecoder.h +++ b/src/cbor/IoTCloudMessageDecoder.h @@ -12,7 +12,7 @@ #define ARDUINO_CBOR_MESSAGE_DECODER_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include "./CBOR.h" @@ -20,7 +20,7 @@ #include "message/Commands.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class OtaUpdateCommandDecoder: public CBORMessageDecoderInterface { diff --git a/src/cbor/IoTCloudMessageEncoder.cpp b/src/cbor/IoTCloudMessageEncoder.cpp index 154053224..8f258f09a 100644 --- a/src/cbor/IoTCloudMessageEncoder.cpp +++ b/src/cbor/IoTCloudMessageEncoder.cpp @@ -9,7 +9,7 @@ */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include "CBOREncoder.h" @@ -17,12 +17,12 @@ #include "IoTCloudMessageEncoder.h" /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ /****************************************************************************** - PRIVATE MEMBER FUNCTIONS + PRIVATE MEMBER FUNCTIONS ******************************************************************************/ MessageEncoder::Status OtaBeginCommandEncoder::encode(CborEncoder* encoder, Message *msg) { @@ -358,4 +358,3 @@ namespace cbor { namespace encoder { namespace iotcloud { (void) deviceNetConfigCmdUpEncoder; } }}} - diff --git a/src/cbor/IoTCloudMessageEncoder.h b/src/cbor/IoTCloudMessageEncoder.h index e71f4defc..a86177302 100644 --- a/src/cbor/IoTCloudMessageEncoder.h +++ b/src/cbor/IoTCloudMessageEncoder.h @@ -12,7 +12,7 @@ #define ARDUINO_CBOR_MESSAGE_ENCODER_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -21,7 +21,7 @@ #include "message/Commands.h" /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class OtaBeginCommandEncoder: public CBORMessageEncoderInterface { diff --git a/src/interfaces/CloudProcess.h b/src/interfaces/CloudProcess.h index 7462e867f..ce8d10c3c 100644 --- a/src/interfaces/CloudProcess.h +++ b/src/interfaces/CloudProcess.h @@ -12,7 +12,7 @@ #define ARDUINO_IOT_CLOUD_PROCESS /****************************************************************************** - * INCLUDES + INCLUDES ******************************************************************************/ #include @@ -21,7 +21,7 @@ #include /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudProcess { diff --git a/src/interfaces/MessageStream.h b/src/interfaces/MessageStream.h index ac2b18ac9..8466a80f3 100644 --- a/src/interfaces/MessageStream.h +++ b/src/interfaces/MessageStream.h @@ -11,7 +11,7 @@ #pragma once /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -20,7 +20,7 @@ using upstreamFunction = std::function; /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class MessageStream { diff --git a/src/message/Commands.h b/src/message/Commands.h index 60840231a..1e4b59908 100644 --- a/src/message/Commands.h +++ b/src/message/Commands.h @@ -11,7 +11,7 @@ #pragma once /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -21,7 +21,7 @@ #include /****************************************************************************** - * DEFINE + DEFINE ******************************************************************************/ #define THING_ID_SIZE 37 @@ -31,7 +31,7 @@ #define MAX_LIB_VERSION_SIZE 10 /****************************************************************************** - TYPEDEF + TYPEDEF ******************************************************************************/ enum CommandId: MessageId { diff --git a/src/ota/implementation/OTAEsp32.cpp b/src/ota/implementation/OTAEsp32.cpp index 5845087c2..9c4462abd 100644 --- a/src/ota/implementation/OTAEsp32.cpp +++ b/src/ota/implementation/OTAEsp32.cpp @@ -24,7 +24,6 @@ ESP32OTACloudProcess::ESP32OTACloudProcess(MessageStream *ms, Client* client) } - OTACloudProcessInterface::State ESP32OTACloudProcess::resume(Message* msg) { return OtaBegin; } @@ -115,4 +114,4 @@ void ESP32OTACloudProcess::calculateSHA256(SHA256& sha256_calc) { appFlashClose(); } -#endif // defined(ARDUINO_ARCH_ESP32) && OTA_ENABLED \ No newline at end of file +#endif // defined(ARDUINO_ARCH_ESP32) && OTA_ENABLED diff --git a/src/ota/implementation/OTANanoRP2040.cpp b/src/ota/implementation/OTANanoRP2040.cpp index c24ebf9ed..2e59e5bae 100644 --- a/src/ota/implementation/OTANanoRP2040.cpp +++ b/src/ota/implementation/OTANanoRP2040.cpp @@ -22,7 +22,6 @@ const char NANO_RP2040OTACloudProcess::UPDATE_FILE_NAME[] = FULL_UPDATE_FILE_PATH; - NANO_RP2040OTACloudProcess::NANO_RP2040OTACloudProcess(MessageStream *ms, Client* client) : OTADefaultCloudProcessInterface(ms, client) , flash((uint32_t)appStartAddress() + 0xF00000, 0x100000) // TODO make this numbers a constant diff --git a/src/ota/implementation/OTASTM32H7.cpp b/src/ota/implementation/OTASTM32H7.cpp index d9675aa21..dd2c32645 100644 --- a/src/ota/implementation/OTASTM32H7.cpp +++ b/src/ota/implementation/OTASTM32H7.cpp @@ -69,7 +69,6 @@ OTACloudProcessInterface::State STM32H7OTACloudProcess::startOTA() { return OTADefaultCloudProcessInterface::startOTA(); } - OTACloudProcessInterface::State STM32H7OTACloudProcess::flashOTA() { fclose(decompressed); decompressed = nullptr; @@ -199,5 +198,4 @@ uint32_t STM32H7OTACloudProcess::appSize() { return ((&__etext - (uint32_t*)appStartAddress()) + (&_edata - &_sdata))*sizeof(void*); } - -#endif // defined(BOARD_STM32H7) && OTA_ENABLED \ No newline at end of file +#endif // defined(BOARD_STM32H7) && OTA_ENABLED diff --git a/src/ota/implementation/OTASamd.cpp b/src/ota/implementation/OTASamd.cpp index bc9194491..0db72dd04 100644 --- a/src/ota/implementation/OTASamd.cpp +++ b/src/ota/implementation/OTASamd.cpp @@ -94,4 +94,4 @@ uint32_t SAMDOTACloudProcess::appSize() { return ((&__etext - &__text_start__) + (&__data_end__ - &__data_start__))*sizeof(void*); } -#endif // defined(ARDUINO_ARCH_SAMD) && OTA_ENABLED \ No newline at end of file +#endif // defined(ARDUINO_ARCH_SAMD) && OTA_ENABLED diff --git a/src/ota/implementation/OTAUnoR4.cpp b/src/ota/implementation/OTAUnoR4.cpp index afe37b4a7..077d4b9bb 100644 --- a/src/ota/implementation/OTAUnoR4.cpp +++ b/src/ota/implementation/OTAUnoR4.cpp @@ -19,7 +19,7 @@ #include "WiFi.h" /****************************************************************************** - * DEFINES + DEFINES ******************************************************************************/ const char UNOR4OTACloudProcess::UPDATE_FILE_NAME[] = "/update.bin"; diff --git a/src/ota/interface/OTAInterface.cpp b/src/ota/interface/OTAInterface.cpp index 13644cabb..76f028aa0 100644 --- a/src/ota/interface/OTAInterface.cpp +++ b/src/ota/interface/OTAInterface.cpp @@ -9,7 +9,7 @@ */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -21,7 +21,7 @@ extern "C" unsigned long getTime(); /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ #ifdef DEBUG_VERBOSE diff --git a/src/ota/interface/OTAInterface.h b/src/ota/interface/OTAInterface.h index d3d21f0f1..7bee1b71f 100644 --- a/src/ota/interface/OTAInterface.h +++ b/src/ota/interface/OTAInterface.h @@ -11,7 +11,7 @@ #pragma once /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -24,7 +24,7 @@ #include /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class OTACloudProcessInterface: public CloudProcess { diff --git a/src/property/Property.cpp b/src/property/Property.cpp index 6297c09cb..d64d67840 100644 --- a/src/property/Property.cpp +++ b/src/property/Property.cpp @@ -1,19 +1,12 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #include "Property.h" @@ -22,7 +15,7 @@ #include /****************************************************************************** - CTOR/DTOR + CTOR/DTOR ******************************************************************************/ Property::Property() : _name{""} @@ -53,7 +46,7 @@ Property::Property() } /****************************************************************************** - CONST + CONST ******************************************************************************/ namespace PropertyActions { @@ -61,7 +54,7 @@ namespace PropertyActions } /****************************************************************************** - PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ void Property::init(String const name, Permission const permission, GetTimeCallbackFunc func) { _name = name; @@ -388,7 +381,7 @@ void Property::setIdentifier(int identifier) { } /****************************************************************************** - SYNCHRONIZATION CALLBACKS + SYNCHRONIZATION CALLBACKS ******************************************************************************/ void onAutoSync(Property & property) { diff --git a/src/property/Property.h b/src/property/Property.h index 329d99e32..fcdb98f2a 100644 --- a/src/property/Property.h +++ b/src/property/Property.h @@ -1,19 +1,12 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef ARDUINO_CLOUD_PROPERTY_HPP_ #define ARDUINO_CLOUD_PROPERTY_HPP_ @@ -24,7 +17,7 @@ #endif /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -38,7 +31,7 @@ #include /****************************************************************************** - CONST + CONST ******************************************************************************/ namespace PropertyActions { @@ -46,7 +39,7 @@ namespace PropertyActions } /****************************************************************************** - ENUM + ENUM ******************************************************************************/ /* Source: https://tools.ietf.org/html/rfc8428#section-6 */ enum class CborIntegerMapKey : int { @@ -135,7 +128,7 @@ class Property; typedef void(*OnSyncCallbackFunc)(Property &); /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class Property @@ -250,7 +243,7 @@ class Property }; /****************************************************************************** - PROTOTYPE FREE FUNCTIONs + PROTOTYPE FREE FUNCTIONs ******************************************************************************/ inline bool operator == (Property const & lhs, Property const & rhs) { @@ -258,7 +251,7 @@ inline bool operator == (Property const & lhs, Property const & rhs) { } /****************************************************************************** - SYNCHRONIZATION CALLBACKS + SYNCHRONIZATION CALLBACKS ******************************************************************************/ void onAutoSync(Property & property); diff --git a/src/property/PropertyContainer.cpp b/src/property/PropertyContainer.cpp index 1ea1edcaa..07a63e766 100644 --- a/src/property/PropertyContainer.cpp +++ b/src/property/PropertyContainer.cpp @@ -1,38 +1,29 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include "PropertyContainer.h" - #include - #include "types/CloudWrapperBase.h" /****************************************************************************** - INTERNAL FUNCTION DECLARATION + INTERNAL FUNCTION DECLARATION ******************************************************************************/ void addProperty(PropertyContainer & prop_cont, Property * property_obj, int propertyIdentifier); /****************************************************************************** - PUBLIC FUNCTION DEFINITION + PUBLIC FUNCTION DEFINITION ******************************************************************************/ Property & addPropertyToContainer(PropertyContainer & prop_cont, Property & property, String const & name, Permission const permission, int propertyIdentifier, GetTimeCallbackFunc func) @@ -146,7 +137,7 @@ String getPropertyNameByIdentifier(PropertyContainer & prop_cont, int propertyId } /****************************************************************************** - INTERNAL FUNCTION DEFINITION + INTERNAL FUNCTION DEFINITION ******************************************************************************/ void addProperty(PropertyContainer & prop_cont, Property * property_obj, int propertyIdentifier) diff --git a/src/property/PropertyContainer.h b/src/property/PropertyContainer.h index 9dc3c86cd..5423d3582 100644 --- a/src/property/PropertyContainer.h +++ b/src/property/PropertyContainer.h @@ -1,25 +1,18 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_PROPERTY_CONTAINER_H_ #define ARDUINO_PROPERTY_CONTAINER_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -51,13 +44,13 @@ #include "types/automation/CloudTelevision.h" /****************************************************************************** - DECLARATION OF getTime + DECLARATION OF getTime ******************************************************************************/ extern "C" unsigned long getTime(); /****************************************************************************** - TYPEDEF + TYPEDEF ******************************************************************************/ typedef std::list PropertyContainer; @@ -94,7 +87,7 @@ typedef CloudFloat CloudPercentage; typedef CloudFloat CloudRelativeHumidity; /****************************************************************************** - FUNCTION DECLARATION + FUNCTION DECLARATION ******************************************************************************/ Property & addPropertyToContainer(PropertyContainer & prop_cont, @@ -104,7 +97,7 @@ Property & addPropertyToContainer(PropertyContainer & prop_cont, int propertyIdentifier = -1, GetTimeCallbackFunc func = getTime); - + Property * getProperty(PropertyContainer & prop_cont, String const & name); Property * getProperty(PropertyContainer & prop_cont, int const identifier); @@ -114,4 +107,4 @@ void requestUpdateForAllProperties(PropertyContainer & prop_cont); void updateProperty(PropertyContainer & prop_cont, String propertyName, unsigned long cloudChangeEventTime, bool const is_sync_message, std::list * map_data_list); String getPropertyNameByIdentifier(PropertyContainer & prop_cont, int propertyIdentifier); -#endif /* ARDUINO_PROPERTY_CONTAINER_H_ */ \ No newline at end of file +#endif /* ARDUINO_PROPERTY_CONTAINER_H_ */ diff --git a/src/property/math_utils.h b/src/property/math_utils.h index 5d5e465c0..4d115ee52 100644 --- a/src/property/math_utils.h +++ b/src/property/math_utils.h @@ -7,6 +7,7 @@ License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #pragma once #include diff --git a/src/property/types/CloudBool.h b/src/property/types/CloudBool.h index 3434656fc..ff2ddaf76 100644 --- a/src/property/types/CloudBool.h +++ b/src/property/types/CloudBool.h @@ -1,46 +1,37 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDBOOL_H_ #define CLOUDBOOL_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudBool : public Property { protected: bool _value, _cloud_value; public: - CloudBool() { + CloudBool() { CloudBool(false); } CloudBool(bool v) : _value(v), _cloud_value(v) {} - operator bool() const { + operator bool() const { return _value; } virtual bool isDifferentFromCloud() { @@ -74,5 +65,4 @@ class CloudBool : public Property { //friends }; - #endif /* CLOUDBOOL_H_ */ diff --git a/src/property/types/CloudColor.h b/src/property/types/CloudColor.h index 54cb4f30f..13e52f963 100644 --- a/src/property/types/CloudColor.h +++ b/src/property/types/CloudColor.h @@ -1,25 +1,18 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDCOLOR_H_ #define CLOUDCOLOR_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -27,7 +20,7 @@ #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class Color { @@ -162,7 +155,6 @@ class CloudColor : public Property { CloudColor(float hue, float saturation, float brightness) : _value(hue, saturation, brightness), _cloud_value(hue, saturation, brightness) {} virtual bool isDifferentFromCloud() { - return _value != _cloud_value; } @@ -201,4 +193,4 @@ class CloudColor : public Property { } }; -#endif /* CLOUDCOLOR_H_ */ \ No newline at end of file +#endif /* CLOUDCOLOR_H_ */ diff --git a/src/property/types/CloudFloat.h b/src/property/types/CloudFloat.h index 1918f9669..31b5f89c3 100644 --- a/src/property/types/CloudFloat.h +++ b/src/property/types/CloudFloat.h @@ -1,19 +1,12 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDFLOAT_H_ #define CLOUDFLOAT_H_ @@ -22,24 +15,22 @@ #include "../math_utils.h" /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudFloat : public Property { protected: float _value, _cloud_value; public: - CloudFloat() { + CloudFloat() { CloudFloat(0.0f); } CloudFloat(float v) : _value(v), _cloud_value(v) {} @@ -184,5 +175,4 @@ class CloudFloat : public Property { } }; - #endif /* CLOUDFLOAT_H_ */ diff --git a/src/property/types/CloudInt.h b/src/property/types/CloudInt.h index 37e4d3cae..8f1a24215 100644 --- a/src/property/types/CloudInt.h +++ b/src/property/types/CloudInt.h @@ -1,42 +1,33 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDINT_H_ #define CLOUDINT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudInt : public Property { private: int _value, _cloud_value; public: - CloudInt() { + CloudInt() { CloudInt(0); } CloudInt(int v) : _value(v), _cloud_value(v) {} @@ -215,8 +206,6 @@ class CloudInt : public Property { friend CloudInt operator>>(int v, CloudInt iw) { return CloudInt(v) >>= iw; } - }; - #endif /* CLOUDINT_H_ */ diff --git a/src/property/types/CloudLocation.h b/src/property/types/CloudLocation.h index cd4f0dc67..f5f4121fe 100644 --- a/src/property/types/CloudLocation.h +++ b/src/property/types/CloudLocation.h @@ -1,25 +1,18 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDLOCATION_H_ #define CLOUDLOCATION_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -27,11 +20,9 @@ #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class Location { public: float lat, diff --git a/src/property/types/CloudSchedule.h b/src/property/types/CloudSchedule.h index 9a9222968..9054cf1b7 100644 --- a/src/property/types/CloudSchedule.h +++ b/src/property/types/CloudSchedule.h @@ -1,25 +1,18 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2021 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDSCHEDULE_H_ #define CLOUDSCHEDULE_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -29,7 +22,7 @@ #include /****************************************************************************** - * DEFINE + DEFINE ******************************************************************************/ #define SCHEDULE_UNIT_MASK 0xC0000000 #define SCHEDULE_UNIT_SHIFT 30 @@ -47,7 +40,7 @@ #define SCHEDULE_ONE_SHOT 0xFFFFFFFF /****************************************************************************** - ENUM + ENUM ******************************************************************************/ enum class ScheduleUnit : int { Seconds = 0, @@ -95,7 +88,7 @@ enum class ScheduleState : int { }; /****************************************************************************** - * TYPEDEF + TYPEDEF ******************************************************************************/ typedef struct ScheduleWeeklyMask { ScheduleState& operator[](ScheduleWeekDay i) { return day[static_cast(i)];} @@ -106,7 +99,7 @@ typedef unsigned int ScheduleTimeType; typedef unsigned int ScheduleConfigurationType; /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class Schedule { public: @@ -318,11 +311,11 @@ class Schedule { if(isScheduleFixed(msk) || isScheduleOneShot(msk)) { return true; } - + if(isScheduleWeekly(msk)) { unsigned int currentDayMask = getCurrentDayMask(now); unsigned int scheduleMask = getScheduleWeekMask(msk); - + if((currentDayMask & scheduleMask) != 0) { return true; } diff --git a/src/property/types/CloudString.h b/src/property/types/CloudString.h index f884720c0..6f5051b41 100644 --- a/src/property/types/CloudString.h +++ b/src/property/types/CloudString.h @@ -1,45 +1,36 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDSTRING_H_ #define CLOUDSTRING_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudString : public Property { private: String _value, _cloud_value; public: - CloudString() { + CloudString() { CloudString(""); } - CloudString(const char *v) { + CloudString(const char *v) { CloudString(String(v)); } CloudString(String v) : _value(v), _cloud_value(v) {} @@ -88,5 +79,4 @@ class CloudString : public Property { } }; - #endif /* CLOUDSTRING_H_ */ diff --git a/src/property/types/CloudUnsignedInt.h b/src/property/types/CloudUnsignedInt.h index 40bed697a..f6503aeea 100644 --- a/src/property/types/CloudUnsignedInt.h +++ b/src/property/types/CloudUnsignedInt.h @@ -1,42 +1,33 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDUINT_H_ #define CLOUDUINT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudUnsignedInt : public Property { private: unsigned int _value, _cloud_value; public: - CloudUnsignedInt() { + CloudUnsignedInt() { CloudUnsignedInt(0); } CloudUnsignedInt(unsigned int v) : _value(v), _cloud_value(v) {} @@ -215,8 +206,6 @@ class CloudUnsignedInt : public Property { friend CloudUnsignedInt operator>>(unsigned int v, CloudUnsignedInt iw) { return CloudUnsignedInt(v) >>= iw; } - }; - #endif /* CLOUDUINT_H_ */ diff --git a/src/property/types/CloudWrapperBase.h b/src/property/types/CloudWrapperBase.h index 9efd86100..02d025e95 100644 --- a/src/property/types/CloudWrapperBase.h +++ b/src/property/types/CloudWrapperBase.h @@ -1,32 +1,25 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDWRAPPERBASE_H_ #define CLOUDWRAPPERBASE_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudWrapperBase : public Property { @@ -34,5 +27,4 @@ class CloudWrapperBase : public Property { virtual bool isChangedLocally() = 0; }; - #endif /* CLOUDWRAPPERBASE_H_ */ diff --git a/src/property/types/CloudWrapperBool.h b/src/property/types/CloudWrapperBool.h index 8fffd4209..5027db055 100644 --- a/src/property/types/CloudWrapperBool.h +++ b/src/property/types/CloudWrapperBool.h @@ -1,32 +1,25 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDWRAPPERBOOL_H_ #define CLOUDWRAPPERBOOL_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "CloudWrapperBase.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudWrapperBool : public CloudWrapperBase { @@ -59,5 +52,4 @@ class CloudWrapperBool : public CloudWrapperBase { } }; - #endif /* CLOUDWRAPPERBOOL_H_ */ diff --git a/src/property/types/CloudWrapperFloat.h b/src/property/types/CloudWrapperFloat.h index 4e8d97986..31960559c 100644 --- a/src/property/types/CloudWrapperFloat.h +++ b/src/property/types/CloudWrapperFloat.h @@ -1,19 +1,12 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDWRAPPERFLOAT_H_ #define CLOUDWRAPPERFLOAT_H_ @@ -22,14 +15,14 @@ #include "../math_utils.h" /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "CloudWrapperBase.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudWrapperFloat : public CloudWrapperBase { @@ -62,5 +55,4 @@ class CloudWrapperFloat : public CloudWrapperBase { } }; - #endif /* CLOUWRAPPERFLOAT_H_ */ diff --git a/src/property/types/CloudWrapperInt.h b/src/property/types/CloudWrapperInt.h index 73623abfc..ff233f78c 100644 --- a/src/property/types/CloudWrapperInt.h +++ b/src/property/types/CloudWrapperInt.h @@ -1,32 +1,25 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDWRAPPERINT_H_ #define CLOUDWRAPPERINT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "CloudWrapperBase.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudWrapperInt : public CloudWrapperBase { @@ -59,5 +52,4 @@ class CloudWrapperInt : public CloudWrapperBase { } }; - #endif /* CLOUDWRAPPERINT_H_ */ diff --git a/src/property/types/CloudWrapperString.h b/src/property/types/CloudWrapperString.h index 7c75db0db..cc54eedb5 100644 --- a/src/property/types/CloudWrapperString.h +++ b/src/property/types/CloudWrapperString.h @@ -1,32 +1,25 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDWRAPPERSTRING_H_ #define CLOUDWRAPPERSTRING_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "CloudWrapperBase.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudWrapperString : public CloudWrapperBase { @@ -63,5 +56,4 @@ class CloudWrapperString : public CloudWrapperBase { } }; - #endif /* CLOUDWRAPPERSTRING_H_ */ diff --git a/src/property/types/CloudWrapperUnsignedInt.h b/src/property/types/CloudWrapperUnsignedInt.h index 34ed01ef3..95de479f7 100644 --- a/src/property/types/CloudWrapperUnsignedInt.h +++ b/src/property/types/CloudWrapperUnsignedInt.h @@ -1,32 +1,25 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDWRAPPERUINT_H_ #define CLOUDWRAPPERUINT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "CloudWrapperBase.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudWrapperUnsignedInt : public CloudWrapperBase { @@ -59,5 +52,4 @@ class CloudWrapperUnsignedInt : public CloudWrapperBase { } }; - #endif /* CLOUDWRAPPERINT_H_ */ diff --git a/src/property/types/automation/CloudColoredLight.h b/src/property/types/automation/CloudColoredLight.h index 031590a39..4d92f3bf2 100644 --- a/src/property/types/automation/CloudColoredLight.h +++ b/src/property/types/automation/CloudColoredLight.h @@ -1,25 +1,18 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDCOLOREDLIGHT_H_ #define CLOUDCOLOREDLIGHT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -27,7 +20,7 @@ #include "../CloudColor.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class ColoredLight : public Color { @@ -133,4 +126,4 @@ class CloudColoredLight : public CloudColor { } }; -#endif /* CLOUDCOLOREDLIGHT_H_ */ \ No newline at end of file +#endif /* CLOUDCOLOREDLIGHT_H_ */ diff --git a/src/property/types/automation/CloudContactSensor.h b/src/property/types/automation/CloudContactSensor.h index 351eaed73..4c6bb7b27 100644 --- a/src/property/types/automation/CloudContactSensor.h +++ b/src/property/types/automation/CloudContactSensor.h @@ -1,40 +1,31 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDCONTACTSENSOR_H_ #define CLOUDCONTACTSENSOR_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../CloudBool.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudContactSensor : public CloudBool { private: public: - operator bool() const { + operator bool() const { return _value; } CloudContactSensor& operator=(bool v) { @@ -43,5 +34,4 @@ class CloudContactSensor : public CloudBool { } }; - #endif /* CLOUDCONTACTSENSOR_H_ */ diff --git a/src/property/types/automation/CloudDimmedLight.h b/src/property/types/automation/CloudDimmedLight.h index 5da30821b..d202c4499 100644 --- a/src/property/types/automation/CloudDimmedLight.h +++ b/src/property/types/automation/CloudDimmedLight.h @@ -1,25 +1,18 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDDIMMEDLIGHT_H_ #define CLOUDDIMMEDLIGHT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include @@ -27,7 +20,7 @@ #include "../../Property.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class DimmedLight { public: @@ -110,4 +103,4 @@ class CloudDimmedLight : public Property { } }; -#endif /* CLOUDDIMMEDLIGHT_H_ */ \ No newline at end of file +#endif /* CLOUDDIMMEDLIGHT_H_ */ diff --git a/src/property/types/automation/CloudLight.h b/src/property/types/automation/CloudLight.h index 358527b37..f778ad8af 100644 --- a/src/property/types/automation/CloudLight.h +++ b/src/property/types/automation/CloudLight.h @@ -1,40 +1,31 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDLIGHT_H_ #define CLOUDLIGHT_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../CloudBool.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudLight : public CloudBool { private: public: - operator bool() const { + operator bool() const { return _value; } CloudLight& operator=(bool v) { @@ -43,5 +34,4 @@ class CloudLight : public CloudBool { } }; - #endif /* CLOUDLIGHT_H_ */ diff --git a/src/property/types/automation/CloudMotionSensor.h b/src/property/types/automation/CloudMotionSensor.h index 3831d3d27..0e9996099 100644 --- a/src/property/types/automation/CloudMotionSensor.h +++ b/src/property/types/automation/CloudMotionSensor.h @@ -1,40 +1,31 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDMOTIONSENSOR_H_ #define CLOUDMOTIONSENSOR_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../CloudBool.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudMotionSensor : public CloudBool { private: public: - operator bool() const { + operator bool() const { return _value; } CloudMotionSensor& operator=(bool v) { @@ -43,5 +34,4 @@ class CloudMotionSensor : public CloudBool { } }; - #endif /* CLOUDMOTIONSENSOR_H_ */ diff --git a/src/property/types/automation/CloudSmartPlug.h b/src/property/types/automation/CloudSmartPlug.h index 99c7886fb..6601d9fcf 100644 --- a/src/property/types/automation/CloudSmartPlug.h +++ b/src/property/types/automation/CloudSmartPlug.h @@ -1,40 +1,31 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDSMARTPLUG_H_ #define CLOUDSMARTPLUG_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../CloudBool.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudSmartPlug : public CloudBool { private: public: - operator bool() const { + operator bool() const { return _value; } CloudSmartPlug& operator=(bool v) { @@ -43,5 +34,4 @@ class CloudSmartPlug : public CloudBool { } }; - #endif /* CLOUDSMARTPLUG_H_ */ diff --git a/src/property/types/automation/CloudSwitch.h b/src/property/types/automation/CloudSwitch.h index d22345d88..2ae406164 100644 --- a/src/property/types/automation/CloudSwitch.h +++ b/src/property/types/automation/CloudSwitch.h @@ -1,40 +1,31 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDSWITCH_H_ #define CLOUDSWITCH_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../CloudBool.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ - - class CloudSwitch : public CloudBool { private: public: - operator bool() const { + operator bool() const { return _value; } CloudSwitch& operator=(bool v) { @@ -43,5 +34,4 @@ class CloudSwitch : public CloudBool { } }; - #endif /* CLOUDSWITCH_H_ */ diff --git a/src/property/types/automation/CloudTelevision.h b/src/property/types/automation/CloudTelevision.h index f1d203d3b..78293eb5f 100644 --- a/src/property/types/automation/CloudTelevision.h +++ b/src/property/types/automation/CloudTelevision.h @@ -1,32 +1,25 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUDTELEVISION_H_ #define CLOUDTELEVISION_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include #include "../../Property.h" /****************************************************************************** - ENUM + ENUM ******************************************************************************/ enum class PlaybackCommands : int { FastForward = 0, @@ -104,7 +97,7 @@ enum class InputValue : int { }; /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class Television { diff --git a/src/property/types/automation/CloudTemperatureSensor.h b/src/property/types/automation/CloudTemperatureSensor.h index 69ce33eb8..777c63d05 100644 --- a/src/property/types/automation/CloudTemperatureSensor.h +++ b/src/property/types/automation/CloudTemperatureSensor.h @@ -1,31 +1,24 @@ -// -// This file is part of ArduinoCloudThing -// -// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) -// -// This software is released under the GNU General Public License version 3, -// which covers the main part of ArduinoCloudThing. -// The terms of this license can be found at: -// https://www.gnu.org/licenses/gpl-3.0.en.html -// -// You can be released from the requirements of the above licenses by purchasing -// a commercial license. Buying such a license is mandatory if you want to modify or -// otherwise use the software for commercial activities involving the Arduino -// software without disclosing the source code of your own applications. To purchase -// a commercial license, send an email to license@arduino.cc. -// +/* + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2019 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef CLOUD_TEMPERATURE_SENSOR_H_ #define CLOUD_TEMPERATURE_SENSOR_H_ /****************************************************************************** - INCLUDE + INCLUDE ******************************************************************************/ #include "../CloudFloat.h" /****************************************************************************** - CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class CloudTemperatureSensor : public CloudFloat diff --git a/src/tls/AIoTCSSCert.h b/src/tls/AIoTCSSCert.h index b2046af2e..a7d24cc61 100644 --- a/src/tls/AIoTCSSCert.h +++ b/src/tls/AIoTCSSCert.h @@ -1,33 +1,25 @@ /* - This file is part of ArduinoIoTBearSSL. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) - - This software is released under the GNU General Public License version 3, - which covers the main part of ArduinoIoTBearSSL. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + Copyright (c) 2019 Arduino SA + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef _AIOTC_SS_CERT_H_ #define _AIOTC_SS_CERT_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include #if defined(BOARD_HAS_SE050) || defined(BOARD_HAS_SOFTSE) /****************************************************************************** - * CONSTANTS + CONSTANTS ******************************************************************************/ static const char AIoTSSCert[] = /* https://iot.arduino.cc:8885 */ diff --git a/src/tls/AIoTCUPCert.h b/src/tls/AIoTCUPCert.h index 5d9802f8f..e11e32c04 100644 --- a/src/tls/AIoTCUPCert.h +++ b/src/tls/AIoTCUPCert.h @@ -1,33 +1,25 @@ /* - This file is part of ArduinoIoTBearSSL. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) - - This software is released under the GNU General Public License version 3, - which covers the main part of ArduinoIoTBearSSL. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + Copyright (c) 2019 Arduino SA + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef _AIOTC_UP_CERT_H_ #define _AIOTC_UP_CERT_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include #if defined(ARDUINO_ARCH_ESP32) || defined (ARDUINO_EDGE_CONTROL) || defined (ARDUINO_RASPBERRY_PI_PICO_W) /****************************************************************************** - * CONSTANTS + CONSTANTS ******************************************************************************/ static const char AIoTUPCert[] = /* https://www.amazontrust.com/repository/AmazonRootCA1.pem */ diff --git a/src/tls/BearSSLClientProfile.c b/src/tls/BearSSLClientProfile.c index cd787889f..39430693b 100644 --- a/src/tls/BearSSLClientProfile.c +++ b/src/tls/BearSSLClientProfile.c @@ -1,29 +1,15 @@ /* - * Copyright (c) 2016 Thomas Pornin - * - * 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. - */ + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2025 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -103,4 +89,3 @@ void aiotc_client_profile_init(br_ssl_client_context *cc, br_x509_minimal_contex } #endif /* #ifdef BOARD_HAS_ECCX08 */ - diff --git a/src/tls/BearSSLClientProfile.h b/src/tls/BearSSLClientProfile.h index dbf9792db..ddd4717d7 100644 --- a/src/tls/BearSSLClientProfile.h +++ b/src/tls/BearSSLClientProfile.h @@ -1,32 +1,18 @@ /* - * Copyright (c) 2016 Thomas Pornin - * - * 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. - */ + This file is part of the ArduinoIoTCloud library. + + Copyright (c) 2020 Arduino SA + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ #ifndef _BEAR_SSL_CLIENT_PROFILE_H_ #define _BEAR_SSL_CLIENT_PROFILE_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include diff --git a/src/tls/BearSSLTrustAnchors.h b/src/tls/BearSSLTrustAnchors.h index dbd2c2fc4..fe6851f68 100644 --- a/src/tls/BearSSLTrustAnchors.h +++ b/src/tls/BearSSLTrustAnchors.h @@ -1,26 +1,18 @@ /* - This file is part of ArduinoIoTBearSSL. + This file is part of the ArduinoIoTCloud library. - Copyright 2019 ARDUINO SA (http://www.arduino.cc/) - - This software is released under the GNU General Public License version 3, - which covers the main part of ArduinoIoTBearSSL. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + Copyright (c) 2019 Arduino SA + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef _BEAR_SSL_TRUST_ANCHOR_H_ #define _BEAR_SSL_TRUST_ANCHOR_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -29,7 +21,7 @@ #include "bearssl/bearssl_ssl.h" /****************************************************************************** - * CONSTANTS + CONSTANTS ******************************************************************************/ // The following was created by running the BearSSL "brssl" tool in the diff --git a/src/utility/time/NTPUtils.cpp b/src/utility/time/NTPUtils.cpp index 3069ae823..0f1f64193 100644 --- a/src/utility/time/NTPUtils.cpp +++ b/src/utility/time/NTPUtils.cpp @@ -1,23 +1,16 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** - * INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include "../../AIoTC_Config.h" #ifndef HAS_LORA @@ -29,9 +22,9 @@ #include #endif -/************************************************************************************** - * PUBLIC MEMBER FUNCTIONS - **************************************************************************************/ +/****************************************************************************** + PUBLIC MEMBER FUNCTIONS + ******************************************************************************/ unsigned long NTPUtils::getTime(UDP & udp) { @@ -74,9 +67,9 @@ unsigned long NTPUtils::getTime(UDP & udp) return epoch; } -/************************************************************************************** - * PRIVATE MEMBER FUNCTIONS - **************************************************************************************/ +/****************************************************************************** + PRIVATE MEMBER FUNCTIONS + ******************************************************************************/ void NTPUtils::sendNTPpacket(UDP & udp) { diff --git a/src/utility/time/NTPUtils.h b/src/utility/time/NTPUtils.h index 6337015a5..d2942cb9a 100644 --- a/src/utility/time/NTPUtils.h +++ b/src/utility/time/NTPUtils.h @@ -1,18 +1,11 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef __NTP_UTILS__ @@ -22,20 +15,22 @@ #ifndef HAS_LORA /* - This Utility Class is derived from the example code found here https://www.arduino.cc/en/Tutorial/UdpNTPClient - For more information on NTP (Network Time Protocol) you can refer to this Wikipedia article https://en.wikipedia.org/wiki/Network_Time_Protocol + This Utility Class is derived from the example code found here + https://www.arduino.cc/en/Tutorial/UdpNTPClient + For more information on NTP (Network Time Protocol) you can refer to this + Wikipedia article https://en.wikipedia.org/wiki/Network_Time_Protocol */ -/************************************************************************************** - * INCLUDE - **************************************************************************************/ +/****************************************************************************** + INCLUDE + ******************************************************************************/ #include #include -/************************************************************************************** +/****************************************************************************** * CLASS DECLARATION - **************************************************************************************/ + ******************************************************************************/ class NTPUtils { diff --git a/src/utility/time/RTCMillis.cpp b/src/utility/time/RTCMillis.cpp index 0dc970e8d..19ea17ec0 100644 --- a/src/utility/time/RTCMillis.cpp +++ b/src/utility/time/RTCMillis.cpp @@ -1,23 +1,16 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/************************************************************************************** +/****************************************************************************** * INCLUDE - **************************************************************************************/ + ******************************************************************************/ #include "AIoTC_Config.h" @@ -26,9 +19,9 @@ #include #include "RTCMillis.h" -/************************************************************************************** +/****************************************************************************** * CTOR/DTOR - **************************************************************************************/ + ******************************************************************************/ RTCMillis::RTCMillis() : _last_rtc_update_tick(0) @@ -37,9 +30,9 @@ RTCMillis::RTCMillis() } -/************************************************************************************** +/****************************************************************************** * PUBLIC MEMBER FUNCTIONS - **************************************************************************************/ + ******************************************************************************/ void RTCMillis::begin() { diff --git a/src/utility/time/RTCMillis.h b/src/utility/time/RTCMillis.h index 543988071..f5a25e1f2 100644 --- a/src/utility/time/RTCMillis.h +++ b/src/utility/time/RTCMillis.h @@ -1,18 +1,11 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_IOT_CLOUD_RTC_MILLIS_H_ @@ -20,13 +13,9 @@ #if !defined(BOARD_HAS_HW_RTC) -/************************************************************************************** - * INCLUDE - **************************************************************************************/ - -/************************************************************************************** +/****************************************************************************** * CLASS DECLARATION - **************************************************************************************/ + ******************************************************************************/ class RTCMillis { diff --git a/src/utility/time/TimeService.cpp b/src/utility/time/TimeService.cpp index 9d88551df..8906a8249 100644 --- a/src/utility/time/TimeService.cpp +++ b/src/utility/time/TimeService.cpp @@ -9,7 +9,7 @@ */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include @@ -34,7 +34,7 @@ #endif /****************************************************************************** - * GLOBAL VARIABLES + GLOBAL VARIABLES ******************************************************************************/ #if !defined(BOARD_HAS_HW_RTC) @@ -46,13 +46,13 @@ RTCZero rtc; #endif /****************************************************************************** - * INTERNAL FUNCTION DECLARATION + INTERNAL FUNCTION DECLARATION ******************************************************************************/ time_t cvt_time(char const * time); /****************************************************************************** - * RTC PRIVATE FUNCTION DEFINITION + RTC PRIVATE FUNCTION DEFINITION ******************************************************************************/ #if defined(BOARD_HAS_HW_RTC) @@ -118,13 +118,13 @@ static inline unsigned long _getRTC() { #endif /****************************************************************************** - * DEFINES + DEFINES ******************************************************************************/ #define EPOCH_AT_COMPILE_TIME cvt_time(__DATE__) /****************************************************************************** - * CONSTANTS + CONSTANTS ******************************************************************************/ /* Default NTP synch is scheduled each 24 hours from startup */ @@ -132,7 +132,7 @@ static time_t const TIMESERVICE_NTP_SYNC_TIMEOUT_ms = DAYS * 1000; static time_t const EPOCH = 0; /****************************************************************************** - * CTOR/DTOR + CTOR/DTOR ******************************************************************************/ TimeServiceClass::TimeServiceClass() @@ -149,7 +149,7 @@ TimeServiceClass::TimeServiceClass() } /****************************************************************************** - * PUBLIC MEMBER FUNCTIONS + PUBLIC MEMBER FUNCTIONS ******************************************************************************/ void TimeServiceClass::begin(ConnectionHandler * con_hdl) @@ -307,7 +307,7 @@ unsigned long TimeServiceClass::getTimeFromString(const String& input) return mktime(&t); } /****************************************************************************** - * PRIVATE MEMBER FUNCTIONS + PRIVATE MEMBER FUNCTIONS ******************************************************************************/ #if defined(HAS_NOTECARD) || defined(HAS_TCP) @@ -383,7 +383,7 @@ unsigned long TimeServiceClass::getRTC() } /****************************************************************************** - * INTERNAL FUNCTION DEFINITION + INTERNAL FUNCTION DEFINITION ******************************************************************************/ time_t cvt_time(char const * time) @@ -423,7 +423,7 @@ time_t cvt_time(char const * time) } /****************************************************************************** - * EXTERN DEFINITION + EXTERN DEFINITION ******************************************************************************/ TimeServiceClass TimeService; diff --git a/src/utility/time/TimeService.h b/src/utility/time/TimeService.h index d4a455cef..5df0768ef 100644 --- a/src/utility/time/TimeService.h +++ b/src/utility/time/TimeService.h @@ -12,20 +12,20 @@ #define ARDUINO_IOT_CLOUD_TIME_SERVICE_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include #include /****************************************************************************** - * TYPEDEF + TYPEDEF ******************************************************************************/ typedef unsigned long(*syncTimeFunctionPtr)(void); /****************************************************************************** - * CLASS DECLARATION + CLASS DECLARATION ******************************************************************************/ class TimeServiceClass @@ -74,7 +74,7 @@ class TimeServiceClass }; /****************************************************************************** - * EXTERN DECLARATION + EXTERN DECLARATION ******************************************************************************/ extern TimeServiceClass TimeService; diff --git a/src/utility/watchdog/Watchdog.cpp b/src/utility/watchdog/Watchdog.cpp index d47234064..9fe3af6b8 100644 --- a/src/utility/watchdog/Watchdog.cpp +++ b/src/utility/watchdog/Watchdog.cpp @@ -1,22 +1,15 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include "Watchdog.h" @@ -40,14 +33,14 @@ #endif /* ARDUINO_ARCH_MBED */ /****************************************************************************** - * GLOBAL VARIABLES + GLOBAL VARIABLES ******************************************************************************/ #if defined(ARDUINO_ARCH_SAMD) static bool is_watchdog_enabled = false; #endif /****************************************************************************** - * FUNCTION DEFINITION + FUNCTION DEFINITION ******************************************************************************/ #ifdef ARDUINO_ARCH_SAMD diff --git a/src/utility/watchdog/Watchdog.h b/src/utility/watchdog/Watchdog.h index 2ba43a875..f0bd41507 100644 --- a/src/utility/watchdog/Watchdog.h +++ b/src/utility/watchdog/Watchdog.h @@ -1,31 +1,24 @@ /* - This file is part of ArduinoIoTCloud. + This file is part of the ArduinoIoTCloud library. - Copyright 2020 ARDUINO SA (http://www.arduino.cc/) + Copyright (c) 2020 Arduino SA - This software is released under the GNU General Public License version 3, - which covers the main part of arduino-cli. - The terms of this license can be found at: - https://www.gnu.org/licenses/gpl-3.0.en.html - - You can be released from the requirements of the above licenses by purchasing - a commercial license. Buying such a license is mandatory if you want to modify or - otherwise use the software for commercial activities involving the Arduino - software without disclosing the source code of your own applications. To purchase - a commercial license, send an email to license@arduino.cc. + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifndef ARDUINO_AIOTC_UTILITY_WATCHDOG_H_ #define ARDUINO_AIOTC_UTILITY_WATCHDOG_H_ /****************************************************************************** - * INCLUDE + INCLUDE ******************************************************************************/ #include /****************************************************************************** - * FUNCTION DECLARATION + FUNCTION DECLARATION ******************************************************************************/ #if defined (ARDUINO_ARCH_SAMD) || defined (ARDUINO_ARCH_MBED)