From 9d7d795158c53ba751b7242b38e5c280001f7c08 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 11 Oct 2015 14:48:40 +1100 Subject: [PATCH 01/22] Simple OBD example A simple example for interfacing with the Freematics Arduino OBD-II Adapter (Model A). This example utilises the following: 1) https://github.com/stanleyhuangyc/ArduinoOBD/tree/master/libraries/OBD 2) https://github.com/olikraus/U8glib_Arduino --- coytar/HelloOBD.ino | 132 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 coytar/HelloOBD.ino diff --git a/coytar/HelloOBD.ino b/coytar/HelloOBD.ino new file mode 100644 index 0000000..1287338 --- /dev/null +++ b/coytar/HelloOBD.ino @@ -0,0 +1,132 @@ +/************************************************************************* +HelloOBD +A simple example for interfacing with the Freematics Arduino OBD-II +Adapter (Model A). + +Copyright (C) 2015 Raghavendra Rao + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*************************************************************************/ + +#include +#include +#include +#include + +class CMyOBD : public COBD +{ +public: + CMyOBD() { + u8g = U8GLIB_SH1106_128X64(U8G_I2C_OPT_NONE); + pidRPM = 0; + pidThrottle = 0; + pidSpeed = 0; + pidMAFFlow = 0; + pidIntakeTemp = 0; + bReady = false; + } + + void loop() + { + // read + read(PID_RPM, pidRPM); + read(PID_THROTTLE, pidThrottle); + read(PID_SPEED, pidSpeed); + read(PID_MAF_FLOW, pidMAFFlow); + read(PID_INTAKE_TEMP, pidIntakeTemp); + + if (errors >= 2) { + setup(); + } + } + +private: + U8GLIB_SH1106_128X64 u8g; + int pidRPM, pidThrottle, pidSpeed; + int pidMAFFlow, pidIntakeTemp; + char szStr[50]; + bool bReady; + + void dataIdleLoop() + { + // picture loop + u8g.firstPage(); + do { + draw(); + } while( u8g.nextPage() ); + } + + void checkState() + { + if (errors > 0) + { + bReady = false; + sprintf(szStr, "Connecting"); + for (int i = 0; i <= (errors % 10); i++) + { + szStr[i+10] = '.'; + } + u8g.drawStr(0, 0, szStr); + } + else + { + bReady = true; + sprintf(szStr, "Connected"); + u8g.drawStr(0, 0, szStr); + } + } + + void draw(void) { + u8g_prepare(); + // clear string + memset(szStr, 0, sizeof(szStr)); + // Check & show connection state + checkState(); + // Draw stats + if (bReady) + { + // PID_SPEED + sprintf(szStr, "Speed: %i", pidSpeed); + u8g.drawStr(0, 12, szStr); + // PID_RPM + sprintf(szStr, "RPM: %i", pidRPM); + u8g.drawStr(70, 12, szStr); + // PID_THROTTLE + sprintf(szStr, "Throttle: %i", pidThrottle); + u8g.drawStr(0, 24, szStr); + // PID_MAF_FLOW + sprintf(szStr, "MAF Flow: %i", pidMAFFlow); + u8g.drawStr(0, 36, szStr); + // PID_INTAKE_TEMP + sprintf(szStr, "Intake Temp: %i", pidIntakeTemp); + u8g.drawStr(0, 48, szStr); + } + } + + void u8g_prepare(void) { + u8g.setFont(u8g_font_6x10); + u8g.setFontRefHeightExtendedText(); + u8g.setDefaultForegroundColor(); + u8g.setFontPosTop(); + } +}; + +static CMyOBD myobd; + +void setup(void) { + // start communication with OBD-II UART adapter + myobd.begin(); +} + +void loop(void) { + myobd.loop(); +} + From c425f1e6eaca4b36639aac078ea791828aa54dd4 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 11 Oct 2015 14:50:16 +1100 Subject: [PATCH 02/22] Rename coytar/HelloOBD.ino to coytar/HelloOBD/HelloOBD.ino --- coytar/{ => HelloOBD}/HelloOBD.ino | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename coytar/{ => HelloOBD}/HelloOBD.ino (100%) diff --git a/coytar/HelloOBD.ino b/coytar/HelloOBD/HelloOBD.ino similarity index 100% rename from coytar/HelloOBD.ino rename to coytar/HelloOBD/HelloOBD.ino From 98917f564d585d3ed4659e37ba1e5a170c2776d3 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 11 Oct 2015 14:52:27 +1100 Subject: [PATCH 03/22] Create gpl-2.0.txt --- coytar/HelloOBD/gpl-2.0.txt | 339 ++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 coytar/HelloOBD/gpl-2.0.txt diff --git a/coytar/HelloOBD/gpl-2.0.txt b/coytar/HelloOBD/gpl-2.0.txt new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/coytar/HelloOBD/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. From 18ada6ac63669e4270912c69cf25adf4668e76d4 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 11 Oct 2015 14:53:28 +1100 Subject: [PATCH 04/22] Create README --- coytar/HelloOBD/README | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 coytar/HelloOBD/README diff --git a/coytar/HelloOBD/README b/coytar/HelloOBD/README new file mode 100644 index 0000000..b84e3de --- /dev/null +++ b/coytar/HelloOBD/README @@ -0,0 +1,3 @@ +HelloOBD +A simple example for interfacing with the Freematics Arduino OBD-II +Adapter (Model A). From f24cdb17ed3302ae42c628f46f73f7e942a49cdf Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 11 Oct 2015 15:08:48 +1100 Subject: [PATCH 05/22] Update README --- coytar/HelloOBD/README | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coytar/HelloOBD/README b/coytar/HelloOBD/README index b84e3de..ad808e0 100644 --- a/coytar/HelloOBD/README +++ b/coytar/HelloOBD/README @@ -1,3 +1,6 @@ HelloOBD -A simple example for interfacing with the Freematics Arduino OBD-II -Adapter (Model A). +A simple example for interfacing with the Freematics Arduino OBD-II Adapter (Model A). + +This program improves on the nanologger (https://github.com/stanleyhuangyc/ArduinoOBD/tree/master/nanologger): +1) Faster OBD refresh rate +2) Utilises the U8 graphics library (https://github.com/olikraus/U8glib_Arduino) From e361c71d3314a5d88629e4f0257e20c74fc9bd72 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 18 Oct 2015 12:45:32 +1100 Subject: [PATCH 06/22] Updated wording --- coytar/HelloOBD/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coytar/HelloOBD/README b/coytar/HelloOBD/README index ad808e0..dc936a7 100644 --- a/coytar/HelloOBD/README +++ b/coytar/HelloOBD/README @@ -2,5 +2,5 @@ HelloOBD A simple example for interfacing with the Freematics Arduino OBD-II Adapter (Model A). This program improves on the nanologger (https://github.com/stanleyhuangyc/ArduinoOBD/tree/master/nanologger): -1) Faster OBD refresh rate +1) Faster screen updates 2) Utilises the U8 graphics library (https://github.com/olikraus/U8glib_Arduino) From 6dc097dae75327e5eb420a39069ec16f4919daeb Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:30:29 +1100 Subject: [PATCH 07/22] Create HelloOBD.ino --- Examples/HelloOBD.ino | 147 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 Examples/HelloOBD.ino diff --git a/Examples/HelloOBD.ino b/Examples/HelloOBD.ino new file mode 100644 index 0000000..c086fd0 --- /dev/null +++ b/Examples/HelloOBD.ino @@ -0,0 +1,147 @@ +Skip to content +This repository +Search +Pull requests +Issues +Gist + @coytar + Unwatch 1 + Star 0 + Fork 173 coytar/ArduinoOBD +forked from stanleyhuangyc/ArduinoOBD + Branch: master ArduinoOBD/coytar/HelloOBD/HelloOBD.ino +c425f1e 14 days ago +@coytar coytar Rename coytar/HelloOBD.ino to coytar/HelloOBD/HelloOBD.ino +1 contributor +RawBlameHistory 133 lines (116 sloc) 2.96 KB +/************************************************************************* +HelloOBD +A simple example for interfacing with the Freematics Arduino OBD-II +Adapter (Model A). +Copyright (C) 2015 Raghavendra Rao +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*************************************************************************/ + +#include +#include +#include +#include + +class CMyOBD : public COBD +{ +public: + CMyOBD() { + u8g = U8GLIB_SH1106_128X64(U8G_I2C_OPT_NONE); + pidRPM = 0; + pidThrottle = 0; + pidSpeed = 0; + pidMAFFlow = 0; + pidIntakeTemp = 0; + bReady = false; + } + + void loop() + { + // read + read(PID_RPM, pidRPM); + read(PID_THROTTLE, pidThrottle); + read(PID_SPEED, pidSpeed); + read(PID_MAF_FLOW, pidMAFFlow); + read(PID_INTAKE_TEMP, pidIntakeTemp); + + if (errors >= 2) { + setup(); + } + } + +private: + U8GLIB_SH1106_128X64 u8g; + int pidRPM, pidThrottle, pidSpeed; + int pidMAFFlow, pidIntakeTemp; + char szStr[50]; + bool bReady; + + void dataIdleLoop() + { + // picture loop + u8g.firstPage(); + do { + draw(); + } while( u8g.nextPage() ); + } + + void checkState() + { + if (errors > 0) + { + bReady = false; + sprintf(szStr, "Connecting"); + for (int i = 0; i <= (errors % 10); i++) + { + szStr[i+10] = '.'; + } + u8g.drawStr(0, 0, szStr); + } + else + { + bReady = true; + sprintf(szStr, "Connected"); + u8g.drawStr(0, 0, szStr); + } + } + + void draw(void) { + u8g_prepare(); + // clear string + memset(szStr, 0, sizeof(szStr)); + // Check & show connection state + checkState(); + // Draw stats + if (bReady) + { + // PID_SPEED + sprintf(szStr, "Speed: %i", pidSpeed); + u8g.drawStr(0, 12, szStr); + // PID_RPM + sprintf(szStr, "RPM: %i", pidRPM); + u8g.drawStr(70, 12, szStr); + // PID_THROTTLE + sprintf(szStr, "Throttle: %i", pidThrottle); + u8g.drawStr(0, 24, szStr); + // PID_MAF_FLOW + sprintf(szStr, "MAF Flow: %i", pidMAFFlow); + u8g.drawStr(0, 36, szStr); + // PID_INTAKE_TEMP + sprintf(szStr, "Intake Temp: %i", pidIntakeTemp); + u8g.drawStr(0, 48, szStr); + } + } + + void u8g_prepare(void) { + u8g.setFont(u8g_font_6x10); + u8g.setFontRefHeightExtendedText(); + u8g.setDefaultForegroundColor(); + u8g.setFontPosTop(); + } +}; + +static CMyOBD myobd; + +void setup(void) { + // start communication with OBD-II UART adapter + myobd.begin(); +} + +void loop(void) { + myobd.loop(); +} + +Status API Training Shop Blog About Pricing +© 2015 GitHub, Inc. Terms Privacy Security Contact Help From 45f39c44b28b94fde601356eabd90bd49815d494 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:30:53 +1100 Subject: [PATCH 08/22] Rename Examples/HelloOBD.ino to Examples/HelloOBD/HelloOBD.ino --- Examples/{ => HelloOBD}/HelloOBD.ino | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Examples/{ => HelloOBD}/HelloOBD.ino (100%) diff --git a/Examples/HelloOBD.ino b/Examples/HelloOBD/HelloOBD.ino similarity index 100% rename from Examples/HelloOBD.ino rename to Examples/HelloOBD/HelloOBD.ino From 473d92dbd672723ca6f856a7019d6909272cbaf0 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:31:39 +1100 Subject: [PATCH 09/22] Create README --- Examples/HelloOBD/README | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Examples/HelloOBD/README diff --git a/Examples/HelloOBD/README b/Examples/HelloOBD/README new file mode 100644 index 0000000..048e60b --- /dev/null +++ b/Examples/HelloOBD/README @@ -0,0 +1,6 @@ +HelloOBD +A simple example for interfacing with the Freematics Arduino OBD-II Adapter (Model A). + +This program improves on the nanologger sketch: +1) Faster screen updates +2) Utilises the U8 graphics library (https://github.com/olikraus/U8glib_Arduino) From 38273ae56d7a9cdb80ee4823509c6ea1aa93af51 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:33:30 +1100 Subject: [PATCH 10/22] Delete HelloOBD.ino --- coytar/HelloOBD/HelloOBD.ino | 132 ----------------------------------- 1 file changed, 132 deletions(-) delete mode 100644 coytar/HelloOBD/HelloOBD.ino diff --git a/coytar/HelloOBD/HelloOBD.ino b/coytar/HelloOBD/HelloOBD.ino deleted file mode 100644 index 1287338..0000000 --- a/coytar/HelloOBD/HelloOBD.ino +++ /dev/null @@ -1,132 +0,0 @@ -/************************************************************************* -HelloOBD -A simple example for interfacing with the Freematics Arduino OBD-II -Adapter (Model A). - -Copyright (C) 2015 Raghavendra Rao - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. -*************************************************************************/ - -#include -#include -#include -#include - -class CMyOBD : public COBD -{ -public: - CMyOBD() { - u8g = U8GLIB_SH1106_128X64(U8G_I2C_OPT_NONE); - pidRPM = 0; - pidThrottle = 0; - pidSpeed = 0; - pidMAFFlow = 0; - pidIntakeTemp = 0; - bReady = false; - } - - void loop() - { - // read - read(PID_RPM, pidRPM); - read(PID_THROTTLE, pidThrottle); - read(PID_SPEED, pidSpeed); - read(PID_MAF_FLOW, pidMAFFlow); - read(PID_INTAKE_TEMP, pidIntakeTemp); - - if (errors >= 2) { - setup(); - } - } - -private: - U8GLIB_SH1106_128X64 u8g; - int pidRPM, pidThrottle, pidSpeed; - int pidMAFFlow, pidIntakeTemp; - char szStr[50]; - bool bReady; - - void dataIdleLoop() - { - // picture loop - u8g.firstPage(); - do { - draw(); - } while( u8g.nextPage() ); - } - - void checkState() - { - if (errors > 0) - { - bReady = false; - sprintf(szStr, "Connecting"); - for (int i = 0; i <= (errors % 10); i++) - { - szStr[i+10] = '.'; - } - u8g.drawStr(0, 0, szStr); - } - else - { - bReady = true; - sprintf(szStr, "Connected"); - u8g.drawStr(0, 0, szStr); - } - } - - void draw(void) { - u8g_prepare(); - // clear string - memset(szStr, 0, sizeof(szStr)); - // Check & show connection state - checkState(); - // Draw stats - if (bReady) - { - // PID_SPEED - sprintf(szStr, "Speed: %i", pidSpeed); - u8g.drawStr(0, 12, szStr); - // PID_RPM - sprintf(szStr, "RPM: %i", pidRPM); - u8g.drawStr(70, 12, szStr); - // PID_THROTTLE - sprintf(szStr, "Throttle: %i", pidThrottle); - u8g.drawStr(0, 24, szStr); - // PID_MAF_FLOW - sprintf(szStr, "MAF Flow: %i", pidMAFFlow); - u8g.drawStr(0, 36, szStr); - // PID_INTAKE_TEMP - sprintf(szStr, "Intake Temp: %i", pidIntakeTemp); - u8g.drawStr(0, 48, szStr); - } - } - - void u8g_prepare(void) { - u8g.setFont(u8g_font_6x10); - u8g.setFontRefHeightExtendedText(); - u8g.setDefaultForegroundColor(); - u8g.setFontPosTop(); - } -}; - -static CMyOBD myobd; - -void setup(void) { - // start communication with OBD-II UART adapter - myobd.begin(); -} - -void loop(void) { - myobd.loop(); -} - From e9d8fede7bebd87259306e7479b41629957b0c6b Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:33:38 +1100 Subject: [PATCH 11/22] Delete README --- coytar/HelloOBD/README | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 coytar/HelloOBD/README diff --git a/coytar/HelloOBD/README b/coytar/HelloOBD/README deleted file mode 100644 index dc936a7..0000000 --- a/coytar/HelloOBD/README +++ /dev/null @@ -1,6 +0,0 @@ -HelloOBD -A simple example for interfacing with the Freematics Arduino OBD-II Adapter (Model A). - -This program improves on the nanologger (https://github.com/stanleyhuangyc/ArduinoOBD/tree/master/nanologger): -1) Faster screen updates -2) Utilises the U8 graphics library (https://github.com/olikraus/U8glib_Arduino) From da7924849d350608eb492f4ac1a91fe11799ee96 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:33:47 +1100 Subject: [PATCH 12/22] Delete gpl-2.0.txt --- coytar/HelloOBD/gpl-2.0.txt | 339 ------------------------------------ 1 file changed, 339 deletions(-) delete mode 100644 coytar/HelloOBD/gpl-2.0.txt diff --git a/coytar/HelloOBD/gpl-2.0.txt b/coytar/HelloOBD/gpl-2.0.txt deleted file mode 100644 index d159169..0000000 --- a/coytar/HelloOBD/gpl-2.0.txt +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. - - 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 -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. From a54c18ed67d6cb3380e95c0e5e893845ee70d9df Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:43:17 +1100 Subject: [PATCH 13/22] Added read_raw function read_raw function returns the entire response string --- libraries/OBD/OBD.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libraries/OBD/OBD.cpp b/libraries/OBD/OBD.cpp index 4242cf3..1405a3d 100644 --- a/libraries/OBD/OBD.cpp +++ b/libraries/OBD/OBD.cpp @@ -81,6 +81,14 @@ bool COBD::read(byte pid, int& result) return getResult(pid, result); } +void COBD::read_raw(byte pid, char* result) +{ + char buffer[OBD_RECV_BUF_SIZE]; + sendQuery(pid); + char* data = getResponse(pid, buffer); + memcpy(result, buffer, sizeof(char)*OBD_RECV_BUF_SIZE); +} + void COBD::clearDTC() { write("04\r"); From 19cd4e1c19f73046fb9e9bb6b6d06c07bac66c3f Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 16:44:14 +1100 Subject: [PATCH 14/22] Added read_raw function --- libraries/OBD/OBD.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/OBD/OBD.h b/libraries/OBD/OBD.h index 90944e9..2951e51 100644 --- a/libraries/OBD/OBD.h +++ b/libraries/OBD/OBD.h @@ -127,6 +127,8 @@ class COBD virtual OBD_STATES getState() { return m_state; } // read specified OBD-II PID value virtual bool read(byte pid, int& result); + // read raw PID value including entire response + virtual void read_raw(byte pid, char* result); // set device into virtual void sleep(); // set working protocol (default auto) From 58f9d72d5013146f21506e14200dae7d329daef3 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 17:11:55 +1100 Subject: [PATCH 15/22] Added call for recover() if not data is received. --- libraries/OBD/OBD.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/OBD/OBD.cpp b/libraries/OBD/OBD.cpp index 1405a3d..2f772a2 100644 --- a/libraries/OBD/OBD.cpp +++ b/libraries/OBD/OBD.cpp @@ -86,7 +86,13 @@ void COBD::read_raw(byte pid, char* result) char buffer[OBD_RECV_BUF_SIZE]; sendQuery(pid); char* data = getResponse(pid, buffer); - memcpy(result, buffer, sizeof(char)*OBD_RECV_BUF_SIZE); + if (!data) { + recover(); + errors++; + } + else { + memcpy(result, buffer, sizeof(char)*OBD_RECV_BUF_SIZE); + } } void COBD::clearDTC() From 7eb899e8e078848bc0cfa8c7af95a349c80e1ec3 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 17:32:07 +1100 Subject: [PATCH 16/22] Update HelloOBD.ino --- Examples/HelloOBD/HelloOBD.ino | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Examples/HelloOBD/HelloOBD.ino b/Examples/HelloOBD/HelloOBD.ino index c086fd0..6d6d0a6 100644 --- a/Examples/HelloOBD/HelloOBD.ino +++ b/Examples/HelloOBD/HelloOBD.ino @@ -1,19 +1,3 @@ -Skip to content -This repository -Search -Pull requests -Issues -Gist - @coytar - Unwatch 1 - Star 0 - Fork 173 coytar/ArduinoOBD -forked from stanleyhuangyc/ArduinoOBD - Branch: master ArduinoOBD/coytar/HelloOBD/HelloOBD.ino -c425f1e 14 days ago -@coytar coytar Rename coytar/HelloOBD.ino to coytar/HelloOBD/HelloOBD.ino -1 contributor -RawBlameHistory 133 lines (116 sloc) 2.96 KB /************************************************************************* HelloOBD A simple example for interfacing with the Freematics Arduino OBD-II From 5c216b3524fce5840abf8bdef6452b6a28a55fdb Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 17:32:56 +1100 Subject: [PATCH 17/22] Update HelloOBD.ino --- Examples/HelloOBD/HelloOBD.ino | 3 --- 1 file changed, 3 deletions(-) diff --git a/Examples/HelloOBD/HelloOBD.ino b/Examples/HelloOBD/HelloOBD.ino index 6d6d0a6..5dae70a 100644 --- a/Examples/HelloOBD/HelloOBD.ino +++ b/Examples/HelloOBD/HelloOBD.ino @@ -126,6 +126,3 @@ void setup(void) { void loop(void) { myobd.loop(); } - -Status API Training Shop Blog About Pricing -© 2015 GitHub, Inc. Terms Privacy Security Contact Help From 5856bb7066e93fa76c30bd81e7d10927836e9855 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 17:36:04 +1100 Subject: [PATCH 18/22] Removed else branch and added return. --- libraries/OBD/OBD.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libraries/OBD/OBD.cpp b/libraries/OBD/OBD.cpp index 2f772a2..ff19260 100644 --- a/libraries/OBD/OBD.cpp +++ b/libraries/OBD/OBD.cpp @@ -83,16 +83,15 @@ bool COBD::read(byte pid, int& result) void COBD::read_raw(byte pid, char* result) { - char buffer[OBD_RECV_BUF_SIZE]; - sendQuery(pid); - char* data = getResponse(pid, buffer); - if (!data) { - recover(); - errors++; - } - else { - memcpy(result, buffer, sizeof(char)*OBD_RECV_BUF_SIZE); - } + char buffer[OBD_RECV_BUF_SIZE]; + sendQuery(pid); + char* data = getResponse(pid, buffer); + if (!data) { + recover(); + errors++; + return; + } + memcpy(result, buffer, sizeof(char)*OBD_RECV_BUF_SIZE); } void COBD::clearDTC() From 50611878749c4b5fdf18a51fcd44d95a09e454c9 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 17:39:27 +1100 Subject: [PATCH 19/22] Create ExOBD.cpp --- libraries/ExOBD/ExOBD.cpp | 1 + 1 file changed, 1 insertion(+) create mode 100644 libraries/ExOBD/ExOBD.cpp diff --git a/libraries/ExOBD/ExOBD.cpp b/libraries/ExOBD/ExOBD.cpp new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/libraries/ExOBD/ExOBD.cpp @@ -0,0 +1 @@ + From 98d7e7275e63e6b2804945f86afc3c765df24c65 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 17:39:37 +1100 Subject: [PATCH 20/22] Create ExOBD.h --- libraries/ExOBD/ExOBD.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 libraries/ExOBD/ExOBD.h diff --git a/libraries/ExOBD/ExOBD.h b/libraries/ExOBD/ExOBD.h new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/libraries/ExOBD/ExOBD.h @@ -0,0 +1 @@ + From 8a9c62722c1e6d2276fa83898d9ea90c6550177b Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 18:32:46 +1100 Subject: [PATCH 21/22] Delete ExOBD.cpp --- libraries/ExOBD/ExOBD.cpp | 1 - 1 file changed, 1 deletion(-) delete mode 100644 libraries/ExOBD/ExOBD.cpp diff --git a/libraries/ExOBD/ExOBD.cpp b/libraries/ExOBD/ExOBD.cpp deleted file mode 100644 index 8b13789..0000000 --- a/libraries/ExOBD/ExOBD.cpp +++ /dev/null @@ -1 +0,0 @@ - From 29c66b6769c50011db7205b05fffe0398f76f555 Mon Sep 17 00:00:00 2001 From: coytar Date: Sun, 25 Oct 2015 18:32:51 +1100 Subject: [PATCH 22/22] Delete ExOBD.h --- libraries/ExOBD/ExOBD.h | 1 - 1 file changed, 1 deletion(-) delete mode 100644 libraries/ExOBD/ExOBD.h diff --git a/libraries/ExOBD/ExOBD.h b/libraries/ExOBD/ExOBD.h deleted file mode 100644 index 8b13789..0000000 --- a/libraries/ExOBD/ExOBD.h +++ /dev/null @@ -1 +0,0 @@ -