mirror of https://github.com/rusefi/msqur.git
Working on API and filter.
This commit is contained in:
nearwood
commit
208d9400e2
|
|
@ -0,0 +1,5 @@
|
|||
.*.msq
|
||||
script.config$
|
||||
config.php$
|
||||
VERSION
|
||||
doxygen/*
|
||||
|
|
@ -0,0 +1,596 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
==========================
|
||||
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright © 2007 Free Software Foundation, Inc. <<http://fsf.org/>>
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim copies of this license
|
||||
document, but changing it is not allowed.
|
||||
|
||||
## Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for software and other
|
||||
kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed to take away
|
||||
your freedom to share and change the works. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change all versions of a
|
||||
program--to make sure it remains free software for all its users. We, the Free
|
||||
Software Foundation, use the GNU General Public License for most of our software; it
|
||||
applies also to any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not price. Our General
|
||||
Public Licenses are designed to make sure that you have the freedom to distribute
|
||||
copies of free software (and charge for them if you wish), that you receive source
|
||||
code or can get it if you want it, that you can change the software or use pieces of
|
||||
it in new free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you these rights or
|
||||
asking you to surrender the rights. Therefore, you have certain responsibilities if
|
||||
you distribute copies of the software, or if you modify it: responsibilities to
|
||||
respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether gratis or for a fee,
|
||||
you must pass on to the recipients the same freedoms that you received. You must make
|
||||
sure that they, too, receive or can get the source code. And you must show them these
|
||||
terms so they know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps: (1) assert
|
||||
copyright on the software, and (2) offer you this License giving you legal permission
|
||||
to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains that there is
|
||||
no warranty for this free software. For both users' and authors' sake, the GPL
|
||||
requires that modified versions be marked as changed, so that their problems will not
|
||||
be attributed erroneously to authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run modified versions of
|
||||
the software inside them, although the manufacturer can do so. This is fundamentally
|
||||
incompatible with the aim of protecting users' freedom to change the software. The
|
||||
systematic pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we have designed
|
||||
this version of the GPL to prohibit the practice for those products. If such problems
|
||||
arise substantially in other domains, we stand ready to extend this provision to
|
||||
those domains in future versions of the GPL, as needed to protect the freedom of
|
||||
users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents. States should
|
||||
not allow patents to restrict development and use of software on general-purpose
|
||||
computers, but in those that do, we wish to avoid the special danger that patents
|
||||
applied to a free program could make it effectively proprietary. To prevent this, the
|
||||
GPL assures that patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and modification follow.
|
||||
|
||||
## TERMS AND CONDITIONS
|
||||
|
||||
### 0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work in
|
||||
a fashion requiring copyright permission, other than the making of an exact copy. The
|
||||
resulting work is called a "modified version" of the earlier work or a
|
||||
work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based on
|
||||
the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for infringement under
|
||||
applicable copyright law, except executing it on a computer or modifying a private
|
||||
copy. Propagation includes copying, distribution (with or without modification),
|
||||
making available to the public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through a computer
|
||||
network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices" to the
|
||||
extent that it includes a convenient and prominently visible feature that (1)
|
||||
displays an appropriate copyright notice, and (2) tells the user that there is no
|
||||
warranty for the work (except to the extent that warranties are provided), that
|
||||
licensees may convey the work under this License, and how to view a copy of this
|
||||
License. If the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
### 1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work for
|
||||
making modifications to it. "Object code" means any non-source form of a
|
||||
work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of interfaces
|
||||
specified for a particular programming language, one that is widely used among
|
||||
developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other than
|
||||
the work as a whole, that (a) is included in the normal form of packaging a Major
|
||||
Component, but which is not part of that Major Component, and (b) serves only to
|
||||
enable use of the work with that Major Component, or to implement a Standard
|
||||
Interface for which an implementation is available to the public in source code form.
|
||||
A "Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system (if any) on which
|
||||
the executable work runs, or a compiler used to produce the work, or an object code
|
||||
interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all the
|
||||
source code needed to generate, install, and (for an executable work) run the object
|
||||
code and to modify the work, including scripts to control those activities. However,
|
||||
it does not include the work's System Libraries, or general-purpose tools or
|
||||
generally available free programs which are used unmodified in performing those
|
||||
activities but which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for the work, and
|
||||
the source code for shared libraries and dynamically linked subprograms that the work
|
||||
is specifically designed to require, such as by intimate data communication or
|
||||
control flow between those subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users can regenerate
|
||||
automatically from other parts of the Corresponding Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that same work.
|
||||
|
||||
### 2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of copyright on the
|
||||
Program, and are irrevocable provided the stated conditions are met. This License
|
||||
explicitly affirms your unlimited permission to run the unmodified Program. The
|
||||
output from running a covered work is covered by this License only if the output,
|
||||
given its content, constitutes a covered work. This License acknowledges your rights
|
||||
of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not convey, without
|
||||
conditions so long as your license otherwise remains in force. You may convey covered
|
||||
works to others for the sole purpose of having them make modifications exclusively
|
||||
for you, or provide you with facilities for running those works, provided that you
|
||||
comply with the terms of this License in conveying all material for which you do not
|
||||
control copyright. Those thus making or running the covered works for you must do so
|
||||
exclusively on your behalf, under your direction and control, on terms that prohibit
|
||||
them from making any copies of your copyrighted material outside their relationship
|
||||
with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under the conditions
|
||||
stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
|
||||
|
||||
### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological measure under any
|
||||
applicable law fulfilling obligations under article 11 of the WIPO copyright treaty
|
||||
adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention
|
||||
of such measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid circumvention of
|
||||
technological measures to the extent such circumvention is effected by exercising
|
||||
rights under this License with respect to the covered work, and you disclaim any
|
||||
intention to limit operation or modification of the work as a means of enforcing,
|
||||
against the work's users, your or third parties' legal rights to forbid circumvention
|
||||
of technological measures.
|
||||
|
||||
### 4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you receive it, in any
|
||||
medium, provided that you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice; keep intact all notices stating that this License and
|
||||
any non-permissive terms added in accord with section 7 apply to the code; keep
|
||||
intact all notices of the absence of any warranty; and give all recipients a copy of
|
||||
this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey, and you may offer
|
||||
support or warranty protection for a fee.
|
||||
|
||||
### 5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to produce it from
|
||||
the Program, in the form of source code under the terms of section 4, provided that
|
||||
you also meet all of these conditions:
|
||||
|
||||
* **a)** The work must carry prominent notices stating that you modified it, and giving a
|
||||
relevant date.
|
||||
* **b)** The work must carry prominent notices stating that it is released under this
|
||||
License and any conditions added under section 7. This requirement modifies the
|
||||
requirement in section 4 to "keep intact all notices".
|
||||
* **c)** You must license the entire work, as a whole, under this License to anyone who
|
||||
comes into possession of a copy. This License will therefore apply, along with any
|
||||
applicable section 7 additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no permission to license the
|
||||
work in any other way, but it does not invalidate such permission if you have
|
||||
separately received it.
|
||||
* **d)** If the work has interactive user interfaces, each must display Appropriate Legal
|
||||
Notices; however, if the Program has interactive interfaces that do not display
|
||||
Appropriate Legal Notices, your work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent works, which are
|
||||
not by their nature extensions of the covered work, and which are not combined with
|
||||
it such as to form a larger program, in or on a volume of a storage or distribution
|
||||
medium, is called an "aggregate" if the compilation and its resulting
|
||||
copyright are not used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work in an aggregate
|
||||
does not cause this License to apply to the other parts of the aggregate.
|
||||
|
||||
### 6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms of sections 4 and
|
||||
5, provided that you also convey the machine-readable Corresponding Source under the
|
||||
terms of this License, in one of these ways:
|
||||
|
||||
* **a)** Convey the object code in, or embodied in, a physical product (including a
|
||||
physical distribution medium), accompanied by the Corresponding Source fixed on a
|
||||
durable physical medium customarily used for software interchange.
|
||||
* **b)** Convey the object code in, or embodied in, a physical product (including a
|
||||
physical distribution medium), accompanied by a written offer, valid for at least
|
||||
three years and valid for as long as you offer spare parts or customer support for
|
||||
that product model, to give anyone who possesses the object code either (1) a copy of
|
||||
the Corresponding Source for all the software in the product that is covered by this
|
||||
License, on a durable physical medium customarily used for software interchange, for
|
||||
a price no more than your reasonable cost of physically performing this conveying of
|
||||
source, or (2) access to copy the Corresponding Source from a network server at no
|
||||
charge.
|
||||
* **c)** Convey individual copies of the object code with a copy of the written offer to
|
||||
provide the Corresponding Source. This alternative is allowed only occasionally and
|
||||
noncommercially, and only if you received the object code with such an offer, in
|
||||
accord with subsection 6b.
|
||||
* **d)** Convey the object code by offering access from a designated place (gratis or for
|
||||
a charge), and offer equivalent access to the Corresponding Source in the same way
|
||||
through the same place at no further charge. You need not require recipients to copy
|
||||
the Corresponding Source along with the object code. If the place to copy the object
|
||||
code is a network server, the Corresponding Source may be on a different server
|
||||
(operated by you or a third party) that supports equivalent copying facilities,
|
||||
provided you maintain clear directions next to the object code saying where to find
|
||||
the Corresponding Source. Regardless of what server hosts the Corresponding Source,
|
||||
you remain obligated to ensure that it is available for as long as needed to satisfy
|
||||
these requirements.
|
||||
* **e)** Convey the object code using peer-to-peer transmission, provided you inform
|
||||
other peers where the object code and Corresponding Source of the work are being
|
||||
offered to the general public at no charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded from the
|
||||
Corresponding Source as a System Library, need not be included in conveying the
|
||||
object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which
|
||||
means any tangible personal property which is normally used for personal, family, or
|
||||
household purposes, or (2) anything designed or sold for incorporation into a
|
||||
dwelling. In determining whether a product is a consumer product, doubtful cases
|
||||
shall be resolved in favor of coverage. For a particular product received by a
|
||||
particular user, "normally used" refers to a typical or common use of
|
||||
that class of product, regardless of the status of the particular user or of the way
|
||||
in which the particular user actually uses, or expects or is expected to use, the
|
||||
product. A product is a consumer product regardless of whether the product has
|
||||
substantial commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install and execute
|
||||
modified versions of a covered work in that User Product from a modified version of
|
||||
its Corresponding Source. The information must suffice to ensure that the continued
|
||||
functioning of the modified object code is in no case prevented or interfered with
|
||||
solely because modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or specifically for
|
||||
use in, a User Product, and the conveying occurs as part of a transaction in which
|
||||
the right of possession and use of the User Product is transferred to the recipient
|
||||
in perpetuity or for a fixed term (regardless of how the transaction is
|
||||
characterized), the Corresponding Source conveyed under this section must be
|
||||
accompanied by the Installation Information. But this requirement does not apply if
|
||||
neither you nor any third party retains the ability to install modified object code
|
||||
on the User Product (for example, the work has been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a requirement to
|
||||
continue to provide support service, warranty, or updates for a work that has been
|
||||
modified or installed by the recipient, or for the User Product in which it has been
|
||||
modified or installed. Access to a network may be denied when the modification itself
|
||||
materially and adversely affects the operation of the network or violates the rules
|
||||
and protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided, in accord with
|
||||
this section must be in a format that is publicly documented (and with an
|
||||
implementation available to the public in source code form), and must require no
|
||||
special password or key for unpacking, reading or copying.
|
||||
|
||||
### 7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions. Additional
|
||||
permissions that are applicable to the entire Program shall be treated as though they
|
||||
were included in this License, to the extent that they are valid under applicable
|
||||
law. If additional permissions apply only to part of the Program, that part may be
|
||||
used separately under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option remove any
|
||||
additional permissions from that copy, or from any part of it. (Additional
|
||||
permissions may be written to require their own removal in certain cases when you
|
||||
modify the work.) You may place additional permissions on material, added by you to a
|
||||
covered work, for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you add to a
|
||||
covered work, you may (if authorized by the copyright holders of that material)
|
||||
supplement the terms of this License with terms:
|
||||
|
||||
* **a)** Disclaiming warranty or limiting liability differently from the terms of
|
||||
sections 15 and 16 of this License; or
|
||||
* **b)** Requiring preservation of specified reasonable legal notices or author
|
||||
attributions in that material or in the Appropriate Legal Notices displayed by works
|
||||
containing it; or
|
||||
* **c)** Prohibiting misrepresentation of the origin of that material, or requiring that
|
||||
modified versions of such material be marked in reasonable ways as different from the
|
||||
original version; or
|
||||
* **d)** Limiting the use for publicity purposes of names of licensors or authors of the
|
||||
material; or
|
||||
* **e)** Declining to grant rights under trademark law for use of some trade names,
|
||||
trademarks, or service marks; or
|
||||
* **f)** Requiring indemnification of licensors and authors of that material by anyone
|
||||
who conveys the material (or modified versions of it) with contractual assumptions of
|
||||
liability to the recipient, for any liability that these contractual assumptions
|
||||
directly impose on those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you received
|
||||
it, or any part of it, contains a notice stating that it is governed by this License
|
||||
along with a term that is a further restriction, you may remove that term. If a
|
||||
license document contains a further restriction but permits relicensing or conveying
|
||||
under this License, you may add to a covered work material governed by the terms of
|
||||
that license document, provided that the further restriction does not survive such
|
||||
relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you must place, in
|
||||
the relevant source files, a statement of the additional terms that apply to those
|
||||
files, or a notice indicating where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the form of a
|
||||
separately written license, or stated as exceptions; the above requirements apply
|
||||
either way.
|
||||
|
||||
### 8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly provided under
|
||||
this License. Any attempt otherwise to propagate or modify it is void, and will
|
||||
automatically terminate your rights under this License (including any patent licenses
|
||||
granted under the third paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your license from a
|
||||
particular copyright holder is reinstated (a) provisionally, unless and until the
|
||||
copyright holder explicitly and finally terminates your license, and (b) permanently,
|
||||
if the copyright holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is reinstated permanently
|
||||
if the copyright holder notifies you of the violation by some reasonable means, this
|
||||
is the first time you have received notice of violation of this License (for any
|
||||
work) from that copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the licenses of
|
||||
parties who have received copies or rights from you under this License. If your
|
||||
rights have been terminated and not permanently reinstated, you do not qualify to
|
||||
receive new licenses for the same material under section 10.
|
||||
|
||||
### 9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or run a copy of the
|
||||
Program. Ancillary propagation of a covered work occurring solely as a consequence of
|
||||
using peer-to-peer transmission to receive a copy likewise does not require
|
||||
acceptance. However, nothing other than this License grants you permission to
|
||||
propagate or modify any covered work. These actions infringe copyright if you do not
|
||||
accept this License. Therefore, by modifying or propagating a covered work, you
|
||||
indicate your acceptance of this License to do so.
|
||||
|
||||
### 10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically receives a license
|
||||
from the original licensors, to run, modify and propagate that work, subject to this
|
||||
License. You are not responsible for enforcing compliance by third parties with this
|
||||
License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an organization, or
|
||||
merging organizations. If propagation of a covered work results from an entity
|
||||
transaction, each party to that transaction who receives a copy of the work also
|
||||
receives whatever licenses to the work the party's predecessor in interest had or
|
||||
could give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if the predecessor
|
||||
has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the rights granted or
|
||||
affirmed under this License. For example, you may not impose a license fee, royalty,
|
||||
or other charge for exercise of rights granted under this License, and you may not
|
||||
initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging
|
||||
that any patent claim is infringed by making, using, selling, offering for sale, or
|
||||
importing the Program or any portion of it.
|
||||
|
||||
### 11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The work thus
|
||||
licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims owned or
|
||||
controlled by the contributor, whether already acquired or hereafter acquired, that
|
||||
would be infringed by some manner, permitted by this License, of making, using, or
|
||||
selling its contributor version, but do not include claims that would be infringed
|
||||
only as a consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant patent
|
||||
sublicenses in a manner consistent with the requirements of this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free patent license
|
||||
under the contributor's essential patent claims, to make, use, sell, offer for sale,
|
||||
import and otherwise run, modify and propagate the contents of its contributor
|
||||
version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent (such as an
|
||||
express permission to practice a patent or covenant not to sue for patent
|
||||
infringement). To "grant" such a patent license to a party means to make
|
||||
such an agreement or commitment not to enforce a patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license, and the
|
||||
Corresponding Source of the work is not available for anyone to copy, free of charge
|
||||
and under the terms of this License, through a publicly available network server or
|
||||
other readily accessible means, then you must either (1) cause the Corresponding
|
||||
Source to be so available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner consistent with
|
||||
the requirements of this License, to extend the patent license to downstream
|
||||
recipients. "Knowingly relying" means you have actual knowledge that, but
|
||||
for the patent license, your conveying the covered work in a country, or your
|
||||
recipient's use of the covered work in a country, would infringe one or more
|
||||
identifiable patents in that country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or arrangement, you
|
||||
convey, or propagate by procuring conveyance of, a covered work, and grant a patent
|
||||
license to some of the parties receiving the covered work authorizing them to use,
|
||||
propagate, modify or convey a specific copy of the covered work, then the patent
|
||||
license you grant is automatically extended to all recipients of the covered work and
|
||||
works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within the
|
||||
scope of its coverage, prohibits the exercise of, or is conditioned on the
|
||||
non-exercise of one or more of the rights that are specifically granted under this
|
||||
License. You may not convey a covered work if you are a party to an arrangement with
|
||||
a third party that is in the business of distributing software, under which you make
|
||||
payment to the third party based on the extent of your activity of conveying the
|
||||
work, and under which the third party grants, to any of the parties who would receive
|
||||
the covered work from you, a discriminatory patent license (a) in connection with
|
||||
copies of the covered work conveyed by you (or copies made from those copies), or (b)
|
||||
primarily for and in connection with specific products or compilations that contain
|
||||
the covered work, unless you entered into that arrangement, or that patent license
|
||||
was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting any implied
|
||||
license or other defenses to infringement that may otherwise be available to you
|
||||
under applicable patent law.
|
||||
|
||||
### 12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or otherwise)
|
||||
that contradict the conditions of this License, they do not excuse you from the
|
||||
conditions of this License. If you cannot convey a covered work so as to satisfy
|
||||
simultaneously your obligations under this License and any other pertinent
|
||||
obligations, then as a consequence you may not convey it at all. For example, if you
|
||||
agree to terms that obligate you to collect a royalty for further conveying from
|
||||
those to whom you convey the Program, the only way you could satisfy both those terms
|
||||
and this License would be to refrain entirely from conveying the Program.
|
||||
|
||||
### 13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have permission to link or
|
||||
combine any covered work with a work licensed under version 3 of the GNU Affero
|
||||
General Public License into a single combined work, and to convey the resulting work.
|
||||
The terms of this License will continue to apply to the part which is the covered
|
||||
work, but the special requirements of the GNU Affero General Public License, section
|
||||
13, concerning interaction through a network will apply to the combination as such.
|
||||
|
||||
### 14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of the GNU
|
||||
General Public License from time to time. Such new versions will be similar in spirit
|
||||
to the present version, but may differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Program specifies that
|
||||
a certain numbered version of the GNU General Public License "or any later
|
||||
version" applies to it, you have the option of following the terms and
|
||||
conditions either of that numbered version or of any later version published by the
|
||||
Free Software Foundation. If the Program does not specify a version number of the GNU
|
||||
General Public License, you may choose any version ever published by the Free
|
||||
Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future versions of the GNU
|
||||
General Public License can be used, that proxy's public statement of acceptance of a
|
||||
version permanently authorizes you to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different permissions. However, no
|
||||
additional obligations are imposed on any author or copyright holder as a result of
|
||||
your choosing to follow a later version.
|
||||
|
||||
### 15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
|
||||
EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
|
||||
QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
||||
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
### 16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
|
||||
COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS
|
||||
PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
|
||||
INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||
PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE
|
||||
OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE
|
||||
WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
### 17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided above cannot be
|
||||
given local legal effect according to their terms, reviewing courts shall apply local
|
||||
law that most closely approximates an absolute waiver of all civil liability in
|
||||
connection with the Program, unless a warranty or assumption of liability accompanies
|
||||
a copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
## How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest possible use to
|
||||
the public, the best way to achieve this is to make it free software which everyone
|
||||
can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest to attach them
|
||||
to the start of each source file to most effectively state the exclusion of warranty;
|
||||
and each file should have at least the "copyright" line and a pointer to
|
||||
where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short notice like this
|
||||
when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type 'show c' for details.
|
||||
|
||||
The hypothetical commands 'show w' and 'show c' should show the appropriate parts of
|
||||
the General Public License. Of course, your program's commands might be different;
|
||||
for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school, if any, to
|
||||
sign a "copyright disclaimer" for the program, if necessary. For more
|
||||
information on this, and how to apply and follow the GNU GPL, see
|
||||
<<http://www.gnu.org/licenses/>>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may consider it
|
||||
more useful to permit linking proprietary applications with the library. If this is
|
||||
what you want to do, use the GNU Lesser General Public License instead of this
|
||||
License. But first, please read
|
||||
<<http://www.gnu.org/philosophy/why-not-lgpl.html>>.
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
# MSQur #
|
||||
|
||||
'Masker' for lack of better name.
|
||||
MegaSquirt MSQ file sharing and viewing site.
|
||||
|
||||
Parses MSQ "XML" in tandem with an associated INI (config) file and displays it in a familiar format for viewing and comparing.
|
||||
|
||||
### TODO ###
|
||||
|
||||
* Uploader (user)/Manager (admin)
|
||||
* 3D table charts
|
||||
* Tests and test lib.
|
||||
* Better DB update procedure.
|
||||
|
||||
### Installation ###
|
||||
|
||||
#### Needed software ####
|
||||
|
||||
* AMP Stack
|
||||
|
||||
#### Recommended software ####
|
||||
|
||||
* phpMyAdmin
|
||||
|
||||
#### Process ####
|
||||
|
||||
* Create database user and database itself.
|
||||
* Upload & deploy files.
|
||||
* Setup script.config with details.
|
||||
* Run db scripts.
|
||||
|
||||
#### hgrc ####
|
||||
To display a fancy version string, modify your .hgrc to have this hook:
|
||||
|
||||
```
|
||||
#!bash
|
||||
|
||||
[hooks]
|
||||
post-update = hg log -r . --template "v{latesttag}-{latesttagdistance}-{node|short}\n" > VERSION
|
||||
```
|
||||
|
||||
### Update & Deployment Instructions ###
|
||||
|
||||
* Pull updates on host.
|
||||
* Update any configuration files (config.php, script.config) if needed.
|
||||
* Run any new DB scripts.
|
||||
* Run deploy.sh to copy web files to web server.
|
||||
|
||||
### License ###
|
||||
|
||||
msqur is licensed under the GPL v3.0. A copy of this license is included in the LICENSE.md file in the source tree.
|
||||
|
||||
### Who do I talk to? ###
|
||||
|
||||
* Nicholas Earwood
|
||||
* nearwood@gmail.com
|
||||
* http://nearwood.net/
|
||||
|
||||
### Credits ###
|
||||
Apache, PHP, MySQL
|
||||
jQuery, jQuery UI,
|
||||
jquery.tablesorter http://tablesorter.com/docs/,
|
||||
Chart.js,
|
||||
AngularJS,
|
||||
Tango Icon Theme,
|
||||
Geany/Notepad++
|
||||
|
|
@ -0,0 +1 @@
|
|||
CREATE USER 'msqur'@'%' IDENTIFIED BY '';GRANT USAGE ON *.* TO 'msqur'@'%' IDENTIFIED BY '' WITH MAX_QUERIES_PER_HOUR 0 MAX_CONNECTIONS_PER_HOUR 0 MAX_UPDATES_PER_HOUR 0 MAX_USER_CONNECTIONS 0;CREATE DATABASE IF NOT EXISTS `msqur`;GRANT ALL PRIVILEGES ON `msqur`.* TO 'msqur'@'%';
|
||||
|
|
@ -0,0 +1 @@
|
|||
ALTER TABLE `msqs` ADD `html` MEDIUMTEXT NULL DEFAULT NULL;
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
ALTER TABLE `engines` ADD `twoStroke` VARCHAR(32) NOT NULL, ADD `injType` VARCHAR(32) NOT NULL, ADD `nInjectors` TINYINT NOT NULL;
|
||||
ALTER TABLE `engines` ADD `engineType` VARCHAR(32) NOT NULL;
|
||||
ALTER TABLE `engines` CHANGE `numCylinders` `numCylinders` TINYINT(2) NULL DEFAULT NULL, CHANGE `injectorSize` `injectorSize` INT(11) NULL DEFAULT NULL, CHANGE `twoStroke` `twoStroke` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, CHANGE `injType` `injType` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, CHANGE `nInjectors` `nInjectors` TINYINT(4) NULL DEFAULT NULL, CHANGE `engineType` `engineType` VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
ALTER TABLE `engines` ADD `make` TINYTEXT NULL DEFAULT NULL AFTER `id`, ADD `code` TINYTEXT NULL DEFAULT NULL AFTER `make`;
|
||||
ALTER TABLE `metadata` ADD `views` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `url`;
|
||||
ALTER TABLE `metadata` ADD `reingest` BOOLEAN NOT NULL DEFAULT FALSE;
|
||||
|
||||
UPDATE `metadata` SET `reingest`=1 WHERE 1
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
-- phpMyAdmin SQL Dump
|
||||
-- version 4.3.3
|
||||
-- http://www.phpmyadmin.net
|
||||
--
|
||||
-- Host: localhost
|
||||
-- Generation Time: Dec 22, 2014 at 02:49 PM
|
||||
-- Server version: 10.0.15-MariaDB-log
|
||||
-- PHP Version: 5.6.3
|
||||
|
||||
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
|
||||
SET time_zone = "+00:00";
|
||||
|
||||
/*!40101 SET NAMES utf8 */;
|
||||
|
||||
--
|
||||
-- Database: `msqur`
|
||||
--
|
||||
CREATE DATABASE IF NOT EXISTS `msqur` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
|
||||
USE `msqur`;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `engines`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `engines`;
|
||||
CREATE TABLE IF NOT EXISTS `engines` (
|
||||
`id` int(11) NOT NULL,
|
||||
`displacement` decimal(4,2) NOT NULL,
|
||||
`numCylinders` tinyint(2) NOT NULL,
|
||||
`compression` decimal(4,2) NOT NULL,
|
||||
`induction` int(11) NOT NULL,
|
||||
`injectorSize` int(11) NOT NULL
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `metadata`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `metadata`;
|
||||
CREATE TABLE IF NOT EXISTS `metadata` (
|
||||
`id` int(11) NOT NULL,
|
||||
`msq` int(11) NOT NULL,
|
||||
`engine` int(11) DEFAULT NULL,
|
||||
`url` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`fileFormat` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`signature` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
|
||||
`firmware` varchar(255) NOT NULL,
|
||||
`author` varchar(255) NOT NULL,
|
||||
`writeDate` datetime NOT NULL,
|
||||
`uploadDate` datetime NOT NULL,
|
||||
`tuneComment` text NOT NULL
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `msqs`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `msqs`;
|
||||
CREATE TABLE IF NOT EXISTS `msqs` (
|
||||
`id` int(11) NOT NULL,
|
||||
`xml` mediumtext CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
|
||||
|
||||
--
|
||||
-- Indexes for dumped tables
|
||||
--
|
||||
|
||||
--
|
||||
-- Indexes for table `engines`
|
||||
--
|
||||
ALTER TABLE `engines`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `metadata`
|
||||
--
|
||||
ALTER TABLE `metadata`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
|
||||
--
|
||||
-- Indexes for table `msqs`
|
||||
--
|
||||
ALTER TABLE `msqs`
|
||||
ADD PRIMARY KEY (`id`);
|
||||
|
||||
--
|
||||
-- AUTO_INCREMENT for dumped tables
|
||||
--
|
||||
|
||||
--
|
||||
-- AUTO_INCREMENT for table `engines`
|
||||
--
|
||||
ALTER TABLE `engines`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `metadata`
|
||||
--
|
||||
ALTER TABLE `metadata`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3;
|
||||
--
|
||||
-- AUTO_INCREMENT for table `msqs`
|
||||
--
|
||||
ALTER TABLE `msqs`
|
||||
MODIFY `id` int(11) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3;
|
||||
|
|
@ -0,0 +1 @@
|
|||
UPDATE `metadata` SET `reingest`=1 WHERE 1
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
. script.config
|
||||
|
||||
rsync -av --exclude='config.php' --exclude='*/.hg*' src/ $DEPLOY_DIR/
|
||||
cp -v VERSION $DEPLOY_DIR/
|
||||
|
|
@ -0,0 +1,124 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
<meta name="generator" content="Doxygen 1.8.9.1"/>
|
||||
<title>msqur: lib Directory Reference</title>
|
||||
<link href="tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="jquery.js"></script>
|
||||
<script type="text/javascript" src="dynsections.js"></script>
|
||||
<link href="navtree.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="resize.js"></script>
|
||||
<script type="text/javascript" src="navtreedata.js"></script>
|
||||
<script type="text/javascript" src="navtree.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(initResizable);
|
||||
$(window).load(resizeHeight);
|
||||
</script>
|
||||
<link href="search/search.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="search/searchdata.js"></script>
|
||||
<script type="text/javascript" src="search/search.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() { init_search(); });
|
||||
</script>
|
||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr style="height: 56px;">
|
||||
<td style="padding-left: 0.5em;">
|
||||
<div id="projectname">msqur
|
||||
 <span id="projectnumber">0.53b</span>
|
||||
</div>
|
||||
<div id="projectbrief">MSQ Web Viewer</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!-- end header part -->
|
||||
<!-- Generated by Doxygen 1.8.9.1 -->
|
||||
<script type="text/javascript">
|
||||
var searchBox = new SearchBox("searchBox", "search",false,'Search');
|
||||
</script>
|
||||
<div id="navrow1" class="tabs">
|
||||
<ul class="tablist">
|
||||
<li><a href="index.html"><span>Main Page</span></a></li>
|
||||
<li><a href="pages.html"><span>Related Pages</span></a></li>
|
||||
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
||||
<li><a href="files.html"><span>Files</span></a></li>
|
||||
<li>
|
||||
<div id="MSearchBox" class="MSearchBoxInactive">
|
||||
<span class="left">
|
||||
<img id="MSearchSelect" src="search/mag_sel.png"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
alt=""/>
|
||||
<input type="text" id="MSearchField" value="Search" accesskey="S"
|
||||
onfocus="searchBox.OnSearchFieldFocus(true)"
|
||||
onblur="searchBox.OnSearchFieldFocus(false)"
|
||||
onkeyup="searchBox.OnSearchFieldChange(event)"/>
|
||||
</span><span class="right">
|
||||
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div><!-- top -->
|
||||
<div id="side-nav" class="ui-resizable side-nav-resizable">
|
||||
<div id="nav-tree">
|
||||
<div id="nav-tree-contents">
|
||||
<div id="nav-sync" class="sync"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="splitbar" style="-moz-user-select:none;"
|
||||
class="ui-resizable-handle">
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){initNavTree('dir_97aefd0d527b934f1d99a682da8fe6a9.html','');});
|
||||
</script>
|
||||
<div id="doc-content">
|
||||
<!-- window showing the filter options -->
|
||||
<div id="MSearchSelectWindow"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
onkeydown="return searchBox.OnSearchSelectKey(event)">
|
||||
</div>
|
||||
|
||||
<!-- iframe showing the search results (closed by default) -->
|
||||
<div id="MSearchResultsWindow">
|
||||
<iframe src="javascript:void(0)" frameborder="0"
|
||||
name="MSearchResults" id="MSearchResults">
|
||||
</iframe>
|
||||
</div>
|
||||
|
||||
<div class="header">
|
||||
<div class="headertitle">
|
||||
<div class="title">lib Directory Reference</div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
<table class="memberdecls">
|
||||
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
|
||||
Directories</h2></td></tr>
|
||||
<tr class="memitem:dir_b73f27eb1851e51add1fc2019b2745f9"><td class="memItemLeft" align="right" valign="top">directory  </td><td class="memItemRight" valign="bottom"><a class="el" href="dir_b73f27eb1851e51add1fc2019b2745f9.html">tablesorter</a></td></tr>
|
||||
<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
</table>
|
||||
</div><!-- contents -->
|
||||
</div><!-- doc-content -->
|
||||
<!-- start footer part -->
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
<li class="navelem"><a class="el" href="dir_97aefd0d527b934f1d99a682da8fe6a9.html">lib</a></li>
|
||||
<li class="footer">Generated on Thu Feb 12 2015 16:30:08 for msqur by
|
||||
<a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,124 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
<meta name="generator" content="Doxygen 1.8.9.1"/>
|
||||
<title>msqur: lib/tablesorter Directory Reference</title>
|
||||
<link href="tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="jquery.js"></script>
|
||||
<script type="text/javascript" src="dynsections.js"></script>
|
||||
<link href="navtree.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="resize.js"></script>
|
||||
<script type="text/javascript" src="navtreedata.js"></script>
|
||||
<script type="text/javascript" src="navtree.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(initResizable);
|
||||
$(window).load(resizeHeight);
|
||||
</script>
|
||||
<link href="search/search.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="search/searchdata.js"></script>
|
||||
<script type="text/javascript" src="search/search.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() { init_search(); });
|
||||
</script>
|
||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr style="height: 56px;">
|
||||
<td style="padding-left: 0.5em;">
|
||||
<div id="projectname">msqur
|
||||
 <span id="projectnumber">0.53b</span>
|
||||
</div>
|
||||
<div id="projectbrief">MSQ Web Viewer</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!-- end header part -->
|
||||
<!-- Generated by Doxygen 1.8.9.1 -->
|
||||
<script type="text/javascript">
|
||||
var searchBox = new SearchBox("searchBox", "search",false,'Search');
|
||||
</script>
|
||||
<div id="navrow1" class="tabs">
|
||||
<ul class="tablist">
|
||||
<li><a href="index.html"><span>Main Page</span></a></li>
|
||||
<li><a href="pages.html"><span>Related Pages</span></a></li>
|
||||
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
||||
<li><a href="files.html"><span>Files</span></a></li>
|
||||
<li>
|
||||
<div id="MSearchBox" class="MSearchBoxInactive">
|
||||
<span class="left">
|
||||
<img id="MSearchSelect" src="search/mag_sel.png"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
alt=""/>
|
||||
<input type="text" id="MSearchField" value="Search" accesskey="S"
|
||||
onfocus="searchBox.OnSearchFieldFocus(true)"
|
||||
onblur="searchBox.OnSearchFieldFocus(false)"
|
||||
onkeyup="searchBox.OnSearchFieldChange(event)"/>
|
||||
</span><span class="right">
|
||||
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div><!-- top -->
|
||||
<div id="side-nav" class="ui-resizable side-nav-resizable">
|
||||
<div id="nav-tree">
|
||||
<div id="nav-tree-contents">
|
||||
<div id="nav-sync" class="sync"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="splitbar" style="-moz-user-select:none;"
|
||||
class="ui-resizable-handle">
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){initNavTree('dir_b73f27eb1851e51add1fc2019b2745f9.html','');});
|
||||
</script>
|
||||
<div id="doc-content">
|
||||
<!-- window showing the filter options -->
|
||||
<div id="MSearchSelectWindow"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
onkeydown="return searchBox.OnSearchSelectKey(event)">
|
||||
</div>
|
||||
|
||||
<!-- iframe showing the search results (closed by default) -->
|
||||
<div id="MSearchResultsWindow">
|
||||
<iframe src="javascript:void(0)" frameborder="0"
|
||||
name="MSearchResults" id="MSearchResults">
|
||||
</iframe>
|
||||
</div>
|
||||
|
||||
<div class="header">
|
||||
<div class="headertitle">
|
||||
<div class="title">tablesorter Directory Reference</div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
<table class="memberdecls">
|
||||
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="files"></a>
|
||||
Files</h2></td></tr>
|
||||
<tr class="memitem:jquery_8tablesorter_8min_8js"><td class="memItemLeft" align="right" valign="top">file  </td><td class="memItemRight" valign="bottom"><a class="el" href="jquery_8tablesorter_8min_8js.html">jquery.tablesorter.min.js</a></td></tr>
|
||||
<tr class="separator:"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
</table>
|
||||
</div><!-- contents -->
|
||||
</div><!-- doc-content -->
|
||||
<!-- start footer part -->
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
<li class="navelem"><a class="el" href="dir_97aefd0d527b934f1d99a682da8fe6a9.html">lib</a></li><li class="navelem"><a class="el" href="dir_b73f27eb1851e51add1fc2019b2745f9.html">tablesorter</a></li>
|
||||
<li class="footer">Generated on Thu Feb 12 2015 16:30:08 for msqur by
|
||||
<a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,117 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
<meta name="generator" content="Doxygen 1.8.9.1"/>
|
||||
<title>msqur: Main Page</title>
|
||||
<link href="tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="jquery.js"></script>
|
||||
<script type="text/javascript" src="dynsections.js"></script>
|
||||
<link href="navtree.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="resize.js"></script>
|
||||
<script type="text/javascript" src="navtreedata.js"></script>
|
||||
<script type="text/javascript" src="navtree.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(initResizable);
|
||||
$(window).load(resizeHeight);
|
||||
</script>
|
||||
<link href="search/search.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="search/searchdata.js"></script>
|
||||
<script type="text/javascript" src="search/search.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() { init_search(); });
|
||||
</script>
|
||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr style="height: 56px;">
|
||||
<td style="padding-left: 0.5em;">
|
||||
<div id="projectname">msqur
|
||||
 <span id="projectnumber">1.0</span>
|
||||
</div>
|
||||
<div id="projectbrief">MSQ Web Viewer</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!-- end header part -->
|
||||
<!-- Generated by Doxygen 1.8.9.1 -->
|
||||
<script type="text/javascript">
|
||||
var searchBox = new SearchBox("searchBox", "search",false,'Search');
|
||||
</script>
|
||||
<div id="navrow1" class="tabs">
|
||||
<ul class="tablist">
|
||||
<li class="current"><a href="index.html"><span>Main Page</span></a></li>
|
||||
<li><a href="pages.html"><span>Related Pages</span></a></li>
|
||||
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
||||
<li><a href="files.html"><span>Files</span></a></li>
|
||||
<li>
|
||||
<div id="MSearchBox" class="MSearchBoxInactive">
|
||||
<span class="left">
|
||||
<img id="MSearchSelect" src="search/mag_sel.png"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
alt=""/>
|
||||
<input type="text" id="MSearchField" value="Search" accesskey="S"
|
||||
onfocus="searchBox.OnSearchFieldFocus(true)"
|
||||
onblur="searchBox.OnSearchFieldFocus(false)"
|
||||
onkeyup="searchBox.OnSearchFieldChange(event)"/>
|
||||
</span><span class="right">
|
||||
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div><!-- top -->
|
||||
<div id="side-nav" class="ui-resizable side-nav-resizable">
|
||||
<div id="nav-tree">
|
||||
<div id="nav-tree-contents">
|
||||
<div id="nav-sync" class="sync"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="splitbar" style="-moz-user-select:none;"
|
||||
class="ui-resizable-handle">
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){initNavTree('index.html','');});
|
||||
</script>
|
||||
<div id="doc-content">
|
||||
<!-- window showing the filter options -->
|
||||
<div id="MSearchSelectWindow"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
onkeydown="return searchBox.OnSearchSelectKey(event)">
|
||||
</div>
|
||||
|
||||
<!-- iframe showing the search results (closed by default) -->
|
||||
<div id="MSearchResultsWindow">
|
||||
<iframe src="javascript:void(0)" frameborder="0"
|
||||
name="MSearchResults" id="MSearchResults">
|
||||
</iframe>
|
||||
</div>
|
||||
|
||||
<div class="header">
|
||||
<div class="headertitle">
|
||||
<div class="title">msqur Documentation</div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
</div><!-- contents -->
|
||||
</div><!-- doc-content -->
|
||||
<!-- start footer part -->
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
<li class="footer">Generated on Thu Jun 18 2015 16:52:24 for msqur by
|
||||
<a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,151 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
<meta name="generator" content="Doxygen 1.8.9.1"/>
|
||||
<title>msqur: MSQur</title>
|
||||
<link href="tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="jquery.js"></script>
|
||||
<script type="text/javascript" src="dynsections.js"></script>
|
||||
<link href="navtree.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="resize.js"></script>
|
||||
<script type="text/javascript" src="navtreedata.js"></script>
|
||||
<script type="text/javascript" src="navtree.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(initResizable);
|
||||
$(window).load(resizeHeight);
|
||||
</script>
|
||||
<link href="search/search.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="search/searchdata.js"></script>
|
||||
<script type="text/javascript" src="search/search.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() { init_search(); });
|
||||
</script>
|
||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr style="height: 56px;">
|
||||
<td style="padding-left: 0.5em;">
|
||||
<div id="projectname">msqur
|
||||
 <span id="projectnumber">0.53b</span>
|
||||
</div>
|
||||
<div id="projectbrief">MSQ Web Viewer</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!-- end header part -->
|
||||
<!-- Generated by Doxygen 1.8.9.1 -->
|
||||
<script type="text/javascript">
|
||||
var searchBox = new SearchBox("searchBox", "search",false,'Search');
|
||||
</script>
|
||||
<div id="navrow1" class="tabs">
|
||||
<ul class="tablist">
|
||||
<li><a href="index.html"><span>Main Page</span></a></li>
|
||||
<li class="current"><a href="pages.html"><span>Related Pages</span></a></li>
|
||||
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
||||
<li><a href="files.html"><span>Files</span></a></li>
|
||||
<li>
|
||||
<div id="MSearchBox" class="MSearchBoxInactive">
|
||||
<span class="left">
|
||||
<img id="MSearchSelect" src="search/mag_sel.png"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
alt=""/>
|
||||
<input type="text" id="MSearchField" value="Search" accesskey="S"
|
||||
onfocus="searchBox.OnSearchFieldFocus(true)"
|
||||
onblur="searchBox.OnSearchFieldFocus(false)"
|
||||
onkeyup="searchBox.OnSearchFieldChange(event)"/>
|
||||
</span><span class="right">
|
||||
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div><!-- top -->
|
||||
<div id="side-nav" class="ui-resizable side-nav-resizable">
|
||||
<div id="nav-tree">
|
||||
<div id="nav-tree-contents">
|
||||
<div id="nav-sync" class="sync"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="splitbar" style="-moz-user-select:none;"
|
||||
class="ui-resizable-handle">
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){initNavTree('md__r_e_a_d_m_e.html','');});
|
||||
</script>
|
||||
<div id="doc-content">
|
||||
<!-- window showing the filter options -->
|
||||
<div id="MSearchSelectWindow"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
onkeydown="return searchBox.OnSearchSelectKey(event)">
|
||||
</div>
|
||||
|
||||
<!-- iframe showing the search results (closed by default) -->
|
||||
<div id="MSearchResultsWindow">
|
||||
<iframe src="javascript:void(0)" frameborder="0"
|
||||
name="MSearchResults" id="MSearchResults">
|
||||
</iframe>
|
||||
</div>
|
||||
|
||||
<div class="header">
|
||||
<div class="headertitle">
|
||||
<div class="title">MSQur </div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
<div class="textblock"><p>'Masker' for lack of better name. MegaSquirt <a class="el" href="class_m_s_q.html">MSQ</a> file sharing and viewing site.</p>
|
||||
<p>Parses <a class="el" href="class_m_s_q.html">MSQ</a> "XML" and displays it in a familiar format for viewing and comparison.</p>
|
||||
<p><a class="el" href="class_m_s_q.html">MSQ</a> XML is pretty bad XML, it doesn't take advantage of many XML features.</p>
|
||||
<h1>TODO</h1>
|
||||
<p>Uploader (user)/Manager (admin)</p>
|
||||
<h3>How do I get set up?</h3>
|
||||
<ul>
|
||||
<li>AMP Stack</li>
|
||||
<li>Arch: PHP, PHP-Apache, MariaDB/MySQL, phpMyAdmin, pdo_mysql.so in php.ini</li>
|
||||
<li>Create database user and tables</li>
|
||||
<li>Upload web files</li>
|
||||
<li>How to run tests</li>
|
||||
</ul>
|
||||
<h3>hgrc</h3>
|
||||
<p>[hooks] post-update = hg log -r . –template "v{latesttag}-{latesttagdistance}-{node|short}\n" > VERSION</p>
|
||||
<h3>Deployment instructions</h3>
|
||||
<ul>
|
||||
<li>Export tables (not entire DB)</li>
|
||||
<li>Pull updates on host (don't overwrite DB config)</li>
|
||||
<li>Import DB</li>
|
||||
</ul>
|
||||
<h3>Contribution guidelines</h3>
|
||||
<ul>
|
||||
<li>Writing tests</li>
|
||||
<li>Code review</li>
|
||||
<li>Other guidelines</li>
|
||||
</ul>
|
||||
<h3>Who do I talk to?</h3>
|
||||
<ul>
|
||||
<li>Repo owner or admin</li>
|
||||
<li>Other community or team contact</li>
|
||||
</ul>
|
||||
<h3>Credits</h3>
|
||||
<p>Apache, PHP, MySQL jQuery, jQuery UI jquery.tablesorter <a href="http://tablesorter.com/docs/">http://tablesorter.com/docs/</a> Tango Icon Theme Geany/Notepad++ </p>
|
||||
</div></div><!-- contents -->
|
||||
</div><!-- doc-content -->
|
||||
<!-- start footer part -->
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
<li class="footer">Generated on Thu Feb 12 2015 16:30:08 for msqur by
|
||||
<a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
var NAVTREE =
|
||||
[
|
||||
[ "msqur", "index.html", [
|
||||
[ "MSQur", "md__home_nearwood_dev_msqur__r_e_a_d_m_e.html", null ],
|
||||
[ "Data Structures", null, [
|
||||
[ "Data Structures", "annotated.html", "annotated" ],
|
||||
[ "Data Structure Index", "classes.html", null ],
|
||||
[ "Data Fields", "functions.html", [
|
||||
[ "All", "functions.html", null ],
|
||||
[ "Functions", "functions_func.html", null ],
|
||||
[ "Variables", "functions_vars.html", null ]
|
||||
] ]
|
||||
] ],
|
||||
[ "Files", null, [
|
||||
[ "File List", "files.html", "files" ],
|
||||
[ "Globals", "globals.html", [
|
||||
[ "All", "globals.html", null ],
|
||||
[ "Functions", "globals_func.html", null ],
|
||||
[ "Variables", "globals_vars.html", null ]
|
||||
] ]
|
||||
] ]
|
||||
] ]
|
||||
];
|
||||
|
||||
var NAVTREEINDEX =
|
||||
[
|
||||
"admin_8php.html"
|
||||
];
|
||||
|
||||
var SYNCONMSG = 'click to disable panel synchronisation';
|
||||
var SYNCOFFMSG = 'click to enable panel synchronisation';
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
var NAVTREEINDEX0 =
|
||||
{
|
||||
"admin_8php.html":[2,0,0,1],
|
||||
"annotated.html":[1,0],
|
||||
"browse_8php.html":[2,0,0,2],
|
||||
"browse_8php.html#a233d12bd8b6d3453e9a7a3f0b8c31db2":[2,0,0,2,2],
|
||||
"browse_8php.html#a43baf42ef6a8d4ad2d663b9ea7abf8d1":[2,0,0,2,1],
|
||||
"browse_8php.html#a55b5cb8f94b982429e9e30b74fa47ca2":[2,0,0,2,0],
|
||||
"browse_8php.html#a565ed48069549bbb02b7124d5e291949":[2,0,0,2,3],
|
||||
"class_i_n_i.html":[1,0,0],
|
||||
"class_i_n_i.html#a1a43818fc723ed8a6b6f3cc10fcd4d36":[1,0,0,3],
|
||||
"class_i_n_i.html#a6e9e3721856aab02590a218966ddeb85":[1,0,0,1],
|
||||
"class_i_n_i.html#a75debb083f1f1d0dbf68b5b070d88545":[1,0,0,2],
|
||||
"class_i_n_i.html#aeaee7326122d4694a4ce85faedd0178c":[1,0,0,0],
|
||||
"class_m_s_q.html":[1,0,1],
|
||||
"class_m_s_q.html#a31a3768527eab3cc784b7c460bdc8801":[1,0,1,6],
|
||||
"class_m_s_q.html#a674a86372ed023c63f3df59aaf74d00c":[1,0,1,4],
|
||||
"class_m_s_q.html#a7b758fa171fc074eeb628272c1a6c8c6":[1,0,1,7],
|
||||
"class_m_s_q.html#a848675774f1332bdbcf87afcb01e6689":[1,0,1,2],
|
||||
"class_m_s_q.html#a9ec0cc4f54bf94b42e133b1a517882eb":[1,0,1,1],
|
||||
"class_m_s_q.html#aa0fb620bf1b4b2fb101fb5c2525062ac":[1,0,1,0],
|
||||
"class_m_s_q.html#ac553bca6772425906ef70cbdc236205b":[1,0,1,3],
|
||||
"class_m_s_q.html#ac90f2c3a6e2e5b849426e2dbb6771a9a":[1,0,1,5],
|
||||
"class_msqur.html":[1,0,2],
|
||||
"class_msqur.html#a095c5d389db211932136b53f25f39685":[1,0,2,0],
|
||||
"class_msqur.html#a183dfa1d4121168eeeb360480a77d773":[1,0,2,7],
|
||||
"class_msqur.html#a1fa3127fc82f96b1436d871ef02be319":[1,0,2,9],
|
||||
"class_msqur.html#a6f8768f48db9e199d50755f9e7bde6a8":[1,0,2,1],
|
||||
"class_msqur.html#a8d2198905b4342a4f3f3ef239e2d4846":[1,0,2,5],
|
||||
"class_msqur.html#a93a99cdd06e6a3044ed7e56db0f9419a":[1,0,2,8],
|
||||
"class_msqur.html#aa269a71df51bd785442b37ac1b802359":[1,0,2,2],
|
||||
"class_msqur.html#aafc568a720a06040aa70083c38435804":[1,0,2,6],
|
||||
"class_msqur.html#ae14ac317a885239cbbac9d45c0683baa":[1,0,2,3],
|
||||
"class_msqur.html#ae5058e5b790e8cea2dd33c1c9bbcbbd4":[1,0,2,4],
|
||||
"class_msqur_d_b.html":[1,0,3],
|
||||
"class_msqur_d_b.html#a05dd37c018353b1f2e2ed1a5dace4c22":[1,0,3,15],
|
||||
"class_msqur_d_b.html#a095c5d389db211932136b53f25f39685":[1,0,3,0],
|
||||
"class_msqur_d_b.html#a1942f6ea6ce9dea52b4afb5fa65cc1c7":[1,0,3,3],
|
||||
"class_msqur_d_b.html#a1fa3127fc82f96b1436d871ef02be319":[1,0,3,16],
|
||||
"class_msqur_d_b.html#a222e4faac5984af62092915f3a373290":[1,0,3,10],
|
||||
"class_msqur_d_b.html#a4c2892a07acb54495abbcf292ef31a16":[1,0,3,11],
|
||||
"class_msqur_d_b.html#a4c91beb51ae79c0e67378c853b282855":[1,0,3,12],
|
||||
"class_msqur_d_b.html#a551996f28837a1c36359ae5d32d58405":[1,0,3,2],
|
||||
"class_msqur_d_b.html#a67c95481c00ae0b6da9becf30cda2bc0":[1,0,3,4],
|
||||
"class_msqur_d_b.html#a6f8768f48db9e199d50755f9e7bde6a8":[1,0,3,1],
|
||||
"class_msqur_d_b.html#a78572828d11dcdf2a498497d9001d557":[1,0,3,5],
|
||||
"class_msqur_d_b.html#a8a861ec50e2704407befb0d224435a4b":[1,0,3,6],
|
||||
"class_msqur_d_b.html#a8d2198905b4342a4f3f3ef239e2d4846":[1,0,3,7],
|
||||
"class_msqur_d_b.html#aa13cdb36d5cc60bbb9097c6875b3313a":[1,0,3,8],
|
||||
"class_msqur_d_b.html#ac47d2059e334aaa67af037cbd576aed4":[1,0,3,9],
|
||||
"class_msqur_d_b.html#af57a49d1e56b5ca6b7008cc7d33798cd":[1,0,3,13],
|
||||
"class_msqur_d_b.html#aff6fb7747e3e7e51cea86ee5ae526e64":[1,0,3,14],
|
||||
"classes.html":[1,1],
|
||||
"config_8php.html":[2,0,0,3],
|
||||
"config_8php.html#a293363d7988627f671958e2d908c202a":[2,0,0,3,2],
|
||||
"config_8php.html#a3dc7e6fbe723d5255ba78073bd034b45":[2,0,0,3,1],
|
||||
"config_8php.html#a40fe9c33039f1d817ebc6832421d4378":[2,0,0,3,0],
|
||||
"config_8php.html#a4dca144fafcc7bd3f71cb5778afcdd13":[2,0,0,3,4],
|
||||
"config_8php.html#a565be278b91d652102945a504f647487":[2,0,0,3,7],
|
||||
"config_8php.html#a758c150b67e476ecf77478f16b387c61":[2,0,0,3,6],
|
||||
"config_8php.html#ab5db0d3504f917f268614c50b02c53e2":[2,0,0,3,3],
|
||||
"config_8php.html#abb7390a8906b1822e4ac48ec48fd6f56":[2,0,0,3,5],
|
||||
"db_8php.html":[2,0,0,4],
|
||||
"dir_68267d1309a1af8e8297ef4c3efbcdba.html":[2,0,0],
|
||||
"dir_b39b5091e8d1d2be4b7fc59d57749634.html":[2,0,0,0],
|
||||
"files.html":[2,0],
|
||||
"footer_8php.html":[2,0,0,0,1],
|
||||
"functions.html":[1,2,0],
|
||||
"functions_func.html":[1,2,1],
|
||||
"functions_vars.html":[1,2,2],
|
||||
"globals.html":[2,1,0],
|
||||
"globals_func.html":[2,1,1],
|
||||
"globals_vars.html":[2,1,2],
|
||||
"header_8php.html":[2,0,0,0,2],
|
||||
"index.html":[],
|
||||
"index_8php.html":[2,0,0,5],
|
||||
"ini_8php.html":[2,0,0,6],
|
||||
"md__home_nearwood_dev_msqur__r_e_a_d_m_e.html":[0],
|
||||
"msq_8format_8php.html":[2,0,0,7],
|
||||
"msq_8format_8php.html#a1f247140025ff1e0635f578059ed4913":[2,0,0,7,0],
|
||||
"msq_8php.html":[2,0,0,8],
|
||||
"msqur_8js.html":[2,0,0,0,3],
|
||||
"msqur_8js.html#a0544c3fe466e421738dae463968b70ba":[2,0,0,0,3,21],
|
||||
"msqur_8js.html#a070cf5406f7c9bebf68cfa1ea5a50d9c":[2,0,0,0,3,10],
|
||||
"msqur_8js.html#a1777d0532c0edc260c4bb4db98b24adb":[2,0,0,0,3,22],
|
||||
"msqur_8js.html#a1bf38b30d9a16b1d4c48ac8471724a95":[2,0,0,0,3,19],
|
||||
"msqur_8js.html#a31d9eb398906bae7f1a37a19fc24e4d0":[2,0,0,0,3,12],
|
||||
"msqur_8js.html#a37eeb4e9a826e73a7dca7d3b79506cae":[2,0,0,0,3,3],
|
||||
"msqur_8js.html#a46f5ecaeaa22dc8344970034f2787e6d":[2,0,0,0,3,16],
|
||||
"msqur_8js.html#a5064f6e10e6fbb7d14540f1175f06a2b":[2,0,0,0,3,18],
|
||||
"msqur_8js.html#a6237be64331c8dcfb2f82d65ad2d36be":[2,0,0,0,3,17],
|
||||
"msqur_8js.html#a67f742872d8677fc6d7b66de89769a59":[2,0,0,0,3,9],
|
||||
"msqur_8js.html#a6b0662312618fdc81da5639510bc20ec":[2,0,0,0,3,0],
|
||||
"msqur_8js.html#a79cb2505d93b6dfddd012910566e14a8":[2,0,0,0,3,15],
|
||||
"msqur_8js.html#a91102e835de63df53e08079757a66a98":[2,0,0,0,3,1],
|
||||
"msqur_8js.html#a9494e72b4c7cba8a671094c5aa8a9a9c":[2,0,0,0,3,6],
|
||||
"msqur_8js.html#a99fc1fcc95d267c4a17c521d85273d56":[2,0,0,0,3,14],
|
||||
"msqur_8js.html#aaca7bf0efe3c375d85050fc9c48bfcd6":[2,0,0,0,3,13],
|
||||
"msqur_8js.html#ac0b3fb034537e206ceba38d615d985d3":[2,0,0,0,3,5],
|
||||
"msqur_8js.html#ac77b3d37d0dc9410e969288d9396f54e":[2,0,0,0,3,2],
|
||||
"msqur_8js.html#ad89fc44962dbdb0b0218e45884e19fff":[2,0,0,0,3,8],
|
||||
"msqur_8js.html#add53b31c04531d3bda27f851b51442fb":[2,0,0,0,3,20],
|
||||
"msqur_8js.html#ae2475e10618961c050dcba04e8c42331":[2,0,0,0,3,23],
|
||||
"msqur_8js.html#aeae6e9eb4b82f7a65040da098c815e46":[2,0,0,0,3,4],
|
||||
"msqur_8js.html#af30ab003aea1a203392cbb196f2343f9":[2,0,0,0,3,7],
|
||||
"msqur_8js.html#afaafaf744d12b2034e2b2bfd9e02ecf6":[2,0,0,0,3,11],
|
||||
"msqur_8php.html":[2,0,0,9],
|
||||
"msqur_8php.html#ad6c013ab2d9250a19e0a4164eed9e3af":[2,0,0,9,1],
|
||||
"pages.html":[],
|
||||
"splash_8php.html":[2,0,0,0,4],
|
||||
"upload_8php.html":[2,0,0,10],
|
||||
"upload_8php.html#a046332ff580552dc34b5f8e8e2ca1bde":[2,0,0,10,1],
|
||||
"upload_8php.html#a0544c3fe466e421738dae463968b70ba":[2,0,0,10,2],
|
||||
"upload_8php.html#a5a7674e55ea7010796c64065fab0df5f":[2,0,0,10,0],
|
||||
"util_8php.html":[2,0,0,11],
|
||||
"util_8php.html#a0f7dbd06a92412446a4b697651360898":[2,0,0,11,0],
|
||||
"view_2browse_8php.html":[2,0,0,0,0],
|
||||
"view_8php.html":[2,0,0,12],
|
||||
"view_8php.html#a961b58624dbabb0c2063a24fc56c3fda":[2,0,0,12,0]
|
||||
};
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
|
||||
<meta name="generator" content="Doxygen 1.8.9.1"/>
|
||||
<title>msqur: Related Pages</title>
|
||||
<link href="tabs.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="jquery.js"></script>
|
||||
<script type="text/javascript" src="dynsections.js"></script>
|
||||
<link href="navtree.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="resize.js"></script>
|
||||
<script type="text/javascript" src="navtreedata.js"></script>
|
||||
<script type="text/javascript" src="navtree.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(initResizable);
|
||||
$(window).load(resizeHeight);
|
||||
</script>
|
||||
<link href="search/search.css" rel="stylesheet" type="text/css"/>
|
||||
<script type="text/javascript" src="search/searchdata.js"></script>
|
||||
<script type="text/javascript" src="search/search.js"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() { init_search(); });
|
||||
</script>
|
||||
<link href="doxygen.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
|
||||
<div id="titlearea">
|
||||
<table cellspacing="0" cellpadding="0">
|
||||
<tbody>
|
||||
<tr style="height: 56px;">
|
||||
<td style="padding-left: 0.5em;">
|
||||
<div id="projectname">msqur
|
||||
 <span id="projectnumber">1.0</span>
|
||||
</div>
|
||||
<div id="projectbrief">MSQ Web Viewer</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!-- end header part -->
|
||||
<!-- Generated by Doxygen 1.8.9.1 -->
|
||||
<script type="text/javascript">
|
||||
var searchBox = new SearchBox("searchBox", "search",false,'Search');
|
||||
</script>
|
||||
<div id="navrow1" class="tabs">
|
||||
<ul class="tablist">
|
||||
<li><a href="index.html"><span>Main Page</span></a></li>
|
||||
<li class="current"><a href="pages.html"><span>Related Pages</span></a></li>
|
||||
<li><a href="annotated.html"><span>Data Structures</span></a></li>
|
||||
<li><a href="files.html"><span>Files</span></a></li>
|
||||
<li>
|
||||
<div id="MSearchBox" class="MSearchBoxInactive">
|
||||
<span class="left">
|
||||
<img id="MSearchSelect" src="search/mag_sel.png"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
alt=""/>
|
||||
<input type="text" id="MSearchField" value="Search" accesskey="S"
|
||||
onfocus="searchBox.OnSearchFieldFocus(true)"
|
||||
onblur="searchBox.OnSearchFieldFocus(false)"
|
||||
onkeyup="searchBox.OnSearchFieldChange(event)"/>
|
||||
</span><span class="right">
|
||||
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div><!-- top -->
|
||||
<div id="side-nav" class="ui-resizable side-nav-resizable">
|
||||
<div id="nav-tree">
|
||||
<div id="nav-tree-contents">
|
||||
<div id="nav-sync" class="sync"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="splitbar" style="-moz-user-select:none;"
|
||||
class="ui-resizable-handle">
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){initNavTree('pages.html','');});
|
||||
</script>
|
||||
<div id="doc-content">
|
||||
<!-- window showing the filter options -->
|
||||
<div id="MSearchSelectWindow"
|
||||
onmouseover="return searchBox.OnSearchSelectShow()"
|
||||
onmouseout="return searchBox.OnSearchSelectHide()"
|
||||
onkeydown="return searchBox.OnSearchSelectKey(event)">
|
||||
</div>
|
||||
|
||||
<!-- iframe showing the search results (closed by default) -->
|
||||
<div id="MSearchResultsWindow">
|
||||
<iframe src="javascript:void(0)" frameborder="0"
|
||||
name="MSearchResults" id="MSearchResults">
|
||||
</iframe>
|
||||
</div>
|
||||
|
||||
<div class="header">
|
||||
<div class="headertitle">
|
||||
<div class="title">Related Pages</div> </div>
|
||||
</div><!--header-->
|
||||
<div class="contents">
|
||||
<div class="textblock">Here is a list of all related documentation pages:</div><div class="directory">
|
||||
<table class="directory">
|
||||
<tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;"> </span><a class="el" href="md__home_nearwood_dev_msqur__r_e_a_d_m_e.html" target="_self">MSQur</a></td><td class="desc"></td></tr>
|
||||
</table>
|
||||
</div><!-- directory -->
|
||||
</div><!-- contents -->
|
||||
</div><!-- doc-content -->
|
||||
<!-- start footer part -->
|
||||
<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
|
||||
<ul>
|
||||
<li class="footer">Generated on Thu Jun 18 2015 16:52:24 for msqur by
|
||||
<a href="http://www.doxygen.org/index.html">
|
||||
<img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
|
||||
</ul>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
var searchData=
|
||||
[
|
||||
['_24db',['$db',['../class_msqur_d_b.html#a1fa3127fc82f96b1436d871ef02be319',1,'MsqurDB\$db()'],['../class_msqur.html#a1fa3127fc82f96b1436d871ef02be319',1,'Msqur\$db()']]],
|
||||
['_24msq_5fconstant_5fblacklist',['$msq_constant_blacklist',['../class_m_s_q.html#a31a3768527eab3cc784b7c460bdc8801',1,'MSQ']]],
|
||||
['_24msq_5fcurve_5fblacklist',['$msq_curve_blacklist',['../class_m_s_q.html#a7b758fa171fc074eeb628272c1a6c8c6',1,'MSQ']]],
|
||||
['_24msqur',['$msqur',['../msqur_8php.html#ad6c013ab2d9250a19e0a4164eed9e3af',1,'msqur.php']]],
|
||||
['_24numresults',['$numResults',['../browse_8php.html#a55b5cb8f94b982429e9e30b74fa47ca2',1,'browse.php']]],
|
||||
['_24page',['$page',['../browse_8php.html#a43baf42ef6a8d4ad2d663b9ea7abf8d1',1,'browse.php']]],
|
||||
['_24results',['$results',['../browse_8php.html#a233d12bd8b6d3453e9a7a3f0b8c31db2',1,'browse.php']]]
|
||||
];
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
var searchData=
|
||||
[
|
||||
['msqur',['MSQur',['../md__home_nearwood_dev_msqur__r_e_a_d_m_e.html',1,'']]]
|
||||
];
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
var indexSectionsWithContent =
|
||||
{
|
||||
0: "$_abcdefghimnprstuv",
|
||||
1: "im",
|
||||
2: "abcdfhimrsuv",
|
||||
3: "_abcdefghimnprstuv",
|
||||
4: "$acdefhs",
|
||||
5: "m"
|
||||
};
|
||||
|
||||
var indexSectionNames =
|
||||
{
|
||||
0: "all",
|
||||
1: "classes",
|
||||
2: "files",
|
||||
3: "functions",
|
||||
4: "variables",
|
||||
5: "pages"
|
||||
};
|
||||
|
||||
var indexSectionLabels =
|
||||
{
|
||||
0: "All",
|
||||
1: "Data Structures",
|
||||
2: "Files",
|
||||
3: "Functions",
|
||||
4: "Variables",
|
||||
5: "Pages"
|
||||
};
|
||||
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
\hypertarget{dir_97aefd0d527b934f1d99a682da8fe6a9}{}\section{lib Directory Reference}
|
||||
\label{dir_97aefd0d527b934f1d99a682da8fe6a9}\index{lib Directory Reference@{lib Directory Reference}}
|
||||
\subsection*{Directories}
|
||||
\begin{DoxyCompactItemize}
|
||||
\item
|
||||
directory \hyperlink{dir_b73f27eb1851e51add1fc2019b2745f9}{tablesorter}
|
||||
\end{DoxyCompactItemize}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
\hypertarget{dir_b73f27eb1851e51add1fc2019b2745f9}{}\section{lib/tablesorter Directory Reference}
|
||||
\label{dir_b73f27eb1851e51add1fc2019b2745f9}\index{lib/tablesorter Directory Reference@{lib/tablesorter Directory Reference}}
|
||||
\subsection*{Files}
|
||||
\begin{DoxyCompactItemize}
|
||||
\item
|
||||
file \hyperlink{jquery_8tablesorter_8min_8js}{jquery.\+tablesorter.\+min.\+js}
|
||||
\end{DoxyCompactItemize}
|
||||
|
|
@ -0,0 +1 @@
|
|||
msqur.\+com \hyperlink{class_m_s_q}{M\+S\+Q} File Viewer
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
\textquotesingle{}Masker\textquotesingle{} for lack of better name. Mega\+Squirt \hyperlink{class_m_s_q}{M\+S\+Q} file sharing and viewing site.
|
||||
|
||||
Parses \hyperlink{class_m_s_q}{M\+S\+Q} \char`\"{}\+X\+M\+L\char`\"{} and displays it in a familiar format for viewing and comparison.
|
||||
|
||||
\hyperlink{class_m_s_q}{M\+S\+Q} X\+M\+L is pretty bad X\+M\+L, it doesn\textquotesingle{}t take advantage of many X\+M\+L features.
|
||||
|
||||
\section*{T\+O\+D\+O}
|
||||
|
||||
Uploader (user)/\+Manager (admin)
|
||||
|
||||
\subsubsection*{How do I get set up?}
|
||||
|
||||
|
||||
\begin{DoxyItemize}
|
||||
\item A\+M\+P Stack
|
||||
\item Arch\+: P\+H\+P, P\+H\+P-\/\+Apache, Maria\+D\+B/\+My\+S\+Q\+L, php\+My\+Admin, pdo\+\_\+mysql.\+so in php.\+ini
|
||||
\item Create database user and tables
|
||||
\item Upload web files
|
||||
\item How to run tests
|
||||
\end{DoxyItemize}
|
||||
|
||||
\subsubsection*{hgrc}
|
||||
|
||||
\mbox{[}hooks\mbox{]} post-\/update = hg log -\/r . --template \char`\"{}v\{latesttag\}-\/\{latesttagdistance\}-\/\{node$\vert$short\}\textbackslash{}n\char`\"{} $>$ V\+E\+R\+S\+I\+O\+N
|
||||
|
||||
\subsubsection*{Deployment instructions}
|
||||
|
||||
|
||||
\begin{DoxyItemize}
|
||||
\item Export tables (not entire D\+B)
|
||||
\item Pull updates on host (don\textquotesingle{}t overwrite D\+B config)
|
||||
\item Import D\+B
|
||||
\end{DoxyItemize}
|
||||
|
||||
\subsubsection*{Contribution guidelines}
|
||||
|
||||
|
||||
\begin{DoxyItemize}
|
||||
\item Writing tests
|
||||
\item Code review
|
||||
\item Other guidelines
|
||||
\end{DoxyItemize}
|
||||
|
||||
\subsubsection*{Who do I talk to?}
|
||||
|
||||
|
||||
\begin{DoxyItemize}
|
||||
\item Repo owner or admin
|
||||
\item Other community or team contact
|
||||
\end{DoxyItemize}
|
||||
|
||||
\subsubsection*{Credits}
|
||||
|
||||
Apache, P\+H\+P, My\+S\+Q\+L j\+Query, j\+Query U\+I jquery.\+tablesorter \href{http://tablesorter.com/docs/}{\tt http\+://tablesorter.\+com/docs/} Tango Icon Theme Geany/\+Notepad++
|
||||
|
|
@ -0,0 +1,183 @@
|
|||
\documentclass[twoside]{book}
|
||||
|
||||
% Packages required by doxygen
|
||||
\usepackage{fixltx2e}
|
||||
\usepackage{calc}
|
||||
\usepackage{doxygen}
|
||||
\usepackage[export]{adjustbox} % also loads graphicx
|
||||
\usepackage{graphicx}
|
||||
\usepackage[utf8]{inputenc}
|
||||
\usepackage{makeidx}
|
||||
\usepackage{multicol}
|
||||
\usepackage{multirow}
|
||||
\PassOptionsToPackage{warn}{textcomp}
|
||||
\usepackage{textcomp}
|
||||
\usepackage[nointegrals]{wasysym}
|
||||
\usepackage[table]{xcolor}
|
||||
|
||||
% Font selection
|
||||
\usepackage[T1]{fontenc}
|
||||
\usepackage[scaled=.90]{helvet}
|
||||
\usepackage{courier}
|
||||
\usepackage{amssymb}
|
||||
\usepackage{sectsty}
|
||||
\renewcommand{\familydefault}{\sfdefault}
|
||||
\allsectionsfont{%
|
||||
\fontseries{bc}\selectfont%
|
||||
\color{darkgray}%
|
||||
}
|
||||
\renewcommand{\DoxyLabelFont}{%
|
||||
\fontseries{bc}\selectfont%
|
||||
\color{darkgray}%
|
||||
}
|
||||
\newcommand{\+}{\discretionary{\mbox{\scriptsize$\hookleftarrow$}}{}{}}
|
||||
|
||||
% Page & text layout
|
||||
\usepackage{geometry}
|
||||
\geometry{%
|
||||
a4paper,%
|
||||
top=2.5cm,%
|
||||
bottom=2.5cm,%
|
||||
left=2.5cm,%
|
||||
right=2.5cm%
|
||||
}
|
||||
\tolerance=750
|
||||
\hfuzz=15pt
|
||||
\hbadness=750
|
||||
\setlength{\emergencystretch}{15pt}
|
||||
\setlength{\parindent}{0cm}
|
||||
\setlength{\parskip}{0.2cm}
|
||||
\makeatletter
|
||||
\renewcommand{\paragraph}{%
|
||||
\@startsection{paragraph}{4}{0ex}{-1.0ex}{1.0ex}{%
|
||||
\normalfont\normalsize\bfseries\SS@parafont%
|
||||
}%
|
||||
}
|
||||
\renewcommand{\subparagraph}{%
|
||||
\@startsection{subparagraph}{5}{0ex}{-1.0ex}{1.0ex}{%
|
||||
\normalfont\normalsize\bfseries\SS@subparafont%
|
||||
}%
|
||||
}
|
||||
\makeatother
|
||||
|
||||
% Headers & footers
|
||||
\usepackage{fancyhdr}
|
||||
\pagestyle{fancyplain}
|
||||
\fancyhead[LE]{\fancyplain{}{\bfseries\thepage}}
|
||||
\fancyhead[CE]{\fancyplain{}{}}
|
||||
\fancyhead[RE]{\fancyplain{}{\bfseries\leftmark}}
|
||||
\fancyhead[LO]{\fancyplain{}{\bfseries\rightmark}}
|
||||
\fancyhead[CO]{\fancyplain{}{}}
|
||||
\fancyhead[RO]{\fancyplain{}{\bfseries\thepage}}
|
||||
\fancyfoot[LE]{\fancyplain{}{}}
|
||||
\fancyfoot[CE]{\fancyplain{}{}}
|
||||
\fancyfoot[RE]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Jun 18 2015 16\+:52\+:24 for msqur by Doxygen }}
|
||||
\fancyfoot[LO]{\fancyplain{}{\bfseries\scriptsize Generated on Thu Jun 18 2015 16\+:52\+:24 for msqur by Doxygen }}
|
||||
\fancyfoot[CO]{\fancyplain{}{}}
|
||||
\fancyfoot[RO]{\fancyplain{}{}}
|
||||
\renewcommand{\footrulewidth}{0.4pt}
|
||||
\renewcommand{\chaptermark}[1]{%
|
||||
\markboth{#1}{}%
|
||||
}
|
||||
\renewcommand{\sectionmark}[1]{%
|
||||
\markright{\thesection\ #1}%
|
||||
}
|
||||
|
||||
% Indices & bibliography
|
||||
\usepackage{natbib}
|
||||
\usepackage[titles]{tocloft}
|
||||
\setcounter{tocdepth}{3}
|
||||
\setcounter{secnumdepth}{5}
|
||||
\makeindex
|
||||
|
||||
% Hyperlinks (required, but should be loaded last)
|
||||
\usepackage{ifpdf}
|
||||
\ifpdf
|
||||
\usepackage[pdftex,pagebackref=true]{hyperref}
|
||||
\else
|
||||
\usepackage[ps2pdf,pagebackref=true]{hyperref}
|
||||
\fi
|
||||
\hypersetup{%
|
||||
colorlinks=true,%
|
||||
linkcolor=blue,%
|
||||
citecolor=blue,%
|
||||
unicode%
|
||||
}
|
||||
|
||||
% Custom commands
|
||||
\newcommand{\clearemptydoublepage}{%
|
||||
\newpage{\pagestyle{empty}\cleardoublepage}%
|
||||
}
|
||||
|
||||
|
||||
%===== C O N T E N T S =====
|
||||
|
||||
\begin{document}
|
||||
|
||||
% Titlepage & ToC
|
||||
\hypersetup{pageanchor=false,
|
||||
bookmarks=true,
|
||||
bookmarksnumbered=true,
|
||||
pdfencoding=unicode
|
||||
}
|
||||
\pagenumbering{roman}
|
||||
\begin{titlepage}
|
||||
\vspace*{7cm}
|
||||
\begin{center}%
|
||||
{\Large msqur \\[1ex]\large 1.\+0 }\\
|
||||
\vspace*{1cm}
|
||||
{\large Generated by Doxygen 1.8.9.1}\\
|
||||
\vspace*{0.5cm}
|
||||
{\small Thu Jun 18 2015 16:52:24}\\
|
||||
\end{center}
|
||||
\end{titlepage}
|
||||
\clearemptydoublepage
|
||||
\tableofcontents
|
||||
\clearemptydoublepage
|
||||
\pagenumbering{arabic}
|
||||
\hypersetup{pageanchor=true}
|
||||
|
||||
%--- Begin generated contents ---
|
||||
\chapter{M\+S\+Qur}
|
||||
\label{md__home_nearwood_dev_msqur__r_e_a_d_m_e}
|
||||
\hypertarget{md__home_nearwood_dev_msqur__r_e_a_d_m_e}{}
|
||||
\input{md__home_nearwood_dev_msqur__r_e_a_d_m_e}
|
||||
\chapter{Data Structure Index}
|
||||
\input{annotated}
|
||||
\chapter{File Index}
|
||||
\input{files}
|
||||
\chapter{Data Structure Documentation}
|
||||
\input{class_i_n_i}
|
||||
\input{class_m_s_q}
|
||||
\input{class_msqur}
|
||||
\input{class_msqur_d_b}
|
||||
\chapter{File Documentation}
|
||||
\input{_r_e_a_d_m_e_8md}
|
||||
\input{admin_8php}
|
||||
\input{browse_8php}
|
||||
\input{view_2browse_8php}
|
||||
\input{config_8php}
|
||||
\input{db_8php}
|
||||
\input{index_8php}
|
||||
\input{ini_8php}
|
||||
\input{msq_8format_8php}
|
||||
\input{msq_8php}
|
||||
\input{msqur_8php}
|
||||
\input{upload_8php}
|
||||
\input{util_8php}
|
||||
\input{view_8php}
|
||||
\input{footer_8php}
|
||||
\input{header_8php}
|
||||
\input{msqur_8js}
|
||||
\input{splash_8php}
|
||||
%--- End generated contents ---
|
||||
|
||||
% Index
|
||||
\backmatter
|
||||
\newpage
|
||||
\phantomsection
|
||||
\clearemptydoublepage
|
||||
\addcontentsline{toc}{chapter}{Index}
|
||||
\printindex
|
||||
|
||||
\end{document}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,44 @@
|
|||
INI process
|
||||
|
||||
1) find constant name
|
||||
[Constants]
|
||||
veTable1 = array , U08, 0, [16x16], "%", 1.00000, 0.00000, 0.00, 255.00, 0 ; * (144 bytes)
|
||||
|
||||
2) get description from [SettingContextHelp]
|
||||
; constantName = "Help Text"
|
||||
veTable1 = ""
|
||||
|
||||
3) Find any tables/curves
|
||||
[CurveEditor]
|
||||
curve = crankingPW, "Cranking Pulsewidth%"
|
||||
; topicHelp = "http://www.megasquirt.info/xxx"
|
||||
columnLabel = "Coolant", "Cranking PW%"
|
||||
#if EXPANDED_CLT_TEMP
|
||||
xAxis = -40, 350, 9
|
||||
xAxis = -40, {cltmax}, 9
|
||||
#else
|
||||
xAxis = -40, 220, 9
|
||||
#endif
|
||||
yAxis = 0, 500, 6
|
||||
xBins = temp_table_p5, coolant
|
||||
yBins = crankPctTable
|
||||
gauge = cltGauge
|
||||
|
||||
|
||||
[TableEditor]
|
||||
; table_id, map3d_id, "title", page
|
||||
;std 16x16
|
||||
table = veTable1Tbl, veTable1Map, "VE Table 1", 5
|
||||
; constant, variable
|
||||
xBins = frpm_table1, rpm
|
||||
yBins = fmap_table1, fuelload
|
||||
zBins = veTable1
|
||||
|
||||
upDownLabel = "RICHER", "LEANER"
|
||||
gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
|
||||
X) Parse menu (UI overhaul)
|
||||
[Menu]
|
||||
menu = "&Basic setup"
|
||||
subMenu = veTable1Tbl, "Fuel VE Table &1", 0,{ (feature4_0VEtblsize==0) }
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
DEPLOY_DIR=/srv/http/msqur
|
||||
DB_HOST=localhost
|
||||
DB_USER=msqur
|
||||
DB_PASS=
|
||||
DB_TABLE=msqur
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
<?php
|
||||
/* msqur - MegaSquirt .msq file viewer web application
|
||||
Copyright (C) 2015 Nicholas Earwood nearwood@gmail.com http://nearwood.net
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
require "msqur.php";
|
||||
|
||||
$msqur->header();
|
||||
|
||||
//trim/concentrate/whatever engines (remove dupes)
|
||||
//remove all msqs/metadata/engines (fresh slate)
|
||||
|
||||
//DELETE ALL DATA
|
||||
//TRUNCATE metadata; TRUNCATE msqs; TRUNCATE engines;
|
||||
|
||||
//Flag for reingest:
|
||||
//UPDATE metadata SET reingest = 1 WHERE true
|
||||
|
||||
//reingest
|
||||
//reparse XML
|
||||
|
||||
//find metada and engines (browse)
|
||||
//SELECT * FROM `metadata` JOIN `engines` ON engines.id = metadata.engine
|
||||
|
||||
$msqur->footer();
|
||||
?>
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
<?php
|
||||
/* msqur - MegaSquirt .msq file viewer web application
|
||||
Copyright (C) 2015 Nicholas Earwood nearwood@gmail.com http://nearwood.net
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
define('DEBUG', FALSE); //Debug output is bad for API
|
||||
|
||||
require "msqur.php";
|
||||
|
||||
//TODO Check query vars, call appropriate method
|
||||
echo "API ACCESS GRANTED";
|
||||
|
||||
|
||||
/*
|
||||
* @brief Public API
|
||||
*
|
||||
* Defines the actions taken at the user level:
|
||||
* get firmware versions (for ajax calls)
|
||||
* get tune files?
|
||||
* get individual tables?
|
||||
*
|
||||
* @see http://www.aljtmedia.com/blog/creating-a-php-rest-routing-class-for-your-application/
|
||||
*/
|
||||
class API
|
||||
{
|
||||
public function fwList()
|
||||
{
|
||||
$fwList = $msqur->getFirmwareVersionList('MS2Extra');
|
||||
var_export($msqur->getFirmwareVersionList('MS2Extra'));
|
||||
foreach ($fwList as $fw)
|
||||
{
|
||||
echo $fw;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
<?php
|
||||
/* msqur - MegaSquirt .msq file viewer web application
|
||||
Copyright (C) 2015 Nicholas Earwood nearwood@gmail.com http://nearwood.net
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
require "msqur.php";
|
||||
|
||||
if (isset($_GET['p'])) {
|
||||
$page = $_GET['p']; //TODO processing
|
||||
} else $page = 0;
|
||||
|
||||
$results = $msqur->browse($page);
|
||||
$numResults = count($results);
|
||||
|
||||
//echo '<div class="debug">'; var_export($results); echo '</div>';
|
||||
|
||||
$msqur->header();
|
||||
|
||||
require "view/filter.php";
|
||||
|
||||
echo '<div id="content"><div class="info">' . $numResults . ' results.</div>';
|
||||
echo '<table>';
|
||||
echo '<tr><th>ID</th><th>Engine Make</th><th>Engine Code</th><th>Cylinders</th><th>Liters</th><th>Compression</th><th>Aspiration</th><th>Firmware/Version</th><th>Upload Date</th><th>Views</th></th>';
|
||||
for ($c = 0; $c < $numResults; $c++)
|
||||
{
|
||||
$aspiration = $results[$c]['induction'] == 1 ? "Turbo" : "NA";
|
||||
echo '<tr><td><a href="view.php?msq=' . $results[$c]['mid'] . '">' . $results[$c]['mid'] . '</a></td><td>' . $results[$c]['make'] . '</td><td>' . $results[$c]['code'] . '</td><td>' . $results[$c]['numCylinders'] . '</td><td>' . $results[$c]['displacement'] . '</td><td>' . $results[$c]['compression'] . ':1</td><td>' . $aspiration . '</td><td>' . $results[$c]['firmware'] . '/' . $results[$c]['signature'] . '</td><td>' . $results[$c]['uploadDate'] . '</td><td>' . $results[$c]['views'] . '</td></tr>';
|
||||
}
|
||||
echo '</table></div>';
|
||||
|
||||
$msqur->footer();
|
||||
?>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<?php
|
||||
define('CONFIG_VERSION', "4");
|
||||
define('DB_HOST', "localhost");
|
||||
define('DB_USERNAME', "msqur");
|
||||
define('DB_PASSWORD', "");
|
||||
define('DB_NAME', "msqur");
|
||||
|
||||
define('DEBUG', FALSE);
|
||||
define('DISABLE_MSQ_CACHE', FALSE);
|
||||
|
||||
error_reporting(E_ALL);
|
||||
|
||||
ini_set('display_errors', DEBUG ? 'On' : 'Off');
|
||||
//ini_set('log_errors', DEBUG ? 'Off' : 'On');
|
||||
|
||||
//Default in case it's not set in php.ini
|
||||
//MSQUR-1
|
||||
date_default_timezone_set('UTC');
|
||||
|
||||
assert_options(ASSERT_ACTIVE, DEBUG ? 1 : 0);
|
||||
assert_options(ASSERT_WARNING, 0);
|
||||
assert_options(ASSERT_QUIET_EVAL, 1);
|
||||
|
||||
//Setup assert() callback
|
||||
function msqur_assert_handler($file, $line, $code)
|
||||
{
|
||||
echo "<div class=\"error\">Assertion Failed:<br />
|
||||
File '$file'<br />
|
||||
Line '$line'<br />
|
||||
Code '$code'<br /></div>";
|
||||
}
|
||||
assert_options(ASSERT_CALLBACK, 'msqur_assert_handler');
|
||||
?>
|
||||
|
|
@ -0,0 +1,560 @@
|
|||
<?php
|
||||
/* msqur - MegaSquirt .msq file viewer web application
|
||||
Copyright (C) 2015 Nicholas Earwood nearwood@gmail.com http://nearwood.net
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/**
|
||||
* @brief DB handling stuff.
|
||||
*
|
||||
*/
|
||||
class MsqurDB
|
||||
{
|
||||
private $db;
|
||||
|
||||
private function connect()
|
||||
{
|
||||
if (isset($this->db) && $this->db instanceof PDO)
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Reusing DB connection.</div>';
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Connecting to DB: ' . "mysql:dbname=" . DB_NAME . ";host=" . DB_HOST . "," . DB_USERNAME . ", [****]" . '</div>';
|
||||
$this->db = new PDO("mysql:dbname=" . DB_NAME . ";host=" . DB_HOST, DB_USERNAME, DB_PASSWORD);
|
||||
//Persistent connection:
|
||||
//$this->db = new PDO("mysql:dbname=" . DB_NAME . ";host=" . DB_HOST, DB_USERNAME, DB_PASSWORD, array(PDO::ATTR_PERSISTENT => true);
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
echo '<div class="error">Error connecting to database.</div>';
|
||||
$this->dbError($e);
|
||||
$this->db = null; //Redundant.
|
||||
}
|
||||
}
|
||||
|
||||
if (DEBUG) echo '<div class="debug">Connecting to DB: ' . (($this->db != null) ? 'Connected.' : 'Connection FAILED') . '</div>';
|
||||
return ($this->db != null);
|
||||
}
|
||||
|
||||
function __construct()
|
||||
{
|
||||
$this->connect();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Add a new MSQ to the DB
|
||||
* @param $file The uploaded file
|
||||
* @param $engineid String The ID of the engine metadata
|
||||
* @returns the ID of the new engine record, or null if unsuccessful.
|
||||
*/
|
||||
public function addMSQ($file, $engineid)
|
||||
{
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
try
|
||||
{
|
||||
//TODO Compress?
|
||||
$st = $this->db->prepare("INSERT INTO msqs (xml) VALUES (:xml)");
|
||||
$xml = file_get_contents($file['tmp_name']);
|
||||
//Convert encoding to UTF-8
|
||||
$xml = mb_convert_encoding($xml, "UTF-8");
|
||||
//Strip out invalid xmlns
|
||||
$xml = preg_replace('/xmlns=".*?"/', '', $xml);
|
||||
$this->tryBind($st, ":xml", $xml);
|
||||
if ($st->execute())
|
||||
{
|
||||
$id = $this->db->lastInsertId();
|
||||
$st = $this->db->prepare("INSERT INTO metadata (url,msq,engine,fileFormat,signature,uploadDate) VALUES (:url, :id, :engine, '4.0', 'unknown', :uploaded)");
|
||||
$this->tryBind($st, ":url", $id); //could do hash but for now, just the id
|
||||
$this->tryBind($st, ":id", $id);
|
||||
if (!is_numeric($engineid)) $engineid = null;
|
||||
$this->tryBind($st, ":engine", $engineid);
|
||||
//TODO Make sure it's an int
|
||||
$dt = new DateTime();
|
||||
$dt = $dt->format('Y-m-d H:i:s');
|
||||
$this->tryBind($st, ":uploaded", $dt);
|
||||
if ($st->execute()) $id = $this->db->lastInsertId();
|
||||
else $id = -1;
|
||||
}
|
||||
else $id = -1;
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
$id = -1;
|
||||
}
|
||||
|
||||
return $id;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Add a new engine to the DB
|
||||
* @param $make String The engine make (Nissan)
|
||||
* @param $code String the engine code (VG30)
|
||||
* @param $displacement decimal in liters
|
||||
* @param $compression decimal The X from X:1 compression ratio
|
||||
* @param $turbo boolean Forced induction
|
||||
* @returns the ID of the new engine record, or null if unsuccessful.
|
||||
*/
|
||||
public function addEngine($make, $code, $displacement, $compression, $turbo)
|
||||
{
|
||||
$id = null;
|
||||
|
||||
if ($make == NULL) $make = "";
|
||||
if ($code == NULL) $code = "";
|
||||
|
||||
if (!is_numeric($displacement) || !is_numeric($compression))
|
||||
echo '<div class="error">Invalid engine configuration.</div>';
|
||||
else
|
||||
{
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo "<div class=\"debug\">Add engine: \"$make\", \"$code\", $displacement, $compression, $turbo</div>";
|
||||
//TODO use any existing one before creating
|
||||
$st = $this->db->prepare("INSERT INTO engines (make, code, displacement, compression, induction) VALUES (:make, :code, :displacement, :compression, :induction)");
|
||||
|
||||
$this->tryBind($st, ":make", $make);
|
||||
$this->tryBind($st, ":code", $code);
|
||||
$this->tryBind($st, ":displacement", $displacement);
|
||||
$this->tryBind($st, ":compression", $compression);
|
||||
|
||||
if ($turbo == "na")
|
||||
$t = 0;
|
||||
else
|
||||
$t = 1;
|
||||
$this->tryBind($st, ":induction", $t);
|
||||
|
||||
if ($st->execute()) $id = $this->db->lastInsertId();
|
||||
else echo "<div class=\"error\">Error adding engine: \"$make\", \"$code\"</div>";
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
}
|
||||
|
||||
if (DEBUG) echo "<div class=\"debug\">Add engine returns: $id</div>";
|
||||
return $id;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Whether the reingest flag is set or not for the given id
|
||||
* @param $id The metadata id
|
||||
* @returns TRUE if reingest flag is set to 1, FALSE if 0
|
||||
*/
|
||||
public function needReingest($id)
|
||||
{
|
||||
if (!$this->connect()) return FALSE;
|
||||
|
||||
try
|
||||
{
|
||||
$st = $this->db->prepare("SELECT reingest FROM metadata WHERE metadata.id = :id LIMIT 1");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
$st->execute();
|
||||
if ($st->rowCount() > 0)
|
||||
{
|
||||
$result = $st->fetch(PDO::FETCH_ASSOC);
|
||||
$reingest = $result['reingest'];
|
||||
return $reingest;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (DEBUG) echo "<div class=\"debug\">No result for $id</div>";
|
||||
echo '<div class="error">Invalid MSQ</div>';
|
||||
}
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Reset regingest flag.
|
||||
* @param $id The metadata id
|
||||
* @returns true if successful, false otherwise
|
||||
*/
|
||||
public function resetReingest($id)
|
||||
{
|
||||
if (!$this->connect()) return false;
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Updating HTML cache...</div>';
|
||||
$st = $this->db->prepare("UPDATE metadata m SET m.reingest=FALSE WHERE m.id = :id");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
if ($st->execute())
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Reingest reset.</div>';
|
||||
return true;
|
||||
}
|
||||
else
|
||||
if (DEBUG) echo '<div class="warn">Unable to update cache.</div>';
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get MSQ HTML from metadata id
|
||||
* @param $id The metadata id
|
||||
* @returns FALSE if not cached, null if not found, otherwise the HTML.
|
||||
*/
|
||||
public function getMSQ($id)
|
||||
{
|
||||
if (DISABLE_MSQ_CACHE)
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug warn">Cache disabled.</div>';
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if ($this->needReingest($id))
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug info">Flagged for reingest.</div>';
|
||||
$this->resetReingest($id);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
$html = FALSE;
|
||||
|
||||
try
|
||||
{
|
||||
$st = $this->db->prepare("SELECT html FROM msqs INNER JOIN metadata ON metadata.msq = msqs.id WHERE metadata.id = :id LIMIT 1");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
$st->execute();
|
||||
if ($st->rowCount() > 0)
|
||||
{
|
||||
$result = $st->fetch(PDO::FETCH_ASSOC);
|
||||
$html = $result['html'];
|
||||
if ($html === NULL)
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">No HTML cache found.</div>';
|
||||
return FALSE;
|
||||
}
|
||||
else if (DEBUG) echo '<div class="debug">Cached, returning HTML.</div>';
|
||||
}
|
||||
else
|
||||
{
|
||||
if (DEBUG) echo "<div class=\"debug\">No result for $id</div>";
|
||||
echo '<div class="error">Invalid MSQ</div>';
|
||||
return null;
|
||||
}
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return $html;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get a list of MSQs
|
||||
* @param $page The page of results (NI)
|
||||
* @returns A list of metadata, or null if unsuccessful
|
||||
*/
|
||||
public function browse($page)
|
||||
{
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
try
|
||||
{
|
||||
$st = $this->db->prepare("SELECT m.id as mid, make, code, numCylinders, displacement, compression, induction, firmware, signature, uploadDate, views FROM metadata m INNER JOIN engines e ON m.engine = e.id");
|
||||
if ($st->execute())
|
||||
{
|
||||
$result = $st->fetchAll(PDO::FETCH_ASSOC);
|
||||
return $result;
|
||||
}
|
||||
else echo '<div class="error">There was a problem constructing the browse query.</div>';
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get all unique firmware names listed in DB
|
||||
* @returns List of strings
|
||||
*/
|
||||
public function getFirmwareList()
|
||||
{
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo "<div class=\"debug\">Getting firmware list...</div>";
|
||||
$st = $this->db->prepare("SELECT DISTINCT firmware FROM `metadata`");
|
||||
|
||||
if ($st->execute()) return $st->fetchAll(PDO::FETCH_ASSOC);
|
||||
else echo "<div class=\"error\">Error getting firmware list</div>";
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get all unique firmware versions listed in DB
|
||||
* @returns List of strings
|
||||
*/
|
||||
public function getFirmwareVersionList($firmware)
|
||||
{
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo "<div class=\"debug\">Getting firmware list...</div>";
|
||||
$st = $this->db->prepare("SELECT DISTINCT signature FROM `metadata` WHERE firmware = :fw");
|
||||
$this->tryBind($st, ":fw", $firmware);
|
||||
|
||||
if ($st->execute()) return $st->fetchAll(PDO::FETCH_ASSOC);
|
||||
else echo "<div class=\"error\">Error getting firmware version list for: $firmware</div>";
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Update HTML cache of MSQ by metadata id
|
||||
* @param $id integer The ID of the metadata.
|
||||
* @param $html String HTML string of the shit to update.
|
||||
* @returns TRUE or FALSE depending on success.
|
||||
*/
|
||||
public function updateCache($id, $html)
|
||||
{
|
||||
if (!$this->connect()) return false;
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Updating HTML cache...</div>';
|
||||
$st = $this->db->prepare("UPDATE msqs ms, metadata m SET ms.html=:html WHERE m.msq = ms.id AND m.id = :id");
|
||||
//$xml = mb_convert_encoding($html, "UTF-8");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
$this->tryBind($st, ":html", $html);
|
||||
if ($st->execute())
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Cache updated.</div>';
|
||||
return true;
|
||||
}
|
||||
else
|
||||
if (DEBUG) echo '<div class="warn">Unable to update cache.</div>';
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Update engine with extra data.
|
||||
* This is used after parsing a MSQ and getting additional engine information (injector size, number of cylinders, etc.)
|
||||
* @param $id integer The ID of the engine.
|
||||
* @param $engine array The associative array of new engine data.
|
||||
* @returns TRUE or FALSE depending on success.
|
||||
*/
|
||||
public function updateEngine($id, $engine)
|
||||
{
|
||||
if (!$this->connect()) return false;
|
||||
|
||||
if (!array_keys_exist($engine, 'nCylinders', 'engineType', 'twoStroke', 'nInjectors'))
|
||||
{//Some MSQs seem to be missing the injType
|
||||
echo '<div class="warn">Incomplete engine information. Unable to update engine metadata.</div>';
|
||||
//var_export($engine);
|
||||
return false;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Updating engine information...</div>';
|
||||
$st = $this->db->prepare("UPDATE engines e, metadata m SET e.numCylinders = :nCylinders, twoStroke = :twoStroke, injType = :injType, nInjectors = :nInjectors, engineType = :engineType WHERE e.id = m.engine AND m.id = :id");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
$this->tryBind($st, ":nCylinders", $engine['nCylinders']);
|
||||
$this->tryBind($st, ":twoStroke", $engine['twoStroke']);
|
||||
|
||||
if (array_key_exists('injType', $engine))
|
||||
$this->tryBind($st, ":injType", $engine['injType']);
|
||||
else
|
||||
$this->tryBind($st, ":injType", "Port Injection");
|
||||
|
||||
$this->tryBind($st, ":nInjectors", $engine['nInjectors']);
|
||||
$this->tryBind($st, ":engineType", $engine['engineType']);
|
||||
if ($st->execute())
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Engine updated.</div>';
|
||||
return true;
|
||||
}
|
||||
else
|
||||
if (DEBUG) echo '<div class="warn">Unable to update engine metadata.</div>';
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Update metadata with extra information.
|
||||
* This is used after parsing a MSQ and getting additional information (firmware version, etc.)
|
||||
* @param $id integer The ID of the metadata.
|
||||
* @param $metadata array The associative array of extra metadata.
|
||||
* @returns TRUE or FALSE depending on success.
|
||||
*/
|
||||
public function updateMetadata($id, $metadata)
|
||||
{
|
||||
if (!$this->connect()) return false;
|
||||
|
||||
if (!array_keys_exist($metadata, 'fileFormat', 'signature', 'firmware', 'author'))
|
||||
{
|
||||
echo '<div class="warn">Incomplete MSQ metadata.</div>';
|
||||
return false;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Updating HTML cache...</div>';
|
||||
$st = $this->db->prepare("UPDATE metadata md SET md.fileFormat = :fileFormat, md.signature = :signature, md.firmware = :firmware, md.author = :author WHERE md.id = :id");
|
||||
//$xml = mb_convert_encoding($html, "UTF-8");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
$this->tryBind($st, ":fileFormat", $metadata['fileFormat']);
|
||||
$this->tryBind($st, ":signature", $metadata['signature']);
|
||||
$this->tryBind($st, ":firmware", $metadata['firmware']);
|
||||
$this->tryBind($st, ":author", $metadata['author']);
|
||||
if ($st->execute())
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Metadata updated.</div>';
|
||||
return true;
|
||||
}
|
||||
else
|
||||
if (DEBUG) echo '<div class="warn">Unable to update metadata.</div>';
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Increment the view count of a metadata record.
|
||||
* @param $id integer The ID of the metadata to update.
|
||||
* @returns TRUE or FALSE depending on success.
|
||||
*/
|
||||
public function updateViews($id)
|
||||
{
|
||||
if (!$this->connect()) return false;
|
||||
|
||||
try
|
||||
{
|
||||
$st = $this->db->prepare("UPDATE metadata SET views = views + 1 WHERE id = :id LIMIT 1");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
return $st->execute();
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private function bindError($e)
|
||||
{
|
||||
if (DEBUG)
|
||||
{
|
||||
echo '<div class="error">Error preparing database query:<br/>';
|
||||
echo $e;
|
||||
echo '</div>';
|
||||
}
|
||||
else echo '<div class="error">Error preparing database query.</div>';
|
||||
}
|
||||
|
||||
private function tryBind($statement, $placeholder, $value)
|
||||
{
|
||||
//TODO arg check
|
||||
if (!$statement->bindParam($placeholder, $value))
|
||||
{
|
||||
$this->bindError("Error binding: $value to $placeholder");
|
||||
}
|
||||
}
|
||||
|
||||
private function dbError($e)
|
||||
{
|
||||
if (DEBUG)
|
||||
{
|
||||
echo '<div class="error">Error executing database query:<br/>';
|
||||
echo $e->getMessage();
|
||||
echo '</div>';
|
||||
}
|
||||
else echo '<div class="error">Error executing database query.</div>';
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Get the raw XML of a MSQ
|
||||
* @param $id The ID of the associated metadata
|
||||
* @returns XML String or null if unsuccessful
|
||||
*/
|
||||
public function getXML($id)
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">Getting XML for id: ' . $id . '</div>';
|
||||
|
||||
if (!$this->connect()) return null;
|
||||
|
||||
$xml = null;
|
||||
|
||||
try
|
||||
{
|
||||
$st = $this->db->prepare("SELECT xml FROM msqs INNER JOIN metadata ON metadata.msq = msqs.id WHERE metadata.id = :id LIMIT 1");
|
||||
$this->tryBind($st, ":id", $id);
|
||||
if ($st->execute())
|
||||
{
|
||||
if (DEBUG) echo '<div class="debug">XML Found...</div>';
|
||||
$result = $st->fetch(PDO::FETCH_ASSOC);
|
||||
$xml = $result['xml'];
|
||||
}
|
||||
else echo '<div class="error">XML not found.</div>';
|
||||
}
|
||||
catch (PDOException $e)
|
||||
{
|
||||
$this->dbError($e);
|
||||
}
|
||||
|
||||
return $xml;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
/* msqur - MegaSquirt .msq file viewer web application
|
||||
Copyright (C) 2015 Nicholas Earwood nearwood@gmail.com http://nearwood.net
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
require "msqur.php";
|
||||
|
||||
//Msq $msq = msqur.upload("blah");
|
||||
$msqur->splash();
|
||||
|
||||
//browse
|
||||
//list<Msq> msqs = browse()//browse(START_NUMBER)
|
||||
//have to check with angular how data pagination/ordering can work best
|
||||
|
||||
//search
|
||||
?>
|
||||
|
|
@ -0,0 +1,344 @@
|
|||
<?php
|
||||
/*
|
||||
* @brief INI parsing
|
||||
*
|
||||
*/
|
||||
class INI
|
||||
{
|
||||
/**
|
||||
* @brief Given a signature string, finds and parses the respective INI file.
|
||||
*
|
||||
* Returns an array of the config file contents.
|
||||
* @param $signature The signature string which will be modified into a firmware/version array.
|
||||
*/
|
||||
public static function getConfig(&$signature)
|
||||
{
|
||||
//sig is 19 bytes + \0
|
||||
//"MS3 Format 0262.09 "
|
||||
//"MS3 Format 0435.14P"
|
||||
//"MS2Extra comms332m2"
|
||||
//"MS2Extra comms333e2"
|
||||
//"MS2Extra Serial321 "
|
||||
//"MS2Extra Serial310 "
|
||||
//"MSII Rev 3.83000 "
|
||||
|
||||
//Get the signature from the MSQ
|
||||
$sig = explode(' ', $signature); //, 3); limit 3 buckets
|
||||
$msVersion = $sig[0];
|
||||
if ($msVersion == "MS2Extra") $fwVersion = $sig[1];
|
||||
else $fwVersion = $sig[2];
|
||||
|
||||
if (DEBUG) echo "<div class=\"debug\">$msVersion/$fwVersion</div>";
|
||||
|
||||
//Parse msVersion
|
||||
switch ($msVersion)
|
||||
{
|
||||
case "MS1":
|
||||
$msDir = "ms1/";
|
||||
break;
|
||||
case "MSII":
|
||||
$msDir = "ms2/";
|
||||
break;
|
||||
case "MS2Extra":
|
||||
$msDir = "ms2extra/";
|
||||
break;
|
||||
case "MS3":
|
||||
$msDir = "ms3/";
|
||||
break;
|
||||
}
|
||||
|
||||
//Setup firmware version for matching.
|
||||
//(explode() already trimmed the string of spaces) -- this isn't true a couple inis
|
||||
//If there's a decimal, remove any trailing zeros.
|
||||
if (strrpos($fwVersion, '.') !== FALSE)
|
||||
$fwVersion = rtrim($fwVersion, '0');
|
||||
|
||||
//store all our hardwork for use in the calling function
|
||||
$signature = array($msVersion, $fwVersion);
|
||||
|
||||
$iniFile = "ini/" . $msDir . $fwVersion . ".ini";
|
||||
$msqMap = INI::parse($iniFile, TRUE);
|
||||
|
||||
return $msqMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Parse a MS INI file into sections.
|
||||
*
|
||||
* Based on code from: goulven.ch@gmail.com (php.net comments) http://php.net/manual/en/function.parse-ini-file.php#78815
|
||||
*
|
||||
* @param $file The path to the INI file that will be loaded and parsed.
|
||||
* @param $something Unused
|
||||
* @returns A huge array of arrays, starting with sections.
|
||||
*/
|
||||
public static function parse($file, $something)
|
||||
{
|
||||
try
|
||||
{
|
||||
$ini = file($file, FILE_SKIP_EMPTY_LINES | FILE_IGNORE_NEW_LINES);
|
||||
}
|
||||
catch (Exception $e)
|
||||
{
|
||||
echo "<div class=\"error\">Error opening file: $file</div>";
|
||||
return null;
|
||||
}
|
||||
|
||||
if ($ini == FALSE || count($ini) == 0)
|
||||
{
|
||||
echo "<div class=\"error\">Error opening file: $file</div>";
|
||||
return null;
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"debug\">Opened: $file</div>";
|
||||
|
||||
$globals = array();
|
||||
$curve = array();
|
||||
$table = array();
|
||||
$currentSection = NULL;
|
||||
$values = array();
|
||||
|
||||
foreach ($ini as $line)
|
||||
{
|
||||
$line = trim($line);
|
||||
if ($line == '' || $line[0] == ';') continue;
|
||||
if ($line[0] == '#')
|
||||
{//TODO Parse directives, each needs to be a checkbox (combobox?) on the FE
|
||||
continue;
|
||||
}
|
||||
|
||||
//[ at the beginning of the line is the indicator of a new section.
|
||||
if ($line[0] == '[') //TODO until before ] not end of line
|
||||
{
|
||||
$currentSection = substr($line, 1, -1);
|
||||
$values[$currentSection] = array();
|
||||
if (DEBUG) echo "<div class=\"debug\">Reading section: $currentSection</div>";
|
||||
continue;
|
||||
}
|
||||
|
||||
//We don't handle formulas/composites yet
|
||||
if (strpos($line, '{') !== FALSE)
|
||||
{
|
||||
//isolate expression, parse it, fill in variables from msq, give back result (true,false,42?)
|
||||
//These are used in the ReferenceTables, Menus, and output/logging sections
|
||||
|
||||
//For the menu, this is whether the menu item is visible or enabled.
|
||||
INI::parseExpression($line);
|
||||
|
||||
//if (DEBUG) echo "<div class=\"debug\">Skipping expression in line: $line</div>";
|
||||
continue;
|
||||
}
|
||||
|
||||
//Pretty much anything left has an equals sign I think.
|
||||
//Key-value pair around equals sign
|
||||
list($key, $value) = explode('=', $line, 2);
|
||||
$key = trim($key);
|
||||
|
||||
//Remove any line end comment
|
||||
//This could be moved somewhere else, but works fine here I guess.
|
||||
$hasComment = strpos($value, ';');
|
||||
if ($hasComment !== FALSE) $value = substr($value, 0, $hasComment);
|
||||
|
||||
$value = trim($value);
|
||||
|
||||
switch ($currentSection)
|
||||
{
|
||||
case "Constants": //The start of our journey. Fill in details about variables.
|
||||
$values[$currentSection][$key] = INI::defaultSectionHandler($value);
|
||||
break;
|
||||
|
||||
case "SettingContextHelp": //Any help text for our variable
|
||||
$values[$currentSection][$key] = trim($value);
|
||||
break;
|
||||
|
||||
//Whenever I do menu recreation these two will be used
|
||||
case "Menu":
|
||||
break;
|
||||
case "UserDefined":
|
||||
break;
|
||||
|
||||
case "CurveEditor": //2D Graph //curve = coldAdvance, "Cold Ignition Advance Offset"
|
||||
switch ($key)
|
||||
{
|
||||
case "curve": //start of new curve
|
||||
if (!empty($curve))
|
||||
{//save the last one, if any
|
||||
if (DEBUG) echo '<div class="debug">Parsed curve: ' . $curve['id'] . '</div>';
|
||||
//var_export($curve);
|
||||
$values[$currentSection][$curve['id']] = $curve;
|
||||
}
|
||||
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) == 2)
|
||||
{
|
||||
$curve = array();
|
||||
$curve['id'] = $value[0];
|
||||
$curve['desc'] = trim($value[1], '"');
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid curve: $key</div>";
|
||||
break;
|
||||
case "topicHelp":
|
||||
if (is_array($curve))
|
||||
{
|
||||
$curve[$key] = $value;
|
||||
}
|
||||
break;
|
||||
case "columnLabel":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) == 2)
|
||||
{
|
||||
$curve['xLabel'] = $value[0];
|
||||
$curve['yLabel'] = $value[1];
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid curve column label: $key</div>";
|
||||
break;
|
||||
case "xAxis":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) == 3)
|
||||
{
|
||||
$curve['xMin'] = $value[0];
|
||||
$curve['xMax'] = $value[1];
|
||||
$curve['xSomething'] = $value[2];
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid curve X axis: $key</div>";
|
||||
break;
|
||||
case "yAxis":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) == 3)
|
||||
{
|
||||
$curve['yMin'] = $value[0];
|
||||
$curve['yMax'] = $value[1];
|
||||
$curve['ySomething'] = $value[2];
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid curve Y axis: $key</div>";
|
||||
break;
|
||||
case "xBins":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) >= 1)
|
||||
{
|
||||
$curve['xBinConstant'] = $value[0];
|
||||
//$curve['xBinVar'] = $value[1]; //The value read from the ECU
|
||||
//Think they all have index 1 except bogus curves
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid curve X bins: $key</div>";
|
||||
break;
|
||||
case "yBins":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) == 1)
|
||||
{
|
||||
$curve['yBinConstant'] = $value[0];
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid curve Y bins: $key</div>";
|
||||
break;
|
||||
case "gauge": //not all have this
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case "TableEditor": //3D Table/Graph
|
||||
switch ($key)
|
||||
{
|
||||
case "table": //start of new curve
|
||||
if (!empty($table))
|
||||
{//save the last one, if any
|
||||
if (DEBUG) echo '<div class="debug">Parsed table: ' . $table['id'] . '</div>';
|
||||
//var_export($curve);
|
||||
$values[$currentSection][$table['id']] = $table;
|
||||
}
|
||||
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) == 4)
|
||||
{
|
||||
$table = array();
|
||||
$table['id'] = $value[0];
|
||||
$table['map3d_id'] = $value[1];
|
||||
$table['desc'] = trim($value[2], '"');
|
||||
//$table['page'] = $value[3]; //Don't care for this one AFAIK.
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid table: $key</div>";
|
||||
break;
|
||||
case "topicHelp":
|
||||
if (is_array($table))
|
||||
{
|
||||
$table[$key] = $value;
|
||||
}
|
||||
break;
|
||||
case "xBins":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) >= 1)
|
||||
{
|
||||
$table['xBinConstant'] = $value[0];
|
||||
//$table['xBinVar'] = $value[1]; //The value read from the ECU
|
||||
//Think they all have index 1 except bogus tables
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid table X bins: $key</div>";
|
||||
break;
|
||||
case "yBins":
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) >= 1)
|
||||
{
|
||||
$table['yBinConstant'] = $value[0];
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid table Y bins: $key</div>";
|
||||
break;
|
||||
case "zBins": //not all have this
|
||||
$value = array_map('trim', explode(',', $value));
|
||||
if (count($value) >= 1)
|
||||
{
|
||||
$table['zBinConstant'] = $value[0];
|
||||
}
|
||||
else if (DEBUG) echo "<div class=\"warn\">Invalid table Z bins: $key</div>";
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
//Don't care about these
|
||||
case "MegaTune":
|
||||
case "ReferenceTables": //misc MAF stuff
|
||||
case "SettingGroups": //misc settings
|
||||
case "ConstantsExtensions": //misc reset required fields
|
||||
case "PortEditor": //not sure
|
||||
case "GaugeConfigurations": //Not relevant
|
||||
case "FrontPage": //Not relevant
|
||||
case "RunTime": //Not relevant
|
||||
case "Tuning": //Not relevant
|
||||
case "AccelerationWizard": //Not sure
|
||||
case "BurstMode": //Not relevant
|
||||
case "OutputChannels": //These are for gauges and datalogging
|
||||
case "Datalog": //Not relevant
|
||||
default:
|
||||
break;
|
||||
case NULL:
|
||||
//Should be global values (don't think any ini's have them)
|
||||
assert($currentSection === NULL);
|
||||
$globals[$key] = INI::defaultSectionHandler($value);
|
||||
continue; //Skip the section values assignment below
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//var_export($values);
|
||||
return $values + $globals;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Strip excess whitespace and cruft to get to value assignments
|
||||
* @param $value
|
||||
* @returns An array if there's a comma, or just the value.
|
||||
*/
|
||||
private static function defaultSectionHandler($value)
|
||||
{
|
||||
//For things like "nCylinders = bits, U08, 0,"
|
||||
//split CSV into an array
|
||||
if (strpos($value, ',') !== FALSE)
|
||||
return array_map('trim', explode(',', $value)); //Use trim() as a callback on elements returned from explode()
|
||||
else //otherwise just return the value
|
||||
return trim($value);
|
||||
}
|
||||
|
||||
public static function parseExpression($line)
|
||||
{
|
||||
|
||||
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -0,0 +1,500 @@
|
|||
;-------------------------------------------------------------------------------
|
||||
|
||||
[MegaTune]
|
||||
MTversion = 2.25 ; MegaTune itself; needs to match exec version.
|
||||
|
||||
queryCommand = "Q" ; B&G embedded code version 2.0/2.98x/3.00
|
||||
signature = 20 ; Versions above return a single byte, 20T.
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Constants]
|
||||
|
||||
;----------------------------------------------------------------------------
|
||||
; Constants Definition
|
||||
; --------------------
|
||||
;
|
||||
; Scalar Values
|
||||
; -------------
|
||||
; The scaling and translation values are used as follows:
|
||||
; msValue = userValue / scale - translate
|
||||
; userValue = (msValue + translate) * scale
|
||||
;
|
||||
; I've got no good way to handle a few of these things yet.
|
||||
;
|
||||
; Temperatures are fine, check out the Fielding IAC example (fastIdleT).
|
||||
;
|
||||
; The TPS stuff is a problem, because we have to modify the ini file for
|
||||
; each TPS installation and again whenever we move the TPS... I figured
|
||||
; out a moderately palatable solution to presenting the frequency
|
||||
; divider in the boost control values, turn it into a bit field and then
|
||||
; enumerate the resulting frequencies.
|
||||
;
|
||||
; Array Values
|
||||
; ------------
|
||||
; Arrays are specified just like scalars, except that they have a "shape"
|
||||
; entry in the fourth parameter. The shape allows you to define lists or
|
||||
; tables, for example [8] defines a list with eight values and [2x4] defines
|
||||
; a table with eight values (two rows and four columns). Tables may be
|
||||
; stored in either "X-" or "Y-order." X-order means that memory is layed
|
||||
; out like.
|
||||
;
|
||||
; [x1,y1] [x2,y1]...[xn,y1] [x1,y2]...
|
||||
;
|
||||
; Y-order would be
|
||||
;
|
||||
; [x1,y1] [x1,y2]...[x1,yn] [x2,y1]...
|
||||
;
|
||||
; To use the TableEditor, you must define two lists and a table, and
|
||||
; the lengths of the lists must correspond to the shape of the table.
|
||||
;
|
||||
; Bit Fields
|
||||
; ----------
|
||||
; Bits are numbered 0-7, the rightmost being bit zero. The basic
|
||||
; data word that stores bit fields must be unsigned.
|
||||
;
|
||||
; You need NOT supply the correct number of labels matching the
|
||||
; number of bits you've specified (one bit requires 2 values, two
|
||||
; bits requires 4 values and so on). If you neglect to supply enough
|
||||
; labels, they will be synthesized using the sequence "1", "2" and so
|
||||
; on based upon their position in the sequence (the cltType and matType
|
||||
; will end up with identical lists).
|
||||
;
|
||||
; If you specify a label as "INVALID" (all upper case), then it will
|
||||
; not be displayed in the combo box, so you can leave out values that
|
||||
; make no sense.
|
||||
;
|
||||
;----------------------------------------------------------------------------
|
||||
|
||||
endianness = big
|
||||
nPages = 1
|
||||
burnCommand = "B"
|
||||
pageSize = 125
|
||||
pageActivationDelay = 10
|
||||
; pageActivate = ""
|
||||
pageReadCommand = "V"
|
||||
pageValueWrite = "W%o%v"
|
||||
; pageChunkWrite = "" ; No chunk write for standard MS.
|
||||
|
||||
page = 1
|
||||
; name = bits, type, offset, bits
|
||||
; name = array, type, offset, shape, units, scale, translate, lo, hi, digits
|
||||
; name = scalar, type, offset, units, scale, translate, lo, hi, digits
|
||||
veTable = array, U08, 0, [8x8], "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
crankCold = scalar, U08, 64, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
crankHot = scalar, U08, 65, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
asePct = scalar, U08, 66, "%", 1.0, 0.0, 0.0, 95.0, 0
|
||||
aseCount = scalar, U08, 67, "", 1.0, 0.0, 0.0, 254.0, 0
|
||||
wueBins = array, U08, 68, [ 10], "%", 1.0, 0.0, 100.0, 255.0, 0
|
||||
taeBins = array, U08, 78, [ 4], "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
taeColdA = scalar, U08, 82, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
tpsThresh = scalar, U08, 83, "v/s",0.1953125, 0.0, 0.2, 49.8, 3
|
||||
taeTime = scalar, U08, 84, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
tdePct = scalar, U08, 85, "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
#if CELSIUS
|
||||
egoTemp = scalar, U08, 86, "°C", 0.555, -72, -40, 102.0, 0
|
||||
#else
|
||||
egoTemp = scalar, U08, 86, "°F", 1.0, -40, -40, 215.0, 0
|
||||
#endif
|
||||
egoCount = scalar, U08, 87, "", 1.0, 0.0, 0.0, 255.0, 0
|
||||
egoDelta = scalar, U08, 88, "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
egoLimit = scalar, U08, 89, "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
reqFuel = scalar, U08, 90, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
divider = scalar, U08, 91, "", 1.0, 0.0
|
||||
alternate = bits, U08, 92, [0:0], "Simultaneous", "Alternating"
|
||||
injOpen = scalar, U08, 93, "ms", 0.1, 0.0, 0.1, 25.5, 1
|
||||
injOCfuel = scalar, U08, 94, "ms", 0.1, 0.0, 0.0, 0.0, 0
|
||||
injPwmP = scalar, U08, 95, "%", 1.0, 0.0, 0.0, 100.0, 0
|
||||
injPwmT = scalar, U08, 96, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
battFac = scalar, U08, 97, "ms/v",0.0166667, 0.0, 0.0, 1.0, 2
|
||||
rpmk = scalar, U16, 98, "", 1.0, 0.0
|
||||
rpmBins = array, U08, 100, [ 8], "RPM", 100.0, 0.0, 100.0, 25500.0, 0
|
||||
#if SPEED_DENSITY
|
||||
mapBins = array, U08, 108, [ 8], "kPa", 1.0, 0.0, 0.0, 255.0, 0
|
||||
#elif ALPHA_N
|
||||
tpsBins = array, U08, 108, [ 8], "TPS", 1.0, 0.0, 0.0, 255.0, 0
|
||||
#elif AIR_FLOW_METER
|
||||
#error "MSnS does not support MAF"
|
||||
#exit
|
||||
#endif
|
||||
; Config1
|
||||
mapType = bits, U08, 116, [0:1], "115 kPa", "250 kPa", "INVALID", "INVALID"
|
||||
twoStroke = bits, U08, 116, [2:2], "Four-stroke", "Two-stroke"
|
||||
injType = bits, U08, 116, [3:3], "Port", "Throttle Body"
|
||||
nCylinders = bits, U08, 116, [4:7+1]
|
||||
; Config3
|
||||
cltType = bits, U08, 117, [0:1], "GM", "Unknown1", "Unknown2", "Unknown3"
|
||||
matType = bits, U08, 117, [2:3], "GM", "Unknown1", "Unknown2", "Unknown3"
|
||||
nInjectors = bits, U08, 117, [4:7+1]
|
||||
; Config3
|
||||
engineType = bits, U08, 118, [0:0], "Even fire", "Odd fire"
|
||||
egoType = bits, U08, 118, [1:1], "Narrow band", "Wide band"
|
||||
algorithm = bits, U08, 118, [2:2], "Speed Density", "Alpha-N"
|
||||
baroCorr = bits, U08, 118, [3:3], "Off", "On"
|
||||
|
||||
primePulse = scalar, U08, 119, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
egoRPM = scalar, U08, 120, "RPM", 100.0, 0.0, 100, 25500, 0
|
||||
#if CELSIUS
|
||||
fastIdleT = scalar, U08, 121, "°C", 0.555, -72.0, -40, 102, 1
|
||||
#else
|
||||
fastIdleT = scalar, U08, 121, "°F", 1.0, -40.0, -40, 215, 0
|
||||
#endif
|
||||
egoSwitch = scalar, U08, 122, "v", 0.0196, 0.0, 0.0, 5.0, 3
|
||||
taeColdM = scalar, U08, 123, "%", 1.0, 0.0, 0.0, 250.0, 0
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Menu]
|
||||
|
||||
;----------------------------------------------------------------------------
|
||||
; There are five pre-defined values that may be used to define your menus.
|
||||
; The first four allow access to the "standard" dialog boxes, the last one
|
||||
; merely draws a separator (horizontal line) in the menu.
|
||||
;
|
||||
; std_constants
|
||||
; std_enrichments
|
||||
; std_realtime
|
||||
; std_warmup
|
||||
;
|
||||
; std_separator
|
||||
;
|
||||
; If you use any of the std_constants, std_enrichments or std_warmup
|
||||
; editors, they may be optionally suffixed with a page number (only
|
||||
; useful for multi-page code variants), which causes them to edit the
|
||||
; specified page. If you leave off the page specifier, they edit logical
|
||||
; page one as specified in the Constants section.
|
||||
;
|
||||
; There are four special menu names, which when used append to the standard
|
||||
; menus of the same name instead of creating a new one. The menu names
|
||||
; are "File", "Communications", "Tools" and "Help".
|
||||
;
|
||||
;----------------------------------------------------------------------------
|
||||
|
||||
menu = "&Settings"
|
||||
subMenu = std_constants, "&Constants"
|
||||
subMenu = std_enrichments, "&Enrichments"
|
||||
subMenu = veTableTbl, "&VE Table"
|
||||
|
||||
menu = "&Tuning"
|
||||
subMenu = std_realtime, "&Realtime Display"
|
||||
subMenu = std_warmup, "&Warmup Wizard"
|
||||
subMenu = veTableMap, "&VE Table"
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[TableEditor]
|
||||
; table_id, map3d_id, "title", page
|
||||
table = veTableTbl, veTableMap, "VE Table", 1
|
||||
; constant, variable
|
||||
xBins = rpmBins, rpm
|
||||
#if SPEED_DENSITY
|
||||
yBins = mapBins, map
|
||||
#else
|
||||
yBins = tpsBins, tpsADC
|
||||
#endif
|
||||
zBins = veTable
|
||||
|
||||
gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
upDownLabel = "(RICHER)", "(LEANER)"
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[GaugeConfigurations]
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
; Notes on some of the gauges.
|
||||
;
|
||||
; The accelEnrichGauge is now a composite of both acceleration enrichment
|
||||
; and deceleration enleanment numbers. See the definition of the variable
|
||||
; accDecEnrich in the OutputChannels section.
|
||||
;
|
||||
; David Hooke contributed the lambda gauge and associated transfer
|
||||
; function files.
|
||||
;
|
||||
; "The lambda gauge is the best way (my opinion) to report data from a
|
||||
; wide band EGO gauge, it standardizes the output irrespective of fuel
|
||||
; or mix of fuels, so you needn't do any brainwork to know if your 75%
|
||||
; gasoline and 25% methanol is rich at 10:1 or not.
|
||||
;
|
||||
; "Use the file WBlambda100AVR.inc, if using a standard ADC (e.g., AVR cpu).
|
||||
; Use the file WBlambda100MOT.inc, if using a biased ADC (e.g., MOT cpu)."
|
||||
;-------------------------------------------------------------------------------
|
||||
; Define a gauge's characteristics here, then go to a specific layout
|
||||
; block (Tuning or FrontPage) and use the name you've defined here to
|
||||
; display that gauge in a particular position.
|
||||
;
|
||||
; Name = Case-sensitive, user-defined name for this gauge configuration.
|
||||
; Var = Case-sensitive name of variable to be displayed, see the
|
||||
; OutputChannels block in this file for possible values.
|
||||
; Title = Title displayed at the top of the gauge.
|
||||
; Units = Units displayed below value on gauge.
|
||||
; Lo = Lower scale limit of gauge.
|
||||
; Hi = Upper scale limit of gauge.
|
||||
; LoD = Lower limit at which danger color is used for gauge background.
|
||||
; LoW = Lower limit at which warning color is used.
|
||||
; HiW = Upper limit at which warning color is used.
|
||||
; HiD = Upper limit at which danger color is used.
|
||||
; vd = Decimal places in displayed value
|
||||
; ld = Label decimal places for display of Lo and Hi, above.
|
||||
|
||||
;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld
|
||||
baroADCGauge = baroADC, "Barometer ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
mapADCGauge = mapADC, "MAP ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
matADCGauge = matADC, "MAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
cltADCGauge = cltADC, "CLT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
tpsADCGauge = tpsADC, "TPS ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
batADCGauge = batADC, "BAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
|
||||
#if NARROW_BAND_EGO
|
||||
egoGauge = egoVoltage, "Exhaust Gas Oxygen", "volts", 0, 1.0, 0.2, 0.3, 0.6, 0.8, 2, 2
|
||||
#else
|
||||
egoGauge = egoVoltage, "Exhaust Gas Oxygen", "volts", 0.5, 4.5, 0.0, 0.0, 5.0, 5.0, 2, 2
|
||||
#endif
|
||||
lambdaGauge = lambda, "Lambda", "", 0.5, 1.5, 0.5, 0.7, 2, 1.1, 2, 2
|
||||
|
||||
accelEnrichGauge = accDecEnrich, "Accel Enrich", "%", 50, 150, -1, -1, 999, 999, 0, 0
|
||||
afrGauge = afr, "Air:Fuel Ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2
|
||||
clockGauge = secl, "Clock", "Seconds", 0, 255, 10, 10, 245, 245, 0, 0
|
||||
deadGauge = deadValue, "---", "", 0, 1, -1, -1, 2, 2, 0, 0
|
||||
dutyCycleGauge = dutyCycle, "Duty Cycle", "%", 0, 100, -1, -1, 85, 90, 1, 1
|
||||
egoCorrGauge = egoCorrection, "EGO Correction", "%", 50, 150, 90, 99, 101, 110, 0, 0
|
||||
|
||||
gammaEnrichGauge = gammaEnrich, "Gamma Enrichment", "%", 50, 150, -1, -1, 151, 151, 0, 0
|
||||
mapGauge = map, "Engine MAP", "kPa", 0, 255, 0, 20, 200, 245, 0, 0
|
||||
pulseWidthGauge = pulseWidth, "Pulse Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 1, 1
|
||||
tachometer = rpm, "Engine Speed", "RPM", 0, 8000, 300, 600, 3000, 5000, 0, 0
|
||||
throttleGauge = throttle, "Throttle Position", "%TPS", 0, 100, -1, 1, 90, 100, 0, 0
|
||||
veBucketGauge = veTuneValue, "VE Value", "%", 0, 120, -1, -1, 999, 999, 0, 0
|
||||
veGauge = veCurr, "VE Current", "%", 0, 120, -1, -1, 999, 999, 0, 0
|
||||
voltMeter = batteryVoltage,"Battery Voltage", "volts", 7, 21, 8, 9, 15, 16, 2, 2
|
||||
warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 150, -1, -1, 101, 105, 0, 0
|
||||
|
||||
#if CELSIUS
|
||||
cltGauge = coolant, "Coolant Temp", "%TEMP", -40, 120, -15, 0, 95, 105, 0, 0
|
||||
matGauge = mat, "Manifold Air Temp", "%TEMP", -40, 110, -15, 0, 95, 100, 0, 0
|
||||
#else
|
||||
cltGauge = coolant, "Coolant Temp", "%TEMP", -40, 250, 0, 30, 200, 220, 0, 0
|
||||
matGauge = mat, "Manifold Air Temp", "%TEMP", -40, 215, 0, 30, 200, 210, 0, 0
|
||||
#endif
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[FrontPage]
|
||||
#if NARROW_BAND_EGO
|
||||
egoLEDs = 0.0, 1.0, 0.5 ; NB settings.
|
||||
#else
|
||||
; If you reverse these range values as you see below, then the LED
|
||||
; bar will work as you expect, high on the right, low on the left.
|
||||
egoLEDs = 4.0, 1.0, 2.5 ; WB settings.
|
||||
#endif
|
||||
|
||||
; Gauges are numbered left to right, top to bottom.
|
||||
;
|
||||
; 1 2 3 4
|
||||
; 5 6 7 8
|
||||
|
||||
gauge1 = tachometer
|
||||
#if SPEED_DENSITY
|
||||
gauge2 = throttleGauge
|
||||
#else
|
||||
gauge2 = tpsADCGauge
|
||||
#endif
|
||||
gauge3 = pulseWidthGauge
|
||||
gauge4 = dutyCycleGauge
|
||||
gauge5 = mapGauge
|
||||
gauge6 = matGauge
|
||||
|
||||
#unset OLD_STYLE_FRONT_PAGE
|
||||
#if OLD_STYLE_FRONT_PAGE
|
||||
#log "Old style gauges enabled"
|
||||
gauge7 = BGpw2Gauge ; Use these two for backward compatibility with older releases of MT,
|
||||
gauge8 = BGdc2Gauge ; or do something useful with them now.
|
||||
#else
|
||||
gauge7 = cltGauge
|
||||
gauge8 = gammaEnrichGauge
|
||||
#endif
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[RunTime]
|
||||
barHysteresis = 2.5 ; Seconds
|
||||
#if CELSIUS
|
||||
coolantBar = -40, 100
|
||||
matBar = -40, 100
|
||||
#else
|
||||
coolantBar = -40, 215
|
||||
matBar = -40, 215
|
||||
#endif
|
||||
|
||||
batteryBar = 6, 15
|
||||
dutyCycleBar = 0, 100
|
||||
#if NARROW_BAND_EGO
|
||||
egoBar = 0, 1.0
|
||||
#else
|
||||
egoBar = 0, 5.0
|
||||
#endif
|
||||
gammaEBar = 0, 200
|
||||
mapBar = 0, 255
|
||||
pulseWidthBar = 0, 25.5
|
||||
rpmBar = 0, 8000
|
||||
throttleBar = 0, 100
|
||||
|
||||
egoCorrBar = 0, 200
|
||||
baroCorrBar = 0, 200
|
||||
warmupCorrBar = 0, 200
|
||||
airdenCorrBar = 0, 200
|
||||
veCorrBar = 0, 200
|
||||
accCorrBar = 0, 100
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Tuning]
|
||||
#if NARROW_BAND_EGO
|
||||
egoLEDs = 0.0, 1.0, 0.5 ; NB settings.
|
||||
#else
|
||||
; If you reverse these range values as you see below, then the LED
|
||||
; bar will work as you expect, high on the right, low on the left.
|
||||
egoLEDs = 4.0, 1.0, 2.5 ; WB settings.
|
||||
#endif
|
||||
|
||||
font = "Courier", 14
|
||||
spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators.
|
||||
cursorDepth = 2 ; Same as spot depth.
|
||||
|
||||
; The four radio buttons on the tuning screen select a "page" of six
|
||||
; gauges. The gauge numbering is the same as the front page, across
|
||||
; then down.
|
||||
; 1 2
|
||||
; 3 4
|
||||
; 5 6
|
||||
;
|
||||
; gaugeColumns allows you to hide or show gauges in column 2 (i.e.,
|
||||
; gauges 2, 4 and 6).
|
||||
|
||||
gaugeColumns = 2 ; Only 1 or 2 are valid.
|
||||
|
||||
;----------------------------------------------------------------------------
|
||||
; Notes on tuning screen gauges:
|
||||
; pageButtons = Labels for radio buttons at bottom of tuning dialog.
|
||||
;
|
||||
; Gauge 2 previously switched automatically to be tpsGauge when alpha-n
|
||||
; was enabled, but you need to do it manually now.
|
||||
;----------------------------------------------------------------------------
|
||||
; Page 1 Page 2 Page 3 Page 4
|
||||
pageButtons = "&EGO", "&WUE", "PW&1", "PW&2"
|
||||
gauge1 = tachometer, tachometer, tachometer, tachometer
|
||||
gauge2 = mapGauge, mapGauge, mapGauge, mapGauge
|
||||
gauge3 = egoGauge, egoGauge, egoGauge, egoGauge
|
||||
gauge4 = egoCorrGauge, warmupEnrichGauge, pulseWidthGauge, pulseWidthGauge
|
||||
gauge5 = veBucketGauge, veBucketGauge, veBucketGauge, veBucketGauge
|
||||
gauge6 = accelEnrichGauge, accelEnrichGauge, dutyCycleGauge, dutyCycleGauge
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[OutputChannels]
|
||||
; The number of bytes MegaTune should expect as a result
|
||||
; of sending the "A" command to MegaSquirt is determined
|
||||
; by the value of ochBlockSize, so be very careful when
|
||||
; you change it.
|
||||
|
||||
deadValue = { 0 } ; Convenient unchanging value.
|
||||
|
||||
ochBlockSize = 22
|
||||
|
||||
secl = scalar, U08, 0, "sec", 1.000, 0.000
|
||||
squirt = scalar, U08, 1, "bits", 1.000, 0.000
|
||||
engine = scalar, U08, 2, "bits", 1.000, 0.000
|
||||
baroADC = scalar, U08, 3, "ADC", 1.000, 0.000
|
||||
mapADC = scalar, U08, 4, "ADC", 1.000, 0.000
|
||||
matADC = scalar, U08, 5, "ADC", 1.000, 0.000
|
||||
cltADC = scalar, U08, 6, "ADC", 1.000, 0.000
|
||||
tpsADC = scalar, U08, 7, "ADC", 1.000, 0.000
|
||||
batADC = scalar, U08, 8, "ADC", 1.000, 0.000
|
||||
egoADC = scalar, U08, 9, "ADC", 1.000, 0.000
|
||||
egoCorrection = scalar, U08, 10, "%", 1.000, 0.000
|
||||
airCorrection = scalar, U08, 11, "%", 1.000, 0.000
|
||||
warmupEnrich = scalar, U08, 12, "%", 1.000, 0.000
|
||||
rpm100 = scalar, U08, 13, "r100", 1.000, 0.000
|
||||
pulseWidth = scalar, U08, 14, "ms", 0.100, 0.000
|
||||
accelEnrich = scalar, U08, 15, "%", 1.000, 0.000
|
||||
baroCorrection = scalar, U08, 16, "%", 1.000, 0.000
|
||||
gammaEnrich = scalar, U08, 17, "%", 1.000, 0.000
|
||||
veCurr = scalar, U08, 18, "%", 1.000, 0.000
|
||||
blank1 = scalar, U08, 19 ; Raw inputs, as they come from MS.
|
||||
blank2 = scalar, U08, 20
|
||||
blank3 = scalar, U08, 21
|
||||
|
||||
; Computed output channels. See "megatuneExamples.ini" for all the
|
||||
; pre-defined variables, search for "???" and you'll see them.
|
||||
|
||||
accDecEnrich = { accelEnrich + ((engine & 0b00100000) ? tdePct : 100) }
|
||||
batteryVoltage = { batADC / 255.0 * 30.0 } ; Current MS power supply voltage.
|
||||
coolant = { tempCvt(table(cltADC, "thermfactor.inc")-40) } ; Coolant sensor temperature in user units.
|
||||
egoVoltage = { egoADC / 255.0 * 5.0 } ; EGO sensor voltage.
|
||||
mat = { tempCvt(table(matADC, "matfactor.inc")-40) } ; Manifold temperature in user units.
|
||||
rpm = { rpm100*100 } ; True RPM.
|
||||
time = { timeNow } ; "timeNow" is a parameterless built-in function.
|
||||
|
||||
afrtarget = { 0 }
|
||||
#include "lambdaSensors.ini"
|
||||
|
||||
#if MPX4250
|
||||
barometer = { table(baroADC, "kpafactor4250.inc") }
|
||||
map = { table(mapADC, "kpafactor4250.inc") } ; Manifold pressure in kPa.
|
||||
#else
|
||||
barometer = { table(baroADC, "kpafactor4115.inc") }
|
||||
map = { table(mapADC, "kpafactor4115.inc") }
|
||||
#endif
|
||||
throttle = { table(tpsADC, "throttlefactor.inc") }
|
||||
|
||||
idleDC = { (coolant < fastIdleT) * 100 }
|
||||
|
||||
altDiv = { alternate ? 2 : 1 }
|
||||
cycleTime = { 60000.0 / rpm * (2.0-twoStroke) }
|
||||
nSquirts = { nCylinders/divider }
|
||||
dutyCycle = { 100.0*nSquirts/altDiv*pulseWidth/cycleTime }
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Datalog]
|
||||
; Full datalog.
|
||||
;
|
||||
; Default user-defined log emulates the full datalog.
|
||||
;
|
||||
; The entries are saved in the datalog file in the order in
|
||||
; which they appear in the list below.
|
||||
;
|
||||
; Channel - Case sensitive name of output channel to be logged.
|
||||
; Label - String written to header line of log. Be careful
|
||||
; about changing these, as programs like MSLVV and
|
||||
; MSTweak key off specific column names.
|
||||
; Type - Data type of output, converted before writing.
|
||||
; Format - C-style output format of data.
|
||||
;
|
||||
; Channel Label Type Format
|
||||
; -------------- ---------- ----- ------
|
||||
entry = time, "Time", float, "%.3f"
|
||||
entry = secl, "SecL", int, "%d"
|
||||
entry = rpm100, "RPM", int, "%d"
|
||||
entry = map, "MAP", int, "%d"
|
||||
entry = throttle, "TP", int, "%d"
|
||||
entry = egoVoltage, "O2", float, "%.3f"
|
||||
entry = mat, "MAT", float, "%.1f"
|
||||
entry = coolant, "CLT", float, "%.1f"
|
||||
entry = engine, "Engine", int, "%d"
|
||||
entry = egoCorrection, "Gego", int, "%d"
|
||||
entry = airCorrection, "Gair", int, "%d"
|
||||
entry = warmupEnrich, "Gwarm", int, "%d"
|
||||
entry = baroCorrection, "Gbaro", int, "%d"
|
||||
entry = gammaEnrich, "Gammae", int, "%d"
|
||||
entry = accDecEnrich, "TPSacc", int, "%d"
|
||||
entry = veCurr, "Gve", int, "%d"
|
||||
entry = pulseWidth, "PW", float, "%.1f"
|
||||
entry = blank2, "Gve2", int, "%d"
|
||||
entry = pulseWidth, "PW2", float, "%.1f"
|
||||
entry = dutyCycle, "DutyCycle1", float, "%.1f"
|
||||
entry = dutyCycle, "DutyCycle2", float, "%.1f"
|
||||
entry = blank1, "UserData1", int, "%d"
|
||||
entry = blank2, "UserData2", int, "%d"
|
||||
entry = blank3, "UserData3", int, "%d"
|
||||
|
|
@ -0,0 +1,655 @@
|
|||
;-------------------------------------------------------------------------------
|
||||
|
||||
[MegaTune]
|
||||
MTversion = 2.25 ; MegaTune itself; needs to match exec version.
|
||||
|
||||
queryCommand = "Q" ; B&G embedded code version 2.0/2.98x/3.00
|
||||
signature = 20 ; Versions above return a single byte, 20T.
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Constants]
|
||||
|
||||
;----------------------------------------------------------------------------
|
||||
; Constants Definition
|
||||
; --------------------
|
||||
;
|
||||
; Scalar Values
|
||||
; -------------
|
||||
; The scaling and translation values are used as follows:
|
||||
; msValue = userValue / scale - translate
|
||||
; userValue = (msValue + translate) * scale
|
||||
;
|
||||
; I've got no good way to handle a few of these things yet.
|
||||
;
|
||||
; Temperatures are fine, check out the Fielding IAC example (fastIdleT).
|
||||
;
|
||||
; The TPS stuff is a problem, because we have to modify the ini file for
|
||||
; each TPS installation and again whenever we move the TPS... I figured
|
||||
; out a moderately palatable solution to presenting the frequency
|
||||
; divider in the boost control values, turn it into a bit field and then
|
||||
; enumerate the resulting frequencies.
|
||||
;
|
||||
; Array Values
|
||||
; ------------
|
||||
; Arrays are specified just like scalars, except that they have a "shape"
|
||||
; entry in the fourth parameter. The shape allows you to define lists or
|
||||
; tables, for example [8] defines a list with eight values and [2x4] defines
|
||||
; a table with eight values (two rows and four columns). Tables may be
|
||||
; stored in either "X-" or "Y-order." X-order means that memory is layed
|
||||
; out like.
|
||||
;
|
||||
; [x1,y1] [x2,y1]...[xn,y1] [x1,y2]...
|
||||
;
|
||||
; Y-order would be
|
||||
;
|
||||
; [x1,y1] [x1,y2]...[x1,yn] [x2,y1]...
|
||||
;
|
||||
; To use the TableEditor, you must define two lists and a table, and
|
||||
; the lengths of the lists must correspond to the shape of the table.
|
||||
;
|
||||
; Bit Fields
|
||||
; ----------
|
||||
; Bits are numbered 0-7, the rightmost being bit zero. The basic
|
||||
; data word that stores bit fields must be unsigned.
|
||||
;
|
||||
; You need NOT supply the correct number of labels matching the
|
||||
; number of bits you've specified (one bit requires 2 values, two
|
||||
; bits requires 4 values and so on). If you neglect to supply enough
|
||||
; labels, they will be synthesized using the sequence "1", "2" and so
|
||||
; on based upon their position in the sequence (the cltType and matType
|
||||
; will end up with identical lists).
|
||||
;
|
||||
; If you specify a label as "INVALID" (all upper case), then it will
|
||||
; not be displayed in the combo box, so you can leave out values that
|
||||
; make no sense.
|
||||
;
|
||||
;----------------------------------------------------------------------------
|
||||
|
||||
endianness = big
|
||||
nPages = 1
|
||||
burnCommand = "B"
|
||||
pageSize = 125
|
||||
pageActivationDelay = 10
|
||||
; pageActivate = ""
|
||||
pageReadCommand = "V"
|
||||
pageValueWrite = "W%o%v"
|
||||
; pageChunkWrite = "" ; No chunk write for standard MS.
|
||||
|
||||
page = 1
|
||||
; name = bits, type, offset, bits
|
||||
; name = array, type, offset, shape, units, scale, translate, lo, hi, digits
|
||||
; name = scalar, type, offset, units, scale, translate, lo, hi, digits
|
||||
veTable = array, U08, 0, [8x8], "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
crankCold = scalar, U08, 64, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
crankHot = scalar, U08, 65, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
asePct = scalar, U08, 66, "%", 1.0, 0.0, 0.0, 95.0, 0
|
||||
aseCount = scalar, U08, 67, "", 1.0, 0.0, 0.0, 254.0, 0
|
||||
wueBins = array, U08, 68, [ 10], "%", 1.0, 0.0, 100.0, 255.0, 0
|
||||
taeBins = array, U08, 78, [ 4], "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
taeBins1 = scalar, U08, 78, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
taeBins2 = scalar, U08, 79, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
taeBins3 = scalar, U08, 80, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
taeBins4 = scalar, U08, 81, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
taeColdA = scalar, U08, 82, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
tpsThresh = scalar, U08, 83, "v/s",0.1953125, 0.0, 0.2, 49.8, 3
|
||||
taeTime = scalar, U08, 84, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
tdePct = scalar, U08, 85, "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
#if CELSIUS
|
||||
egoTemp = scalar, U08, 86, "°C", 0.555, -72, -40, 102.0, 0
|
||||
#else
|
||||
egoTemp = scalar, U08, 86, "°F", 1.0, -40, -40, 215.0, 0
|
||||
#endif
|
||||
egoCount = scalar, U08, 87, "", 1.0, 0.0, 0.0, 255.0, 0
|
||||
egoDelta = scalar, U08, 88, "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
egoLimit = scalar, U08, 89, "%", 1.0, 0.0, 0.0, 255.0, 0
|
||||
reqFuel = scalar, U08, 90, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
divider = scalar, U08, 91, "", 1.0, 0.0
|
||||
alternate = bits, U08, 92, [0:0], "Simultaneous", "Alternating"
|
||||
injOpen = scalar, U08, 93, "ms", 0.1, 0.0, 0.1, 25.5, 1
|
||||
injOCfuel = scalar, U08, 94, "ms", 0.1, 0.0, 0.0, 0.0, 0
|
||||
injPwmP = scalar, U08, 95, "%", 1.0, 0.0, 0.0, 100.0, 0
|
||||
injPwmT = scalar, U08, 96, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
battFac = scalar, U08, 97, "ms/v",0.0166667, 0.0, 0.0, 1.0, 2
|
||||
rpmk = scalar, U16, 98, "", 1.0, 0.0
|
||||
rpmBins = array, U08, 100, [ 8], "RPM", 100.0, 0.0, 100.0, 25500.0, 0
|
||||
#if SPEED_DENSITY
|
||||
mapBins = array, U08, 108, [ 8], "kPa", 1.0, 0.0, 0.0, 255.0, 0
|
||||
#elif ALPHA_N
|
||||
tpsBins = array, U08, 108, [ 8], "TPS", 1.0, 0.0, 0.0, 255.0, 0
|
||||
#elif AIR_FLOW_METER
|
||||
#error "MSnS does not support MAF"
|
||||
#exit
|
||||
#endif
|
||||
; Config1
|
||||
mapType = bits, U08, 116, [0:1], "115 kPa", "250 kPa", "INVALID", "INVALID"
|
||||
twoStroke = bits, U08, 116, [2:2], "Four-stroke", "Two-stroke"
|
||||
injType = bits, U08, 116, [3:3], "Port", "Throttle Body"
|
||||
nCylinders = bits, U08, 116, [4:7+1]
|
||||
; Config3
|
||||
cltType = bits, U08, 117, [0:1], "GM", "Unknown1", "Unknown2", "Unknown3"
|
||||
matType = bits, U08, 117, [2:3], "GM", "Unknown1", "Unknown2", "Unknown3"
|
||||
nInjectors = bits, U08, 117, [4:7+1]
|
||||
; Config3
|
||||
engineType = bits, U08, 118, [0:0], "Even fire", "Odd fire"
|
||||
egoType = bits, U08, 118, [1:1], "Narrow band", "Wide band"
|
||||
algorithm = bits, U08, 118, [2:2], "Speed Density", "Alpha-N"
|
||||
baroCorr = bits, U08, 118, [3:3], "Off", "On"
|
||||
|
||||
primePulse = scalar, U08, 119, "ms", 0.1, 0.0, 0.0, 25.5, 1
|
||||
egoRPM = scalar, U08, 120, "RPM", 100.0, 0.0, 100, 25500, 0
|
||||
#if CELSIUS
|
||||
fastIdleT = scalar, U08, 121, "°C", 0.555, -72.0, -40, 102, 1
|
||||
#else
|
||||
fastIdleT = scalar, U08, 121, "°F", 1.0, -40.0, -40, 215, 0
|
||||
#endif
|
||||
egoSwitch = scalar, U08, 122, "v", 0.0196, 0.0, 0.0, 5.0, 3
|
||||
taeColdM = scalar, U08, 123, "%", 1.0, 0.0, 0.0, 250.0, 0
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Menu]
|
||||
|
||||
;----------------------------------------------------------------------------
|
||||
; There are five pre-defined values that may be used to define your menus.
|
||||
; The first four allow access to the "standard" dialog boxes, the last one
|
||||
; merely draws a separator (horizontal line) in the menu.
|
||||
;
|
||||
; std_constants
|
||||
; std_enrichments
|
||||
; std_realtime
|
||||
; std_warmup
|
||||
;
|
||||
; std_separator
|
||||
;
|
||||
; If you use any of the std_constants, std_enrichments or std_warmup
|
||||
; editors, they may be optionally suffixed with a page number (only
|
||||
; useful for multi-page code variants), which causes them to edit the
|
||||
; specified page. If you leave off the page specifier, they edit logical
|
||||
; page one as specified in the Constants section.
|
||||
;
|
||||
; There are four special menu names, which when used append to the standard
|
||||
; menus of the same name instead of creating a new one. The menu names
|
||||
; are "File", "Communications", "Tools" and "Help".
|
||||
;
|
||||
;----------------------------------------------------------------------------
|
||||
|
||||
menu = "&Settings"
|
||||
subMenu = std_constants, "&Constants"
|
||||
subMenu = std_enrichments, "&Enrichments"
|
||||
subMenu = veTableTbl, "&VE Table"
|
||||
|
||||
menu = "&Tuning"
|
||||
subMenu = std_realtime, "&Realtime Display"
|
||||
subMenu = std_warmup, "&Warmup Wizard"
|
||||
subMenu = veTableMap, "&VE Table"
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[UserDefined]
|
||||
; define a MegaTune compatible version here
|
||||
; no need to for std_enrichments, it is built in.
|
||||
|
||||
|
||||
[UserDefinedTS]
|
||||
; Enhanced TunerStudio dialogs can be defined here
|
||||
; MegaTune will over look this section
|
||||
; These dialogs will over-ride those in the UserDefined Section
|
||||
; User defined ar loaded first, then if one by the same name is defiend here,
|
||||
; it will replace the MegaTune definition
|
||||
|
||||
; dialog = name, Title, Layout
|
||||
;
|
||||
; valid options for layout are xAxis, yAxis, border
|
||||
; for an xAxis, each field added will be added from right to left
|
||||
; A yAxis layout will add fields from top to bottom
|
||||
; A border layout will expect an additional constraint to determine placement
|
||||
; valid border constraints are north, South, East, West, Center
|
||||
; all 5 do not need to be filled.
|
||||
|
||||
; The field name can be either a constant reference, or a reference to another
|
||||
; dialog which will be added.
|
||||
; dialogs can be nested and can be mixed with fields
|
||||
|
||||
|
||||
dialog = accelEnrichments, "Acceleration Enrichment"
|
||||
field = "TPSdot Threshold", tpsThresh
|
||||
field = "Accel Time", taeTime
|
||||
field = "Cold Accel Enrichment", taeColdA
|
||||
field = "Cold Accel Mult", taeColdM
|
||||
field = "Decel Fuel Amount", tdePct
|
||||
field = "Acceleration Enrichment Bins (ms)"
|
||||
field = "2 v/s", taeBins1
|
||||
field = "4 v/s", taeBins2
|
||||
field = "8 v/s", taeBins3
|
||||
field = "15 v/s", taeBins4
|
||||
|
||||
dialog = crankPW, "Cranking Pulsewidths (ms)"
|
||||
#if CELSIUS
|
||||
field = "Priming Pulsewidth", primePulse
|
||||
field = "Pulsewidth at -40°C", crankCold
|
||||
field = "Pulsewidth at 77°C", crankHot
|
||||
#else
|
||||
field = "Priming Pulsewidth", primePulse
|
||||
field = "Pulsewidth at -40°F", crankCold
|
||||
field = "Pulsewidth at 170°F", crankHot
|
||||
#endif
|
||||
|
||||
dialog = aseSettings, "Afterstart Enrichment"
|
||||
field = "Enrichment %", asePct
|
||||
field = "Number of Ignition Cycles", aseCount
|
||||
|
||||
dialog = egoSettings, "Exhaust Gas Oxygen"
|
||||
field = "EGO Sensor Type", egoType
|
||||
field = "EGO Switch Point (v)", egoSwitch
|
||||
field = "Coolant Temp Activation", egoTemp
|
||||
field = "Ignition Events Per Step", egoCount
|
||||
field = "EGO Step", egoDelta
|
||||
field = "EGO ± Limit", egoLimit
|
||||
field = "EGO Active Above", egoRPM
|
||||
|
||||
dialog = westEnrichments, "", yAxis
|
||||
panel = crankPW
|
||||
panel = aseSettings
|
||||
panel = egoSettings
|
||||
|
||||
dialog = std_enrichments, "Enrichments", border ; xAxis would work here too, but wanted to give a border example
|
||||
topicHelp = "helpEnrichments"
|
||||
panel = westEnrichments, West
|
||||
panel = accelEnrichments, East
|
||||
|
||||
; -------------------------------------------------------------
|
||||
; Help down here
|
||||
help = helpEnrichments, "Enrichments Help"
|
||||
text = "<strong>Priming Pulse</strong><br><br>"
|
||||
text = "The duration in milliseconds of a priming pulse that is applied when the MS controller is powered up. If you don’t want a priming pulse, set this field to zero. (Only available for version 2.0 and later of MegaSquirt controller code.)<br>"
|
||||
|
||||
text = "<br><strong>Cranking Pulsewidth</strong><br><br>"
|
||||
text = "Cranking pulse width determines how long the injector will be open in milliseconds for each pulse while the engine is cranking (i.e., the RPM is below 300). The actual pulse width is determined by performing linear interpolation on the line described by the end points you enter for the "-40 degrees F" and "170 degrees F" values. For instance, if you enter 10.0 ms as the pulse width at -40 F and 2.0 ms at 170 F, the pulse width will be 6.0 ms when you start your engine at 65 F.<br>"
|
||||
text = "Note: Cranking pulse occur at every ignition event, while running pulses only occur at the interval specified on the constants page; if you have a 4 cylinder engine and are taking the tachometer signal from the coil, then you will get four (4) cranking pulses per cycle and depending on settings one injection per cycle while running.<br>"
|
||||
text = "The MS variables "CWU" and "CWH" hold the low temperature and high temperature pulse widths, respectively.<br>"
|
||||
|
||||
text = "<br><strong>Afterstart Enrichment</strong><br>"
|
||||
text = "The afterstart enrichment is one that decays from its max value (specified in the "Enrichment (percent)" field) to zero in a linear fashion over a period defined in "Number of Ignition Cycles." If you specify 20% enrichment over 250 ignition cycles, then the first pulse is enriched by 20%, the 125th pulse is enriched by 10% and the 250th (and later) by zero percent (this assumes 1 event per cycle, or a 1 cylinder engine; divide by the number of ignition events per cycle to get the specific behavior for your motor).<br>"
|
||||
text = "MS stores these values in the flash constants called "AWC" (Afterstart Warmup Count) and "AWEV" (Afterstart Warmup Enrichment Value).<br>"
|
||||
|
||||
text = "<br><strong>Exhaust Gas Oxygen Sensor Parameters</strong><br>"
|
||||
text = "These parameters define the closed loop behavior of MS. You must have a narrow band O2 sensor hooked up for this mode to work in v.1.0 controller code; either a narrow band or wide band will work with v.2.0 of controller code. To disable closed loop operation altogether, set the EGO Step value to zero.<br>"
|
||||
|
||||
text = "<br><strong>EGO Sensor Type</strong><br>"
|
||||
text = "Specify either a narrow band sensor or wide band sensor. Functionally this merely sets the direction sense of the sensor voltage. For narrow band sensors, the voltage rises as the mixture is richening and drops as the mixture becomes lean. The wide band setting corresponds to the opposite sense, i.e., voltage drops to indicate enrichment (this is how the DIY-WB operates, not necessarily all WB sensors!). (Available in v 2.0 controller code.)<br>"
|
||||
|
||||
text = "<br><strong>EGO Switch Point (v)</strong><br>"
|
||||
text = "This is the switching point voltage that indicates stoichiometric combustion (approximately 14.7:1 with gasoline). For narrow band sensors this is 0.5 v*; for the DIY-WB wideband sensor it is 2.5 v (for other wideband sensors this voltage may be quite different). (This value is only active in v 2.0 controller code.)<br>"
|
||||
text = "*This is true for zirconia NB sensors, which are used almost exclusively in modern vehicles. The titania NB sensor has a different voltage range (1-5 v), but is rarely used.<br>"
|
||||
|
||||
text = "<br><strong>Coolant Temp Activation (°F)</strong><br>"
|
||||
text = "This is the temperature below which closed loop operation is disabled. If this value is too low, then closed loop will try to lean out the warmup enrichments and you may experience rough running. Typical value is 160 F and should somewhat above the point at which warmup enrichment stops (see the Warmup Enrichment Bins settings and find the lowest on which contains 100).<br>"
|
||||
text = "The MS value "EGOTEMP" stores this quantity.<br>"
|
||||
|
||||
text = "<br><strong>Ignition Events Per Step</strong><br>"
|
||||
text = "This value determines the rate at which the closed loop algorithm applies correction. The default value of 32, when used on a four cylinder engine with four ignition events per cycle, tells MS to wait for 8 cycles before changing the current correction factor.<br>"
|
||||
|
||||
text = "<br><strong>EGO Step (percent)</strong><br>"
|
||||
text = "Once the closed loop algorithm has decided to change the correction factor, it adds or subtracts this percentage from the current value. This should move slowly to avoid unstable response, so make sure it is small, 1% being the default.<br>"
|
||||
|
||||
text = "<br><strong>EGO Limit (%)</strong><br>"
|
||||
text = "Closed loop operation should not be substituted for proper tuning! This value limits the correction that can be made by the closed loop algorithm, the default of 10% indicates the correction factor cannot go outside the range 90-110%.<br>"
|
||||
|
||||
text = "<br><strong>EGO Active Above RPM</strong><br>"
|
||||
text = "This value specifies the lower limit above which closed loop operation occurs. Typically, your engine will idle best when it is richer than stoich, so turning off closed loop for low RPMs allows this to happen. The default value for the RPM limit is 1200. (Available only in v 2.0 MS, older versions have a fixed 1200 RPM value in the controller code.)<br>"
|
||||
|
||||
text = "<br><strong>Warmup Enrichment Bins</strong><br>"
|
||||
text = "Warmup enrichment is based on coolant temperature. Since warmup enrichment requirements are usually non-linear, several bins are provided to specify different rates in different temperature domains.<br>"
|
||||
text = "Place values in the "-40" through "160 degrees F" fields, typically running from about 120 at -40 F to 100 at 100 F; make sure the values are all 100 or greater.<br>"
|
||||
text = "The MS array "WWU" contains these enrichment values.<br>"
|
||||
|
||||
text = "<br><strong>Acceleration Enrichment</strong><br>"
|
||||
text = "Acceleration enrichment (AE) occurs when you open the throttle "rapidly" to avoid bogging the engine. In v.1.01 MS, this is done solely based upon the rate of change in the throttle position sensor (also called TPSDOT).<br>"
|
||||
|
||||
text = "<br><strong>TPSDOT Thresh</strong><br>"
|
||||
text = "This is the threshold in v/sec below which no acceleration enrichment will occur (you can move the throttle from idle to full open without acceleration enrichment, if you open it slowly enough). Depends grossly upon the range of your TPS, a typical value might be 1.2 v/sec.<br>"
|
||||
|
||||
text = "<strong>Tuning Note:</strong> While you are tuning the VE table you should set this threshold artificially high (maybe 40.0) to disable acceleration enrichment completely. After the VE table is fairly well-defined, set this back to 1.2 and begin tuning AE.<br>"
|
||||
text = "MS stores this value in the "TPSTHRESH" variable.<br>"
|
||||
|
||||
text = "<br><strong>Accel Time (sec)</strong><br>"
|
||||
text = "This value indicates how long the acceleration enrichment "squirt" will last. Typical values are around 1.0 second. MS stores this value in the variable "TPSACLK."<br>"
|
||||
|
||||
text = "<br><strong>Cold Accel Enrichment (ms)</strong><br>"
|
||||
text = "The acceleration enrichment pulse also varies depending upon coolant temperature. The value specified here is the pulse width added to the value from the bin calculations at -40 F. The Cold Acceleration Enrichment amount is linearly interpolated from full amount at -40 F down to zero at 165 F. A typical value might be 2.0 ms.<br>"
|
||||
text = "This value is stored in the "TPSACOLD" variable in MS.<br>"
|
||||
|
||||
text = "<br><strong>Cold Accel Multiplier (%)</strong><br>"
|
||||
text = "Another means for increasing the amount of fuel delivered by the acceleration enrichment pulse is supplied by this value; it is likewise interpolated from the full specified amount at –40F down to zero at 165 F. Before the Cold Acceleration Enrichment value is added to the base acceleration enrichment pulsewidth, it is multiplied by this value.<br>"
|
||||
text = "Total AE = Base AE * CAM + CAE<br>"
|
||||
text = "The difference between the two types of AE cold modify can be easily seen with a few examples:<br>"
|
||||
text = "1) Assume we have a calculated AE pulse of 5.0 ms. Say our coolant temperature is 40 F, giving a CAE pulse of 2.0 ms and CAM is turned off (100%). The result is 5.0+2.0 = 7.0 ms.<br>"
|
||||
text = "2) Assume same base AE and temperature, but now we turn off CAE (0.0 ms) and set CAM to give 140%. The result is the same, we get 5.0*1.4 = 7.0 ms.<br>"
|
||||
text = "3) Take the first case, but hit the accelerator faster, giving 8.0 ms base AE pulse. We now have a result of 8.0+2.0 = 10.0 ms.<br>"
|
||||
text = "4) Take case 2, but with the higher base AE pulse, giving 8.0*1.4 = 11.2 ms.<br>"
|
||||
text = "The bottom line is that the CAE modifier is constant and independent of the base pulse, where on the other hand, the CAM modifier has a proportional effect on the AE, bigger base pulse means bigger result.<br>"
|
||||
text = "This value is stored in the 'ACMULT' variable in MS.<br>"
|
||||
|
||||
text = "<br><strong>Decel Fuel Amount (%)</strong><br>"
|
||||
text = "When you let off the throttle rapidly (that is the closing rate exceeds TPSDOT Thresh) and the engine is turning faster than 1500 RPM, then deceleration fuel cutoff is performed by MS. Deceleration fuel amount is multiplied by the "normal" pulse width, that is, if the calculated pulse is 12.0 ms and you have 20% decel amount, then the resulting pulse width is 2.4 ms. A value of 100% causes the fuel to remain at its calculated value, and can cure bucking on deceleration in vehicles with manual transmissions; those with automatic transmissions may benefit in fuel economy by using values below 100%.<br>"
|
||||
text = "The MS variable "TPSDQ" holds this value as a percentage. <br>"
|
||||
|
||||
text = "<br><strong>Acceleration Enrichment Bins (ms)</strong><br>"
|
||||
text = "These bins specify the actual enrichment in terms of pulse width. They are linearly interpolated to determine a value that is ultimately added to the computed pulse width.<br>"
|
||||
text = "The array of values is called "TPSAQ" as stored in MS."
|
||||
|
||||
|
||||
|
||||
|
||||
[TableEditor]
|
||||
; table_id, map3d_id, "title", page
|
||||
table = veTableTbl, veTableMap, "VE Table", 1
|
||||
; constant, variable
|
||||
xBins = rpmBins, rpm
|
||||
#if SPEED_DENSITY
|
||||
yBins = mapBins, map
|
||||
#else
|
||||
yBins = tpsBins, tpsADC
|
||||
#endif
|
||||
zBins = veTable
|
||||
|
||||
gridHeight = 2.0
|
||||
gridOrient = 250, 0, 340 ; Space 123 rotation of grid in degrees.
|
||||
upDownLabel = "(RICHER)", "(LEANER)"
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[GaugeConfigurations]
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
; Notes on some of the gauges.
|
||||
;
|
||||
; The accelEnrichGauge is now a composite of both acceleration enrichment
|
||||
; and deceleration enleanment numbers. See the definition of the variable
|
||||
; accDecEnrich in the OutputChannels section.
|
||||
;
|
||||
; David Hooke contributed the lambda gauge and associated transfer
|
||||
; function files.
|
||||
;
|
||||
; "The lambda gauge is the best way (my opinion) to report data from a
|
||||
; wide band EGO gauge, it standardizes the output irrespective of fuel
|
||||
; or mix of fuels, so you needn't do any brainwork to know if your 75%
|
||||
; gasoline and 25% methanol is rich at 10:1 or not.
|
||||
;
|
||||
; "Use the file WBlambda100AVR.inc, if using a standard ADC (e.g., AVR cpu).
|
||||
; Use the file WBlambda100MOT.inc, if using a biased ADC (e.g., MOT cpu)."
|
||||
;-------------------------------------------------------------------------------
|
||||
; Define a gauge's characteristics here, then go to a specific layout
|
||||
; block (Tuning or FrontPage) and use the name you've defined here to
|
||||
; display that gauge in a particular position.
|
||||
;
|
||||
; Name = Case-sensitive, user-defined name for this gauge configuration.
|
||||
; Var = Case-sensitive name of variable to be displayed, see the
|
||||
; OutputChannels block in this file for possible values.
|
||||
; Title = Title displayed at the top of the gauge.
|
||||
; Units = Units displayed below value on gauge.
|
||||
; Lo = Lower scale limit of gauge.
|
||||
; Hi = Upper scale limit of gauge.
|
||||
; LoD = Lower limit at which danger color is used for gauge background.
|
||||
; LoW = Lower limit at which warning color is used.
|
||||
; HiW = Upper limit at which warning color is used.
|
||||
; HiD = Upper limit at which danger color is used.
|
||||
; vd = Decimal places in displayed value
|
||||
; ld = Label decimal places for display of Lo and Hi, above.
|
||||
|
||||
;Name Var Title Units Lo Hi LoD LoW HiW HiD vd ld
|
||||
baroADCGauge = baroADC, "Barometer ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
mapADCGauge = mapADC, "MAP ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
matADCGauge = matADC, "MAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
cltADCGauge = cltADC, "CLT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
tpsADCGauge = tpsADC, "TPS ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
batADCGauge = batADC, "BAT ADC", "", 0, 255, -1, -1, 256, 256, 0, 0
|
||||
|
||||
#if NARROW_BAND_EGO
|
||||
egoGauge = egoVoltage, "Exhaust Gas Oxygen", "volts", 0, 1.0, 0.2, 0.3, 0.6, 0.8, 2, 2
|
||||
#else
|
||||
egoGauge = egoVoltage, "Exhaust Gas Oxygen", "volts", 0.5, 4.5, 0.0, 0.0, 5.0, 5.0, 2, 2
|
||||
#endif
|
||||
lambdaGauge = lambda, "Lambda", "", 0.5, 1.5, 0.5, 0.7, 2, 1.1, 2, 2
|
||||
|
||||
accelEnrichGauge = accDecEnrich, "Accel Enrich", "%", 50, 150, -1, -1, 999, 999, 0, 0
|
||||
afrGauge = afr, "Air:Fuel Ratio", "", 10, 19.4, 12, 13, 15, 16, 2, 2
|
||||
clockGauge = secl, "Clock", "Seconds", 0, 255, 10, 10, 245, 245, 0, 0
|
||||
deadGauge = deadValue, "---", "", 0, 1, -1, -1, 2, 2, 0, 0
|
||||
dutyCycleGauge = dutyCycle, "Duty Cycle", "%", 0, 100, -1, -1, 85, 90, 1, 1
|
||||
egoCorrGauge = egoCorrection, "EGO Correction", "%", 50, 150, 90, 99, 101, 110, 0, 0
|
||||
|
||||
gammaEnrichGauge = gammaEnrich, "Gamma Enrichment", "%", 50, 150, -1, -1, 151, 151, 0, 0
|
||||
mapGauge = map, "Engine MAP", "kPa", 0, 255, 0, 20, 200, 245, 0, 0
|
||||
pulseWidthGauge = pulseWidth, "Pulse Width", "mSec", 0, 25.5, 1.0, 1.2, 20, 25, 1, 1
|
||||
tachometer = rpm, "Engine Speed", "RPM", 0, 8000, 300, 600, 3000, 5000, 0, 0
|
||||
throttleGauge = throttle, "Throttle Position", "%TPS", 0, 100, -1, 1, 90, 100, 0, 0
|
||||
veBucketGauge = veTuneValue, "VE Value", "%", 0, 120, -1, -1, 999, 999, 0, 0
|
||||
veGauge = veCurr, "VE Current", "%", 0, 120, -1, -1, 999, 999, 0, 0
|
||||
voltMeter = batteryVoltage,"Battery Voltage", "volts", 7, 21, 8, 9, 15, 16, 2, 2
|
||||
warmupEnrichGauge = warmupEnrich, "Warmup Enrichment", "%", 100, 150, -1, -1, 101, 105, 0, 0
|
||||
|
||||
#if CELSIUS
|
||||
cltGauge = coolant, "Coolant Temp", "%TEMP", -40, 120, -15, 0, 95, 105, 0, 0
|
||||
matGauge = mat, "Manifold Air Temp", "%TEMP", -40, 110, -15, 0, 95, 100, 0, 0
|
||||
#else
|
||||
cltGauge = coolant, "Coolant Temp", "%TEMP", -40, 250, 0, 30, 200, 220, 0, 0
|
||||
matGauge = mat, "Manifold Air Temp", "%TEMP", -40, 215, 0, 30, 200, 210, 0, 0
|
||||
#endif
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[FrontPage]
|
||||
#if NARROW_BAND_EGO
|
||||
egoLEDs = 0.0, 1.0, 0.5 ; NB settings.
|
||||
#else
|
||||
; If you reverse these range values as you see below, then the LED
|
||||
; bar will work as you expect, high on the right, low on the left.
|
||||
egoLEDs = 4.0, 1.0, 2.5 ; WB settings.
|
||||
#endif
|
||||
|
||||
; Gauges are numbered left to right, top to bottom.
|
||||
;
|
||||
; 1 2 3 4
|
||||
; 5 6 7 8
|
||||
|
||||
gauge1 = tachometer
|
||||
#if SPEED_DENSITY
|
||||
gauge2 = throttleGauge
|
||||
#else
|
||||
gauge2 = tpsADCGauge
|
||||
#endif
|
||||
gauge3 = pulseWidthGauge
|
||||
gauge4 = dutyCycleGauge
|
||||
gauge5 = mapGauge
|
||||
gauge6 = matGauge
|
||||
gauge7 = cltGauge
|
||||
gauge8 = gammaEnrichGauge
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
|
||||
[RunTime]
|
||||
barHysteresis = 2.5 ; Seconds
|
||||
#if CELSIUS
|
||||
coolantBar = -40, 100
|
||||
matBar = -40, 100
|
||||
#else
|
||||
coolantBar = -40, 215
|
||||
matBar = -40, 215
|
||||
#endif
|
||||
|
||||
batteryBar = 6, 15
|
||||
dutyCycleBar = 0, 100
|
||||
#if NARROW_BAND_EGO
|
||||
egoBar = 0, 1.0
|
||||
#else
|
||||
egoBar = 0, 5.0
|
||||
#endif
|
||||
gammaEBar = 0, 200
|
||||
mapBar = 0, 255
|
||||
pulseWidthBar = 0, 25.5
|
||||
rpmBar = 0, 8000
|
||||
throttleBar = 0, 100
|
||||
|
||||
egoCorrBar = 0, 200
|
||||
baroCorrBar = 0, 200
|
||||
warmupCorrBar = 0, 200
|
||||
airdenCorrBar = 0, 200
|
||||
veCorrBar = 0, 200
|
||||
accCorrBar = 0, 100
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Tuning]
|
||||
#if NARROW_BAND_EGO
|
||||
egoLEDs = 0.0, 1.0, 0.5 ; NB settings.
|
||||
#else
|
||||
; If you reverse these range values as you see below, then the LED
|
||||
; bar will work as you expect, high on the right, low on the left.
|
||||
egoLEDs = 4.0, 1.0, 2.5 ; WB settings.
|
||||
#endif
|
||||
|
||||
font = "Courier", 14
|
||||
spotDepth = 2 ; 0 = no indicators, 1 = Z only, 2 = XYZ indicators.
|
||||
cursorDepth = 2 ; Same as spot depth.
|
||||
|
||||
; The four radio buttons on the tuning screen select a "page" of six
|
||||
; gauges. The gauge numbering is the same as the front page, across
|
||||
; then down.
|
||||
; 1 2
|
||||
; 3 4
|
||||
; 5 6
|
||||
;
|
||||
; gaugeColumns allows you to hide or show gauges in column 2 (i.e.,
|
||||
; gauges 2, 4 and 6).
|
||||
|
||||
gaugeColumns = 2 ; Only 1 or 2 are valid.
|
||||
|
||||
;----------------------------------------------------------------------------
|
||||
; Notes on tuning screen gauges:
|
||||
; pageButtons = Labels for radio buttons at bottom of tuning dialog.
|
||||
;
|
||||
; Gauge 2 previously switched automatically to be tpsGauge when alpha-n
|
||||
; was enabled, but you need to do it manually now.
|
||||
;----------------------------------------------------------------------------
|
||||
; Page 1 Page 2 Page 3 Page 4
|
||||
pageButtons = "&EGO", "&WUE", "PW&1", "PW&2"
|
||||
gauge1 = tachometer, tachometer, tachometer, tachometer
|
||||
gauge2 = mapGauge, mapGauge, mapGauge, mapGauge
|
||||
gauge3 = egoGauge, egoGauge, egoGauge, egoGauge
|
||||
gauge4 = egoCorrGauge, warmupEnrichGauge, pulseWidthGauge, pulseWidthGauge
|
||||
gauge5 = veBucketGauge, veBucketGauge, veBucketGauge, veBucketGauge
|
||||
gauge6 = accelEnrichGauge, accelEnrichGauge, dutyCycleGauge, dutyCycleGauge
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[OutputChannels]
|
||||
; The number of bytes MegaTune should expect as a result
|
||||
; of sending the "A" command to MegaSquirt is determined
|
||||
; by the value of ochBlockSize, so be very careful when
|
||||
; you change it.
|
||||
|
||||
deadValue = { 0 } ; Convenient unchanging value.
|
||||
|
||||
ochGetCommand = "A"
|
||||
|
||||
ochBlockSize = 22
|
||||
|
||||
secl = scalar, U08, 0, "sec", 1.000, 0.000
|
||||
squirt = scalar, U08, 1, "bits", 1.000, 0.000
|
||||
engine = scalar, U08, 2, "bits", 1.000, 0.000
|
||||
baroADC = scalar, U08, 3, "ADC", 1.000, 0.000
|
||||
mapADC = scalar, U08, 4, "ADC", 1.000, 0.000
|
||||
matADC = scalar, U08, 5, "ADC", 1.000, 0.000
|
||||
cltADC = scalar, U08, 6, "ADC", 1.000, 0.000
|
||||
tpsADC = scalar, U08, 7, "ADC", 1.000, 0.000
|
||||
batADC = scalar, U08, 8, "ADC", 1.000, 0.000
|
||||
egoADC = scalar, U08, 9, "ADC", 1.000, 0.000
|
||||
egoCorrection = scalar, U08, 10, "%", 1.000, 0.000
|
||||
airCorrection = scalar, U08, 11, "%", 1.000, 0.000
|
||||
warmupEnrich = scalar, U08, 12, "%", 1.000, 0.000
|
||||
rpm100 = scalar, U08, 13, "r100", 1.000, 0.000
|
||||
pulseWidth = scalar, U08, 14, "ms", 0.100, 0.000
|
||||
accelEnrich = scalar, U08, 15, "%", 1.000, 0.000
|
||||
baroCorrection = scalar, U08, 16, "%", 1.000, 0.000
|
||||
gammaEnrich = scalar, U08, 17, "%", 1.000, 0.000
|
||||
veCurr = scalar, U08, 18, "%", 1.000, 0.000
|
||||
blank1 = scalar, U08, 19 ; Raw inputs, as they come from MS.
|
||||
blank2 = scalar, U08, 20
|
||||
blank3 = scalar, U08, 21
|
||||
|
||||
; Computed output channels. See "megatuneExamples.ini" for all the
|
||||
; pre-defined variables, search for "???" and you'll see them.
|
||||
|
||||
accDecEnrich = { accelEnrich + ((engine & 0b00100000) ? tdePct : 100) }
|
||||
batteryVoltage = { batADC / 255.0 * 30.0 } ; Current MS power supply voltage.
|
||||
coolant = { tempCvt(table(cltADC, "thermfactor.inc")-40) } ; Coolant sensor temperature in user units.
|
||||
egoVoltage = { egoADC / 255.0 * 5.0 } ; EGO sensor voltage.
|
||||
mat = { tempCvt(table(matADC, "matfactor.inc")-40) } ; Manifold temperature in user units.
|
||||
rpm = { rpm100*100 } ; True RPM.
|
||||
time = { timeNow } ; "timeNow" is a parameterless built-in function.
|
||||
|
||||
afrtarget = { 0 }
|
||||
#include "lambdaSensors.ini"
|
||||
|
||||
#if MPX4250
|
||||
barometer = { table(baroADC, "kpafactor4250.inc") }
|
||||
map = { table(mapADC, "kpafactor4250.inc") } ; Manifold pressure in kPa.
|
||||
#else
|
||||
barometer = { table(baroADC, "kpafactor4115.inc") }
|
||||
map = { table(mapADC, "kpafactor4115.inc") }
|
||||
#endif
|
||||
throttle = { table(tpsADC, "throttlefactor.inc") }
|
||||
|
||||
idleDC = { (coolant < fastIdleT) * 100 }
|
||||
|
||||
altDiv = { alternate ? 2 : 1 }
|
||||
cycleTime = { 60000.0 / rpm * (2.0-twoStroke) }
|
||||
nSquirts = { nCylinders/divider }
|
||||
dutyCycle = { 100.0*nSquirts/altDiv*pulseWidth/cycleTime }
|
||||
|
||||
;-------------------------------------------------------------------------------
|
||||
|
||||
[Datalog]
|
||||
; Full datalog.
|
||||
;
|
||||
; Default user-defined log emulates the full datalog.
|
||||
;
|
||||
; The entries are saved in the datalog file in the order in
|
||||
; which they appear in the list below.
|
||||
;
|
||||
; Channel - Case sensitive name of output channel to be logged.
|
||||
; Label - String written to header line of log. Be careful
|
||||
; about changing these, as programs like MSLVV and
|
||||
; MSTweak key off specific column names.
|
||||
; Type - Data type of output, converted before writing.
|
||||
; Format - C-style output format of data.
|
||||
;
|
||||
; Channel Label Type Format
|
||||
; -------------- ---------- ----- ------
|
||||
entry = time, "Time", float, "%.3f"
|
||||
entry = secl, "SecL", int, "%d"
|
||||
entry = rpm100, "RPM", int, "%d"
|
||||
entry = map, "MAP", int, "%d"
|
||||
entry = throttle, "TP", int, "%d"
|
||||
entry = egoVoltage, "O2", float, "%.3f"
|
||||
entry = mat, "MAT", float, "%.1f"
|
||||
entry = coolant, "CLT", float, "%.1f"
|
||||
entry = engine, "Engine", int, "%d"
|
||||
entry = egoCorrection, "Gego", int, "%d"
|
||||
entry = airCorrection, "Gair", int, "%d"
|
||||
entry = warmupEnrich, "Gwarm", int, "%d"
|
||||
entry = baroCorrection, "Gbaro", int, "%d"
|
||||
entry = gammaEnrich, "Gammae", int, "%d"
|
||||
entry = accDecEnrich, "TPSacc", int, "%d"
|
||||
entry = veCurr, "Gve", int, "%d"
|
||||
entry = pulseWidth, "PW", float, "%.1f"
|
||||
entry = blank2, "Gve2", int, "%d"
|
||||
entry = pulseWidth, "PW2", float, "%.1f"
|
||||
entry = dutyCycle, "DutyCycle1", float, "%.1f"
|
||||
entry = dutyCycle, "DutyCycle2", float, "%.1f"
|
||||
entry = blank1, "UserData1", int, "%d"
|
||||
entry = blank2, "UserData2", int, "%d"
|
||||
entry = blank3, "UserData3", int, "%d"
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1 @@
|
|||
2.889.ini
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue