Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Paul Dino Jones
|
485a3489a9 | |
|
Paul Dino Jones
|
aeaced3676 |
|
|
@ -1,4 +1,3 @@
|
|||
[submodule "src/monocoque/simulatorapi/simapi"]
|
||||
path = src/monocoque/simulatorapi/simapi
|
||||
url = https://github.com/spacefreak18/simapi
|
||||
# url = git@github.com:spacefreak18/simapi # ssh is better but Microsoft requires an account
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ endif()
|
|||
|
||||
|
||||
SET_SOURCE_FILES_PROPERTIES( src/monocoque.c PROPERTIES LANGUAGE C)
|
||||
#set(CMAKE_BUILD_TYPE Debug)
|
||||
set(CMAKE_BUILD_TYPE Debug)
|
||||
|
||||
|
||||
project(monocoque)
|
||||
|
|
@ -33,24 +33,16 @@ FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb-1.0
|
|||
set(HIDAPI_WITH_LIBUSB TRUE) # surely will be used only on Linux
|
||||
set(BUILD_SHARED_LIBS TRUE) # HIDAPI as static library on all platforms
|
||||
|
||||
add_executable(monocoque src/monocoque/monocoque.c)
|
||||
if(USE_PULSEAUDIO)
|
||||
message("Using pulseaudio backend...")
|
||||
add_compile_definitions(USE_PULSEAUDIO=true)
|
||||
target_link_libraries(monocoque m ${LIBUSB_LIBRARY} hidapi-libusb pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi)
|
||||
else()
|
||||
message("Using portaudio backend...")
|
||||
target_link_libraries(monocoque m ${LIBUSB_LIBRARY} hidapi-libusb portaudio serialport xml2 argtable2 config gameloop helper devices slog simulatorapi)
|
||||
endif()
|
||||
|
||||
target_include_directories(monocoque PUBLIC config ${LIBUSB_INCLUDE_DIR} ${LIBXML_INCLUDE_DIR})
|
||||
|
||||
add_subdirectory(src/monocoque/gameloop)
|
||||
add_subdirectory(src/monocoque/simulatorapi)
|
||||
add_subdirectory(src/monocoque/helper)
|
||||
add_subdirectory(src/monocoque/devices)
|
||||
add_subdirectory(src/monocoque/slog)
|
||||
|
||||
add_executable(monocoque src/monocoque/monocoque.c)
|
||||
target_include_directories(monocoque PUBLIC config ${LIBUSB_INCLUDE_DIR} ${LIBXML_INCLUDE_DIR})
|
||||
target_link_libraries(monocoque m ${LIBUSB_LIBRARY} hidapi-libusb portaudio serialport xml2 argtable2 config gameloop helper devices slog simulatorapi)
|
||||
|
||||
add_executable(listusb tests/testlibusb.c)
|
||||
target_include_directories(listusb PUBLIC ${LIBUSB_INCLUDE_DIR})
|
||||
target_link_libraries(listusb ${LIBUSB_LIBRARY} portaudio)
|
||||
|
|
@ -130,12 +122,6 @@ else() # GCC/Clang warning option
|
|||
# e.g. at the time of writing, GCC does not support -Wdocumentation
|
||||
#
|
||||
# enable all warnings about 'questionable constructs'
|
||||
|
||||
if(analyze)
|
||||
message("-- Analyzer is on")
|
||||
target_compile_options(monocoque PRIVATE -fanalyzer -Wno-analyzer-possible-null-argument -Wno-analyzer-possible-null-dereference)
|
||||
endif()
|
||||
|
||||
enable_cxx_compiler_flag_if_supported("-Wall")
|
||||
# issue 'pedantic' warnings for strict ISO compliance
|
||||
enable_cxx_compiler_flag_if_supported("-pedantic")
|
||||
|
|
|
|||
873
LICENSE.rst
873
LICENSE.rst
|
|
@ -1,622 +1,281 @@
|
|||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The 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
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
License is intended to guarantee your freedom to share and change free
|
||||
software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
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.
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to 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.
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if you
|
||||
distribute copies of the software, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must 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.
|
||||
gratis or for a fee, you must give the recipients all the rights that
|
||||
you have. You must make sure that they, too, receive or can get the
|
||||
source code. And you must show them these terms so they know their
|
||||
rights.
|
||||
|
||||
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.
|
||||
We protect your rights with two steps: (1) copyright the software, and
|
||||
(2) offer you this license which gives you legal permission to copy,
|
||||
distribute and/or modify the software.
|
||||
|
||||
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.
|
||||
Also, for each author's protection and ours, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
software. If the software is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original, so
|
||||
that any problems introduced by others will not reflect on the original
|
||||
authors' reputations.
|
||||
|
||||
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.
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that redistributors of a free
|
||||
program will individually obtain patent licenses, in effect making the
|
||||
program proprietary. To prevent this, we have made it clear that any
|
||||
patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
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
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
a notice placed by the copyright holder saying it may be distributed
|
||||
under the terms of this General Public License. The "Program", below,
|
||||
refers to any such program or work, and a "work based on the Program"
|
||||
means either the Program or any derivative work under copyright law:
|
||||
that is to say, a work containing the Program or a portion of it,
|
||||
either verbatim or with modifications and/or translated into another
|
||||
language. (Hereinafter, translation is included without limitation in
|
||||
the term "modification".) Each licensee is addressed as "you".
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running the Program is not restricted, and the output from the Program
|
||||
is covered only if its contents constitute a work based on the
|
||||
Program (independent of having been made by running the Program).
|
||||
Whether that is true depends on what the Program does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Program's
|
||||
source code as you receive it, in any medium, provided that you
|
||||
conspicuously and appropriately publish on each copy an appropriate
|
||||
copyright notice and disclaimer of warranty; keep intact all the
|
||||
notices that refer to this License and to the absence of any warranty;
|
||||
and give any other recipients of the Program a copy of this License
|
||||
along with the Program.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy, and
|
||||
you may at your option offer warranty protection in exchange for a fee.
|
||||
|
||||
2. You may modify your copy or copies of the Program or any portion
|
||||
of it, thus forming a work based on the Program, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) You must cause the modified files to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
b) You must cause any work that you distribute or publish, that in
|
||||
whole or in part contains or is derived from the Program or any
|
||||
part thereof, to be licensed as a whole at no charge to all third
|
||||
parties under the terms of this License.
|
||||
|
||||
c) If the modified program normally reads commands interactively
|
||||
when run, you must cause it, when started running for such
|
||||
interactive use in the most ordinary way, to print or display an
|
||||
announcement including an appropriate copyright notice and a
|
||||
notice that there is no warranty (or else, saying that you provide
|
||||
a warranty) and that users may redistribute the program under
|
||||
these conditions, and telling the user how to view a copy of this
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Program, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Program.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Program
|
||||
with the Program (or with a work based on the Program) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may copy and distribute the Program (or a work based on it,
|
||||
under Section 2) in object code or executable form under the terms of
|
||||
Sections 1 and 2 above provided that you also do one of the following:
|
||||
|
||||
a) Accompany it with the complete corresponding machine-readable
|
||||
source code, which must be distributed under the terms of Sections
|
||||
1 and 2 above on a medium customarily used for software interchange; or,
|
||||
|
||||
b) Accompany it with a written offer, valid for at least three
|
||||
years, to give any third party, for a charge no more than your
|
||||
cost of physically performing source distribution, a complete
|
||||
machine-readable copy of the corresponding source code, to be
|
||||
distributed under the terms of Sections 1 and 2 above on a medium
|
||||
customarily used for software interchange; or,
|
||||
|
||||
c) Accompany it with the information you received as to the offer
|
||||
to distribute corresponding source code. (This alternative is
|
||||
allowed only for noncommercial distribution and only if you
|
||||
received the program in object code or executable form with such
|
||||
an offer, in accord with Subsection b above.)
|
||||
|
||||
The source code for a work means the preferred form of the work for
|
||||
making modifications to it. For an executable work, complete source
|
||||
code means all the source code for all modules it contains, plus any
|
||||
associated interface definition files, plus the scripts used to
|
||||
control compilation and installation of the executable. However, as a
|
||||
special exception, the source code distributed need not include
|
||||
anything that is normally distributed (in either source or binary
|
||||
form) with the major components (compiler, kernel, and so on) of the
|
||||
operating system on which the executable runs, unless that component
|
||||
itself accompanies the executable.
|
||||
|
||||
If distribution of executable or object code is made by offering
|
||||
access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
void, and will automatically terminate your rights under this License.
|
||||
However, parties who have received copies, or rights, from you under
|
||||
this License will not have their licenses terminated so long as such
|
||||
parties remain in full compliance.
|
||||
|
||||
5. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Program or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Program (or any work based on the
|
||||
Program), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Program or works based on it.
|
||||
|
||||
6. Each time you redistribute the Program (or any work based on the
|
||||
Program), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute or modify the Program subject to
|
||||
these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
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
|
||||
7. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot 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.
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Program at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Program by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
If any portion of this section is held invalid or unenforceable under
|
||||
any particular circumstance, the balance of the section is intended to
|
||||
apply and the section as a whole is intended to apply in other
|
||||
circumstances.
|
||||
|
||||
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.
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system, which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest 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
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
may add an explicit geographical distribution limitation excluding
|
||||
those countries, so that distribution is permitted only in or among
|
||||
countries not thus excluded. In such case, this License incorporates
|
||||
the limitation as if written in the body of this License.
|
||||
|
||||
9. The Free Software Foundation may publish revised and/or new versions
|
||||
of the General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies 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.
|
||||
Each version is given a distinguishing version number. If the Program
|
||||
specifies a version number of this License which applies to it and "any
|
||||
later version", you have the option of following the terms and conditions
|
||||
either of that version or of any later version published by the Free
|
||||
Software Foundation. If the Program does not specify a version number of
|
||||
this License, you may choose any version ever published by the Free Software
|
||||
Foundation.
|
||||
|
||||
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.
|
||||
10. If you wish to incorporate parts of the Program into other free
|
||||
programs whose distribution conditions are different, write to the author
|
||||
to ask for permission. For software which is copyrighted by the Free
|
||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||
make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
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.
|
||||
NO WARRANTY
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||
REPAIR OR CORRECTION.
|
||||
|
||||
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.
|
||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
|
|
@ -628,15 +287,15 @@ 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
|
||||
convey the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<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
|
||||
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
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
|
|
@ -644,31 +303,37 @@ the "copyright" line and a pointer to where the full notice is found.
|
|||
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/>.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
If the program is interactive, 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'.
|
||||
Gnomovision version 69, Copyright (C) year name of author
|
||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
parts of the General Public License. Of course, the commands you use may
|
||||
be called something other than `show w' and `show c'; they could even be
|
||||
mouse-clicks or menu items--whatever suits your program.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or 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/>.
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
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>.
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||
|
||||
<signature of Ty Coon>, 1 April 1989
|
||||
Ty Coon, President of Vice
|
||||
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
|
|
|
|||
21
README.md
21
README.md
|
|
@ -16,20 +16,18 @@ Cross Platform device manager for driving and flight simulators, for use with co
|
|||
- Includes utility to configure revburner tachometer
|
||||
- Can send data to any serial device. So far only tested with arduino. Includes sample arduino sketch for sim lights.
|
||||
- The support for haptic bass shakers is limited and needs the most work. So far the engine rev is a simple sine wave, which I find convincing. The gear shift event works but not convincing enough for me.
|
||||
- Choice of Portaudio or Pulseaudio backend.
|
||||
|
||||
## Dependencies
|
||||
- libserialport - arduino serial devices
|
||||
- hidapi - usb hid devices
|
||||
- libusb - used by hidapi
|
||||
- portaudio - sound devices (haptic bass shakers)
|
||||
- pulseaudio - sound devices (haptic bass shakers)
|
||||
- libenet - UDP support (not yet implemented)
|
||||
- libenet - UDP support
|
||||
- libxml2
|
||||
- argtable2
|
||||
- libconfig
|
||||
- [slog](https://github.com/kala13x/slog) (static)
|
||||
- [wine-linux-shm-adapter](https://github.com/spacefreak18/simshmbridge) - for sims that need shared memory mapping like AC.
|
||||
- slog (static)
|
||||
- [wine-linux-shm-adapter](https://github.com/spacefreak18/wine-linux-shm-adapter)
|
||||
- [simapi](https://github.com/spacefreak18/simapi)
|
||||
|
||||
## Building
|
||||
|
|
@ -38,28 +36,19 @@ This code depends on the shared memory data headers in the simapi [repo](https:/
|
|||
git submodule sync --recursive
|
||||
git submodule update --init --recursive
|
||||
```
|
||||
|
||||
Then to compile simply:
|
||||
```
|
||||
mkdir build; cd build
|
||||
cmake ..
|
||||
make
|
||||
```
|
||||
|
||||
to use the pulseaudio backend use this cmake command
|
||||
```
|
||||
cmake -DUSE_PULSEAUDIO=YES ..
|
||||
```
|
||||
|
||||
## Testing
|
||||
|
||||
### Setting up Your Arduino Device
|
||||
|
||||
### Static Analysis
|
||||
```
|
||||
mkdir build; cd build
|
||||
make clean
|
||||
cmake -Danalyze=on ..
|
||||
CFLAGS=-fanalyzer cmake ..
|
||||
make
|
||||
```
|
||||
### Valgrind
|
||||
|
|
@ -69,8 +58,8 @@ cmake -DUSE_PULSEAUDIO=YES ..
|
|||
```
|
||||
|
||||
## ToDo
|
||||
- windows port
|
||||
- more memory testing
|
||||
- handling null mallocs
|
||||
- move config code around
|
||||
- cleanup tests which are basically just copies of the example from their respective projects
|
||||
- much, much more
|
||||
|
|
|
|||
|
|
@ -5,24 +5,11 @@ devices = ( { device = "USB";
|
|||
subtype = "Revburner";
|
||||
granularity = 4;
|
||||
config = "/home/paul/.config/monocoque/revburner1.xml"; },
|
||||
{ device = "Sound";
|
||||
type = "Engine";
|
||||
devid = "alsa_output.usb-Generic_USB2.0_Device_20170726905959-00.analog-stereo";
|
||||
pan = 1;
|
||||
volume = 90;
|
||||
frequency = 27; },
|
||||
{ device = "Sound";
|
||||
type = "Gear"
|
||||
devid = "alsa_output.usb-Generic_USB2.0_Device_20170726905959-00.analog-stereo";
|
||||
pan = 1;
|
||||
duration = .25;
|
||||
volume = 100;
|
||||
frequency = 27; },
|
||||
{ device = "Sound";
|
||||
type = "Shaker"
|
||||
devid = "98FD:83AC";
|
||||
config = "shaker1.config"; },
|
||||
{ device = "Serial";
|
||||
type = "ShiftLights";
|
||||
config = "None";
|
||||
devpath = "/dev/ttyACM0"; } ),
|
||||
{ device = "Serial";
|
||||
type = "SimWind";
|
||||
config = "None";
|
||||
devpath = "/dev/ttyACM1"; } );
|
||||
devpath = "/dev/ttyACM0"; } );
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include <FastLED.h>
|
||||
#include "simdata.h"
|
||||
#include "../../monocoque/simulatorapi/simdata.h"
|
||||
|
||||
#define SIMDATA_SIZE sizeof(SimData)
|
||||
#define BYTE_SIZE sizeof(SimData)
|
||||
|
||||
#define LED_PIN 7
|
||||
#define NUM_LEDS 6
|
||||
|
|
@ -39,12 +39,12 @@ void setup()
|
|||
void loop()
|
||||
{
|
||||
int l = 0;
|
||||
char buff[SIMDATA_SIZE];
|
||||
char buff[BYTE_SIZE];
|
||||
|
||||
if (Serial.available() >= SIMDATA_SIZE)
|
||||
if (Serial.available() >= BYTE_SIZE)
|
||||
{
|
||||
Serial.readBytes(buff, SIMDATA_SIZE);
|
||||
memcpy(&sd, &buff, SIMDATA_SIZE);
|
||||
Serial.readBytes(buff, BYTE_SIZE);
|
||||
memcpy(&sd, &buff, BYTE_SIZE);
|
||||
rpm = sd.rpms;
|
||||
maxrpm = sd.maxrpm;
|
||||
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
#include <FastLED.h>
|
||||
#include "../../monocoque/simulatorapi/simdata.h"
|
||||
|
||||
#define BYTE_SIZE sizeof(SimData)
|
||||
|
||||
#define LED_PIN 7
|
||||
#define NUM_LEDS 6
|
||||
|
||||
CRGB leds[NUM_LEDS];
|
||||
SimData sd;
|
||||
int maxrpm = 0;
|
||||
int rpm = 0;
|
||||
int numlights = NUM_LEDS;
|
||||
int pin = LED_PIN;
|
||||
int lights[6];
|
||||
|
||||
|
||||
void setup() {
|
||||
|
||||
Serial.begin(9600);
|
||||
FastLED.addLeds<WS2812, LED_PIN, GRB>(leds, NUM_LEDS);
|
||||
FastLED.setMaxPowerInVoltsAndMilliamps(5, 500);
|
||||
FastLED.setBrightness(40);
|
||||
for (int i = 0; i < numlights; i++)
|
||||
{
|
||||
leds[i] = CRGB ( 0, 0, 0);
|
||||
lights[i] = 0;
|
||||
}
|
||||
FastLED.clear();
|
||||
|
||||
sd.rpms = 0;
|
||||
sd.maxrpm = 6500;
|
||||
sd.altitude = 10;
|
||||
sd.pulses = 40000;
|
||||
sd.velocity = 10;
|
||||
}
|
||||
|
||||
void loop() {
|
||||
|
||||
int l = 0;
|
||||
char buff[BYTE_SIZE];
|
||||
|
||||
if (Serial.available() >= BYTE_SIZE) {
|
||||
Serial.readBytes(buff, BYTE_SIZE);
|
||||
memcpy(&sd, &buff, BYTE_SIZE);
|
||||
rpm = sd.rpms;
|
||||
maxrpm = sd.maxrpm;
|
||||
|
||||
}
|
||||
|
||||
|
||||
while (l < numlights)
|
||||
{
|
||||
lights[l] = 0;
|
||||
l++;
|
||||
}
|
||||
l = -1;
|
||||
int rpmlights = 0;
|
||||
while (rpm > rpmlights)
|
||||
{
|
||||
if (l>=0)
|
||||
{
|
||||
lights[l] = 1;
|
||||
}
|
||||
l++;
|
||||
rpmlights = rpmlights + (((maxrpm-250)/numlights));
|
||||
}
|
||||
|
||||
l = 0;
|
||||
FastLED.clear();
|
||||
while (l < numlights)
|
||||
{
|
||||
|
||||
if (l >= numlights / 2)
|
||||
{
|
||||
leds[l] = CRGB ( 0, 0, 255);
|
||||
}
|
||||
if (l < numlights / 2)
|
||||
{
|
||||
leds[l] = CRGB ( 0, 255, 0);
|
||||
}
|
||||
if (l == numlights - 1)
|
||||
{
|
||||
leds[l] = CRGB ( 255, 0, 0);
|
||||
}
|
||||
if (lights[l] <= 0)
|
||||
{
|
||||
leds[l] = CRGB ( 0, 0, 0);
|
||||
}
|
||||
FastLED.show();
|
||||
l++;
|
||||
}
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../monocoque/simulatorapi/simapi/simapi/simdata.h
|
||||
|
|
@ -1 +0,0 @@
|
|||
../../monocoque/simulatorapi/simapi/simapi/simdata.h
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
#include <Adafruit_MotorShield.h>
|
||||
#include "simdata.h"
|
||||
|
||||
#define BYTE_SIZE sizeof(SimData)
|
||||
#define KPHTOMPH .621317
|
||||
|
||||
|
||||
Adafruit_MotorShield AFMS = Adafruit_MotorShield();
|
||||
|
||||
Adafruit_DCMotor *myMotor1 = AFMS.getMotor(1);
|
||||
Adafruit_DCMotor *myMotor2 = AFMS.getMotor(3);
|
||||
|
||||
SimData sd;
|
||||
int velocity = 0;
|
||||
|
||||
void setup() {
|
||||
Serial.begin(9600);
|
||||
if (!AFMS.begin()) {
|
||||
Serial.println("Could not find Motor Shield. Check wiring.");
|
||||
while (1);
|
||||
}
|
||||
sd.rpms = 0;
|
||||
sd.maxrpm = 6500;
|
||||
sd.altitude = 10;
|
||||
sd.pulses = 40000;
|
||||
sd.velocity = 10;
|
||||
|
||||
myMotor1->setSpeed(0);
|
||||
myMotor1->run(FORWARD);
|
||||
|
||||
myMotor2->setSpeed(0);
|
||||
myMotor2->run(FORWARD);
|
||||
}
|
||||
|
||||
void loop() {
|
||||
char buff[BYTE_SIZE];
|
||||
|
||||
if (Serial.available() >= BYTE_SIZE)
|
||||
{
|
||||
Serial.readBytes(buff, BYTE_SIZE);
|
||||
memcpy(&sd, &buff, BYTE_SIZE);
|
||||
velocity = sd.velocity;
|
||||
}
|
||||
int v = ceil(velocity * KPHTOMPH);
|
||||
if (v >= 255)
|
||||
{
|
||||
v = 255;
|
||||
}
|
||||
myMotor1->setSpeed(v);
|
||||
myMotor2->setSpeed(v);
|
||||
}
|
||||
|
|
@ -9,13 +9,10 @@ set(devices_source_files
|
|||
serialdevice.c
|
||||
tachdevice.h
|
||||
tachdevice.c
|
||||
sound.h
|
||||
sound.c
|
||||
usb/revburner.h
|
||||
usb/revburner.c
|
||||
sound/usb_generic_shaker.h
|
||||
sound/usb_generic_shaker.c
|
||||
sound/usb_generic_shaker_pulse.c
|
||||
serial/arduino.h
|
||||
serial/arduino.c
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "arduino.h"
|
||||
#include "../../slog/slog.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
#define arduino_timeout 2000
|
||||
|
||||
|
|
@ -19,12 +18,11 @@ int arduino_update(SerialDevice* serialdevice, SimData* simdata)
|
|||
return result;
|
||||
}
|
||||
|
||||
int arduino_init(SerialDevice* serialdevice, const char* portdev)
|
||||
int arduino_init(SerialDevice* serialdevice)
|
||||
{
|
||||
slogi("initializing arduino serial device...");
|
||||
int error = 0;
|
||||
char* port_name = strdup(portdev);
|
||||
|
||||
char* port_name = "/dev/ttyACM0";
|
||||
slogd("Looking for port %s.\n", port_name);
|
||||
error = check(sp_get_port_by_name(port_name, &serialdevice->port));
|
||||
if (error != 0)
|
||||
|
|
@ -42,7 +40,6 @@ int arduino_init(SerialDevice* serialdevice, const char* portdev)
|
|||
check(sp_set_stopbits(serialdevice->port, 1));
|
||||
check(sp_set_flowcontrol(serialdevice->port, SP_FLOWCONTROL_NONE));
|
||||
|
||||
free(port_name);
|
||||
slogd("Successfully setup arduino serial device...");
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
#ifndef _ARDUINO_H
|
||||
#define _ARDUINO_H
|
||||
|
||||
#include "../simdevice.h"
|
||||
#include "../serialdevice.h"
|
||||
|
||||
int arduino_update(SerialDevice* serialdevice, SimData* simdata);
|
||||
int arduino_init(SerialDevice* serialdevice, const char* portdev);
|
||||
int arduino_init(SerialDevice* serialdevice);
|
||||
int arduino_free(SerialDevice* serialdevice);
|
||||
int check(enum sp_return result);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,34 +2,26 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "simdevice.h"
|
||||
#include "serialdevice.h"
|
||||
#include "serial/arduino.h"
|
||||
#include "../helper/parameters.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
int serialdev_update(SimDevice* this, SimData* simdata)
|
||||
int serialdev_update(SerialDevice* serialdevice, SimData* simdata)
|
||||
{
|
||||
SerialDevice* serialdevice = (void *) this->derived;
|
||||
|
||||
arduino_update(serialdevice, simdata);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int serialdev_free(SimDevice* this)
|
||||
int serialdev_free(SerialDevice* serialdevice)
|
||||
{
|
||||
SerialDevice* serialdevice = (void *) this->derived;
|
||||
|
||||
arduino_free(serialdevice);
|
||||
|
||||
free(serialdevice);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int serialdev_init(SerialDevice* serialdevice, const char* portdev)
|
||||
int serialdev_init(SerialDevice* serialdevice)
|
||||
{
|
||||
slogi("initializing serial device...");
|
||||
int error = 0;
|
||||
|
|
@ -37,29 +29,7 @@ int serialdev_init(SerialDevice* serialdevice, const char* portdev)
|
|||
serialdevice->type = SERIALDEV_UNKNOWN;
|
||||
serialdevice->type = SERIALDEV_ARDUINO;
|
||||
|
||||
error = arduino_init(serialdevice, portdev);
|
||||
error = arduino_init(serialdevice);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
static const vtable serial_simdevice_vtable = { &serialdev_update, &serialdev_free };
|
||||
|
||||
SerialDevice* new_serial_device(DeviceSettings* ds) {
|
||||
|
||||
SerialDevice* this = (SerialDevice*) malloc(sizeof(SerialDevice));
|
||||
|
||||
this->m.update = &update;
|
||||
this->m.free = &simdevfree;
|
||||
this->m.derived = this;
|
||||
this->m.vtable = &serial_simdevice_vtable;
|
||||
|
||||
int error = serialdev_init(this, ds->serialdevsettings.portdev);
|
||||
|
||||
if (error != 0)
|
||||
{
|
||||
free(this);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,26 @@
|
|||
#define _SERIALDEVICE_H
|
||||
|
||||
#include <libserialport.h>
|
||||
#include "../helper/parameters.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SERIALDEV_UNKNOWN = 0,
|
||||
SERIALDEV_ARDUINO = 1
|
||||
}
|
||||
SerialType;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int id;
|
||||
SerialType type;
|
||||
struct sp_port* port;
|
||||
}
|
||||
SerialDevice;
|
||||
|
||||
int serialdev_update(SerialDevice* serialdevice, SimData* simdata);
|
||||
int serialdev_init(SerialDevice* serialdevice);
|
||||
int serialdev_free(SerialDevice* serialdevice);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,108 +1,85 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "simdevice.h"
|
||||
#include "../helper/parameters.h"
|
||||
#include "../helper/confighelper.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
|
||||
int update(SimDevice* this, SimData* simdata)
|
||||
int devupdate(SimDevice* simdevice, SimData* simdata)
|
||||
{
|
||||
((vtable*)this->vtable)->update(this, simdata);
|
||||
}
|
||||
|
||||
int simdevfree(SimDevice* this)
|
||||
{
|
||||
((vtable*)this->vtable)->free(this);
|
||||
}
|
||||
|
||||
int devupdate(SimDevice* this, SimData* simdata)
|
||||
{
|
||||
|
||||
if (simdevice->initialized==false)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
switch ( simdevice->type )
|
||||
{
|
||||
case SIMDEV_USB :
|
||||
usbdev_update(&simdevice->d.usbdevice, simdata);
|
||||
break;
|
||||
case SIMDEV_SOUND :
|
||||
sounddev_update(&simdevice->d.sounddevice, simdata);
|
||||
break;
|
||||
case SIMDEV_SERIAL :
|
||||
serialdev_update(&simdevice->d.serialdevice, simdata);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int devfree(SimDevice* simdevices, int numdevices)
|
||||
int devfree(SimDevice* simdevice)
|
||||
{
|
||||
|
||||
slogi("freeing %i simdevices...", numdevices);
|
||||
int devices = 0;
|
||||
|
||||
int freed = 0;
|
||||
for (int j = 0; j < 1; j++)
|
||||
if (simdevice->initialized==false)
|
||||
{
|
||||
SimDevice simdev = simdevices[j];
|
||||
if (simdev.initialized == true)
|
||||
{
|
||||
simdev.free(&simdev);
|
||||
}
|
||||
slogw("Attempt to free an uninitialized device");
|
||||
return MONOCOQUE_ERROR_INVALID_DEV;
|
||||
}
|
||||
switch ( simdevice->type )
|
||||
{
|
||||
case SIMDEV_USB :
|
||||
usbdev_free(&simdevice->d.usbdevice);
|
||||
break;
|
||||
case SIMDEV_SOUND :
|
||||
sounddev_free(&simdevice->d.sounddevice);
|
||||
break;
|
||||
case SIMDEV_SERIAL :
|
||||
serialdev_free(&simdevice->d.serialdevice);
|
||||
break;
|
||||
}
|
||||
|
||||
//free(simdevices);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds)
|
||||
int devinit(SimDevice* simdevice, DeviceSettings* ds)
|
||||
{
|
||||
slogi("initializing simdevices...");
|
||||
int devices = 0;
|
||||
slogi("initializing simdevice...");
|
||||
simdevice->initialized = false;
|
||||
int err = 0;
|
||||
|
||||
for (int j = 0; j < numdevices; j++)
|
||||
switch ( ds->dev_type )
|
||||
{
|
||||
simdevices[j].initialized = false;
|
||||
|
||||
if (ds[j].dev_type == SIMDEV_USB) {
|
||||
USBDevice* sim = new_usb_device(&ds[j]);
|
||||
if (sim != NULL)
|
||||
{
|
||||
simdevices[j] = sim->m;
|
||||
simdevices[j].initialized = true;
|
||||
simdevices[j].type = SIMDEV_USB;
|
||||
devices++;
|
||||
}
|
||||
else
|
||||
{
|
||||
slogw("Could not initialize USB Device");
|
||||
}
|
||||
}
|
||||
|
||||
if (ds[j].dev_type == SIMDEV_SOUND) {
|
||||
|
||||
SoundDevice* sim = new_sound_device(&ds[j]);
|
||||
if (sim != NULL)
|
||||
{
|
||||
|
||||
simdevices[j] = sim->m;
|
||||
simdevices[j].initialized = true;
|
||||
simdevices[j].type = SIMDEV_SOUND;
|
||||
devices++;
|
||||
}
|
||||
else
|
||||
{
|
||||
slogw("Could not initialize Sound Device");
|
||||
}
|
||||
}
|
||||
|
||||
if (ds[j].dev_type == SIMDEV_SERIAL) {
|
||||
|
||||
SerialDevice* sim = new_serial_device(&ds[j]);
|
||||
if (sim != NULL)
|
||||
{
|
||||
simdevices[j] = sim->m;
|
||||
simdevices[j].initialized = true;
|
||||
simdevices[j].type = SIMDEV_SERIAL;
|
||||
devices++;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
slogw("Could not initialize Serial Device");
|
||||
}
|
||||
}
|
||||
case SIMDEV_USB :
|
||||
simdevice->type = SIMDEV_USB;
|
||||
simdevice->d.usbdevice.type = USBDEV_UNKNOWN;
|
||||
err = usbdev_init(&simdevice->d.usbdevice, ds);
|
||||
break;
|
||||
case SIMDEV_SOUND :
|
||||
simdevice->type = SIMDEV_SOUND;
|
||||
err = sounddev_init(&simdevice->d.sounddevice);
|
||||
break;
|
||||
case SIMDEV_SERIAL :
|
||||
simdevice->type = SIMDEV_SERIAL;
|
||||
err = serialdev_init(&simdevice->d.serialdevice);
|
||||
break;
|
||||
default :
|
||||
sloge("Unknown device type");
|
||||
err = MONOCOQUE_ERROR_UNKNOWN_DEV;
|
||||
break;
|
||||
}
|
||||
|
||||
return devices;
|
||||
if (err==0)
|
||||
{
|
||||
simdevice->initialized = true;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,109 +7,28 @@
|
|||
#include "sounddevice.h"
|
||||
#include "serialdevice.h"
|
||||
#include "../helper/confighelper.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
|
||||
|
||||
typedef struct SimDevice SimDevice;
|
||||
|
||||
struct SimDevice
|
||||
typedef struct
|
||||
{
|
||||
const void* vtable;
|
||||
int (*update)(SimDevice*, SimData*);
|
||||
int (*free)(SimDevice*);
|
||||
void* derived;
|
||||
int id;
|
||||
bool initialized;
|
||||
DeviceType type;
|
||||
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
int (*update)(SimDevice*, SimData*);
|
||||
int (*free)(SimDevice*);
|
||||
} vtable;
|
||||
|
||||
/********* Serial Devices *****/
|
||||
typedef enum
|
||||
{
|
||||
SERIALDEV_UNKNOWN = 0,
|
||||
SERIALDEV_ARDUINO = 1
|
||||
}
|
||||
SerialType;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SimDevice m;
|
||||
int id;
|
||||
SerialType type;
|
||||
struct sp_port* port;
|
||||
}
|
||||
SerialDevice;
|
||||
|
||||
int serialdev_update(SimDevice* this, SimData* simdata);
|
||||
int serialdev_free(SimDevice* this);
|
||||
|
||||
SerialDevice* new_serial_device(DeviceSettings* ds);
|
||||
|
||||
/********* USB HID Devices *****/
|
||||
typedef enum
|
||||
{
|
||||
USBDEV_UNKNOWN = 0,
|
||||
USBDEV_TACHOMETER = 1
|
||||
}
|
||||
USBType;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SimDevice m;
|
||||
int id;
|
||||
USBType type;
|
||||
union
|
||||
{
|
||||
TachDevice tachdevice;
|
||||
} u;
|
||||
USBDevice usbdevice;
|
||||
SoundDevice sounddevice;
|
||||
SerialDevice serialdevice;
|
||||
} d;
|
||||
}
|
||||
USBDevice;
|
||||
|
||||
int usbdev_update(SimDevice* this, SimData* simdata);
|
||||
int usbdev_free(SimDevice* this);
|
||||
|
||||
USBDevice* new_usb_device(DeviceSettings* ds);
|
||||
|
||||
|
||||
/********* Sound Devices *****/
|
||||
typedef struct
|
||||
{
|
||||
SimDevice m;
|
||||
int id;
|
||||
SoundType type;
|
||||
VibrationEffectType effecttype;
|
||||
SoundData sounddata;
|
||||
#ifdef USE_PULSEAUDIO
|
||||
pa_stream *stream;
|
||||
#else
|
||||
PaStreamParameters outputParameters;
|
||||
PaStream* stream;
|
||||
#endif
|
||||
}
|
||||
SoundDevice;
|
||||
|
||||
int sounddev_engine_update(SimDevice* this, SimData* simdata);
|
||||
int sounddev_gearshift_update(SimDevice* this, SimData* simdata);
|
||||
int sounddev_free(SimDevice* this);
|
||||
|
||||
SoundDevice* new_sound_device(DeviceSettings* ds);
|
||||
|
||||
/***** Generic Methods *********/
|
||||
|
||||
int update(SimDevice* simdevice, SimData* simdata);
|
||||
SimDevice;
|
||||
|
||||
int devupdate(SimDevice* simdevice, SimData* simdata);
|
||||
|
||||
int devinit(SimDevice* simdevices, int numdevices, DeviceSettings* ds);
|
||||
int devinit(SimDevice* simdevice, DeviceSettings* ds);
|
||||
|
||||
int devfree(SimDevice* simdevices, int numdevices);
|
||||
|
||||
int simdevfree(SimDevice* this);
|
||||
int devfree(SimDevice* simdevice);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
#include "sound.h"
|
||||
|
||||
#include "../slog/slog.h"
|
||||
|
||||
#ifdef USE_PULSEAUDIO
|
||||
|
||||
pa_threaded_mainloop* mainloop;
|
||||
pa_context* context;
|
||||
|
||||
void context_state_cb(pa_context* context, void* mainloop) {
|
||||
pa_threaded_mainloop_signal(mainloop, 0);
|
||||
}
|
||||
|
||||
int setupsound()
|
||||
{
|
||||
|
||||
|
||||
|
||||
pa_mainloop_api *mainloop_api;
|
||||
|
||||
slogi("connecting pulseaudio...");
|
||||
// Get a mainloop and its context
|
||||
mainloop = pa_threaded_mainloop_new();
|
||||
assert(mainloop);
|
||||
mainloop_api = pa_threaded_mainloop_get_api(mainloop);
|
||||
context = pa_context_new(mainloop_api, "Monocoque");
|
||||
assert(context);
|
||||
|
||||
pa_context_set_state_callback(context, &context_state_cb, mainloop);
|
||||
|
||||
// Lock the mainloop so that it does not run and crash before the context is ready
|
||||
pa_threaded_mainloop_lock(mainloop);
|
||||
|
||||
// Start the mainloop
|
||||
assert(pa_threaded_mainloop_start(mainloop) == 0);
|
||||
assert(pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL) == 0);
|
||||
|
||||
// Wait for the context to be ready
|
||||
for(;;) {
|
||||
pa_context_state_t context_state = pa_context_get_state(context);
|
||||
assert(PA_CONTEXT_IS_GOOD(context_state));
|
||||
if (context_state == PA_CONTEXT_READY) break;
|
||||
pa_threaded_mainloop_wait(mainloop);
|
||||
}
|
||||
|
||||
slogi("successfully connected pulseaudio...");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
int freesound()
|
||||
{
|
||||
if (context)
|
||||
pa_context_unref(context);
|
||||
|
||||
if (mainloop) {
|
||||
pa_signal_done();
|
||||
pa_threaded_mainloop_free(mainloop);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int setupsound()
|
||||
{
|
||||
|
||||
|
||||
|
||||
slogi("connecting portaudio...");
|
||||
}
|
||||
|
||||
|
||||
int freesound()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
#ifndef _SOUND_H
|
||||
#define _SOUND_H
|
||||
|
||||
#include <pulse/pulseaudio.h>
|
||||
|
||||
extern pa_threaded_mainloop* mainloop;
|
||||
extern pa_context* context;
|
||||
|
||||
|
||||
int setupsound();
|
||||
int freesound();
|
||||
|
||||
#endif
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
#ifndef USE_PULSEAUDIO
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
|
|
@ -12,80 +10,63 @@
|
|||
|
||||
#define SAMPLE_RATE (48000)
|
||||
|
||||
#define DURATION 4.0
|
||||
#define AMPLITUDE .5
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI (3.14159265)
|
||||
#endif
|
||||
|
||||
|
||||
int patestCallbackEngineRPM(const void* inputBuffer,
|
||||
|
||||
int patestCallback(const void* inputBuffer,
|
||||
void* outputBuffer,
|
||||
unsigned long framesPerBuffer,
|
||||
const PaStreamCallbackTimeInfo* timeInfo,
|
||||
PaStreamCallbackFlags statusFlags,
|
||||
void* userData)
|
||||
{
|
||||
SoundData* data = (SoundData*)userData;
|
||||
PATestData* data = (PATestData*)userData;
|
||||
float* out = (float*)outputBuffer;
|
||||
memset(out, 0, framesPerBuffer * 2 * sizeof(float));
|
||||
unsigned int i;
|
||||
unsigned int n;
|
||||
//n = data->n;
|
||||
n = data->n;
|
||||
(void) inputBuffer; /* Prevent unused argument warning. */
|
||||
|
||||
for( i=0; i<framesPerBuffer; i++,n++ )
|
||||
{
|
||||
static double t = 0.0;
|
||||
double sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * t);
|
||||
float v = 0;
|
||||
v = data->amp * sin (2 * M_PI * ((float) n) / (float) SAMPLE_RATE);
|
||||
|
||||
t += 1.0 / SAMPLE_RATE;
|
||||
if (t >= DURATION) {
|
||||
t = 0.0;
|
||||
}
|
||||
*out++ = sample;
|
||||
*out++ = sample;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int patestCallbackGearShift(const void* inputBuffer,
|
||||
void* outputBuffer,
|
||||
unsigned long framesPerBuffer,
|
||||
const PaStreamCallbackTimeInfo* timeInfo,
|
||||
PaStreamCallbackFlags statusFlags,
|
||||
void* userData)
|
||||
{
|
||||
SoundData* data = (SoundData*)userData;
|
||||
float* out = (float*)outputBuffer;
|
||||
memset(out, 0, framesPerBuffer * 2 * sizeof(float));
|
||||
unsigned int i;
|
||||
unsigned int n;
|
||||
//n = data->n;
|
||||
(void) inputBuffer; /* Prevent unused argument warning. */
|
||||
|
||||
for( i=0; i<framesPerBuffer; i++,n++ )
|
||||
{
|
||||
static double t = 0.0;
|
||||
double sample = 0;
|
||||
if (data->frequency>0)
|
||||
if ( data->gear_sound_data > 0 )
|
||||
{
|
||||
sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * data->curr_duration);
|
||||
if (n>=1764)
|
||||
{
|
||||
n=0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (n>=data->table_size)
|
||||
{
|
||||
n=0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
data->curr_duration += 1.0 / SAMPLE_RATE;
|
||||
if (data->curr_duration >= data->duration) {
|
||||
data->curr_duration = 0.0;
|
||||
data->curr_frequency = 0;
|
||||
if ( data->gear_sound_data > 0 )
|
||||
{
|
||||
// right channel only?
|
||||
// i have my butt hooked up to right channel... make this configurable?
|
||||
*out++ = v;
|
||||
}
|
||||
else
|
||||
{
|
||||
*out++ = v;
|
||||
*out++ = v;
|
||||
}
|
||||
|
||||
*out++ = sample;
|
||||
*out++ = sample;
|
||||
}
|
||||
|
||||
data->n=n;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int usb_generic_shaker_free(SoundDevice* sounddevice)
|
||||
|
|
@ -116,28 +97,14 @@ int usb_generic_shaker_init(SoundDevice* sounddevice)
|
|||
sounddevice->outputParameters.suggestedLatency = Pa_GetDeviceInfo( sounddevice->outputParameters.device )->defaultLowOutputLatency;
|
||||
sounddevice->outputParameters.hostApiSpecificStreamInfo = NULL;
|
||||
|
||||
if (sounddevice->effecttype == SOUNDEFFECT_GEARSHIFT)
|
||||
{
|
||||
err = Pa_OpenStream( &sounddevice->stream,
|
||||
NULL, /* No input. */
|
||||
&sounddevice->outputParameters, /* As above. */
|
||||
SAMPLE_RATE,
|
||||
440, /* Frames per buffer. */
|
||||
paClipOff, /* No out of range samples expected. */
|
||||
patestCallbackGearShift,
|
||||
&sounddevice->sounddata );
|
||||
}
|
||||
else
|
||||
{
|
||||
err = Pa_OpenStream( &sounddevice->stream,
|
||||
NULL, /* No input. */
|
||||
&sounddevice->outputParameters, /* As above. */
|
||||
SAMPLE_RATE,
|
||||
440, /* Frames per buffer. */
|
||||
paClipOff, /* No out of range samples expected. */
|
||||
patestCallbackEngineRPM,
|
||||
&sounddevice->sounddata );
|
||||
}
|
||||
err = Pa_OpenStream( &sounddevice->stream,
|
||||
NULL, /* No input. */
|
||||
&sounddevice->outputParameters, /* As above. */
|
||||
SAMPLE_RATE,
|
||||
440, /* Frames per buffer. */
|
||||
paClipOff, /* No out of range samples expected. */
|
||||
patestCallback,
|
||||
&sounddevice->sounddata );
|
||||
if( err != paNoError )
|
||||
{
|
||||
goto error;
|
||||
|
|
@ -154,7 +121,8 @@ int usb_generic_shaker_init(SoundDevice* sounddevice)
|
|||
|
||||
error:
|
||||
Pa_Terminate();
|
||||
//fprintf( stderr, "An error occured while using the portaudio stream\n" );
|
||||
//fprintf( stderr, "Error number: %d\n", err );
|
||||
//fprintf( stderr, "Error message: %s\n", Pa_GetErrorText( err ) );
|
||||
return err;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,13 +1,9 @@
|
|||
#ifndef _USB_GENERIC_SHAKER_H
|
||||
#define _USB_GENERIC_SHAKER_H
|
||||
|
||||
#include "../simdevice.h"
|
||||
#include "../sounddevice.h"
|
||||
|
||||
#ifdef USE_PULSEAUDIO
|
||||
int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, const char* streamname);
|
||||
#else
|
||||
int usb_generic_shaker_init(SoundDevice* sounddevice);
|
||||
#endif
|
||||
int usb_generic_shaker_free(SoundDevice* sounddevice);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,163 +0,0 @@
|
|||
#ifdef USE_PULSEAUDIO
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
|
||||
#include "usb_generic_shaker.h"
|
||||
#include "../sounddevice.h"
|
||||
|
||||
#define FORMAT PA_SAMPLE_S16LE
|
||||
#define SAMPLE_RATE (48000)
|
||||
#define AMPLITUDE .5
|
||||
#define DURATION 4.0
|
||||
|
||||
#ifndef M_PI
|
||||
#define M_PI (3.14159265)
|
||||
#endif
|
||||
|
||||
|
||||
void gear_sound_stream(pa_stream *s, size_t length, void *userdata) {
|
||||
|
||||
SoundData* data = (SoundData*)userdata;
|
||||
size_t num_samples = length / sizeof(int16_t);
|
||||
int16_t buffer[num_samples];
|
||||
|
||||
|
||||
for (size_t i = 0; i < num_samples; i++) {
|
||||
static double t = 0.0;
|
||||
double sample = 0;
|
||||
if (data->frequency>0)
|
||||
{
|
||||
sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * data->curr_duration);
|
||||
}
|
||||
|
||||
|
||||
buffer[i] = (int16_t)sample;
|
||||
|
||||
data->curr_duration += 1.0 / SAMPLE_RATE;
|
||||
if (data->curr_duration >= data->duration) {
|
||||
data->curr_duration = 0.0;
|
||||
data->curr_frequency = 0;
|
||||
}
|
||||
}
|
||||
pa_stream_write(s, buffer, length, NULL, 0LL, PA_SEEK_RELATIVE);
|
||||
}
|
||||
|
||||
void engine_sound_stream(pa_stream *s, size_t length, void *userdata) {
|
||||
|
||||
SoundData* data = (SoundData*)userdata;
|
||||
size_t num_samples = length / sizeof(int16_t);
|
||||
int16_t buffer[num_samples];
|
||||
|
||||
for (size_t i = 0; i < num_samples; i++) {
|
||||
static double t = 0.0;
|
||||
double sample = AMPLITUDE * 32767.0 * sin(2.0 * M_PI * data->curr_frequency * t);
|
||||
|
||||
|
||||
buffer[i] = (int16_t)sample;
|
||||
|
||||
t += 1.0 / SAMPLE_RATE;
|
||||
if (t >= DURATION) {
|
||||
t = 0.0;
|
||||
}
|
||||
}
|
||||
pa_stream_write(s, buffer, length, NULL, 0LL, PA_SEEK_RELATIVE);
|
||||
}
|
||||
|
||||
void stream_success_cb(pa_stream *stream, int success, void *userdata) {
|
||||
return;
|
||||
}
|
||||
|
||||
void stream_state_cb(pa_stream *s, void *mainloop) {
|
||||
pa_threaded_mainloop_signal(mainloop, 0);
|
||||
}
|
||||
|
||||
int usb_generic_shaker_free(SoundDevice* sounddevice)
|
||||
{
|
||||
int err = 0;
|
||||
//err = Pa_CloseStream( sounddevice->stream );
|
||||
//if( err != paNoError )
|
||||
//{
|
||||
// err = Pa_Terminate();
|
||||
//}
|
||||
if (sounddevice->stream)
|
||||
{
|
||||
pa_stream_unref(sounddevice->stream);
|
||||
pa_xfree(sounddevice->stream);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
int usb_generic_shaker_init(SoundDevice* sounddevice, pa_threaded_mainloop* mainloop, pa_context* context, const char* devname, int volume, int pan, const char* streamname)
|
||||
{
|
||||
pa_stream *stream;
|
||||
|
||||
// Create a playback stream
|
||||
pa_sample_spec sample_specifications;
|
||||
sample_specifications.format = FORMAT;
|
||||
sample_specifications.rate = SAMPLE_RATE;
|
||||
sample_specifications.channels = 2;
|
||||
|
||||
|
||||
pa_channel_map channel_map;
|
||||
pa_channel_map_init_stereo(&channel_map);
|
||||
pa_channel_map_parse(&channel_map, "front-left,front-right");
|
||||
|
||||
|
||||
stream = pa_stream_new(context, streamname, &sample_specifications, &channel_map);
|
||||
pa_stream_set_state_callback(stream, stream_state_cb, mainloop);
|
||||
|
||||
|
||||
if (sounddevice->effecttype == SOUNDEFFECT_GEARSHIFT)
|
||||
{
|
||||
pa_stream_set_write_callback(stream, gear_sound_stream, &sounddevice->sounddata);
|
||||
}
|
||||
else
|
||||
{
|
||||
pa_stream_set_write_callback(stream, engine_sound_stream, &sounddevice->sounddata);
|
||||
}
|
||||
|
||||
// recommended settings, i.e. server uses sensible values
|
||||
pa_buffer_attr buffer_attr;
|
||||
buffer_attr.maxlength = (uint32_t) 32767;
|
||||
buffer_attr.tlength = (uint32_t) -1;
|
||||
buffer_attr.prebuf = (uint32_t) -1;
|
||||
buffer_attr.minreq = (uint32_t) -1;
|
||||
|
||||
pa_cvolume cv;
|
||||
uint16_t pvolume = ceil(((double) volume/100.0d)*65535);
|
||||
// Settings copied as per the chromium browser source
|
||||
|
||||
pa_stream_flags_t stream_flags;
|
||||
stream_flags = PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_NOT_MONOTONIC | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_ADJUST_LATENCY | PA_STREAM_START_CORKED;
|
||||
|
||||
// Connect stream to the default audio output sink
|
||||
pa_cvolume_set(&cv, sample_specifications.channels, pvolume);
|
||||
|
||||
pa_cvolume_set_balance(&cv, &channel_map, pan);
|
||||
|
||||
assert(pa_stream_connect_playback(stream, devname, &buffer_attr, stream_flags, &cv, NULL) == 0);
|
||||
|
||||
// Wait for the stream to be ready
|
||||
for(;;) {
|
||||
pa_stream_state_t stream_state = pa_stream_get_state(stream);
|
||||
assert(PA_STREAM_IS_GOOD(stream_state));
|
||||
if (stream_state == PA_STREAM_READY) break;
|
||||
pa_threaded_mainloop_wait(mainloop);
|
||||
}
|
||||
|
||||
|
||||
//pa_threaded_mainloop_unlock(mainloop);
|
||||
|
||||
// Uncork the stream so it will start playing
|
||||
pa_stream_cork(stream, 0, stream_success_cb, mainloop);
|
||||
|
||||
sounddevice->stream = stream;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,142 +1,38 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "sound.h"
|
||||
#include "simdevice.h"
|
||||
#include "sounddevice.h"
|
||||
#include "sound/usb_generic_shaker.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../helper/parameters.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
|
||||
int gear_sound_set(SoundDevice* sounddevice, SimData* simdata)
|
||||
int sounddev_update(SoundDevice* sounddevice, SimData* simdata)
|
||||
{
|
||||
if (sounddevice->sounddata.last_gear != simdata->gear && simdata->gear > 1)
|
||||
sounddevice->sounddata.table_size = 44100/(simdata->rpms/60);
|
||||
|
||||
sounddevice->sounddata.gear_sound_data = 0;
|
||||
if (sounddevice->sounddata.last_gear != simdata->gear)
|
||||
{
|
||||
//sounddevice->sounddata.gear_sound_data = 3.14;
|
||||
sounddevice->sounddata.curr_frequency = sounddevice->sounddata.frequency;
|
||||
sounddevice->sounddata.curr_duration = 0;
|
||||
sounddevice->sounddata.gear_sound_data = sounddevice->sounddata.amp;
|
||||
}
|
||||
sounddevice->sounddata.last_gear = simdata->gear;
|
||||
|
||||
slogt("set gear frequency to %i", sounddevice->sounddata.frequency);
|
||||
}
|
||||
|
||||
// we could make a vtable for these different effects too
|
||||
int sounddev_engine_update(SimDevice* this, SimData* simdata)
|
||||
int sounddev_free(SoundDevice* sounddevice)
|
||||
{
|
||||
SoundDevice* sounddevice = (void *) this->derived;
|
||||
|
||||
sounddevice->sounddata.curr_frequency = simdata->rpms/60;
|
||||
//sounddevice->sounddata.table_size = 48000/(sounddevice->sounddata.frequency);
|
||||
|
||||
slogt("set engine frequency to %i", sounddevice->sounddata.frequency);
|
||||
return usb_generic_shaker_free(sounddevice);
|
||||
}
|
||||
|
||||
int sounddev_gearshift_update(SimDevice* this, SimData* simdata)
|
||||
{
|
||||
SoundDevice* sounddevice = (void *) this->derived;
|
||||
|
||||
gear_sound_set(sounddevice, simdata);
|
||||
}
|
||||
|
||||
int sounddev_free(SimDevice* this)
|
||||
{
|
||||
SoundDevice* sounddevice = (void *) this->derived;
|
||||
|
||||
usb_generic_shaker_free(sounddevice);
|
||||
|
||||
free(sounddevice);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sounddev_init(SoundDevice* sounddevice, const char* devname, int volume, int frequency, int pan, double duration)
|
||||
int sounddev_init(SoundDevice* sounddevice)
|
||||
{
|
||||
slogi("initializing standalone sound device...");
|
||||
|
||||
sounddevice->sounddata.pitch = 1;
|
||||
sounddevice->sounddata.pitch = 261.626;
|
||||
sounddevice->sounddata.amp = 32;
|
||||
sounddevice->sounddata.left_phase = sounddevice->sounddata.right_phase = 0;
|
||||
sounddevice->sounddata.table_size = 44100/(100/60);
|
||||
sounddevice->sounddata.last_gear = 0;
|
||||
|
||||
slogi("volume is: %i", volume);
|
||||
slogi("frequency is: %i", frequency);
|
||||
slogi("pan is: %i", pan);
|
||||
slogi("duration is: %f", duration);
|
||||
|
||||
|
||||
sounddevice->sounddata.frequency = frequency;
|
||||
//sounddevice->sounddata.pitch = 1;
|
||||
//sounddevice->sounddata.pitch = 261.626;
|
||||
//sounddevice->sounddata.amp = 32;
|
||||
//sounddevice->sounddata.left_phase = sounddevice->sounddata.right_phase = 0;
|
||||
//sounddevice->sounddata.table_size = 48000/(100/60);
|
||||
sounddevice->sounddata.curr_frequency = 100/60;
|
||||
|
||||
|
||||
|
||||
const char* streamname= "Engine";
|
||||
switch (sounddevice->effecttype) {
|
||||
case (SOUNDEFFECT_GEARSHIFT):
|
||||
|
||||
sounddevice->sounddata.last_gear = 0;
|
||||
//sounddevice->sounddata.pitch = 500;
|
||||
//sounddevice->sounddata.amp = 128;
|
||||
//sounddevice->sounddata.left_phase = sounddevice->sounddata.right_phase = 0;
|
||||
//sounddevice->sounddata.table_size = 48000/(1);
|
||||
sounddevice->sounddata.duration = duration;
|
||||
sounddevice->sounddata.curr_duration = duration;
|
||||
streamname = "Gear";
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef USE_PULSEAUDIO
|
||||
|
||||
|
||||
//pa_threaded_mainloop* mainloop;
|
||||
//pa_context* context;
|
||||
usb_generic_shaker_init(sounddevice, mainloop, context, devname, volume, pan, streamname);
|
||||
#else
|
||||
usb_generic_shaker_init(sounddevice);
|
||||
#endif
|
||||
}
|
||||
|
||||
static const vtable engine_sound_simdevice_vtable = { &sounddev_engine_update, &sounddev_free };
|
||||
static const vtable gear_sound_simdevice_vtable = { &sounddev_gearshift_update, &sounddev_free };
|
||||
|
||||
SoundDevice* new_sound_device(DeviceSettings* ds) {
|
||||
|
||||
SoundDevice* this = (SoundDevice*) malloc(sizeof(SoundDevice));
|
||||
|
||||
this->m.update = &update;
|
||||
this->m.free = &simdevfree;
|
||||
this->m.derived = this;
|
||||
|
||||
slogt("Attempting to configure sound device with subtype: %i", ds->dev_subtype);
|
||||
switch (ds->dev_subtype) {
|
||||
case (SIMDEVTYPE_ENGINESOUND):
|
||||
this->effecttype = SOUNDEFFECT_ENGINERPM;
|
||||
this->m.vtable = &engine_sound_simdevice_vtable;
|
||||
slogi("Initializing sound device for engine vibrations.");
|
||||
break;
|
||||
case (SIMDEVTYPE_GEARSOUND):
|
||||
this->effecttype = SOUNDEFFECT_GEARSHIFT;
|
||||
this->m.vtable = &gear_sound_simdevice_vtable;
|
||||
slogi("Initializing sound device for gear shift vibrations.");
|
||||
break;
|
||||
}
|
||||
|
||||
slogt("Attempting to use device %s", ds->sounddevsettings.dev);
|
||||
|
||||
int error = sounddev_init(this, ds->sounddevsettings.dev, ds->sounddevsettings.volume, ds->sounddevsettings.frequency, ds->sounddevsettings.pan, ds->sounddevsettings.duration);
|
||||
if (error != 0)
|
||||
{
|
||||
free(this);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
#ifndef _SOUNDDEVICE_H
|
||||
#define _SOUNDDEVICE_H
|
||||
|
||||
#ifdef USE_PULSEAUDIO
|
||||
#include <pulse/pulseaudio.h>
|
||||
#else
|
||||
#include "portaudio.h"
|
||||
#endif
|
||||
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../helper/parameters.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
|
@ -14,23 +13,33 @@ typedef enum
|
|||
}
|
||||
SoundType;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SOUNDEFFECT_ENGINERPM = 0,
|
||||
SOUNDEFFECT_GEARSHIFT = 1
|
||||
}
|
||||
VibrationEffectType;
|
||||
|
||||
#define MAX_TABLE_SIZE (6000)
|
||||
typedef struct
|
||||
{
|
||||
float sine[MAX_TABLE_SIZE];
|
||||
float pitch;
|
||||
int last_gear;
|
||||
int volume;
|
||||
int frequency;
|
||||
double duration;
|
||||
int curr_frequency;
|
||||
double curr_duration;
|
||||
int left_phase;
|
||||
int right_phase;
|
||||
int n;
|
||||
int table_size;
|
||||
int amp;
|
||||
int gear_sound_data;
|
||||
}
|
||||
SoundData;
|
||||
PATestData;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int id;
|
||||
SoundType type;
|
||||
PATestData sounddata;
|
||||
PaStreamParameters outputParameters;
|
||||
PaStream* stream;
|
||||
}
|
||||
SoundDevice;
|
||||
|
||||
int sounddev_update(SoundDevice* sounddevice, SimData* simdata);
|
||||
int sounddev_init(SoundDevice* sounddevice);
|
||||
int sounddev_free(SoundDevice* sounddevice);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include "tachdevice.h"
|
||||
#include "revburner.h"
|
||||
#include "../../helper/confighelper.h"
|
||||
#include "../../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../../simulatorapi/simdata.h"
|
||||
#include "../../slog/slog.h"
|
||||
|
||||
int tachdev_update(TachDevice* tachdevice, SimData* simdata)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <hidapi/hidapi.h>
|
||||
#include "../helper/confighelper.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
|
||||
//typedef int (*tachdev_update)(int revs);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,14 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "usbdevice.h"
|
||||
#include "simdevice.h"
|
||||
#include "../helper/parameters.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
int usbdev_update(SimDevice* this, SimData* simdata)
|
||||
int usbdev_update(USBDevice* usbdevice, SimData* simdata)
|
||||
{
|
||||
USBDevice* usbdevice = (void *) this->derived;
|
||||
|
||||
switch ( usbdevice->type )
|
||||
{
|
||||
case USBDEV_UNKNOWN :
|
||||
|
|
@ -24,10 +20,8 @@ int usbdev_update(SimDevice* this, SimData* simdata)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int usbdev_free(SimDevice* this)
|
||||
int usbdev_free(USBDevice* usbdevice)
|
||||
{
|
||||
USBDevice* usbdevice = (void *) this->derived;
|
||||
|
||||
switch ( usbdevice->type )
|
||||
{
|
||||
case USBDEV_UNKNOWN :
|
||||
|
|
@ -36,8 +30,6 @@ int usbdev_free(SimDevice* this)
|
|||
break;
|
||||
}
|
||||
|
||||
free(usbdevice);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -45,8 +37,6 @@ int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds)
|
|||
{
|
||||
slogi("initializing usb device...");
|
||||
int error = 0;
|
||||
|
||||
usbdevice->type = USBDEV_TACHOMETER;
|
||||
switch ( usbdevice->type )
|
||||
{
|
||||
case USBDEV_UNKNOWN :
|
||||
|
|
@ -57,24 +47,3 @@ int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds)
|
|||
|
||||
return error;
|
||||
}
|
||||
|
||||
static const vtable usb_simdevice_vtable = { &usbdev_update, &usbdev_free };
|
||||
|
||||
USBDevice* new_usb_device(DeviceSettings* ds) {
|
||||
|
||||
USBDevice* this = (USBDevice*) malloc(sizeof(USBDevice));
|
||||
|
||||
this->m.update = &update;
|
||||
this->m.free = &simdevfree;
|
||||
this->m.derived = this;
|
||||
this->m.vtable = &usb_simdevice_vtable;
|
||||
|
||||
int error = usbdev_init(this, ds);
|
||||
|
||||
if (error != 0)
|
||||
{
|
||||
free(this);
|
||||
return NULL;
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,5 +2,29 @@
|
|||
#define _USBDEVICE_H
|
||||
|
||||
#include "tachdevice.h"
|
||||
#include "../helper/confighelper.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
USBDEV_UNKNOWN = 0,
|
||||
USBDEV_TACHOMETER = 1
|
||||
}
|
||||
USBType;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int id;
|
||||
USBType type;
|
||||
union
|
||||
{
|
||||
TachDevice tachdevice;
|
||||
} u;
|
||||
}
|
||||
USBDevice;
|
||||
|
||||
int usbdev_update(USBDevice* usbdevice, SimData* simdata);
|
||||
int usbdev_init(USBDevice* usbdevice, DeviceSettings* ds);
|
||||
int usbdev_free(USBDevice* usbdevice);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
@ -11,12 +10,11 @@
|
|||
#include "../helper/parameters.h"
|
||||
#include "../helper/confighelper.h"
|
||||
#include "../devices/simdevice.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simapi/simapi/simmapper.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../simulatorapi/simmapper.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
#define DEFAULT_UPDATE_RATE 240.0
|
||||
#define SIM_CHECK_RATE 1.0
|
||||
#define DEFAULT_UPDATE_RATE 120.0
|
||||
|
||||
int showstats(SimData* simdata)
|
||||
{
|
||||
|
|
@ -167,72 +165,20 @@ int showstats(SimData* simdata)
|
|||
fflush(stdout);
|
||||
}
|
||||
|
||||
|
||||
int clilooper(SimDevice* devices, int numdevices, Parameters* p, SimData* simdata, SimMap* simmap)
|
||||
int looper(SimDevice* devices[], int numdevices, Simulator simulator)
|
||||
{
|
||||
|
||||
slogi("preparing game loop with %i devices...", numdevices);
|
||||
|
||||
|
||||
slogi("sending initial data to devices");
|
||||
simdata->velocity = 16;
|
||||
simdata->rpms = 100;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
|
||||
struct pollfd mypoll = { STDIN_FILENO, POLLIN|POLLPRI };
|
||||
double update_rate = DEFAULT_UPDATE_RATE;
|
||||
char ch;
|
||||
int t=0;
|
||||
int s=0;
|
||||
bool go = true;
|
||||
while (go == true && simdata->simstatus > 1)
|
||||
{
|
||||
simdatamap(simdata, simmap, p->sim);
|
||||
showstats(simdata);
|
||||
t++;
|
||||
s++;
|
||||
if(simdata->rpms<100)
|
||||
{
|
||||
simdata->rpms=100;
|
||||
}
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
|
||||
if( poll(&mypoll, 1, 1000.0/update_rate) )
|
||||
{
|
||||
scanf("%c", &ch);
|
||||
if(ch == 'q')
|
||||
{
|
||||
go = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
simdata->velocity = 0;
|
||||
simdata->rpms = 100;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
|
||||
fprintf(stdout, "\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int looper(SimDevice* devices, int numdevices, Parameters* p)
|
||||
{
|
||||
|
||||
SimData* simdata = malloc(sizeof(SimData));
|
||||
SimMap* simmap = malloc(sizeof(SimMap));
|
||||
|
||||
int error = siminit(simdata, simmap, simulator);
|
||||
|
||||
if (error != MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
return error;
|
||||
}
|
||||
|
||||
struct termios newsettings, canonicalmode;
|
||||
tcgetattr(0, &canonicalmode);
|
||||
newsettings = canonicalmode;
|
||||
|
|
@ -243,33 +189,37 @@ int looper(SimDevice* devices, int numdevices, Parameters* p)
|
|||
char ch;
|
||||
struct pollfd mypoll = { STDIN_FILENO, POLLIN|POLLPRI };
|
||||
|
||||
fprintf(stdout, "Searching for sim data... Press q to quit...\n");
|
||||
|
||||
p->simon = false;
|
||||
double update_rate = SIM_CHECK_RATE;
|
||||
double update_rate = DEFAULT_UPDATE_RATE;
|
||||
int t=0;
|
||||
int go = true;
|
||||
while (go == true)
|
||||
{
|
||||
|
||||
|
||||
|
||||
|
||||
if (p->simon == false)
|
||||
simdatamap(simdata, simmap, simulator);
|
||||
showstats(simdata);
|
||||
t++;
|
||||
if(simdata->rpms<250)
|
||||
{
|
||||
getSim(simdata, simmap, &p->simon, &p->sim);
|
||||
simdata->rpms=250;
|
||||
}
|
||||
|
||||
if (p->simon == true)
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
clilooper(devices, numdevices, p, simdata, simmap);
|
||||
}
|
||||
if (p->simon == true)
|
||||
{
|
||||
p->simon = false;
|
||||
fprintf(stdout, "Searching for sim data... Press q again to quit...\n");
|
||||
sleep(2);
|
||||
}
|
||||
if (devices[x]->type == SIMDEV_SERIAL)
|
||||
{
|
||||
if(t>=update_rate)
|
||||
{
|
||||
devupdate(devices[x], simdata);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
devupdate(devices[x], simdata);
|
||||
}
|
||||
|
||||
}
|
||||
if(t>=update_rate)
|
||||
{
|
||||
t=0;
|
||||
}
|
||||
if( poll(&mypoll, 1, 1000.0/update_rate) )
|
||||
{
|
||||
scanf("%c", &ch);
|
||||
|
|
@ -279,7 +229,6 @@ int looper(SimDevice* devices, int numdevices, Parameters* p)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
fprintf(stdout, "\n");
|
||||
fflush(stdout);
|
||||
tcsetattr(0, TCSANOW, &canonicalmode);
|
||||
|
|
@ -289,144 +238,3 @@ int looper(SimDevice* devices, int numdevices, Parameters* p)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int tester(SimDevice* devices, int numdevices)
|
||||
{
|
||||
|
||||
slogi("preparing test with %i devices...", numdevices);
|
||||
SimData* simdata = malloc(sizeof(SimData));
|
||||
|
||||
struct termios newsettings, canonicalmode;
|
||||
tcgetattr(0, &canonicalmode);
|
||||
newsettings = canonicalmode;
|
||||
newsettings.c_lflag &= (~ICANON & ~ECHO);
|
||||
newsettings.c_cc[VMIN] = 1;
|
||||
newsettings.c_cc[VTIME] = 0;
|
||||
tcsetattr(0, TCSANOW, &newsettings);
|
||||
|
||||
fprintf(stdout, "\n");
|
||||
simdata->gear = 0;
|
||||
simdata->velocity = 16;
|
||||
simdata->rpms = 100;
|
||||
simdata->maxrpm = 8000;
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting rpms to 1000\n");
|
||||
simdata->rpms = 1000;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Shifting into first gear\n");
|
||||
simdata->gear = 2;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting speed to 100\n");
|
||||
simdata->velocity = 100;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Shifting into second gear\n");
|
||||
simdata->gear = 3;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting speed to 200\n");
|
||||
simdata->velocity = 200;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Shifting into third gear\n");
|
||||
simdata->gear = 4;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting rpms to 2000\n");
|
||||
simdata->rpms = 2000;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting rpms to 4000\n");
|
||||
simdata->rpms = 4000;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Shifting into fourth gear\n");
|
||||
simdata->gear = 5;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting speed to 300\n");
|
||||
simdata->velocity = 300;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
fprintf(stdout, "Setting rpms to 8000\n");
|
||||
simdata->rpms = 8000;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(3);
|
||||
|
||||
simdata->velocity = 0;
|
||||
simdata->rpms = 100;
|
||||
for (int x = 0; x < numdevices; x++)
|
||||
{
|
||||
devices[x].update(&devices[x], simdata);
|
||||
}
|
||||
sleep(1);
|
||||
|
||||
fflush(stdout);
|
||||
tcsetattr(0, TCSANOW, &canonicalmode);
|
||||
|
||||
free(simdata);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
#include "../devices/simdevice.h"
|
||||
#include "../helper/parameters.h"
|
||||
|
||||
int tester(SimDevice* devices, int numdevices);
|
||||
int looper(SimDevice* devices, int numdevices, Parameters* p);
|
||||
int looper (SimDevice* devices[], int numdevices, Simulator simulator);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include <libxml/tree.h>
|
||||
|
||||
#include "../devices/simdevice.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
#define DEFAULT_UPDATE_RATE 30.0
|
||||
|
|
@ -183,7 +183,7 @@ int config_tachometer(int max_revs, int granularity, const char* save_file, SimD
|
|||
WriteXmlFromArrays(nodes, rpm_array, values_array, max_revs, save_file);
|
||||
sleep(2);
|
||||
simdata->pulses = 0;
|
||||
simdevice->update(simdevice, simdata);
|
||||
devupdate(simdevice, simdata);
|
||||
fflush(stdout);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#define _TACHCONFIG_H
|
||||
|
||||
#include "../devices/simdevice.h"
|
||||
#include "../simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../simulatorapi/simdata.h"
|
||||
|
||||
int config_tachometer(int max_revs, int granularity, const char* save_file, SimDevice* simdevice, SimData* simdata);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include <libxml/parser.h>
|
||||
#include <libxml/xmlreader.h>
|
||||
|
|
@ -11,38 +10,25 @@
|
|||
#include "confighelper.h"
|
||||
|
||||
#include "../slog/slog.h"
|
||||
#include "parameters.h"
|
||||
|
||||
#include <pulse/pulseaudio.h>
|
||||
|
||||
int strcicmp(char const *a, char const *b)
|
||||
{
|
||||
for (;; a++, b++) {
|
||||
int d = tolower((unsigned char)*a) - tolower((unsigned char)*b);
|
||||
if (d != 0 || !*a)
|
||||
return d;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int strtogame(const char* game, MonocoqueSettings* ms)
|
||||
{
|
||||
slogd("Checking for %s in list of supported simulators.", game);
|
||||
if (strcicmp(game, "ac") == 0)
|
||||
if (strcmp(game, "ac") == 0)
|
||||
{
|
||||
slogd("Setting simulator to Assetto Corsa");
|
||||
ms->sim_name = SIMULATOR_ASSETTO_CORSA;
|
||||
}
|
||||
else if (strcicmp(game, "rf2") == 0)
|
||||
else if (strcmp(game, "rf2") == 0)
|
||||
{
|
||||
slogd("Setting simulator to RFactor 2");
|
||||
ms->sim_name = SIMULATOR_RFACTOR2;
|
||||
}
|
||||
else
|
||||
if (strcicmp(game, "test") == 0)
|
||||
if (strcmp(game, "test") == 0)
|
||||
{
|
||||
slogd("Setting simulator to Test Data");
|
||||
ms->sim_name = SIMULATOR_SIMAPI_TEST;
|
||||
ms->sim_name = SIMULATOR_MONOCOQUE_TEST;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -52,73 +38,22 @@ int strtogame(const char* game, MonocoqueSettings* ms)
|
|||
return MONOCOQUE_ERROR_NONE;
|
||||
}
|
||||
|
||||
int strtodevsubtype(const char* device_subtype, DeviceSettings* ds, int simdev)
|
||||
int strtodev(const char* device_type, DeviceSettings* ds)
|
||||
{
|
||||
ds->is_valid = false;
|
||||
ds->dev_subtype = SIMDEVTYPE_UNKNOWN;
|
||||
|
||||
switch (simdev) {
|
||||
case SIMDEV_USB:
|
||||
if (strcicmp(device_subtype, "Tachometer") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_TACHOMETER;
|
||||
break;
|
||||
}
|
||||
case SIMDEV_SERIAL:
|
||||
if (strcicmp(device_subtype, "ShiftLights") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_SHIFTLIGHTS;
|
||||
break;
|
||||
}
|
||||
if (strcicmp(device_subtype, "SimWind") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_SIMWIND;
|
||||
break;
|
||||
}
|
||||
case SIMDEV_SOUND:
|
||||
if (strcicmp(device_subtype, "Engine") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_ENGINESOUND;
|
||||
break;
|
||||
}
|
||||
if (strcicmp(device_subtype, "Gear") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_GEARSOUND;
|
||||
break;
|
||||
}
|
||||
if (strcicmp(device_subtype, "ABS") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_ABSBRAKES;
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ds->is_valid = false;
|
||||
slogw("%s does not appear to be a valid device sub type, but attempting to continue with other devices", device_subtype);
|
||||
return MONOCOQUE_ERROR_INVALID_DEV;
|
||||
}
|
||||
ds->is_valid = true;
|
||||
return MONOCOQUE_ERROR_NONE;
|
||||
}
|
||||
|
||||
int strtodev(const char* device_type, const char* device_subtype, DeviceSettings* ds)
|
||||
{
|
||||
ds->is_valid = false;
|
||||
if (strcicmp(device_type, "USB") == 0)
|
||||
if (strcmp(device_type, "USB") == 0)
|
||||
{
|
||||
ds->dev_type = SIMDEV_USB;
|
||||
strtodevsubtype(device_subtype, ds, SIMDEV_USB);
|
||||
}
|
||||
else
|
||||
if (strcicmp(device_type, "Sound") == 0)
|
||||
if (strcmp(device_type, "Sound") == 0)
|
||||
{
|
||||
ds->dev_type = SIMDEV_SOUND;
|
||||
strtodevsubtype(device_subtype, ds, SIMDEV_SOUND);
|
||||
}
|
||||
else
|
||||
if (strcicmp(device_type, "Serial") == 0)
|
||||
if (strcmp(device_type, "Serial") == 0)
|
||||
{
|
||||
ds->dev_type = SIMDEV_SERIAL;
|
||||
strtodevsubtype(device_subtype, ds, SIMDEV_SERIAL);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -130,6 +65,33 @@ int strtodev(const char* device_type, const char* device_subtype, DeviceSettings
|
|||
return MONOCOQUE_ERROR_NONE;
|
||||
}
|
||||
|
||||
int strtodevtype(const char* device_subtype, DeviceSettings* ds)
|
||||
{
|
||||
ds->is_valid = false;
|
||||
if (strcmp(device_subtype, "Tachometer") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_TACHOMETER;
|
||||
}
|
||||
else
|
||||
if (strcmp(device_subtype, "ShiftLights") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_SHIFTLIGHTS;
|
||||
}
|
||||
else
|
||||
if (strcmp(device_subtype, "Shaker") == 0)
|
||||
{
|
||||
ds->dev_subtype = SIMDEVTYPE_SHAKER;
|
||||
}
|
||||
else
|
||||
{
|
||||
ds->is_valid = false;
|
||||
slogi("%s does not appear to be a valid device sub type, but attempting to continue with other devices", device_subtype);
|
||||
return MONOCOQUE_ERROR_INVALID_DEV;
|
||||
}
|
||||
ds->is_valid = true;
|
||||
return MONOCOQUE_ERROR_NONE;
|
||||
}
|
||||
|
||||
int loadtachconfig(const char* config_file, DeviceSettings* ds)
|
||||
{
|
||||
|
||||
|
|
@ -169,7 +131,7 @@ int loadtachconfig(const char* config_file, DeviceSettings* ds)
|
|||
{
|
||||
slogt("Xml Element name %s", cursubsubnode->name);
|
||||
}
|
||||
if (strcicmp(cursubsubnode->name, "SettingsItem") == 0)
|
||||
if (strcmp(cursubsubnode->name, "SettingsItem") == 0)
|
||||
{
|
||||
arraysize++;
|
||||
}
|
||||
|
|
@ -191,13 +153,13 @@ int loadtachconfig(const char* config_file, DeviceSettings* ds)
|
|||
{
|
||||
for (cursubsubsubnode = cursubsubnode->children; cursubsubsubnode; cursubsubsubnode = cursubsubsubnode->next)
|
||||
{
|
||||
if (strcicmp(cursubsubsubnode->name, "Value") == 0)
|
||||
if (strcmp(cursubsubsubnode->name, "Value") == 0)
|
||||
{
|
||||
xmlChar* a = xmlNodeGetContent(cursubsubsubnode);
|
||||
rpms_array[i] = strtol((char*) a, &buf, 10);
|
||||
xmlFree(a);
|
||||
}
|
||||
if (strcicmp(cursubsubsubnode->name, "TimeValue") == 0)
|
||||
if (strcmp(cursubsubsubnode->name, "TimeValue") == 0)
|
||||
{
|
||||
xmlChar* a = xmlNodeGetContent(cursubsubsubnode);
|
||||
pulses_array[i] = strtol((char*) a, &buf, 10);
|
||||
|
|
@ -235,16 +197,20 @@ int loadconfig(const char* config_file, DeviceSettings* ds)
|
|||
int devsetup(const char* device_type, const char* device_subtype, const char* config_file, MonocoqueSettings* ms, DeviceSettings* ds, config_setting_t* device_settings)
|
||||
{
|
||||
int error = MONOCOQUE_ERROR_NONE;
|
||||
//slogt("Called device setup with %s %s %s", device_type, device_subtype, config_file);
|
||||
slogi("Called device setup with %s %s %s", device_type, device_subtype, config_file);
|
||||
ds->dev_type = SIMDEV_UNKNOWN;
|
||||
|
||||
error = strtodev(device_type, device_subtype, ds);
|
||||
ds->dev_subtype = SIMDEVTYPE_UNKNOWN;
|
||||
error = strtodev(device_type, ds);
|
||||
if (error != MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
return error;
|
||||
}
|
||||
|
||||
if (ms->program_action == A_PLAY || ms->program_action == A_TEST)
|
||||
error = strtodevtype(device_subtype, ds);
|
||||
if (error != MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
return error;
|
||||
}
|
||||
if (ms->program_action == A_PLAY)
|
||||
{
|
||||
error = loadconfig(config_file, ds);
|
||||
}
|
||||
|
|
@ -253,41 +219,6 @@ int devsetup(const char* device_type, const char* device_subtype, const char* co
|
|||
return error;
|
||||
}
|
||||
|
||||
if (ds->dev_type == SIMDEV_SOUND)
|
||||
{
|
||||
slogi("reading configured sound device settings");
|
||||
ds->sounddevsettings.frequency = -1;
|
||||
ds->sounddevsettings.volume = -1;
|
||||
ds->sounddevsettings.lowbound_frequency = -1;
|
||||
ds->sounddevsettings.upperbound_frequency = -1;
|
||||
ds->sounddevsettings.pan = 0;
|
||||
ds->sounddevsettings.duration = 2.0;
|
||||
if (ds->dev_subtype == SIMDEVTYPE_GEARSOUND)
|
||||
{
|
||||
ds->sounddevsettings.duration = .125;
|
||||
}
|
||||
if (device_settings != NULL)
|
||||
{
|
||||
|
||||
config_setting_lookup_int(device_settings, "volume", &ds->sounddevsettings.volume);
|
||||
config_setting_lookup_int(device_settings, "frequency", &ds->sounddevsettings.frequency);
|
||||
config_setting_lookup_int(device_settings, "pan", &ds->sounddevsettings.pan);
|
||||
config_setting_lookup_float(device_settings, "duration", &ds->sounddevsettings.duration);
|
||||
|
||||
const char* temp;
|
||||
int found = 0;
|
||||
found = config_setting_lookup_string(device_settings, "devid", &temp);
|
||||
if (found == 0)
|
||||
{
|
||||
ds->sounddevsettings.dev = NULL;
|
||||
}
|
||||
else
|
||||
{
|
||||
ds->sounddevsettings.dev = strdup(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ds->dev_subtype == SIMDEVTYPE_TACHOMETER)
|
||||
{
|
||||
if (device_settings != NULL)
|
||||
|
|
@ -301,43 +232,11 @@ int devsetup(const char* device_type, const char* device_subtype, const char* co
|
|||
slogi("Tachometer granularity set to %i", ds->tachsettings.granularity);
|
||||
}
|
||||
ds->tachsettings.use_pulses = true;
|
||||
if (ms->program_action == A_PLAY || ms->program_action == A_TEST)
|
||||
if (ms->program_action == A_PLAY)
|
||||
{
|
||||
ds->tachsettings.use_pulses = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (ds->dev_subtype == SIMDEVTYPE_SIMWIND || ds->dev_subtype == SIMDEVTYPE_SHIFTLIGHTS)
|
||||
{
|
||||
if (device_settings != NULL)
|
||||
{
|
||||
const char* temp;
|
||||
config_setting_lookup_string(device_settings, "devpath", &temp);
|
||||
ds->serialdevsettings.portdev = strdup(temp);
|
||||
}
|
||||
}
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
int settingsfree(DeviceSettings ds)
|
||||
{
|
||||
|
||||
if (ds.dev_subtype == SIMDEVTYPE_SIMWIND || ds.dev_subtype == SIMDEVTYPE_SHIFTLIGHTS)
|
||||
{
|
||||
if (ds.serialdevsettings.portdev != NULL)
|
||||
{
|
||||
free(ds.serialdevsettings.portdev);
|
||||
}
|
||||
|
||||
}
|
||||
if (ds.dev_type == SIMDEV_SOUND)
|
||||
{
|
||||
if (ds.sounddevsettings.dev != NULL)
|
||||
{
|
||||
free(ds.sounddevsettings.dev);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,14 +21,19 @@ typedef enum
|
|||
{
|
||||
SIMDEVTYPE_UNKNOWN = 0,
|
||||
SIMDEVTYPE_TACHOMETER = 1,
|
||||
SIMDEVTYPE_SHIFTLIGHTS = 2,
|
||||
SIMDEVTYPE_SIMWIND = 3,
|
||||
SIMDEVTYPE_ENGINESOUND = 4,
|
||||
SIMDEVTYPE_GEARSOUND = 5,
|
||||
SIMDEVTYPE_ABSBRAKES = 6
|
||||
SIMDEVTYPE_SHAKER = 2,
|
||||
SIMDEVTYPE_SHIFTLIGHTS = 3
|
||||
}
|
||||
DeviceSubType;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SIMULATOR_MONOCOQUE_TEST = 0,
|
||||
SIMULATOR_ASSETTO_CORSA = 1,
|
||||
SIMULATOR_RFACTOR = 2,
|
||||
SIMULATOR_RFACTOR2 = 3
|
||||
}
|
||||
Simulator;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
|
@ -69,32 +74,12 @@ typedef struct
|
|||
}
|
||||
TachometerSettings;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
char* portdev;
|
||||
}
|
||||
SerialDeviceSettings;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int frequency;
|
||||
int volume;
|
||||
int lowbound_frequency;
|
||||
int upperbound_frequency;
|
||||
int pan;
|
||||
double duration;
|
||||
char* dev;
|
||||
}
|
||||
SoundDeviceSettings;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
bool is_valid;
|
||||
DeviceType dev_type;
|
||||
DeviceSubType dev_subtype;
|
||||
TachometerSettings tachsettings;
|
||||
SerialDeviceSettings serialdevsettings;
|
||||
SoundDeviceSettings sounddevsettings;
|
||||
}
|
||||
DeviceSettings;
|
||||
|
||||
|
|
@ -102,6 +87,4 @@ int strtogame(const char* game, MonocoqueSettings* ms);
|
|||
|
||||
int devsetup(const char* device_type, const char* device_subtype, const char* config_files, MonocoqueSettings* ms, DeviceSettings* ds, config_setting_t* device_settings);
|
||||
|
||||
int settingsfree(DeviceSettings ds);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
|
|||
|
||||
struct arg_lit* arg_verbosity1 = arg_litn("v","verbose", 0, 2, "increase logging verbosity");
|
||||
struct arg_lit* arg_verbosity2 = arg_litn("v","verbose", 0, 2, "increase logging verbosity");
|
||||
struct arg_lit* arg_verbosity3 = arg_litn("v","verbose", 0, 2, "increase logging verbosity");
|
||||
|
||||
struct arg_rex* cmd1 = arg_rex1(NULL, NULL, "play", NULL, REG_ICASE, NULL);
|
||||
struct arg_str* arg_sim = arg_strn("s", "sim", "<gamename>", 0, 1, NULL);
|
||||
|
|
@ -44,13 +43,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
|
|||
void* argtable2[] = {cmd2a,cmd2b,arg_max_revs,arg_granularity,arg_save,arg_verbosity2,help2,vers2,end2};
|
||||
int nerrors2;
|
||||
|
||||
struct arg_rex* cmd3 = arg_rex1(NULL, NULL, "test", NULL, REG_ICASE, NULL);
|
||||
struct arg_lit* help3 = arg_litn(NULL,"help", 0, 1, "print this help and exit");
|
||||
struct arg_lit* vers3 = arg_litn(NULL,"version", 0, 1, "print version information and exit");
|
||||
struct arg_end* end3 = arg_end(20);
|
||||
void* argtable3[] = {cmd3,arg_verbosity3,help3,vers3,end3};
|
||||
int nerrors3;
|
||||
|
||||
struct arg_lit* help0 = arg_lit0(NULL,"help", "print this help and exit");
|
||||
struct arg_lit* version0 = arg_lit0(NULL,"version", "print version information and exit");
|
||||
struct arg_end* end0 = arg_end(20);
|
||||
|
|
@ -78,7 +70,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
|
|||
nerrors0 = arg_parse(argc,argv,argtable0);
|
||||
nerrors1 = arg_parse(argc,argv,argtable1);
|
||||
nerrors2 = arg_parse(argc,argv,argtable2);
|
||||
nerrors3 = arg_parse(argc,argv,argtable3);
|
||||
|
||||
if (nerrors1==0)
|
||||
{
|
||||
|
|
@ -101,12 +92,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
|
|||
p->verbosity_count = arg_verbosity2->count;
|
||||
exitcode = E_SUCCESS_AND_DO;
|
||||
}
|
||||
else if (nerrors3==0)
|
||||
{
|
||||
p->program_action = A_TEST;
|
||||
p->verbosity_count = arg_verbosity3->count;
|
||||
exitcode = E_SUCCESS_AND_DO;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (cmd1->count > 0)
|
||||
|
|
@ -126,13 +111,12 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
|
|||
{
|
||||
if (help->count==0 && vers->count==0)
|
||||
{
|
||||
printf("%s: missing <play|config|test> command.\n",progname);
|
||||
printf("%s: missing <play|config> command.\n",progname);
|
||||
printf("Usage 1: %s ", progname);
|
||||
arg_print_syntax(stdout,argtable1,"\n");
|
||||
printf("Usage 2: %s ", progname);
|
||||
arg_print_syntax(stdout,argtable2,"\n");
|
||||
printf("Usage 3: %s ", progname);
|
||||
arg_print_syntax(stdout,argtable3,"\n");
|
||||
|
||||
}
|
||||
}
|
||||
exitcode = E_SUCCESS_AND_EXIT;
|
||||
|
|
@ -147,8 +131,6 @@ ConfigError getParameters(int argc, char** argv, Parameters* p)
|
|||
arg_print_syntax(stdout,argtable1,"\n");
|
||||
printf("Usage 2: %s ", progname);
|
||||
arg_print_syntax(stdout,argtable2,"\n");
|
||||
printf("Usage 3: %s ", progname);
|
||||
arg_print_syntax(stdout,argtable3,"\n");
|
||||
printf("\nReport bugs on the github github.com/spacefreak18/monocoque.\n");
|
||||
exitcode = E_SUCCESS_AND_EXIT;
|
||||
goto cleanup;
|
||||
|
|
@ -166,7 +148,6 @@ cleanup:
|
|||
arg_freetable(argtable0,sizeof(argtable0)/sizeof(argtable0[0]));
|
||||
arg_freetable(argtable1,sizeof(argtable1)/sizeof(argtable1[0]));
|
||||
arg_freetable(argtable2,sizeof(argtable2)/sizeof(argtable2[0]));
|
||||
arg_freetable(argtable3,sizeof(argtable3)/sizeof(argtable3[0]));
|
||||
return exitcode;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
#ifndef _PARAMETERS_H
|
||||
#define _PARAMETERS_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "../simulatorapi/simapi/simapi/simapi.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int program_action;
|
||||
|
|
@ -12,18 +9,14 @@ typedef struct
|
|||
int max_revs;
|
||||
int granularity;
|
||||
int verbosity_count;
|
||||
|
||||
Simulator sim;
|
||||
bool simon;
|
||||
}
|
||||
Parameters;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
A_PLAY = 0,
|
||||
A_TEST = 1,
|
||||
A_CONFIG_TACH = 2,
|
||||
A_CONFIG_SHAKER = 3
|
||||
A_CONFIG_TACH = 1,
|
||||
A_CONFIG_SHAKER = 2
|
||||
}
|
||||
ProgramAction;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,14 +7,12 @@
|
|||
#include "gameloop/gameloop.h"
|
||||
#include "gameloop/tachconfig.h"
|
||||
#include "devices/simdevice.h"
|
||||
#include "devices/sound.h"
|
||||
#include "helper/parameters.h"
|
||||
#include "helper/dirhelper.h"
|
||||
#include "helper/confighelper.h"
|
||||
#include "simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "simulatorapi/simdata.h"
|
||||
#include "slog/slog.h"
|
||||
|
||||
|
||||
int create_dir(char* dir)
|
||||
{
|
||||
struct stat st = {0};
|
||||
|
|
@ -115,8 +113,9 @@ int main(int argc, char** argv)
|
|||
SimDevice* tachdev = malloc(sizeof(SimDevice));
|
||||
SimData* sdata = malloc(sizeof(SimData));
|
||||
DeviceSettings* ds = malloc(sizeof(DeviceSettings));
|
||||
|
||||
error = devsetup("USB", "Tachometer", "None", ms, ds, NULL);
|
||||
error = devinit(tachdev, ds);
|
||||
slogi("configuring tachometer with max revs: %i, granularity: %i, saving to %s", p->max_revs, p->granularity, p->save_file);
|
||||
|
||||
if (error != MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
|
|
@ -124,38 +123,34 @@ int main(int argc, char** argv)
|
|||
}
|
||||
else
|
||||
{
|
||||
error = devinit(tachdev, 1, ds);
|
||||
}
|
||||
|
||||
if (error != MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
sloge("Could not proceed with tachometer configuration due to error: %i", error);
|
||||
}
|
||||
else
|
||||
{
|
||||
slogi("configuring tachometer with max revs: %i, granularity: %i, saving to %s", p->max_revs, p->granularity, p->save_file);
|
||||
config_tachometer(p->max_revs, p->granularity, p->save_file, tachdev, sdata);
|
||||
}
|
||||
devfree(tachdev, 1);
|
||||
//free(tachdev);
|
||||
devfree(tachdev);
|
||||
free(tachdev);
|
||||
free(sdata);
|
||||
free(ds);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
slogi("running monocoque in gameloop mode..");
|
||||
int error = 0;
|
||||
|
||||
error = strtogame(p->sim_string, ms);
|
||||
if (error != MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
goto cleanup_final;
|
||||
}
|
||||
|
||||
int configureddevices = config_setting_length(config_devices);
|
||||
int numdevices = 0;
|
||||
DeviceSettings ds[configureddevices];
|
||||
DeviceSettings* ds[configureddevices];
|
||||
slogi("found %i devices in configuration", configureddevices);
|
||||
int i = 0;
|
||||
error = MONOCOQUE_ERROR_NONE;
|
||||
while (i<configureddevices)
|
||||
{
|
||||
DeviceSettings settings;
|
||||
|
||||
error = MONOCOQUE_ERROR_NONE;
|
||||
DeviceSettings* settings = malloc(sizeof(DeviceSettings));
|
||||
ds[i] = settings;
|
||||
config_setting_t* config_device = config_setting_get_elem(config_devices, i);
|
||||
const char* device_type;
|
||||
const char* device_subtype;
|
||||
|
|
@ -164,18 +159,14 @@ int main(int argc, char** argv)
|
|||
config_setting_lookup_string(config_device, "type", &device_subtype);
|
||||
config_setting_lookup_string(config_device, "config", &device_config_file);
|
||||
|
||||
//slogt("device type: %s", device_type);
|
||||
//slogt("device sub type: %s", device_subtype);
|
||||
//slogt("device config file: %s", device_config_file);
|
||||
if (error == MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
error = devsetup(device_type, device_subtype, device_config_file, ms, &settings, config_device);
|
||||
error = devsetup(device_type, device_subtype, device_config_file, ms, ds[i], config_device);
|
||||
}
|
||||
if (error == MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
numdevices++;
|
||||
}
|
||||
ds[i] = settings;
|
||||
|
||||
i++;
|
||||
|
||||
|
|
@ -184,61 +175,47 @@ int main(int argc, char** argv)
|
|||
i = 0;
|
||||
int j = 0;
|
||||
error = MONOCOQUE_ERROR_NONE;
|
||||
|
||||
setupsound();
|
||||
SimDevice* devices = malloc(numdevices * sizeof(SimDevice));
|
||||
int initdevices = devinit(devices, configureddevices, ds);
|
||||
|
||||
if (p->program_action == A_PLAY)
|
||||
SimDevice* devices[numdevices];
|
||||
while (i<configureddevices)
|
||||
{
|
||||
slogi("running monocoque in gameloop mode..");
|
||||
//error = strtogame(p->sim_string, ms);
|
||||
//if (error != MONOCOQUE_ERROR_NONE)
|
||||
//{
|
||||
// goto cleanup_final;
|
||||
//}
|
||||
#ifdef USE_PULSEAUDIO
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
#endif
|
||||
if (ds[i]->is_valid == true)
|
||||
{
|
||||
SimDevice* device = malloc(sizeof(SimDevice));
|
||||
devinit(device, ds[i]);
|
||||
devices[j] = device;
|
||||
j++;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
||||
error = looper(devices, initdevices, p);
|
||||
if (error == MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
slogi("Game loop exited succesfully with error code: %i", error);
|
||||
}
|
||||
else
|
||||
{
|
||||
sloge("Game loop exited with error code: %i", error);
|
||||
}
|
||||
error = looper(devices, numdevices, ms->sim_name);
|
||||
if (error == MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
slogi("Game loop exited succesfully with error code: %i", error);
|
||||
}
|
||||
else
|
||||
{
|
||||
slogi("running monocoque in test mode...");
|
||||
|
||||
#ifdef USE_PULSEAUDIO
|
||||
pa_threaded_mainloop_unlock(mainloop);
|
||||
#endif
|
||||
|
||||
error = tester(devices, initdevices);
|
||||
if (error == MONOCOQUE_ERROR_NONE)
|
||||
{
|
||||
slogi("Test exited succesfully with error code: %i", error);
|
||||
}
|
||||
else
|
||||
{
|
||||
sloge("Test exited with error code: %i", error);
|
||||
}
|
||||
sloge("Game loop exited with error code: %i", error);
|
||||
}
|
||||
|
||||
|
||||
devfree(devices, initdevices);
|
||||
i = 0;
|
||||
while (i<configureddevices)
|
||||
{
|
||||
if(ds[i]->dev_subtype == SIMDEV_USB)
|
||||
{
|
||||
free(ds[i]->tachsettings.pulses_array);
|
||||
free(ds[i]->tachsettings.rpms_array);
|
||||
}
|
||||
free(ds[i]);
|
||||
i++;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
// improve the api around the config helper
|
||||
// i don't like that i stack allocated but hid a malloc inside
|
||||
for( i = 0; i < configureddevices; i++)
|
||||
while (i<numdevices)
|
||||
{
|
||||
settingsfree(ds[i]);
|
||||
devfree(devices[i]);
|
||||
free(devices[i]);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,10 @@
|
|||
set(simulatorapi_source_files
|
||||
simapi/simapi/simmapper.c
|
||||
simapi/simapi/simmapper.h
|
||||
simapi/simapi/simdata.h
|
||||
simapi/simapi/test.h
|
||||
simapi/include/acdata.h
|
||||
simapi/include/rf2data.h
|
||||
simapi/simmap/basicmap.h
|
||||
simapi/simmap/mapacdata.c
|
||||
simapi/simmap/mapacdata.h
|
||||
simapi/simapi/ac.h
|
||||
simapi/simapi/rf2.h
|
||||
simmapper.c
|
||||
simmapper.h
|
||||
simdata.h
|
||||
test.h
|
||||
simapi/acdata.h
|
||||
ac.h
|
||||
)
|
||||
|
||||
add_library(simulatorapi STATIC ${simulatorapi_source_files})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
#ifndef _AC_H
|
||||
#define _AC_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "simapi/acdata.h"
|
||||
|
||||
#define AC_PHYSICS_FILE "acpmf_physics"
|
||||
#define AC_STATIC_FILE "acpmf_static"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
bool has_physics;
|
||||
bool has_static;
|
||||
void* physics_map_addr;
|
||||
void* static_map_addr;
|
||||
struct SPageFilePhysics ac_physics;
|
||||
struct SPageFileStatic ac_static;
|
||||
}
|
||||
ACMap;
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
#ifndef _RF2_H
|
||||
#define _RF2_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "simapi/rf2data.h"
|
||||
|
||||
#define RF2_TELEMETRY_FILE "rFactor2SMMP_Telemetry"
|
||||
#define RF2_SCORING_FILE "rFactor2SMMP_Scoring"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
bool has_telemetry;
|
||||
bool has_scoring;
|
||||
void* telemetry_map_addr;
|
||||
void* scoring_map_addr;
|
||||
struct rF2Telemetry rf2_telemetry;
|
||||
//struct rF2Scoring rf2_scoring;
|
||||
}
|
||||
RF2Map;
|
||||
|
||||
#endif
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c77e96339caf1eb79479d89ce342161ad83ca70e
|
||||
Subproject commit 04fd2ca8ed590f562ad6423d9cf9f076daa28b95
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#ifndef _SIMDATA_H
|
||||
#define _SIMDATA_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint32_t velocity;
|
||||
uint32_t rpms;
|
||||
uint32_t gear;
|
||||
uint32_t pulses;
|
||||
uint32_t maxrpm;
|
||||
uint32_t altitude;
|
||||
}
|
||||
SimData;
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,132 @@
|
|||
#include <stdio.h>
|
||||
#include <sys/mman.h>
|
||||
#include <fcntl.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "simmapper.h"
|
||||
#include "simdata.h"
|
||||
#include "test.h"
|
||||
#include "ac.h"
|
||||
#include "rf2.h"
|
||||
#include "../helper/confighelper.h"
|
||||
#include "../slog/slog.h"
|
||||
|
||||
#include "simapi/acdata.h"
|
||||
#include "simapi/rf2data.h"
|
||||
|
||||
|
||||
int simdatamap(SimData* simdata, SimMap* simmap, Simulator simulator)
|
||||
{
|
||||
switch ( simulator )
|
||||
{
|
||||
case SIMULATOR_MONOCOQUE_TEST :
|
||||
memcpy(simdata, simmap->addr, sizeof(SimData));
|
||||
break;
|
||||
case SIMULATOR_ASSETTO_CORSA :
|
||||
memcpy(&simmap->d.ac.ac_physics, simmap->d.ac.physics_map_addr, sizeof(simmap->d.ac.ac_physics));
|
||||
if (simmap->d.ac.has_static == true )
|
||||
{
|
||||
memcpy(&simmap->d.ac.ac_static, simmap->d.ac.static_map_addr, sizeof(simmap->d.ac.ac_static));
|
||||
simdata->maxrpm = simmap->d.ac.ac_static.maxRpm;
|
||||
}
|
||||
simdata->rpms = simmap->d.ac.ac_physics.rpms;
|
||||
simdata->gear = simmap->d.ac.ac_physics.gear;
|
||||
simdata->velocity = simmap->d.ac.ac_physics.speedKmh;
|
||||
simdata->altitude = 1;
|
||||
break;
|
||||
case SIMULATOR_RFACTOR2 :
|
||||
memcpy(&simmap->d.rf2.rf2_telemetry, simmap->d.rf2.telemetry_map_addr, sizeof(simmap->d.rf2.rf2_telemetry));
|
||||
|
||||
simdata->velocity = abs(ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mLocalVel.z * 3.6));
|
||||
simdata->rpms = ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineRPM);
|
||||
simdata->gear = simmap->d.rf2.rf2_telemetry.mVehicles[0].mGear;
|
||||
simdata->maxrpm - ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineMaxRPM);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int siminit(SimData* simdata, SimMap* simmap, Simulator simulator)
|
||||
{
|
||||
slogi("searching for simulator data...");
|
||||
int error = MONOCOQUE_ERROR_NONE;
|
||||
|
||||
void* a;
|
||||
switch ( simulator )
|
||||
{
|
||||
case SIMULATOR_MONOCOQUE_TEST :
|
||||
simmap->fd = shm_open(TEST_MEM_FILE_LOCATION, O_RDONLY, S_IRUSR | S_IWUSR);
|
||||
if (simmap->fd == -1)
|
||||
{
|
||||
return 10;
|
||||
}
|
||||
|
||||
simmap->addr = mmap(NULL, sizeof(SimData), PROT_READ, MAP_SHARED, simmap->fd, 0);
|
||||
if (simmap->addr == MAP_FAILED)
|
||||
{
|
||||
return 30;
|
||||
}
|
||||
slogi("found data for monocoque test...");
|
||||
break;
|
||||
case SIMULATOR_ASSETTO_CORSA :
|
||||
|
||||
simmap->d.ac.has_physics=false;
|
||||
simmap->d.ac.has_static=false;
|
||||
simmap->fd = shm_open(AC_PHYSICS_FILE, O_RDONLY, S_IRUSR | S_IWUSR);
|
||||
if (simmap->fd == -1)
|
||||
{
|
||||
slogd("could not open Assetto Corsa physics engine");
|
||||
return MONOCOQUE_ERROR_NODATA;
|
||||
}
|
||||
simmap->d.ac.physics_map_addr = mmap(NULL, sizeof(simmap->d.ac.ac_physics), PROT_READ, MAP_SHARED, simmap->fd, 0);
|
||||
if (simmap->d.ac.physics_map_addr == MAP_FAILED)
|
||||
{
|
||||
slogd("could not retrieve Assetto Corsa physics data");
|
||||
return 30;
|
||||
}
|
||||
simmap->d.ac.has_physics=true;
|
||||
|
||||
simmap->fd = shm_open(AC_STATIC_FILE, O_RDONLY, S_IRUSR | S_IWUSR);
|
||||
if (simmap->fd == -1)
|
||||
{
|
||||
slogd("could not open Assetto Corsa static data");
|
||||
return 10;
|
||||
}
|
||||
simmap->d.ac.static_map_addr = mmap(NULL, sizeof(simmap->d.ac.ac_static), PROT_READ, MAP_SHARED, simmap->fd, 0);
|
||||
if (simmap->d.ac.static_map_addr == MAP_FAILED)
|
||||
{
|
||||
slogd("could not retrieve Assetto Corsa static data");
|
||||
return 30;
|
||||
}
|
||||
simmap->d.ac.has_static=true;
|
||||
|
||||
slogi("found data for Assetto Corsa...");
|
||||
break;
|
||||
|
||||
case SIMULATOR_RFACTOR2 :
|
||||
|
||||
simmap->d.rf2.has_telemetry=false;
|
||||
simmap->d.rf2.has_scoring=false;
|
||||
simmap->fd = shm_open(RF2_TELEMETRY_FILE, O_RDONLY, S_IRUSR | S_IWUSR);
|
||||
if (simmap->fd == -1)
|
||||
{
|
||||
slogd("could not open RFactor2 Telemetry engine");
|
||||
return MONOCOQUE_ERROR_NODATA;
|
||||
}
|
||||
simmap->d.rf2.telemetry_map_addr = mmap(NULL, sizeof(simmap->d.rf2.rf2_telemetry), PROT_READ, MAP_SHARED, simmap->fd, 0);
|
||||
if (simmap->d.rf2.telemetry_map_addr == MAP_FAILED)
|
||||
{
|
||||
slogd("could not retrieve RFactor2 telemetry data");
|
||||
return 30;
|
||||
}
|
||||
simmap->d.rf2.has_telemetry=true;
|
||||
|
||||
|
||||
slogi("found data for RFactor2...");
|
||||
break;
|
||||
}
|
||||
|
||||
return error;
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
#ifndef _SIMMAPPER_H
|
||||
#define _SIMMAPPER_H
|
||||
|
||||
#include "ac.h"
|
||||
#include "rf2.h"
|
||||
|
||||
#include "simdata.h"
|
||||
#include "../helper/confighelper.h"
|
||||
|
||||
#include "simapi/acdata.h"
|
||||
#include "simapi/rf2data.h"
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void* addr;
|
||||
int fd;
|
||||
union
|
||||
{
|
||||
ACMap ac;
|
||||
RF2Map rf2;
|
||||
} d;
|
||||
}
|
||||
SimMap;
|
||||
|
||||
int siminit(SimData* simdata, SimMap* simmap, Simulator simulator);
|
||||
int simdatamap(SimData* simdata, SimMap* simmap, Simulator simulator);
|
||||
|
||||
#endif
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _TEST_H
|
||||
#define _TEST_H
|
||||
|
||||
#define TEST_MEM_FILE_LOCATION "/monocoque_test"
|
||||
|
||||
#endif
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/test.h"
|
||||
#include "../src/monocoque/simulatorapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/test.h"
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#include <string.h>
|
||||
#include <termios.h>
|
||||
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/test.h"
|
||||
#include "../src/monocoque/simulatorapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/test.h"
|
||||
|
||||
#define DATA "Hello, World! From PID %d"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/test.h"
|
||||
#include "../src/monocoque/simulatorapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/test.h"
|
||||
|
||||
#define DATA "Hello, World! From PID %d"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <libserialport.h>
|
||||
#include "../src/monocoque/simulatorapi/simapi/simapi/simdata.h"
|
||||
#include "../src/monocoque/simulatorapi/simdata.h"
|
||||
|
||||
/* Helper function for error handling. */
|
||||
int check(enum sp_return result);
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
SUBSYSTEMS=="usb",ATTRS{product}=="Rev Burner",GROUP="input",TAG+="uaccess"
|
||||
|
||||
|
||||
SUBSYSTEM=="tty", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0043", ATTRS{serial}=="75033303335351A080F0", SYMLINK+="simdev0", GROUP="input", TAG+="uaccess"
|
||||
SUBSYSTEM=="tty", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0043", ATTRS{serial}=="242303138313514131F1", SYMLINK+="simdev1", GROUP="input", TAG+="uaccess"
|
||||
|
|
|
|||
Loading…
Reference in New Issue