diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. diff --git a/master/master/config.h b/master/master/config.h --- a/master/master/config.h +++ b/master/master/config.h @@ -1,131 +1,145 @@ /* * Master Firmware: Configuration * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning * Kyle Ripperger * Matthew Kroening * - */ - -#ifndef CONFIG_H_ -#define CONFIG_H_ - -#include - -// NOTE: Some settings may be overridden by SD card config.ini parameters - + */ + + +#ifndef CONFIG_H_ +#define CONFIG_H_ + +#include + +// NOTE: Some settings may be overridden by SD card config.ini parameters + // -------------------------------------------------------------------------- // Hardware settings -// -------------------------------------------------------------------------- - -#define F_CPU 11059200 -#define BOARDTEMP_ADDR 0x90 - - +// -------------------------------------------------------------------------- + +#define F_CPU 11059200 +#define BOARDTEMP_ADDR 0x90 + + // -------------------------------------------------------------------------- // Module config (master.c) -// -------------------------------------------------------------------------- - -// Debug Output -//#define DEBUG_OUTPUT - -// Blackout (turn off all but power LEDs) -#define BLACKOUT_ENABLE -#define BLACKOUT_TIMEOUT 1200000 // Blackout after 20 minutes (hopefully after fix and launch) - -// Board heater setpoint -#define HEATER_THRESHOLD 5 // Regulate to 5 degrees Celsius - -// Touchdown buzzer -#define BUZZER_RATE 7000 -#define BUZZER_DURATION 1000 -#define BUZZER_FAILSAFE_DURATION 9600000 // 160min -#define BUZZER_TRIGGER_MINDURATION 2700000 // 45min -#define BUZZER_TRIGGER_MAXALTITUDE 2000 // feet - +// -------------------------------------------------------------------------- + +// Debug Output +//#define DEBUG_OUTPUT + +// Blackout (turn off all but power LEDs) +#define BLACKOUT_ENABLE +#define BLACKOUT_TIMEOUT 1200000 // Blackout after 20 minutes (hopefully after fix and launch) + +// Board heater setpoint +#define HEATER_THRESHOLD 5 // Regulate to 5 degrees Celsius + +// Touchdown buzzer +#define BUZZER_RATE 7000 +#define BUZZER_DURATION 1000 +#define BUZZER_FAILSAFE_DURATION 9600000 // 160min +#define BUZZER_TRIGGER_MINDURATION 2700000 // 45min +#define BUZZER_TRIGGER_MAXALTITUDE 2000 // feet + // -------------------------------------------------------------------------- // Error Codes config (logger.c) -// -------------------------------------------------------------------------- - -// SD Card -#define ERROR_SLAVETIMEOUT 0 -#define ERROR_SD_INIT 1 -#define ERROR_SD_PARTITION 2 -#define ERROR_SD_FILE 3 -#define ERROR_CONFIGPARSE 4 -#define ERROR_XBEETIMEOUT 5 -#define ERROR_FATAL 6 -#define ERROR_ATFAIL 7 -#define ERROR_EXITAT 8 -#define ERROR_INFOTEXT 9 -#define ERROR_WATCHDOG 10 -// !!! Please specify/update detailed messages for these error codes in logger.c - +// -------------------------------------------------------------------------- + +// SD Card +#define ERROR_SLAVETIMEOUT 0 +#define ERROR_SD_INIT 1 +#define ERROR_SD_PARTITION 2 +#define ERROR_SD_FILE 3 +#define ERROR_CONFIGPARSE 4 +#define ERROR_XBEETIMEOUT 5 +#define ERROR_FATAL 6 +#define ERROR_ATFAIL 7 +#define ERROR_EXITAT 8 +#define ERROR_INFOTEXT 9 +#define ERROR_WATCHDOG 10 +// !!! Please specify/update detailed messages for these error codes in logger.c + // -------------------------------------------------------------------------- // Slave Sensors config (slavesensors.c) // -------------------------------------------------------------------------- - -// Slave data structure size -#define MAX_NUM_SLAVES 5 // Maximum number of nodes in the system -#define MAX_NUM_SENSORS 10 // Maximum number of unique types of sensors in the system - -// Node identifier of log destination xbee -#define XBEE_LOGDEST_NAME "HAB-LOGGER" - -// Rate to request data from slaves. Must be greater than AT delay * number slaves -#define DATAREQUEST_RATE 3000 - -// Timeouts -#define TIMEOUT_SLAVEREQUEST 500 -#define TIMEOUT_NETWORKSCAN 7000 -#define TIMEOUT_EXITAT 2000 -#define TIMEOUT_XBEERESPONSE 2000 - -// Slave data request max retries (for retry upon corrupt data reception) -#define MAX_SLAVEREQUEST_RETRIES 2 - - + +// Slave data structure size +#define MAX_NUM_SLAVES 5 // Maximum number of nodes in the system +#define MAX_NUM_SENSORS 10 // Maximum number of unique types of sensors in the system + +// Node identifier of log destination xbee +#define XBEE_LOGDEST_NAME "HAB-LOGGER" + +// Rate to request data from slaves. Must be greater than AT delay * number slaves +#define DATAREQUEST_RATE 3000 + +// Timeouts +#define TIMEOUT_SLAVEREQUEST 500 +#define TIMEOUT_NETWORKSCAN 7000 +#define TIMEOUT_EXITAT 2000 +#define TIMEOUT_XBEERESPONSE 2000 + +// Slave data request max retries (for retry upon corrupt data reception) +#define MAX_SLAVEREQUEST_RETRIES 2 + + // -------------------------------------------------------------------------- // Command Parser config (serparser.c) // -------------------------------------------------------------------------- - -// Maximum payload size of command -#define MAX_PAYLOAD_LEN 16 - -// Circular serial buffer size. Must be at least MAX_CMD_LEN + 5 -#define BUFFER_SIZE 128 - - + +// Maximum payload size of command +#define MAX_PAYLOAD_LEN 16 + +// Circular serial buffer size. Must be at least MAX_CMD_LEN + 5 +#define BUFFER_SIZE 128 + + // -------------------------------------------------------------------------- // GPS config (xxx.c) -// -------------------------------------------------------------------------- - -// NMEA circular buffer size. Must be large enough to hold all received sentences -#define NMEABUFFER_SIZE 150 - +// -------------------------------------------------------------------------- + +// NMEA circular buffer size. Must be large enough to hold all received sentences +#define NMEABUFFER_SIZE 150 + // -------------------------------------------------------------------------- // USART config (serial.c) // -------------------------------------------------------------------------- - -// Baud rates for XBEE and GPS serial ports -#define USART0_BAUDRATE 115200 -#define USART1_BAUDRATE 115200 - - + +// Baud rates for XBEE and GPS serial ports +#define USART0_BAUDRATE 115200 +#define USART1_BAUDRATE 115200 + + // -------------------------------------------------------------------------- // AX.25 config (ax25.c) // -------------------------------------------------------------------------- // TX delay in milliseconds -#define TX_DELAY 200 +#define TX_DELAY 200 // Maximum packet delay -#define MAX_PACKET_LEN 512 // bytes - +#define MAX_PACKET_LEN 512 // bytes + // -------------------------------------------------------------------------- // APRS config (aprs.c) @@ -151,50 +165,50 @@ // is pathless. Uncomment the following two lines for WIDE2-1 path: #define DIGI_PATH1 "WIDE2" #define DIGI_PATH1_TTL 1 - -// Transmit the APRS sentence every X milliseconds -#define APRS_TRANSMIT_PERIOD 35000 + +// Transmit the APRS sentence every X milliseconds +#define APRS_TRANSMIT_PERIOD 35000 // -------------------------------------------------------------------------- // Logger config (logger.c) // -------------------------------------------------------------------------- - -// Log number EEPROM address (this number is incremented on boot, used for filenames) -#define LOGGER_ID_EEPROM_ADDR 0x10 - -// Watchdog save/restore of program timer -#define WATCHDOG_PROGTIMER_EEPROM_ADDR 0x20 - -// Written to the beginning of every log file -#define LOGGER_HEADERTEXT "HAB Master v1.2\n" - -// Log to SD card every X milliseconds -#define LOGGER_RATE 1000 - -// LED cycle indicator speed -#define LEDCYCLE_RATE 100 - - - + +// Log number EEPROM address (this number is incremented on boot, used for filenames) +#define LOGGER_ID_EEPROM_ADDR 0x10 + +// Watchdog save/restore of program timer +#define WATCHDOG_PROGTIMER_EEPROM_ADDR 0x20 + +// Written to the beginning of every log file +#define LOGGER_HEADERTEXT "HAB Master v1.2\n" + +// Log to SD card every X milliseconds +#define LOGGER_RATE 1000 + +// LED cycle indicator speed +#define LEDCYCLE_RATE 100 + + + // -------------------------------------------------------------------------- // Dynamic Configuration (iniparse.c) - You probably don't want to change this // -------------------------------------------------------------------------- #include -typedef struct -{ - bool blackout_enable; - uint32_t blackout_timeout; - int8_t heater_threshold; - uint32_t buzzer_failsafe_duration; - uint32_t buzzer_trigger_minduration; - uint32_t buzzer_trigger_maxaltitude; - uint32_t datarequest_rate; - char s_callsign[7]; - uint8_t s_callsign_id; - uint32_t aprs_transmit_period; -} configuration; - -configuration* sysconfig; - +typedef struct +{ + bool blackout_enable; + uint32_t blackout_timeout; + int8_t heater_threshold; + uint32_t buzzer_failsafe_duration; + uint32_t buzzer_trigger_minduration; + uint32_t buzzer_trigger_maxaltitude; + uint32_t datarequest_rate; + char s_callsign[7]; + uint8_t s_callsign_id; + uint32_t aprs_transmit_period; +} configuration; + +configuration* sysconfig; + #endif /* CONFIG_H_ */ \ No newline at end of file diff --git a/master/master/lib/afsk.c b/master/master/lib/afsk.c --- a/master/master/lib/afsk.c +++ b/master/master/lib/afsk.c @@ -1,7 +1,20 @@ /* * Master Firmware: AFSK Generation * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/afsk.h b/master/master/lib/afsk.h --- a/master/master/lib/afsk.h +++ b/master/master/lib/afsk.h @@ -1,7 +1,20 @@ /* * Master Firmware: AFSK Generation * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/aprs.c b/master/master/lib/aprs.c --- a/master/master/lib/aprs.c +++ b/master/master/lib/aprs.c @@ -1,15 +1,28 @@ /* * Master Firmware: APRS * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning * Kyle Ripperger * Matthew Kroening * - */ - + */ + #include "../config.h" #include "aprs.h" #include "ax25.h" @@ -71,7 +84,7 @@ void aprs_send() ax25_send_string(temp); ax25_send_byte(' '); - #define COMMENTBUFFER_SIZE 128 + #define COMMENTBUFFER_SIZE 128 char commentBuffer[COMMENTBUFFER_SIZE]; ax25_send_string(slavesensors_getAPRScomment(commentBuffer, COMMENTBUFFER_SIZE)); diff --git a/master/master/lib/aprs.h b/master/master/lib/aprs.h --- a/master/master/lib/aprs.h +++ b/master/master/lib/aprs.h @@ -1,7 +1,20 @@ /* * Master Firmware: APRS * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/ax25.c b/master/master/lib/ax25.c --- a/master/master/lib/ax25.c +++ b/master/master/lib/ax25.c @@ -1,7 +1,20 @@ /* * Master Firmware: AX25 Protocol * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/ax25.h b/master/master/lib/ax25.h --- a/master/master/lib/ax25.h +++ b/master/master/lib/ax25.h @@ -1,7 +1,20 @@ /* * Master Firmware: AX25 Protocol * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/gps.c b/master/master/lib/gps.c --- a/master/master/lib/gps.c +++ b/master/master/lib/gps.c @@ -1,15 +1,28 @@ /* * Master Firmware: NMEA Parser * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning * Kyle Ripperger * Matthew Kroening * - */ - + */ + #include #include #include @@ -19,21 +32,21 @@ #include "serial.h" #include "../config.h" #include "led.h" -#include "logger.h" - -// Circular buffer for incoming data -uint8_t nmeaBuffer[NMEABUFFER_SIZE]; - -// Location of parser in the buffer -uint8_t nmeaBufferParsePosition = 0; - -// Location of receive byte interrupt in the buffer -volatile uint16_t nmeaBufferDataPosition = 0; +#include "logger.h" + +// Circular buffer for incoming data +uint8_t nmeaBuffer[NMEABUFFER_SIZE]; + +// Location of parser in the buffer +uint8_t nmeaBufferParsePosition = 0; + +// Location of receive byte interrupt in the buffer +volatile uint16_t nmeaBufferDataPosition = 0; // holds the byte ALREADY PARSED. includes starting character int bytesReceived = 0; -//data (and checksum) of most recent transmission +//data (and checksum) of most recent transmission char data[16]; //used to skip over bytes during parse @@ -148,23 +161,23 @@ int calculatedChecksum; int receivedChecksum; // transmission state machine -enum decodeState { - //shared fields - INITIALIZE=0, - GET_TYPE, - GPS_CHECKSUM, //XOR of all the bytes between the $ and the * (not including the delimiters themselves), written in hexadecimal - //GGA data fields - GGA_TIME, - GGA_LATITUDE, - GGA_LONGITUDE, - GGA_QUALITY, - GGA_SATELLITES, - GGA_HDOP, - GGA_ALTITUDE, - GGA_WGS84, - GGA_LAST_UPDATE, - GGA_STATION_ID, - //RMC data fields +enum decodeState { + //shared fields + INITIALIZE=0, + GET_TYPE, + GPS_CHECKSUM, //XOR of all the bytes between the $ and the * (not including the delimiters themselves), written in hexadecimal + //GGA data fields + GGA_TIME, + GGA_LATITUDE, + GGA_LONGITUDE, + GGA_QUALITY, + GGA_SATELLITES, + GGA_HDOP, + GGA_ALTITUDE, + GGA_WGS84, + GGA_LAST_UPDATE, + GGA_STATION_ID, + //RMC data fields RMC_TIME, RMC_VALIDITY, RMC_LATITUDE, @@ -177,10 +190,10 @@ enum decodeState { }decodeState; -ISR(USART1_RX_vect) -{ - nmeaBuffer[nmeaBufferDataPosition % NMEABUFFER_SIZE] = UDR1; - nmeaBufferDataPosition = (nmeaBufferDataPosition + 1) % NMEABUFFER_SIZE; +ISR(USART1_RX_vect) +{ + nmeaBuffer[nmeaBufferDataPosition % NMEABUFFER_SIZE] = UDR1; + nmeaBufferDataPosition = (nmeaBufferDataPosition + 1) % NMEABUFFER_SIZE; } void gps_setup() @@ -196,21 +209,21 @@ void gps_setup() } -// Could inline if program space available -static void setParserState(uint8_t state) -{ - decodeState = state; - - - // If resetting, clear vars - if(state == INITIALIZE) - { - calculatedChecksum = 0; - } - - // Every time we change state, we have parsed a byte - nmeaBufferParsePosition = (nmeaBufferParsePosition + 1) % NMEABUFFER_SIZE; -} +// Could inline if program space available +static void setParserState(uint8_t state) +{ + decodeState = state; + + + // If resetting, clear vars + if(state == INITIALIZE) + { + calculatedChecksum = 0; + } + + // Every time we change state, we have parsed a byte + nmeaBufferParsePosition = (nmeaBufferParsePosition + 1) % NMEABUFFER_SIZE; +} @@ -249,289 +262,289 @@ void parse_gps_transmission(void){ } //parse transmission type - else if (decodeState == GET_TYPE) - { - tramsmissionType[numBytes] = byte; - numBytes++; + else if (decodeState == GET_TYPE) + { + tramsmissionType[numBytes] = byte; + numBytes++; #ifdef DEBUG_NMEA - serial0_sendString("stored a type byte\r\n"); - #endif - - if(byte == ',') //end of this data type - { - tramsmissionType[5] = 0x00; - - if (tramsmissionType[2] == 'G' && - tramsmissionType[3] == 'G' && - tramsmissionType[4] == 'A') - { - setParserState(GGA_TIME); - numBytes = 0; - } - else if (tramsmissionType[2] == 'R' && - tramsmissionType[3] == 'M' && - tramsmissionType[4] == 'C') - { - setParserState(RMC_TIME); - numBytes = 0; - } - else //this is an invalid transmission type - { - setParserState(INITIALIZE); - } - } - else { - // continue - setParserState(GET_TYPE); - } - - } - + serial0_sendString("stored a type byte\r\n"); + #endif + + if(byte == ',') //end of this data type + { + tramsmissionType[5] = 0x00; + + if (tramsmissionType[2] == 'G' && + tramsmissionType[3] == 'G' && + tramsmissionType[4] == 'A') + { + setParserState(GGA_TIME); + numBytes = 0; + } + else if (tramsmissionType[2] == 'R' && + tramsmissionType[3] == 'M' && + tramsmissionType[4] == 'C') + { + setParserState(RMC_TIME); + numBytes = 0; + } + else //this is an invalid transmission type + { + setParserState(INITIALIZE); + } + } + else { + // continue + setParserState(GET_TYPE); + } + + } + ///parses GGA transmissions START /// $--GGA,hhmmss.ss,llll.ll,a,yyyyy.yy,a,x,xx,x.x,x.x,M,x.x,M,x.x,xxxx*xx //timestamp - else if (decodeState == GGA_TIME) - { - if (byte == ',') //end of this data type - { - timestamp[4] = 0x00; // Cut off at 4 (no seconds) for APRS - setParserState(GGA_LATITUDE); - skipBytes = 0; //prep for next phase of parse - numBytes = 0; - } - else //store data - { + else if (decodeState == GGA_TIME) + { + if (byte == ',') //end of this data type + { + timestamp[4] = 0x00; // Cut off at 4 (no seconds) for APRS + setParserState(GGA_LATITUDE); + skipBytes = 0; //prep for next phase of parse + numBytes = 0; + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found GGA time byte\r\n"); - #endif - - setParserState(GGA_TIME); - timestamp[numBytes] = byte; //byte; //adjust number of bytes to fit array - numBytes++; - } - } - - //latitude - else if (decodeState == GGA_LATITUDE) - { - if (byte == ',' && skipBytes == 0) //discard this byte - { + serial0_sendString("found GGA time byte\r\n"); + #endif + + setParserState(GGA_TIME); + timestamp[numBytes] = byte; //byte; //adjust number of bytes to fit array + numBytes++; + } + } + + //latitude + else if (decodeState == GGA_LATITUDE) + { + if (byte == ',' && skipBytes == 0) //discard this byte + { #ifdef DEBUG_NMEA - serial0_sendString("found lat skip byte\r\n"); - #endif - - skipBytes = 1; - setParserState(GGA_LATITUDE); - } - else if (byte == ',') //end of this data type - { - - latitude[numBytes] = 0x00; // null terminate - - setParserState(GGA_LONGITUDE); - skipBytes = 0; //prep for next phase of parse - numBytes = 0; - } - else //store data - { + serial0_sendString("found lat skip byte\r\n"); + #endif + + skipBytes = 1; + setParserState(GGA_LATITUDE); + } + else if (byte == ',') //end of this data type + { + + latitude[numBytes] = 0x00; // null terminate + + setParserState(GGA_LONGITUDE); + skipBytes = 0; //prep for next phase of parse + numBytes = 0; + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found lat byte\r\n"); - #endif - - latitude[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_LATITUDE); - } - } - - //longitude - else if (decodeState == GGA_LONGITUDE) - { - if (byte == ',' && skipBytes == 0) //discard this byte - { + serial0_sendString("found lat byte\r\n"); + #endif + + latitude[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_LATITUDE); + } + } + + //longitude + else if (decodeState == GGA_LONGITUDE) + { + if (byte == ',' && skipBytes == 0) //discard this byte + { #ifdef DEBUG_NMEA - serial0_sendString("found long skip byte\r\n"); - #endif - - skipBytes = 1; - setParserState(GGA_LONGITUDE); - } - else if (byte == ',') //end of this data type - { - longitude[numBytes] = 0x00; - setParserState(GGA_QUALITY); - numBytes = 0; //prep for next phase of parse - skipBytes = 0; - } - else //store data - { + serial0_sendString("found long skip byte\r\n"); + #endif + + skipBytes = 1; + setParserState(GGA_LONGITUDE); + } + else if (byte == ',') //end of this data type + { + longitude[numBytes] = 0x00; + setParserState(GGA_QUALITY); + numBytes = 0; //prep for next phase of parse + skipBytes = 0; + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found long byte\r\n"); - #endif - - longitude[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_LONGITUDE); - } - } - - //GGA quality - else if (decodeState == GGA_QUALITY) - { - if (byte == ',') //end of this data type - { - setParserState(GGA_SATELLITES); - numBytes = 0; //prep for next phase of parse - } - else //store data - { + serial0_sendString("found long byte\r\n"); + #endif + + longitude[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_LONGITUDE); + } + } + + //GGA quality + else if (decodeState == GGA_QUALITY) + { + if (byte == ',') //end of this data type + { + setParserState(GGA_SATELLITES); + numBytes = 0; //prep for next phase of parse + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found quality byte\r\n"); - #endif - - quality = byte; //maybe reset if invalid data ?? - setParserState(GGA_QUALITY); - } - } - - //number of satellites - else if (decodeState == GGA_SATELLITES) - { - if (byte == ',') //end of this data type - { - numSatellites[numBytes] = 0x00; - setParserState(GGA_HDOP); - numBytes = 0; //prep for next phase of parse - } - else //store data - { - numSatellites[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_SATELLITES); - } - } - - //HDOP - else if (decodeState == GGA_HDOP) - { - if (byte == ',' ) //end of this data type - { - hdop[numBytes] = 0x00; - setParserState(GGA_ALTITUDE); - numBytes = 0; //prep for next phase of parse - skipBytes = 0; - } - else //store data - { - hdop[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_HDOP); - } - } - - //altitude - else if (decodeState == GGA_ALTITUDE) - { - if (byte == ',' && skipBytes == 0) //discard this byte - { - altitude[numBytes] = 0x00; - skipBytes = 1; - setParserState(GGA_ALTITUDE); - } - else if(byte == ',') //end of this data type - { - altitude[numBytes] = 0x00; - setParserState(GGA_WGS84); - numBytes = 0; //prep for next phase of parse - } - else //store data - { - altitude[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_ALTITUDE); - } - } - - //WGS84 Height - else if (decodeState == GGA_WGS84) - { - if (byte == ',' && skipBytes == 0) //discard this byte - { - skipBytes = 1; - setParserState(GGA_WGS84); - } - else if(byte == ',') //end of this data type - { - wgs84Height[numBytes] = 0x00; - setParserState(GGA_LAST_UPDATE); - skipBytes = 0; //prep for next phase of parse - numBytes = 0; - } - else //store data - { - wgs84Height[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_WGS84); - } - } - - //last GGA DGPS update - else if (decodeState == GGA_LAST_UPDATE) - { - if (byte == ',') //end of this data type - { - lastUpdated[numBytes] = 0x00; - setParserState(GGA_STATION_ID); - numBytes = 0; //prep for next phase of parse - } - else //store data - this should be blank - { - lastUpdated[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_LAST_UPDATE); - } - } - - //GGA DGPS station ID - else if (decodeState == GGA_STATION_ID) - { - if (byte == ',' || byte == '*') //end of this data type - { - stationID[numBytes] = 0x00; - setParserState(GPS_CHECKSUM); - numBytes = 0; //prep for next phase of parse - } - else //store data - this should be blank - { - stationID[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(GGA_STATION_ID); - } - } - ///parses GGA transmissions END - + serial0_sendString("found quality byte\r\n"); + #endif + + quality = byte; //maybe reset if invalid data ?? + setParserState(GGA_QUALITY); + } + } + + //number of satellites + else if (decodeState == GGA_SATELLITES) + { + if (byte == ',') //end of this data type + { + numSatellites[numBytes] = 0x00; + setParserState(GGA_HDOP); + numBytes = 0; //prep for next phase of parse + } + else //store data + { + numSatellites[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_SATELLITES); + } + } + + //HDOP + else if (decodeState == GGA_HDOP) + { + if (byte == ',' ) //end of this data type + { + hdop[numBytes] = 0x00; + setParserState(GGA_ALTITUDE); + numBytes = 0; //prep for next phase of parse + skipBytes = 0; + } + else //store data + { + hdop[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_HDOP); + } + } + + //altitude + else if (decodeState == GGA_ALTITUDE) + { + if (byte == ',' && skipBytes == 0) //discard this byte + { + altitude[numBytes] = 0x00; + skipBytes = 1; + setParserState(GGA_ALTITUDE); + } + else if(byte == ',') //end of this data type + { + altitude[numBytes] = 0x00; + setParserState(GGA_WGS84); + numBytes = 0; //prep for next phase of parse + } + else //store data + { + altitude[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_ALTITUDE); + } + } + + //WGS84 Height + else if (decodeState == GGA_WGS84) + { + if (byte == ',' && skipBytes == 0) //discard this byte + { + skipBytes = 1; + setParserState(GGA_WGS84); + } + else if(byte == ',') //end of this data type + { + wgs84Height[numBytes] = 0x00; + setParserState(GGA_LAST_UPDATE); + skipBytes = 0; //prep for next phase of parse + numBytes = 0; + } + else //store data + { + wgs84Height[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_WGS84); + } + } + + //last GGA DGPS update + else if (decodeState == GGA_LAST_UPDATE) + { + if (byte == ',') //end of this data type + { + lastUpdated[numBytes] = 0x00; + setParserState(GGA_STATION_ID); + numBytes = 0; //prep for next phase of parse + } + else //store data - this should be blank + { + lastUpdated[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_LAST_UPDATE); + } + } + + //GGA DGPS station ID + else if (decodeState == GGA_STATION_ID) + { + if (byte == ',' || byte == '*') //end of this data type + { + stationID[numBytes] = 0x00; + setParserState(GPS_CHECKSUM); + numBytes = 0; //prep for next phase of parse + } + else //store data - this should be blank + { + stationID[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(GGA_STATION_ID); + } + } + ///parses GGA transmissions END + /// $GPRMC,hhmmss.ss,A,llll.ll,a,yyyyy.yy,a,x.x,x.x,ddmmyy,x.x,a*hh ///parses RMC transmissions //time // emz: commented setter, GMC time better? else if(decodeState == RMC_TIME) { - if (byte == ',') //end of this data type - { - //timestamp[numBytes] = 0x00; - setParserState(RMC_VALIDITY); - numBytes = 0; //prep for next phase of parse - } - else //store data - { + if (byte == ',') //end of this data type + { + //timestamp[numBytes] = 0x00; + setParserState(RMC_VALIDITY); + numBytes = 0; //prep for next phase of parse + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found time byte\r\n"); - #endif - - //timestamp[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - setParserState(RMC_TIME); + serial0_sendString("found time byte\r\n"); + #endif + + //timestamp[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + setParserState(RMC_TIME); } } @@ -539,196 +552,196 @@ void parse_gps_transmission(void){ // not needed? dupe gga else if(decodeState == RMC_VALIDITY) { - if (byte == ',') //end of this data type - { - setParserState(RMC_LATITUDE); - skipBytes = 0; //prep for next phase of parse - numBytes = 0; - } - else //store data - { + if (byte == ',') //end of this data type + { + setParserState(RMC_LATITUDE); + skipBytes = 0; //prep for next phase of parse + numBytes = 0; + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found valid byte\r\n"); - #endif - - //quality = byte; - numBytes++; - setParserState(RMC_VALIDITY); + serial0_sendString("found valid byte\r\n"); + #endif + + //quality = byte; + numBytes++; + setParserState(RMC_VALIDITY); } } //latitude RMC (we don't need this, commented out setter) else if(decodeState == RMC_LATITUDE) { - if (byte == ',' && skipBytes == 0) //discard this byte - { + if (byte == ',' && skipBytes == 0) //discard this byte + { #ifdef DEBUG_NMEA - serial0_sendString("found lat skip byte\r\n"); - #endif - - skipBytes = 1; - setParserState(RMC_LATITUDE); - } - else if (byte == ',') //end of this data type - { - setParserState(RMC_LONGITUDE); - skipBytes = 0; //prep for next phase of parse - numBytes = 0; - } - else //store data - { + serial0_sendString("found lat skip byte\r\n"); + #endif + + skipBytes = 1; + setParserState(RMC_LATITUDE); + } + else if (byte == ',') //end of this data type + { + setParserState(RMC_LONGITUDE); + skipBytes = 0; //prep for next phase of parse + numBytes = 0; + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found lat byte\r\n"); - #endif - - //latitude[numBytes]= byte; //adjust number of bytes to fit array - numBytes++; - setParserState(RMC_LATITUDE); + serial0_sendString("found lat byte\r\n"); + #endif + + //latitude[numBytes]= byte; //adjust number of bytes to fit array + numBytes++; + setParserState(RMC_LATITUDE); } } //longitude RMC (we don't need this, commented out setter) else if(decodeState == RMC_LONGITUDE) { - if (byte == ',' && skipBytes == 0) //discard this byte - { + if (byte == ',' && skipBytes == 0) //discard this byte + { #ifdef DEBUG_NMEA - serial0_sendString("found long byte\r\n"); - #endif - - skipBytes = 1; - setParserState(RMC_LONGITUDE); - } - else if (byte == ',') //end of this data type - { - setParserState(RMC_KNOTS); - skipBytes = 0; - numBytes = 0; - } - else //store data - { + serial0_sendString("found long byte\r\n"); + #endif + + skipBytes = 1; + setParserState(RMC_LONGITUDE); + } + else if (byte == ',') //end of this data type + { + setParserState(RMC_KNOTS); + skipBytes = 0; + numBytes = 0; + } + else //store data + { #ifdef DEBUG_NMEA - serial0_sendString("found long byte\r\n"); - #endif - - //longitude[numBytes]= byte; //adjust number of bytes to fit array - numBytes++; - setParserState(RMC_LONGITUDE); + serial0_sendString("found long byte\r\n"); + #endif + + //longitude[numBytes]= byte; //adjust number of bytes to fit array + numBytes++; + setParserState(RMC_LONGITUDE); } } //knots else if(decodeState == RMC_KNOTS) { - if (byte == ',') //end of this data type - { - knots[numBytes] = 0x00; - setParserState(RMC_COURSE); - numBytes = 0; //prep for next phase of parse - } - else //store data - { - setParserState(RMC_KNOTS); - knots[numBytes]= byte; //adjust number of bytes to fit array - numBytes++; + if (byte == ',') //end of this data type + { + knots[numBytes] = 0x00; + setParserState(RMC_COURSE); + numBytes = 0; //prep for next phase of parse + } + else //store data + { + setParserState(RMC_KNOTS); + knots[numBytes]= byte; //adjust number of bytes to fit array + numBytes++; } } //course else if(decodeState == RMC_COURSE) { - if (byte == ',') //end of this data type - { - course[numBytes] = 0x00; - setParserState(RMC_DATE); - numBytes = 0; //prep for next phase of parse - } - else //store data - { - setParserState(RMC_COURSE); - course[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; + if (byte == ',') //end of this data type + { + course[numBytes] = 0x00; + setParserState(RMC_DATE); + numBytes = 0; //prep for next phase of parse + } + else //store data + { + setParserState(RMC_COURSE); + course[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; } } //date else if(decodeState == RMC_DATE) { - if (byte == ',') //end of this data type - { - // Cut it off at day of month. Also has month and year if we ever need it. - dayofmonth[2] = 0x00; - setParserState(RMC_MAG_VARIATION); - skipBytes = 0; //prep for next phase of parse - numBytes = 0; - } - else //store data - { - setParserState(RMC_DATE); - dayofmonth[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; + if (byte == ',') //end of this data type + { + // Cut it off at day of month. Also has month and year if we ever need it. + dayofmonth[2] = 0x00; + setParserState(RMC_MAG_VARIATION); + skipBytes = 0; //prep for next phase of parse + numBytes = 0; + } + else //store data + { + setParserState(RMC_DATE); + dayofmonth[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; } } //magnetic variation else if(decodeState == RMC_MAG_VARIATION) { - if (byte == '*') //end of this data type - { - variation[numBytes] = 0x00; - setParserState(GPS_CHECKSUM); - numBytes = 0; //prep for next phase of parse - } - else //store data - { - setParserState(RMC_MAG_VARIATION); - variation[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; + if (byte == '*') //end of this data type + { + variation[numBytes] = 0x00; + setParserState(GPS_CHECKSUM); + numBytes = 0; //prep for next phase of parse + } + else //store data + { + setParserState(RMC_MAG_VARIATION); + variation[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; } } - ///parses RMC transmissions END - - - //checksum - else if (decodeState == GPS_CHECKSUM) - { - if (numBytes == 2) //end of data - terminating character ?? - { - //checksum calculator for testing http://www.hhhh.org/wiml/proj/nmeaxor.html - //TODO: must determine what to do with correct and incorrect messages - receivedChecksum = checksum[0] + (checksum[1]*16); //convert bytes to int - if(calculatedChecksum==receivedChecksum) - { - - } - else - { - - } + ///parses RMC transmissions END + + + //checksum + else if (decodeState == GPS_CHECKSUM) + { + if (numBytes == 2) //end of data - terminating character ?? + { + //checksum calculator for testing http://www.hhhh.org/wiml/proj/nmeaxor.html + //TODO: must determine what to do with correct and incorrect messages + receivedChecksum = checksum[0] + (checksum[1]*16); //convert bytes to int + if(calculatedChecksum==receivedChecksum) + { + + } + else + { + + } #ifdef DEBUG_NMEA - serial0_sendString("OMG GOT TO CHECKSUM!\r\n"); - #endif - - setParserState(INITIALIZE); - numBytes = 0; //prep for next phase of parse - } - else //store data - { - setParserState(GPS_CHECKSUM); - checksum[numBytes] = byte; //adjust number of bytes to fit array - numBytes++; - } + serial0_sendString("OMG GOT TO CHECKSUM!\r\n"); + #endif + + setParserState(INITIALIZE); + numBytes = 0; //prep for next phase of parse + } + else //store data + { + setParserState(GPS_CHECKSUM); + checksum[numBytes] = byte; //adjust number of bytes to fit array + numBytes++; + } } else { setParserState(INITIALIZE); } - if (decodeState!=GPS_CHECKSUM && decodeState!=INITIALIZE) //want bytes between '$' and '*' - { + if (decodeState!=GPS_CHECKSUM && decodeState!=INITIALIZE) //want bytes between '$' and '*' + { //input byte into running checksum - XORbyteWithChecksum(byte); - } - led_off(LED_ACTIVITY); + XORbyteWithChecksum(byte); + } + led_off(LED_ACTIVITY); } diff --git a/master/master/lib/gps.h b/master/master/lib/gps.h --- a/master/master/lib/gps.h +++ b/master/master/lib/gps.h @@ -1,7 +1,20 @@ /* * Master Firmware: NMEA Parser * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/heater.c b/master/master/lib/heater.c --- a/master/master/lib/heater.c +++ b/master/master/lib/heater.c @@ -1,7 +1,20 @@ /* * Master Firmware: Board Heater * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/heater.h b/master/master/lib/heater.h --- a/master/master/lib/heater.h +++ b/master/master/lib/heater.h @@ -1,7 +1,20 @@ /* * Master Firmware: Board Heater * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/i2c.c b/master/master/lib/i2c.c --- a/master/master/lib/i2c.c +++ b/master/master/lib/i2c.c @@ -1,7 +1,20 @@ /* * Master Firmware: I2C * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/i2c.h b/master/master/lib/i2c.h --- a/master/master/lib/i2c.h +++ b/master/master/lib/i2c.h @@ -1,7 +1,20 @@ /* * Master Firmware: I2C * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/ini/ini.c b/master/master/lib/ini/ini.c --- a/master/master/lib/ini/ini.c +++ b/master/master/lib/ini/ini.c @@ -1,11 +1,22 @@ -/* inih -- simple .INI file parser - -inih is released under the New BSD license (see LICENSE.txt). Go to the project -home page for more info: - -http://code.google.com/p/inih/ - -*/ +/* + * Master Firmware: INI Parse Backend + * + * Wireless Observational Modular Aerial Network + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + * This library was modified to use SD card FAT read/write operations + * + * Original library: + * + * inih is released under the New BSD license (see LICENSE.txt). Go to the project + * home page for more info: + * http://code.google.com/p/inih/ + * + */ #include #include @@ -21,6 +32,7 @@ http://code.google.com/p/inih/ #define MAX_SECTION 50 #define MAX_NAME 50 + /* Strip whitespace chars off end of given string, in place. Return s. */ static char* rstrip(char* s) { diff --git a/master/master/lib/ini/ini.h b/master/master/lib/ini/ini.h --- a/master/master/lib/ini/ini.h +++ b/master/master/lib/ini/ini.h @@ -1,11 +1,22 @@ -/* inih -- simple .INI file parser - -inih is released under the New BSD license (see LICENSE.txt). Go to the project -home page for more info: - -http://code.google.com/p/inih/ - -*/ +/* + * Master Firmware: INI Parse Backend + * + * Wireless Observational Modular Aerial Network + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + * This library was modified to use SD card FAT read/write operations + * + * Original library: + * + * inih is released under the New BSD license (see LICENSE.txt). Go to the project + * home page for more info: + * http://code.google.com/p/inih/ + * + */ #ifndef __INI_H__ #define __INI_H__ diff --git a/master/master/lib/iniparse.c b/master/master/lib/iniparse.c --- a/master/master/lib/iniparse.c +++ b/master/master/lib/iniparse.c @@ -16,106 +16,106 @@ #include #include "iniparse.h" #include "ini/ini.h" -#include "logger.h" - -static int handler(void* user, const char* section, const char* name, const char* value) -{ - - configuration* pconfig = (configuration*)user; - - #define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0 - - if (MATCH("general", "temp")) { - pconfig->heater_threshold = atoi(value); - - - } else if (MATCH("general", "reqrate")) { - pconfig->datarequest_rate = strtol(value, NULL, 10); - - - } else if (MATCH("blackout", "enable")) { - pconfig->blackout_enable = strncmp(value, "false", 4); - - - } else if (MATCH("blackout", "timeout")) { - pconfig->blackout_timeout = strtol(value, NULL, 10); - - - } else if (MATCH("buzzer", "failsafe")) { - pconfig->buzzer_failsafe_duration = strtol(value, NULL, 10); - - - } else if (MATCH("buzzer", "mintime")) { - pconfig->buzzer_trigger_minduration = strtol(value, NULL, 10); - - } else if (MATCH("buzzer", "maxalt")) { - pconfig->buzzer_trigger_maxaltitude = strtol(value, NULL, 10); - - } else if (MATCH("aprs", "call")) { - snprintf(pconfig->s_callsign, 7, "%s", &value[1], 6); - //pconfig->s_callsign = strdup(value); - - - } else if (MATCH("aprs", "call_id")) { - pconfig->s_callsign_id = atoi(value); - - - } else if (MATCH("aprs", "period")) { - pconfig->aprs_transmit_period = strtol(value, NULL, 10); - - } else { - error_log_msg(ERROR_CONFIGPARSE,false,"bad entry"); - return 0; /* unknown section/name, error */ - } - - - return 1; +#include "logger.h" + +static int handler(void* user, const char* section, const char* name, const char* value) +{ + + configuration* pconfig = (configuration*)user; + + #define MATCH(s, n) strcmp(section, s) == 0 && strcmp(name, n) == 0 + + if (MATCH("general", "temp")) { + pconfig->heater_threshold = atoi(value); + + + } else if (MATCH("general", "reqrate")) { + pconfig->datarequest_rate = strtol(value, NULL, 10); + + + } else if (MATCH("blackout", "enable")) { + pconfig->blackout_enable = strncmp(value, "false", 4); + + + } else if (MATCH("blackout", "timeout")) { + pconfig->blackout_timeout = strtol(value, NULL, 10); + + + } else if (MATCH("buzzer", "failsafe")) { + pconfig->buzzer_failsafe_duration = strtol(value, NULL, 10); + + + } else if (MATCH("buzzer", "mintime")) { + pconfig->buzzer_trigger_minduration = strtol(value, NULL, 10); + + } else if (MATCH("buzzer", "maxalt")) { + pconfig->buzzer_trigger_maxaltitude = strtol(value, NULL, 10); + + } else if (MATCH("aprs", "call")) { + snprintf(pconfig->s_callsign, 7, "%s", &value[1], 6); + //pconfig->s_callsign = strdup(value); + + + } else if (MATCH("aprs", "call_id")) { + pconfig->s_callsign_id = atoi(value); + + + } else if (MATCH("aprs", "period")) { + pconfig->aprs_transmit_period = strtol(value, NULL, 10); + + } else { + error_log_msg(ERROR_CONFIGPARSE,false,"bad entry"); + return 0; /* unknown section/name, error */ + } + + + return 1; } -configuration config = { - #ifdef BLACKOUT_ENABLE - .blackout_enable = true, - #else - .blackout_enable = false, - #endif - - .blackout_timeout = BLACKOUT_TIMEOUT, - .heater_threshold = HEATER_THRESHOLD, - .buzzer_failsafe_duration = BUZZER_FAILSAFE_DURATION, - .buzzer_trigger_minduration = BUZZER_TRIGGER_MINDURATION, - .buzzer_trigger_maxaltitude = BUZZER_TRIGGER_MAXALTITUDE, - .datarequest_rate = DATAREQUEST_RATE, - - .s_callsign_id = S_CALLSIGN_ID, - .aprs_transmit_period = APRS_TRANSMIT_PERIOD +configuration config = { + #ifdef BLACKOUT_ENABLE + .blackout_enable = true, + #else + .blackout_enable = false, + #endif + + .blackout_timeout = BLACKOUT_TIMEOUT, + .heater_threshold = HEATER_THRESHOLD, + .buzzer_failsafe_duration = BUZZER_FAILSAFE_DURATION, + .buzzer_trigger_minduration = BUZZER_TRIGGER_MINDURATION, + .buzzer_trigger_maxaltitude = BUZZER_TRIGGER_MAXALTITUDE, + .datarequest_rate = DATAREQUEST_RATE, + + .s_callsign_id = S_CALLSIGN_ID, + .aprs_transmit_period = APRS_TRANSMIT_PERIOD }; -void iniparse_getconfig() -{ - // Init configuration with default values from config.h - snprintf(config.s_callsign, 10, "KD8TDF"); - config.s_callsign[6] = NULL; - - - if (ini_parse(handler, &config) < 0) { - // ERROR: Make new error code here! - error_log(ERROR_CONFIGPARSE, false); - } - - sysconfig = &config; - - // Print configuration to err - error_log_rawwrite("\nConf:\n"); - - char msg[50]; - snprintf(msg, 50,"reqrate: %lu\n",sysconfig->datarequest_rate); - error_log_rawwrite(msg); - snprintf(msg, 50,"call: %s\n",sysconfig->s_callsign); - error_log_rawwrite(msg); - snprintf(msg, 50,"callID: %u\n",sysconfig->s_callsign_id); - error_log_rawwrite(msg); - snprintf(msg, 50,"aprsperiod: %lu\n\n",sysconfig->aprs_transmit_period); - error_log_rawwrite(msg); - - return; +void iniparse_getconfig() +{ + // Init configuration with default values from config.h + snprintf(config.s_callsign, 10, "KD8TDF"); + config.s_callsign[6] = NULL; + + + if (ini_parse(handler, &config) < 0) { + // ERROR: Make new error code here! + error_log(ERROR_CONFIGPARSE, false); + } + + sysconfig = &config; + + // Print configuration to err + error_log_rawwrite("\nConf:\n"); + + char msg[50]; + snprintf(msg, 50,"reqrate: %lu\n",sysconfig->datarequest_rate); + error_log_rawwrite(msg); + snprintf(msg, 50,"call: %s\n",sysconfig->s_callsign); + error_log_rawwrite(msg); + snprintf(msg, 50,"callID: %u\n",sysconfig->s_callsign_id); + error_log_rawwrite(msg); + snprintf(msg, 50,"aprsperiod: %lu\n\n",sysconfig->aprs_transmit_period); + error_log_rawwrite(msg); + + return; } \ No newline at end of file diff --git a/master/master/lib/iniparse.h b/master/master/lib/iniparse.h --- a/master/master/lib/iniparse.h +++ b/master/master/lib/iniparse.h @@ -1,20 +1,32 @@ /* * Master Firmware: INI Parser * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning * Kyle Ripperger * Matthew Kroening * - */ - - -#ifndef INIPARSE_H_ -#define INIPARSE_H_ - -void iniparse_getconfig(); - - + */ + + +#ifndef INIPARSE_H_ +#define INIPARSE_H_ + +void iniparse_getconfig(); + #endif /* INIPARSE_H_ */ \ No newline at end of file diff --git a/master/master/lib/led.c b/master/master/lib/led.c --- a/master/master/lib/led.c +++ b/master/master/lib/led.c @@ -1,7 +1,20 @@ /* * Master Firmware: Status and Error LED Handler * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/led.h b/master/master/lib/led.h --- a/master/master/lib/led.h +++ b/master/master/lib/led.h @@ -1,7 +1,20 @@ /* * Master Firmware: Status and Error LED Handler * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/logger.c b/master/master/lib/logger.c --- a/master/master/lib/logger.c +++ b/master/master/lib/logger.c @@ -1,7 +1,20 @@ /* * Master Firmware: SD Card Data Logger * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/logger.h b/master/master/lib/logger.h --- a/master/master/lib/logger.h +++ b/master/master/lib/logger.h @@ -1,7 +1,20 @@ /* * Master Firmware: Status and Error LED Handler * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/looptime.c b/master/master/lib/looptime.c --- a/master/master/lib/looptime.c +++ b/master/master/lib/looptime.c @@ -1,7 +1,20 @@ /* * Master Firmware: Program Timer * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/looptime.h b/master/master/lib/looptime.h --- a/master/master/lib/looptime.h +++ b/master/master/lib/looptime.h @@ -1,7 +1,20 @@ /* * Master Firmware: Program Timer * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/sensordata.c b/master/master/lib/sensordata.c --- a/master/master/lib/sensordata.c +++ b/master/master/lib/sensordata.c @@ -1,7 +1,20 @@ /* * Master Firmware: Sensor Data * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/sensordata.h b/master/master/lib/sensordata.h --- a/master/master/lib/sensordata.h +++ b/master/master/lib/sensordata.h @@ -1,7 +1,20 @@ /* * Master Firmware: Sensor Data * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/sensors.c b/master/master/lib/sensors.c --- a/master/master/lib/sensors.c +++ b/master/master/lib/sensors.c @@ -1,9 +1,27 @@ -/* - * sensors.c - * - * Created: 11/19/2012 9:25:01 PM - * Author: kripperger - */ +/* + * Master Firmware: Sensors + * + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + */ #include diff --git a/master/master/lib/sensors.h b/master/master/lib/sensors.h --- a/master/master/lib/sensors.h +++ b/master/master/lib/sensors.h @@ -1,9 +1,27 @@ -/* - * sensors.h - * - * Created: 11/19/2012 9:24:50 PM - * Author: kripperger - */ +/* + * Master Firmware: Sensors + * + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . + * + * Ethan Zonca + * Matthew Kanning + * Kyle Ripperger + * Matthew Kroening + * + */ #ifndef BOARDTEMP_H_ diff --git a/master/master/lib/serial.c b/master/master/lib/serial.c --- a/master/master/lib/serial.c +++ b/master/master/lib/serial.c @@ -1,7 +1,20 @@ /* * Master Firmware: USART Send/Recieve * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/serial.h b/master/master/lib/serial.h --- a/master/master/lib/serial.h +++ b/master/master/lib/serial.h @@ -1,7 +1,20 @@ /* * Master Firmware: USART Send/Recieve * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/serparser.c b/master/master/lib/serparser.c --- a/master/master/lib/serparser.c +++ b/master/master/lib/serparser.c @@ -1,7 +1,20 @@ /* * Master Firmware: Serial Parser * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/serparser.h b/master/master/lib/serparser.h --- a/master/master/lib/serparser.h +++ b/master/master/lib/serparser.h @@ -1,7 +1,20 @@ /* * Master Firmware: Serial Parser * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/slavesensors.c b/master/master/lib/slavesensors.c --- a/master/master/lib/slavesensors.c +++ b/master/master/lib/slavesensors.c @@ -1,7 +1,20 @@ /* * Master Firmware: Slave Sensor Data Acquisition * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/slavesensors.h b/master/master/lib/slavesensors.h --- a/master/master/lib/slavesensors.h +++ b/master/master/lib/slavesensors.h @@ -1,7 +1,20 @@ /* * Master Firmware: Slave Sensor Data Aquisition * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning diff --git a/master/master/lib/watchdog.c b/master/master/lib/watchdog.c --- a/master/master/lib/watchdog.c +++ b/master/master/lib/watchdog.c @@ -1,7 +1,20 @@ /* * Master Firmware: Watchdog Timer * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning @@ -21,7 +34,8 @@ #include "led.h" #include "logger.h" -//initialize watchdog + +// Initialize watchdog timer void watchdog_setup(void) { cli(); @@ -33,6 +47,7 @@ void watchdog_setup(void) sei(); } +// Check if a WDT reset occurred on the previous boot void watchdog_checkreset(void) { // Check if WDT reset occurred @@ -40,21 +55,23 @@ void watchdog_checkreset(void) { MCUSR &= ~(1<. * * Ethan Zonca * Matthew Kanning diff --git a/master/master/master.c b/master/master/master.c --- a/master/master/master.c +++ b/master/master/master.c @@ -1,7 +1,20 @@ /* * Master Firmware * - * Wireless Observational Modular Aerial Network + * This file is part of OpenTrack. + * + * OpenTrack is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * OpenTrack 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with OpenTrack. If not, see . * * Ethan Zonca * Matthew Kanning @@ -60,7 +73,7 @@ int main(void) afsk_setup(); serial0_sendString("Hello.\n\n"); - // Blocking ZigBee node discovery + // ZigBee network discovery (blocking ~6s) slavesensors_network_scan(); // Software timers @@ -108,6 +121,7 @@ int main(void) led_off(LED_SIDEBOARD); } + // Read board temperature and battery level sensors_readBoardTemp(); sensors_readBatt(); @@ -119,7 +133,8 @@ int main(void) } // Periodic: Buzzer - if(time_millis() - lastBuzz > BUZZER_RATE) { + if(time_millis() - lastBuzz > BUZZER_RATE) + { if(sensordata_isTouchdown()) { led_on(LED_BUZZ); @@ -128,8 +143,8 @@ int main(void) } lastBuzz = time_millis(); } - - if(buzz && time_millis() - lastBuzzOn > BUZZER_DURATION) { + if(buzz && time_millis() - lastBuzzOn > BUZZER_DURATION) + { led_off(LED_BUZZ); buzz = false; } diff --git a/slave/slave/lib/inputOutput.c b/slave/slave/lib/inputOutput.c --- a/slave/slave/lib/inputOutput.c +++ b/slave/slave/lib/inputOutput.c @@ -43,10 +43,10 @@ int8_t moduleID; // Slave Module ID from void io_readModuleId() { // Get ID from rotary dip and return it. - moduleID = 2; + moduleID = 0; - /* - // This method is temporary as the next release will read the module ID from EEPROM + + // First read ID from rotary encoder PORTC |= (1 << PC2); // Pull pins on rotary dip high PORTC |= (1 << PC3); // Pull pins on rotary dip high PORTC |= (1 << PC4); // Pull pins on rotary dip high @@ -55,9 +55,9 @@ int8_t moduleID; // Slave Module ID from moduleID = ((PINC & 0b00011100) >> 2); // Read Dip Encoder moduleID = ~moduleID; //Invert Dip reading moduleID = (moduleID & 0b0111); //Mask bits - */ - - while(moduleID==0) //UNCOMMENT ALL THIS + + // If rotary encoder was 0, read ID from EEPROM + while(moduleID==0) { moduleID = i2c_read(EEPROM_ADDR, 0x05); } diff --git a/slave/slave/lib/sensors.c b/slave/slave/lib/sensors.c --- a/slave/slave/lib/sensors.c +++ b/slave/slave/lib/sensors.c @@ -186,10 +186,10 @@ void sensors_readPressure() x1 = (x1 * 3038) >> 16; x2 = (-7357 * pressure) >> 16; pressure += (x1 + x2 + 3791) >> 4; //This is the final value for our pressure - pressure = pressure - 20750; // Linear Offset for actual pressure + pressure = pressure; // Linear Offset for actual pressure - altitude = (float)44330 * (1 - pow(((float) pressure/105225), 0.190295)); // 101325 THIS IS IN METERS - altitude = altitude * 3.2804; //THIS IS IN FEET + altitude = (float)44330 * (1 - pow(((float) pressure/101325), 0.190295)); // 101325 THIS IS IN METERS + altitude = (float)altitude * 3.2804; //THIS IS IN FEET } void sensors_readHumid() diff --git a/slave/slave/modules.c b/slave/slave/modules.c --- a/slave/slave/modules.c +++ b/slave/slave/modules.c @@ -137,7 +137,7 @@ sensors_readSpiTemp(); //Data Read sensors_readPressure(); //Data Read //sensors_readHumid(); //Data Read - //sensors_readLux(); //Data Read + sensors_readLux(); //Data Read }