diff --git a/.gitignore b/.gitignore
index 744fc50..549e541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ NatBrailleTools/BrailleLogger/bin/GCodeGenerator.class
NatBrailleTools.zip
MarlinBraille.zip
NatBrailleTools/bin/hs_err_pid2756.log
+*.log
+NatBrailleTools/gcodestreamer/.settings/org.eclipse.jdt.core.prefs
diff --git a/NatBrailleTools/BrailleLogger/bin/.gitignore b/NatBrailleTools/BrailleLogger/bin/.gitignore
deleted file mode 100644
index b3f7a60..0000000
--- a/NatBrailleTools/BrailleLogger/bin/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/Braille2GcodeEncoder.java.bak
-/BrailleLogger.java.bak
-/BrailleGcodeDot.class
-/BrailleGcodeEncoding.class
diff --git a/NatBrailleTools/bin/gcodestreamer.zip b/NatBrailleTools/bin/gcodestreamer.zip
new file mode 100644
index 0000000..5ce29de
Binary files /dev/null and b/NatBrailleTools/bin/gcodestreamer.zip differ
diff --git a/NatBrailleTools/gcodestreamer/.classpath b/NatBrailleTools/gcodestreamer/.classpath
index 342fca5..ec4ad1e 100644
--- a/NatBrailleTools/gcodestreamer/.classpath
+++ b/NatBrailleTools/gcodestreamer/.classpath
@@ -1,7 +1,7 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/NatBrailleTools/gcodestreamer/.settings/org.eclipse.jdt.core.prefs b/NatBrailleTools/gcodestreamer/.settings/org.eclipse.jdt.core.prefs
index 3a21537..ace45ce 100644
--- a/NatBrailleTools/gcodestreamer/.settings/org.eclipse.jdt.core.prefs
+++ b/NatBrailleTools/gcodestreamer/.settings/org.eclipse.jdt.core.prefs
@@ -1,11 +1,12 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/COPYING b/NatBrailleTools/lib/jSSC-2.8.0-Release/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/NatBrailleTools/lib/jSSC-2.8.0-Release/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/COPYING.LESSER b/NatBrailleTools/lib/jSSC-2.8.0-Release/COPYING.LESSER
deleted file mode 100644
index 65c5ca8..0000000
--- a/NatBrailleTools/lib/jSSC-2.8.0-Release/COPYING.LESSER
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/README.txt b/NatBrailleTools/lib/jSSC-2.8.0-Release/README.txt
deleted file mode 100644
index c5fba55..0000000
--- a/NatBrailleTools/lib/jSSC-2.8.0-Release/README.txt
+++ /dev/null
@@ -1,180 +0,0 @@
-jSSC-2.8.0 Release version (24.01.2014)
-
-This version contains native libs for Windows(x86, x86-64), Linux(x86, x86-64, ARM soft & hard float), Solaris(x86, x86-64), Mac OS X(x86, x86-64, PPC, PPC64).
-All native libs contains in the jssc.jar file and you don't need manage native libs manually.
-
-In this build:
-
- Fixes:
- * Important! Fixed bug with port handles potential leakage
-
- Additions:
- * Added method "writeString(String string, String charsetName)"
- * Added method "getNativeLibraryVersion" in "SerialNativeInterface" class
- * Enabled Java and Native libraries versions mismatch check
-
-With Best Regards, Sokolov Alexey aka scream3r.
-
-============= Previous Builds ==============
-
-///////////////////////////////////////////
-//jSSC-2.6.0 Release version (01.06.2013)//
-///////////////////////////////////////////
-
-In this build:
-
- Note: Linux x86 and x86-64 was builded on Ubuntu 10.04 and don't depends GLIBC-2.15 unlike jSSC-2.5.0
-
- Additions:
- * Added os.name - "Darwin" and os.arch - "universal" support. It can be useful for MacOS X developers.
- * Added ttyO to Linux RegExp for listing OMAP serial devices.
- * Added JSSC_IGNPAR and JSSC_PARMRK properties for enabling IGNPAR and PARMRK flags in _nix termios structure.
-
-///////////////////////////////////////////
-//jSSC-2.5.0 Release version (27.04.2013)//
-///////////////////////////////////////////
-
-In this build:
-
- Fixes:
- * Important! Fixed bug with garbage reading on Linux, MacOSX, Solaris, cause of incorrect using of VMIN and VTIME. Now "read" methods works correctly and are blocking like in Windows
- * Important! Fixed error with garbage reading in Windows using jSSC after another application used serial port. To prevent this effect COMMTIMEOUTS structure zeroing added to setParams() method
- * Important! The port handle now stored in variable of type "long" instead of "int", to prevent potential problems with type conversions on Win64
- * Fixed MacOS X 10.8 bug with native lib loading (*.dylib -> *.jnilib)
- * Fixed Linux error with exclusive access to serial port (TIOCEXCL). TIOCNXCL added to closePort() method for clearing exclusive access
- * Fixed Windows native lib port name concatenation error
- * Fixed native lib extraction path if user home is read only, in this situation lib will be extracted to tmp folder
- * Null port name fix. If try to invoke method openPort() for SerialPort(null) object, exception TYPE_NULL_NOT_PERMITTED will be thrown
- * Enabled TIOCEXCL support in Solaris
-
- Additions:
- * Added ARM Soft & Hard float support (Tested of Raspberry Pi with Oracle JDK(6-7-8))
- * Added ttyACM, ttyAMA, rfcomm to Linux RegExp and tty.usbmodem to MacOS X RegExp
- * Added precompiled RegExp's for Linux, Solaris, MacOS X for more faster port listing
- * Added private common for Linux, Solaris, MacOS X method getUnixBasedPortNames() for listing serial ports
- * Rewrited comparator for sorting port names. Now it's a common comparator for Windows, Linux, Solaris and MacOS X
- * Added some syntax sugar to SerialPortList class, for changing search path, RegExp and comparator
- * Added timeouts for read operations and SerialPortTimeoutException class for catching timeout exceptions
- * Added JSSC_NO_TIOCEXCL JVM property for disable using of exclusive access to serial port
- * Added termios(_nix) and DCB(Windows) structure cheking on port opening, it helps separate real serial devices from others
- * Added "ERR_" constants into SerialNativeInterface
- * Added new exception TYPE_INCORRECT_SERIAL_PORT
- * Added new exception TYPE_PERMISSION_DENIED. It can be very useful for _nix based system if user have no permissions for using serial device
-
-And other little modifications...
-
-///////////////////////////////////////////
-//jSSC-0.9.0 Release version (21.12.2011)//
-///////////////////////////////////////////
-
-In this build:
-* Added Solaris support (x86, x86-64)
-* Added Mac OS X support 10.5 and higher(x86, x86-64, PPC, PPC64)
-* Fixed some bugs in Linux native part
-* Changed openPort() method
-
-Important Note:
- openPort() method has been changed, now if port busy SerialPortException with type: TYPE_PORT_BUSY will be thrown,
- and if port not found SerialPortException with type: TYPE_PORT_NOT_FOUND will be thrown.
-
- It's possible to know that port is busy (TYPE_PORT_BUSY) by using TIOCEXCL directive in *nix native library,
- but using of this directive make some troubles in Solaris OS, that's why TIOCEXCL not used in Solaris (!)
- Be careful with it.
-
- Also Solaris and Mac OS X versions of jSSC not support following events:
- ERR, TXEMPTY, BREAK.
-
- Solaris version not support non standard baudrates
- Mac OS X version not support parity: MARK, SPACE.
-
-* Included javadoc and source codes
-
-/////////////////////////////////////////
-//jSSC-0.8 Release version (28.11.2011)//
-/////////////////////////////////////////
-
-In this build:
-* Implemented events BREAK and ERR (RXFLAG not supported in Linux)
-* Added method sendBreak(int duration) - send Break signal for setted time
-* Fixed bugs in Linux events listener
-* Fixed bug with long port closing operation in Linux
-
-/////////////////////////////
-//jSSC-0.8-tb4 (21.11.2011)//
-/////////////////////////////
-
-In this build was fixed a bug in getPortNames() method under Linux.
-
-Not implemented yet list:
-* Events: BREAK, ERR and RXFLAG
-
-/////////////////////////////
-//jSSC-0.8-tb3 (09.09.2011)//
-/////////////////////////////
-
-In this build was implemented:
-* purgePort()
-
-And was fixed some Linux and Windows lib bugs.
-
-New in this build:
-* getInputBufferBytesCount() - get count of bytes in input buffer (if error has occured -1 will be returned)
-* getOutputBufferBytesCount() - get count of bytes in output buffer (if error has occured -1 will be returned)
-* setFlowControlMode() - setting flow control (available: FLOWCONTROL_NONE,
- FLOWCONTROL_RTSCTS_IN,
- FLOWCONTROL_RTSCTS_OUT,
- FLOWCONTROL_XONXOFF_IN,
- FLOWCONTROL_XONXOFF_OUT)
-* getFlowControlMode() - getting setted flow control mode
-
-Some "syntactic sugar" for more usability:
-
-* writeByte() - write single byte
-* writeString() - write string
-* writeInt() - write int value (for example 0xFF)
-* writeIntArray - write int array (for example new int[]{0xFF, 0x00, 0xFF})
-
-* readString(int byteCount) - read string
-* readHexString(int byteCount) - read Hex string with a space separator (for example "FF 00 FF")
-* readHexString(int byteCount, String separator) - read Hex string with setted separator (for example if separator : "FF:00:FF")
-* readHexStringArray(int byteCount) - read Hex string array (for example {FF, 00, FF})
-* readIntArray(int byteCount) - read int array (values in int array are in range from 0 to 255
- for example if byte == -1 value in this array it will be 255)
-
-The following methods read all bytes in input buffer, if buffer is empty methods will return null
-
-* readBytes()
-* readString()
-* readHexString()
-* readHexString()
-* readHexStringArray()
-* readIntArray()
-
-============================================
-
-Not implemented yet list:
-* Events: BREAK, ERR and RXFLAG
-
-///////////////////////////////
-// jSSC-0.8-tb2 (14.07.2011) //
-///////////////////////////////
-
-In this build was implemented:
-* getPortNames()
-* Parity: MARK and SPACE
-
-And was fixed some Linux lib bugs.
-
-Not implemented yet list:
-* purgePort()
-* Events: BREAK, ERR and RXFLAG
-
-///////////////////////////////
-// jSSC-0.8-tb1 (11.07.2011) //
-///////////////////////////////
-
-Not implemented yet list:
-* getPortNames()
-* Parity: MARK and SPACE
-* purgePort()
-* Events: BREAK, ERR and RXFLAG
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/javadoc/jssc-2.8.0-javadoc.jar b/NatBrailleTools/lib/jSSC-2.8.0-Release/javadoc/jssc-2.8.0-javadoc.jar
deleted file mode 100644
index 75efc8b..0000000
Binary files a/NatBrailleTools/lib/jSSC-2.8.0-Release/javadoc/jssc-2.8.0-javadoc.jar and /dev/null differ
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/jssc.jar b/NatBrailleTools/lib/jSSC-2.8.0-Release/jssc.jar
deleted file mode 100644
index d2b5c07..0000000
Binary files a/NatBrailleTools/lib/jSSC-2.8.0-Release/jssc.jar and /dev/null differ
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/_nix_based/jssc.cpp b/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/_nix_based/jssc.cpp
deleted file mode 100644
index 634b620..0000000
--- a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/_nix_based/jssc.cpp
+++ /dev/null
@@ -1,874 +0,0 @@
-/* jSSC (Java Simple Serial Connector) - serial port communication library.
- * © Alexey Sokolov (scream3r), 2010-2014.
- *
- * This file is part of jSSC.
- *
- * jSSC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * jSSC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with jSSC. If not, see .
- *
- * If you use jSSC in public project you can inform me about this by e-mail,
- * of course if you want it.
- *
- * e-mail: scream3r.org@gmail.com
- * web-site: http://scream3r.org | http://code.google.com/p/java-simple-serial-connector/
- */
-#include
-#include
-#include
-#include
-#include
-#include
-#include //-D_TS_ERRNO use for Solaris C++ compiler
-
-#include //since 2.5.0
-
-#ifdef __linux__
- #include
-#endif
-#ifdef __SunOS
- #include //Needed for FIONREAD in Solaris
- #include //Needed for select() function
-#endif
-#ifdef __APPLE__
- #include //Needed for IOSSIOSPEED in Mac OS X (Non standard baudrate)
-#endif
-
-#include
-#include "../jssc_SerialNativeInterface.h"
-
-//#include //-lCstd use for Solaris linker
-
-/*
- * Get native library version
- */
-JNIEXPORT jstring JNICALL Java_jssc_SerialNativeInterface_getNativeLibraryVersion(JNIEnv *env, jobject object) {
- return env->NewStringUTF(jSSC_NATIVE_LIB_VERSION);
-}
-
-/* OK */
-/*
- * Port opening
- *
- * In 2.2.0 added useTIOCEXCL
- */
-JNIEXPORT jlong JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, jobject object, jstring portName, jboolean useTIOCEXCL){
- const char* port = env->GetStringUTFChars(portName, JNI_FALSE);
- jlong hComm = open(port, O_RDWR | O_NOCTTY | O_NDELAY);
- if(hComm != -1){
- //since 2.2.0 -> (check termios structure for separating real serial devices from others)
- termios *settings = new termios();
- if(tcgetattr(hComm, settings) == 0){
- #if defined TIOCEXCL //&& !defined __SunOS
- if(useTIOCEXCL == JNI_TRUE){
- ioctl(hComm, TIOCEXCL);
- }
- #endif
- int flags = fcntl(hComm, F_GETFL, 0);
- flags &= ~O_NDELAY;
- fcntl(hComm, F_SETFL, flags);
- }
- else {
- close(hComm);//since 2.7.0
- hComm = jssc_SerialNativeInterface_ERR_INCORRECT_SERIAL_PORT;//-4;
- }
- delete settings;
- //<- since 2.2.0
- }
- else {//since 0.9 ->
- if(errno == EBUSY){//Port busy
- hComm = jssc_SerialNativeInterface_ERR_PORT_BUSY;//-1
- }
- else if(errno == ENOENT){//Port not found
- hComm = jssc_SerialNativeInterface_ERR_PORT_NOT_FOUND;//-2;
- }//-> since 2.2.0
- else if(errno == EACCES){//Permission denied
- hComm = jssc_SerialNativeInterface_ERR_PERMISSION_DENIED;//-3;
- }
- else {
- hComm = jssc_SerialNativeInterface_ERR_PORT_NOT_FOUND;//-2;
- }//<- since 2.2.0
- }//<- since 0.9
- env->ReleaseStringUTFChars(portName, port);
- return hComm;
-}
-
-/* OK */
-/*
- * Choose baudrate
- */
-speed_t getBaudRateByNum(jint baudRate) {
- switch(baudRate){
- case 0:
- return B0;
- case 50:
- return B50;
- case 75:
- return B75;
- case 110:
- return B110;
- case 134:
- return B134;
- case 150:
- return B150;
- case 200:
- return B200;
- case 300:
- return B300;
- case 600:
- return B600;
- case 1200:
- return B1200;
- case 1800:
- return B1800;
- case 2400:
- return B2400;
- case 4800:
- return B4800;
- case 9600:
- return B9600;
- case 19200:
- return B19200;
- case 38400:
- return B38400;
- #ifdef B57600
- case 57600:
- return B57600;
- #endif
- #ifdef B115200
- case 115200:
- return B115200;
- #endif
- #ifdef B230400
- case 230400:
- return B230400;
- #endif
- #ifdef B460800
- case 460800:
- return B460800;
- #endif
-
- #ifdef B500000
- case 500000:
- return B500000;
- #endif
- #ifdef B576000
- case 576000:
- return B576000;
- #endif
- #ifdef B921600
- case 921600:
- return B921600;
- #endif
- #ifdef B1000000
- case 1000000:
- return B1000000;
- #endif
-
- #ifdef B1152000
- case 1152000:
- return B1152000;
- #endif
- #ifdef B1500000
- case 1500000:
- return B1500000;
- #endif
- #ifdef B2000000
- case 2000000:
- return B2000000;
- #endif
- #ifdef B2500000
- case 2500000:
- return B2500000;
- #endif
-
- #ifdef B3000000
- case 3000000:
- return B3000000;
- #endif
- #ifdef B3500000
- case 3500000:
- return B3500000;
- #endif
- #ifdef B4000000
- case 4000000:
- return B4000000;
- #endif
- default:
- return -1;
- }
-}
-
-/* OK */
-/*
- * Choose data bits
- */
-int getDataBitsByNum(jint byteSize) {
- switch(byteSize){
- case 5:
- return CS5;
- case 6:
- return CS6;
- case 7:
- return CS7;
- case 8:
- return CS8;
- default:
- return -1;
- }
-}
-
-//since 2.6.0 ->
-const jint PARAMS_FLAG_IGNPAR = 1;
-const jint PARAMS_FLAG_PARMRK = 2;
-//<- since 2.6.0
-
-/* OK */
-/*
- * Set serial port settings
- *
- * In 2.6.0 added flags parameter
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setParams
- (JNIEnv *env, jobject object, jlong portHandle, jint baudRate, jint byteSize, jint stopBits, jint parity, jboolean setRTS, jboolean setDTR, jint flags){
- jboolean returnValue = JNI_FALSE;
-
- speed_t baudRateValue = getBaudRateByNum(baudRate);
- int dataBits = getDataBitsByNum(byteSize);
-
- termios *settings = new termios();
- if(tcgetattr(portHandle, settings) == 0){
- if(baudRateValue != -1){
- //Set standart baudrate from "termios.h"
- if(cfsetispeed(settings, baudRateValue) < 0 || cfsetospeed(settings, baudRateValue) < 0){
- goto methodEnd;
- }
- }
- else {
- #ifdef __SunOS
- goto methodEnd;//Solaris don't support non standart baudrates
- #elif defined __linux__
- //Try to calculate a divisor for setting non standart baudrate
- serial_struct *serial_info = new serial_struct();
- if(ioctl(portHandle, TIOCGSERIAL, serial_info) < 0){ //Getting serial_info structure
- delete serial_info;
- goto methodEnd;
- }
- else {
- serial_info->flags |= ASYNC_SPD_CUST;
- serial_info->custom_divisor = (serial_info->baud_base/baudRate); //Calculate divisor
- if(serial_info->custom_divisor == 0){ //If divisor == 0 go to method end to prevent "division by zero" error
- delete serial_info;
- goto methodEnd;
- }
- settings->c_cflag |= B38400;
- if(cfsetispeed(settings, B38400) < 0 || cfsetospeed(settings, B38400) < 0){
- delete serial_info;
- goto methodEnd;
- }
- if(ioctl(portHandle, TIOCSSERIAL, serial_info) < 0){//Try to set new settings with non standart baudrate
- delete serial_info;
- goto methodEnd;
- }
- delete serial_info;
- }
- #endif
- }
- }
-
- /*
- * Setting data bits
- */
- if(dataBits != -1){
- settings->c_cflag &= ~CSIZE;
- settings->c_cflag |= dataBits;
- }
- else {
- goto methodEnd;
- }
-
- /*
- * Setting stop bits
- */
- if(stopBits == 0){ //1 stop bit (for info see ->> MSDN)
- settings->c_cflag &= ~CSTOPB;
- }
- else if((stopBits == 1) || (stopBits == 2)){ //1 == 1.5 stop bits; 2 == 2 stop bits (for info see ->> MSDN)
- settings->c_cflag |= CSTOPB;
- }
- else {
- goto methodEnd;
- }
-
- settings->c_cflag |= (CREAD | CLOCAL);
- settings->c_cflag &= ~CRTSCTS;
- settings->c_lflag &= ~(ICANON | ECHO | ECHOE | ECHOK | ECHONL | ECHOCTL | ECHOPRT | ECHOKE | ISIG | IEXTEN);
-
- settings->c_iflag &= ~(IXON | IXOFF | IXANY | INPCK | IGNPAR | PARMRK | ISTRIP | IGNBRK | BRKINT | INLCR | IGNCR| ICRNL);
-#ifdef IUCLC
- settings->c_iflag &= ~IUCLC;
-#endif
- settings->c_oflag &= ~OPOST;
-
- //since 2.6.0 ->
- if((flags & PARAMS_FLAG_IGNPAR) == PARAMS_FLAG_IGNPAR){
- settings->c_iflag |= IGNPAR;
- }
- if((flags & PARAMS_FLAG_PARMRK) == PARAMS_FLAG_PARMRK){
- settings->c_iflag |= PARMRK;
- }
- //<- since 2.6.0
-
- //since 0.9 ->
- settings->c_cc[VMIN] = 0;
- settings->c_cc[VTIME] = 0;
- //<- since 0.9
-
- /*
- * Parity bits
- */
-#ifdef PAREXT
- settings->c_cflag &= ~(PARENB | PARODD | PAREXT);//Clear parity settings
-#elif defined CMSPAR
- settings->c_cflag &= ~(PARENB | PARODD | CMSPAR);//Clear parity settings
-#else
- settings->c_cflag &= ~(PARENB | PARODD);//Clear parity settings
-#endif
- if(parity == 1){//Parity ODD
- settings->c_cflag |= (PARENB | PARODD);
- settings->c_iflag |= INPCK;
- }
- else if(parity == 2){//Parity EVEN
- settings->c_cflag |= PARENB;
- settings->c_iflag |= INPCK;
- }
- else if(parity == 3){//Parity MARK
- #ifdef PAREXT
- settings->c_cflag |= (PARENB | PARODD | PAREXT);
- settings->c_iflag |= INPCK;
- #elif defined CMSPAR
- settings->c_cflag |= (PARENB | PARODD | CMSPAR);
- settings->c_iflag |= INPCK;
- #endif
- }
- else if(parity == 4){//Parity SPACE
- #ifdef PAREXT
- settings->c_cflag |= (PARENB | PAREXT);
- settings->c_iflag |= INPCK;
- #elif defined CMSPAR
- settings->c_cflag |= (PARENB | CMSPAR);
- settings->c_iflag |= INPCK;
- #endif
- }
- else if(parity == 0){
- //Do nothing (Parity NONE)
- }
- else {
- goto methodEnd;
- }
-
- if(tcsetattr(portHandle, TCSANOW, settings) == 0){//Try to set all settings
- #ifdef __APPLE__
- //Try to set non-standard baud rate in Mac OS X
- if(baudRateValue == -1){
- speed_t speed = (speed_t)baudRate;
- if(ioctl(portHandle, IOSSIOSPEED, &speed) < 0){//IOSSIOSPEED must be used only after tcsetattr
- goto methodEnd;
- }
- }
- #endif
- int lineStatus;
- if(ioctl(portHandle, TIOCMGET, &lineStatus) >= 0){
- if(setRTS == JNI_TRUE){
- lineStatus |= TIOCM_RTS;
- }
- else {
- lineStatus &= ~TIOCM_RTS;
- }
- if(setDTR == JNI_TRUE){
- lineStatus |= TIOCM_DTR;
- }
- else {
- lineStatus &= ~TIOCM_DTR;
- }
- if(ioctl(portHandle, TIOCMSET, &lineStatus) >= 0){
- returnValue = JNI_TRUE;
- }
- }
- }
- methodEnd: {
- delete settings;
- return returnValue;
- }
-}
-
-const jint PURGE_RXABORT = 0x0002; //ignored
-const jint PURGE_RXCLEAR = 0x0008;
-const jint PURGE_TXABORT = 0x0001; //ignored
-const jint PURGE_TXCLEAR = 0x0004;
-
-/* OK */
-/*
- * PurgeComm
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_purgePort
- (JNIEnv *env, jobject object, jlong portHandle, jint flags){
- int clearValue = -1;
- if((flags & PURGE_RXCLEAR) && (flags & PURGE_TXCLEAR)){
- clearValue = TCIOFLUSH;
- }
- else if(flags & PURGE_RXCLEAR) {
- clearValue = TCIFLUSH;
- }
- else if(flags & PURGE_TXCLEAR) {
- clearValue = TCOFLUSH;
- }
- else if((flags & PURGE_RXABORT) || (flags & PURGE_TXABORT)){
- return JNI_TRUE;
- }
- else {
- return JNI_FALSE;
- }
- return tcflush(portHandle, clearValue) == 0 ? JNI_TRUE : JNI_FALSE;
-}
-
-/* OK */
-/* Closing the port */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_closePort
- (JNIEnv *env, jobject object, jlong portHandle){
-#if defined TIOCNXCL //&& !defined __SunOS
- ioctl(portHandle, TIOCNXCL);//since 2.1.0 Clear exclusive port access on closing
-#endif
- return close(portHandle) == 0 ? JNI_TRUE : JNI_FALSE;
-}
-
-/* OK */
-/*
- * Setting events mask
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setEventsMask
- (JNIEnv *env, jobject object, jlong portHandle, jint mask){
- //Don't needed in linux, implemented in java code
- return JNI_TRUE;
-}
-
-/* OK */
-/*
- * Getting events mask
- */
-JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_getEventsMask
- (JNIEnv *env, jobject object, jlong portHandle){
- //Don't needed in linux, implemented in java code
- return -1;
-}
-
-/* OK */
-/*
- * RTS line status changing (ON || OFF)
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setRTS
- (JNIEnv *env, jobject object, jlong portHandle, jboolean enabled){
- int returnValue = 0;
- int lineStatus;
- ioctl(portHandle, TIOCMGET, &lineStatus);
- if(enabled == JNI_TRUE){
- lineStatus |= TIOCM_RTS;
- }
- else {
- lineStatus &= ~TIOCM_RTS;
- }
- returnValue = ioctl(portHandle, TIOCMSET, &lineStatus);
- return (returnValue >= 0 ? JNI_TRUE : JNI_FALSE);
-}
-
-/* OK */
-/*
- * DTR line status changing (ON || OFF)
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setDTR
- (JNIEnv *env, jobject object, jlong portHandle, jboolean enabled){
- int returnValue = 0;
- int lineStatus;
- ioctl(portHandle, TIOCMGET, &lineStatus);
- if(enabled == JNI_TRUE){
- lineStatus |= TIOCM_DTR;
- }
- else {
- lineStatus &= ~TIOCM_DTR;
- }
- returnValue = ioctl(portHandle, TIOCMSET, &lineStatus);
- return (returnValue >= 0 ? JNI_TRUE : JNI_FALSE);
-}
-
-/* OK */
-/*
- * Writing data to the port
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_writeBytes
- (JNIEnv *env, jobject object, jlong portHandle, jbyteArray buffer){
- jbyte* jBuffer = env->GetByteArrayElements(buffer, JNI_FALSE);
- jint bufferSize = env->GetArrayLength(buffer);
- jint result = write(portHandle, jBuffer, (size_t)bufferSize);
- env->ReleaseByteArrayElements(buffer, jBuffer, 0);
- return result == bufferSize ? JNI_TRUE : JNI_FALSE;
-}
-
-/* OK */
-/*
- * Reading data from the port
- *
- * Rewrited in 2.5.0 (using select() function for correct block reading in MacOS X)
- */
-JNIEXPORT jbyteArray JNICALL Java_jssc_SerialNativeInterface_readBytes
- (JNIEnv *env, jobject object, jlong portHandle, jint byteCount){
- fd_set read_fd_set;
- jbyte *lpBuffer = new jbyte[byteCount];
- int byteRemains = byteCount;
- while(byteRemains > 0) {
- FD_ZERO(&read_fd_set);
- FD_SET(portHandle, &read_fd_set);
- select(portHandle + 1, &read_fd_set, NULL, NULL, NULL);
- int result = read(portHandle, lpBuffer + (byteCount - byteRemains), byteRemains);
- if(result > 0){
- byteRemains -= result;
- }
- }
- FD_CLR(portHandle, &read_fd_set);
- jbyteArray returnArray = env->NewByteArray(byteCount);
- env->SetByteArrayRegion(returnArray, 0, byteCount, lpBuffer);
- delete lpBuffer;
- return returnArray;
-}
-
-/* OK */
-/*
- * Get bytes count in serial port buffers (Input and Output)
- */
-JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getBuffersBytesCount
- (JNIEnv *env, jobject object, jlong portHandle){
- jint returnValues[2];
- returnValues[0] = -1; //Input buffer
- returnValues[1] = -1; //Output buffer
- jintArray returnArray = env->NewIntArray(2);
- ioctl(portHandle, FIONREAD, &returnValues[0]);
- ioctl(portHandle, TIOCOUTQ, &returnValues[1]);
- env->SetIntArrayRegion(returnArray, 0, 2, returnValues);
- return returnArray;
-}
-
-const jint FLOWCONTROL_NONE = 0;
-const jint FLOWCONTROL_RTSCTS_IN = 1;
-const jint FLOWCONTROL_RTSCTS_OUT = 2;
-const jint FLOWCONTROL_XONXOFF_IN = 4;
-const jint FLOWCONTROL_XONXOFF_OUT = 8;
-
-/* OK */
-/*
- * Setting flow control mode
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setFlowControlMode
- (JNIEnv *env, jobject object, jlong portHandle, jint mask){
- jboolean returnValue = JNI_FALSE;
- termios *settings = new termios();
- if(tcgetattr(portHandle, settings) == 0){
- settings->c_cflag &= ~CRTSCTS;
- settings->c_iflag &= ~(IXON | IXOFF);
- if(mask != FLOWCONTROL_NONE){
- if(((mask & FLOWCONTROL_RTSCTS_IN) == FLOWCONTROL_RTSCTS_IN) || ((mask & FLOWCONTROL_RTSCTS_OUT) == FLOWCONTROL_RTSCTS_OUT)){
- settings->c_cflag |= CRTSCTS;
- }
- if((mask & FLOWCONTROL_XONXOFF_IN) == FLOWCONTROL_XONXOFF_IN){
- settings->c_iflag |= IXOFF;
- }
- if((mask & FLOWCONTROL_XONXOFF_OUT) == FLOWCONTROL_XONXOFF_OUT){
- settings->c_iflag |= IXON;
- }
- }
- if(tcsetattr(portHandle, TCSANOW, settings) == 0){
- returnValue = JNI_TRUE;
- }
- }
- delete settings;
- return returnValue;
-}
-
-/* OK */
-/*
- * Getting flow control mode
- */
-JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_getFlowControlMode
- (JNIEnv *env, jobject object, jlong portHandle){
- jint returnValue = 0;
- termios *settings = new termios();
- if(tcgetattr(portHandle, settings) == 0){
- if(settings->c_cflag & CRTSCTS){
- returnValue |= (FLOWCONTROL_RTSCTS_IN | FLOWCONTROL_RTSCTS_OUT);
- }
- if(settings->c_iflag & IXOFF){
- returnValue |= FLOWCONTROL_XONXOFF_IN;
- }
- if(settings->c_iflag & IXON){
- returnValue |= FLOWCONTROL_XONXOFF_OUT;
- }
- }
- return returnValue;
-}
-
-/* OK */
-/*
- * Send break for setted duration
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_sendBreak
- (JNIEnv *env, jobject object, jlong portHandle, jint duration){
- jboolean returnValue = JNI_FALSE;
- if(duration > 0){
- if(ioctl(portHandle, TIOCSBRK, 0) >= 0){
- int sec = (duration >= 1000 ? duration/1000 : 0);
- int nanoSec = (sec > 0 ? duration - sec*1000 : duration)*1000000;
- struct timespec *timeStruct = new timespec();
- timeStruct->tv_sec = sec;
- timeStruct->tv_nsec = nanoSec;
- nanosleep(timeStruct, NULL);
- delete(timeStruct);
- if(ioctl(portHandle, TIOCCBRK, 0) >= 0){
- returnValue = JNI_TRUE;
- }
- }
- }
- return returnValue;
-}
-
-/* OK */
-/*
- * Return "statusLines" from ioctl(portHandle, TIOCMGET, &statusLines)
- * Need for "_waitEvents" and "_getLinesStatus"
- */
-int getLinesStatus(jlong portHandle) {
- int statusLines;
- ioctl(portHandle, TIOCMGET, &statusLines);
- return statusLines;
-}
-
-/* OK */
-/*
- * Not supported in Solaris and Mac OS X
- *
- * Get interrupts count for:
- * 0 - Break(for BREAK event)
- * 1 - TX(for TXEMPTY event)
- * --ERRORS(for ERR event)--
- * 2 - Frame
- * 3 - Overrun
- * 4 - Parity
- */
-void getInterruptsCount(jlong portHandle, int intArray[]) {
-#ifdef TIOCGICOUNT
- struct serial_icounter_struct *icount = new serial_icounter_struct();
- if(ioctl(portHandle, TIOCGICOUNT, icount) >= 0){
- intArray[0] = icount->brk;
- intArray[1] = icount->tx;
- intArray[2] = icount->frame;
- intArray[3] = icount->overrun;
- intArray[4] = icount->parity;
- }
- delete icount;
-#endif
-}
-
-const jint INTERRUPT_BREAK = 512;
-const jint INTERRUPT_TX = 1024;
-const jint INTERRUPT_FRAME = 2048;
-const jint INTERRUPT_OVERRUN = 4096;
-const jint INTERRUPT_PARITY = 8192;
-
-const jint EV_CTS = 8;
-const jint EV_DSR = 16;
-const jint EV_RING = 256;
-const jint EV_RLSD = 32;
-const jint EV_RXCHAR = 1;
-//const jint EV_RXFLAG = 2; //Not supported
-const jint EV_TXEMPTY = 4;
-const jint events[] = {INTERRUPT_BREAK,
- INTERRUPT_TX,
- INTERRUPT_FRAME,
- INTERRUPT_OVERRUN,
- INTERRUPT_PARITY,
- EV_CTS,
- EV_DSR,
- EV_RING,
- EV_RLSD,
- EV_RXCHAR,
- //EV_RXFLAG, //Not supported
- EV_TXEMPTY};
-
-/* OK */
-/*
- * Collecting data for EventListener class (Linux have no implementation of "WaitCommEvent" function from Windows)
- *
- */
-JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_waitEvents
- (JNIEnv *env, jobject object, jlong portHandle) {
-
- jclass intClass = env->FindClass("[I");
- jobjectArray returnArray = env->NewObjectArray(sizeof(events)/sizeof(jint), intClass, NULL);
-
- /*Input buffer*/
- jint bytesCountIn = 0;
- ioctl(portHandle, FIONREAD, &bytesCountIn);
-
- /*Output buffer*/
- jint bytesCountOut = 0;
- ioctl(portHandle, TIOCOUTQ, &bytesCountOut);
-
- /*Lines status*/
- int statusLines = getLinesStatus(portHandle);
-
- jint statusCTS = 0;
- jint statusDSR = 0;
- jint statusRING = 0;
- jint statusRLSD = 0;
-
- /*CTS status*/
- if(statusLines & TIOCM_CTS){
- statusCTS = 1;
- }
-
- /*DSR status*/
- if(statusLines & TIOCM_DSR){
- statusDSR = 1;
- }
-
- /*RING status*/
- if(statusLines & TIOCM_RNG){
- statusRING = 1;
- }
-
- /*RLSD(DCD) status*/
- if(statusLines & TIOCM_CAR){
- statusRLSD = 1;
- }
-
- /*Interrupts*/
- int interrupts[] = {-1, -1, -1, -1, -1};
- getInterruptsCount(portHandle, interrupts);
-
- jint interruptBreak = interrupts[0];
- jint interruptTX = interrupts[1];
- jint interruptFrame = interrupts[2];
- jint interruptOverrun = interrupts[3];
- jint interruptParity = interrupts[4];
-
- for(int i = 0; i < sizeof(events)/sizeof(jint); i++){
- jint returnValues[2];
- switch(events[i]) {
-
- case INTERRUPT_BREAK: //Interrupt Break - for BREAK event
- returnValues[1] = interruptBreak;
- goto forEnd;
- case INTERRUPT_TX: //Interrupt TX - for TXEMPTY event
- returnValues[1] = interruptTX;
- goto forEnd;
- case INTERRUPT_FRAME: //Interrupt Frame - for ERR event
- returnValues[1] = interruptFrame;
- goto forEnd;
- case INTERRUPT_OVERRUN: //Interrupt Overrun - for ERR event
- returnValues[1] = interruptOverrun;
- goto forEnd;
- case INTERRUPT_PARITY: //Interrupt Parity - for ERR event
- returnValues[1] = interruptParity;
- goto forEnd;
- case EV_CTS:
- returnValues[1] = statusCTS;
- goto forEnd;
- case EV_DSR:
- returnValues[1] = statusDSR;
- goto forEnd;
- case EV_RING:
- returnValues[1] = statusRING;
- goto forEnd;
- case EV_RLSD: /*DCD*/
- returnValues[1] = statusRLSD;
- goto forEnd;
- case EV_RXCHAR:
- returnValues[1] = bytesCountIn;
- goto forEnd;
- /*case EV_RXFLAG: // Event RXFLAG - Not supported
- returnValues[0] = EV_RXFLAG;
- returnValues[1] = 0;
- goto forEnd;*/
- case EV_TXEMPTY:
- returnValues[1] = bytesCountOut;
- goto forEnd;
- }
- forEnd: {
- returnValues[0] = events[i];
- jintArray singleResultArray = env->NewIntArray(2);
- env->SetIntArrayRegion(singleResultArray, 0, 2, returnValues);
- env->SetObjectArrayElement(returnArray, i, singleResultArray);
- };
- }
- return returnArray;
-}
-
-/* OK */
-/*
- * Getting serial ports names like an a String array (String[])
- */
-JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_getSerialPortNames
- (JNIEnv *env, jobject object){
- //Don't needed in linux, implemented in java code (Note: null will be returned)
- return NULL;
-}
-
-/* OK */
-/*
- * Getting lines status
- *
- * returnValues[0] - CTS
- * returnValues[1] - DSR
- * returnValues[2] - RING
- * returnValues[3] - RLSD(DCD)
- */
-JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getLinesStatus
- (JNIEnv *env, jobject object, jlong portHandle){
- jint returnValues[4];
- for(jint i = 0; i < 4; i++){
- returnValues[i] = 0;
- }
- jintArray returnArray = env->NewIntArray(4);
-
- /*Lines status*/
- int statusLines = getLinesStatus(portHandle);
-
- /*CTS status*/
- if(statusLines & TIOCM_CTS){
- returnValues[0] = 1;
- }
-
- /*DSR status*/
- if(statusLines & TIOCM_DSR){
- returnValues[1] = 1;
- }
-
- /*RING status*/
- if(statusLines & TIOCM_RNG){
- returnValues[2] = 1;
- }
-
- /*RLSD(DCD) status*/
- if(statusLines & TIOCM_CAR){
- returnValues[3] = 1;
- }
-
- env->SetIntArrayRegion(returnArray, 0, 4, returnValues);
- return returnArray;
-}
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/jssc_SerialNativeInterface.h b/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/jssc_SerialNativeInterface.h
deleted file mode 100644
index 7029b1b..0000000
--- a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/jssc_SerialNativeInterface.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* jSSC (Java Simple Serial Connector) - serial port communication library.
- * © Alexey Sokolov (scream3r), 2010-2014.
- *
- * This file is part of jSSC.
- *
- * jSSC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * jSSC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with jSSC. If not, see .
- *
- * If you use jSSC in public project you can inform me about this by e-mail,
- * of course if you want it.
- *
- * e-mail: scream3r.org@gmail.com
- * web-site: http://scream3r.org | http://code.google.com/p/java-simple-serial-connector/
- */
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class jssc_SerialNativeInterface */
-
-#ifndef _Included_jssc_SerialNativeInterface
-#define _Included_jssc_SerialNativeInterface
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#undef jSSC_NATIVE_LIB_VERSION
-#define jSSC_NATIVE_LIB_VERSION "2.8"
-
-#undef jssc_SerialNativeInterface_OS_LINUX
-#define jssc_SerialNativeInterface_OS_LINUX 0L
-#undef jssc_SerialNativeInterface_OS_WINDOWS
-#define jssc_SerialNativeInterface_OS_WINDOWS 1L
-#undef jssc_SerialNativeInterface_OS_SOLARIS
-#define jssc_SerialNativeInterface_OS_SOLARIS 2L
-#undef jssc_SerialNativeInterface_OS_MAC_OS_X
-#define jssc_SerialNativeInterface_OS_MAC_OS_X 3L
-#undef jssc_SerialNativeInterface_ERR_PORT_BUSY
-#define jssc_SerialNativeInterface_ERR_PORT_BUSY -1LL
-#undef jssc_SerialNativeInterface_ERR_PORT_NOT_FOUND
-#define jssc_SerialNativeInterface_ERR_PORT_NOT_FOUND -2LL
-#undef jssc_SerialNativeInterface_ERR_PERMISSION_DENIED
-#define jssc_SerialNativeInterface_ERR_PERMISSION_DENIED -3LL
-#undef jssc_SerialNativeInterface_ERR_INCORRECT_SERIAL_PORT
-#define jssc_SerialNativeInterface_ERR_INCORRECT_SERIAL_PORT -4LL
-/*
- * Class: jssc_SerialNativeInterface
- * Method: getNativeLibraryVersion
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_jssc_SerialNativeInterface_getNativeLibraryVersion
- (JNIEnv *, jobject);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: openPort
- * Signature: (Ljava/lang/String;Z)J
- */
-JNIEXPORT jlong JNICALL Java_jssc_SerialNativeInterface_openPort
- (JNIEnv *, jobject, jstring, jboolean);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: setParams
- * Signature: (JIIIIZZI)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setParams
- (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jboolean, jboolean, jint);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: purgePort
- * Signature: (JI)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_purgePort
- (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: closePort
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_closePort
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: setEventsMask
- * Signature: (JI)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setEventsMask
- (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: getEventsMask
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_getEventsMask
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: waitEvents
- * Signature: (J)[[I
- */
-JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_waitEvents
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: setRTS
- * Signature: (JZ)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setRTS
- (JNIEnv *, jobject, jlong, jboolean);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: setDTR
- * Signature: (JZ)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setDTR
- (JNIEnv *, jobject, jlong, jboolean);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: readBytes
- * Signature: (JI)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_jssc_SerialNativeInterface_readBytes
- (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: writeBytes
- * Signature: (J[B)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_writeBytes
- (JNIEnv *, jobject, jlong, jbyteArray);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: getBuffersBytesCount
- * Signature: (J)[I
- */
-JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getBuffersBytesCount
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: setFlowControlMode
- * Signature: (JI)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setFlowControlMode
- (JNIEnv *, jobject, jlong, jint);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: getFlowControlMode
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_getFlowControlMode
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: getSerialPortNames
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_getSerialPortNames
- (JNIEnv *, jobject);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: getLinesStatus
- * Signature: (J)[I
- */
-JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getLinesStatus
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: jssc_SerialNativeInterface
- * Method: sendBreak
- * Signature: (JI)Z
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_sendBreak
- (JNIEnv *, jobject, jlong, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/windows/jssc.c++ b/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/windows/jssc.c++
deleted file mode 100644
index c1fd6e9..0000000
--- a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/cpp/windows/jssc.c++
+++ /dev/null
@@ -1,693 +0,0 @@
-/* jSSC (Java Simple Serial Connector) - serial port communication library.
- * © Alexey Sokolov (scream3r), 2010-2014.
- *
- * This file is part of jSSC.
- *
- * jSSC is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * jSSC is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with jSSC. If not, see .
- *
- * If you use jSSC in public project you can inform me about this by e-mail,
- * of course if you want it.
- *
- * e-mail: scream3r.org@gmail.com
- * web-site: http://scream3r.org | http://code.google.com/p/java-simple-serial-connector/
- */
-#include
-#include
-#include
-#include "../jssc_SerialNativeInterface.h"
-
-//#include
-
-/*
- * Get native library version
- */
-JNIEXPORT jstring JNICALL Java_jssc_SerialNativeInterface_getNativeLibraryVersion(JNIEnv *env, jobject object) {
- return env->NewStringUTF(jSSC_NATIVE_LIB_VERSION);
-}
-
-/*
- * Port opening.
- *
- * In 2.2.0 added useTIOCEXCL (not used in Windows, only for compatibility with _nix version)
- */
-JNIEXPORT jlong JNICALL Java_jssc_SerialNativeInterface_openPort(JNIEnv *env, jobject object, jstring portName, jboolean useTIOCEXCL){
- char prefix[] = "\\\\.\\";
- const char* port = env->GetStringUTFChars(portName, JNI_FALSE);
-
- //since 2.1.0 -> string concat fix
- char portFullName[strlen(prefix) + strlen(port) + 1];
- strcpy(portFullName, prefix);
- strcat(portFullName, port);
- //<- since 2.1.0
-
- HANDLE hComm = CreateFile(portFullName,
- GENERIC_READ | GENERIC_WRITE,
- 0,
- 0,
- OPEN_EXISTING,
- FILE_FLAG_OVERLAPPED,
- 0);
- env->ReleaseStringUTFChars(portName, port);
-
- //since 2.3.0 ->
- if(hComm != INVALID_HANDLE_VALUE){
- DCB *dcb = new DCB();
- if(!GetCommState(hComm, dcb)){
- CloseHandle(hComm);//since 2.7.0
- hComm = (HANDLE)jssc_SerialNativeInterface_ERR_INCORRECT_SERIAL_PORT;//(-4)Incorrect serial port
- }
- delete dcb;
- }
- else {
- DWORD errorValue = GetLastError();
- if(errorValue == ERROR_ACCESS_DENIED){
- hComm = (HANDLE)jssc_SerialNativeInterface_ERR_PORT_BUSY;//(-1)Port busy
- }
- else if(errorValue == ERROR_FILE_NOT_FOUND){
- hComm = (HANDLE)jssc_SerialNativeInterface_ERR_PORT_NOT_FOUND;//(-2)Port not found
- }
- }
- //<- since 2.3.0
- return (jlong)hComm;//since 2.4.0 changed to jlong
-};
-
-/*
- * Setting serial port params.
- *
- * In 2.6.0 added flags (not used in Windows, only for compatibility with _nix version)
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setParams
- (JNIEnv *env, jobject object, jlong portHandle, jint baudRate, jint byteSize, jint stopBits, jint parity, jboolean setRTS, jboolean setDTR, jint flags){
- HANDLE hComm = (HANDLE)portHandle;
- DCB *dcb = new DCB();
- jboolean returnValue = JNI_FALSE;
- if(GetCommState(hComm, dcb)){
- dcb->BaudRate = baudRate;
- dcb->ByteSize = byteSize;
- dcb->StopBits = stopBits;
- dcb->Parity = parity;
-
- //since 0.8 ->
- if(setRTS == JNI_TRUE){
- dcb->fRtsControl = RTS_CONTROL_ENABLE;
- }
- else {
- dcb->fRtsControl = RTS_CONTROL_DISABLE;
- }
- if(setDTR == JNI_TRUE){
- dcb->fDtrControl = DTR_CONTROL_ENABLE;
- }
- else {
- dcb->fDtrControl = DTR_CONTROL_DISABLE;
- }
- dcb->fOutxCtsFlow = FALSE;
- dcb->fOutxDsrFlow = FALSE;
- dcb->fDsrSensitivity = FALSE;
- dcb->fTXContinueOnXoff = TRUE;
- dcb->fOutX = FALSE;
- dcb->fInX = FALSE;
- dcb->fErrorChar = FALSE;
- dcb->fNull = FALSE;
- dcb->fAbortOnError = FALSE;
- dcb->XonLim = 2048;
- dcb->XoffLim = 512;
- dcb->XonChar = (char)17; //DC1
- dcb->XoffChar = (char)19; //DC3
- //<- since 0.8
-
- if(SetCommState(hComm, dcb)){
-
- //since 2.1.0 -> previously setted timeouts by another application should be cleared
- COMMTIMEOUTS *lpCommTimeouts = new COMMTIMEOUTS();
- lpCommTimeouts->ReadIntervalTimeout = 0;
- lpCommTimeouts->ReadTotalTimeoutConstant = 0;
- lpCommTimeouts->ReadTotalTimeoutMultiplier = 0;
- lpCommTimeouts->WriteTotalTimeoutConstant = 0;
- lpCommTimeouts->WriteTotalTimeoutMultiplier = 0;
- if(SetCommTimeouts(hComm, lpCommTimeouts)){
- returnValue = JNI_TRUE;
- }
- delete lpCommTimeouts;
- //<- since 2.1.0
- }
- }
- delete dcb;
- return returnValue;
-}
-
-/*
- * PurgeComm
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_purgePort
- (JNIEnv *env, jobject object, jlong portHandle, jint flags){
- HANDLE hComm = (HANDLE)portHandle;
- DWORD dwFlags = (DWORD)flags;
- return (PurgeComm(hComm, dwFlags) ? JNI_TRUE : JNI_FALSE);
-}
-
-/*
- * Port closing
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_closePort
- (JNIEnv *env, jobject object, jlong portHandle){
- HANDLE hComm = (HANDLE)portHandle;
- return (CloseHandle(hComm) ? JNI_TRUE : JNI_FALSE);
-}
-
-/*
- * Set events mask
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setEventsMask
- (JNIEnv *env, jobject object, jlong portHandle, jint mask){
- HANDLE hComm = (HANDLE)portHandle;
- DWORD dwEvtMask = (DWORD)mask;
- return (SetCommMask(hComm, dwEvtMask) ? JNI_TRUE : JNI_FALSE);
-}
-
-/*
- * Get events mask
- */
-JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_getEventsMask
- (JNIEnv *env, jobject object, jlong portHandle){
- HANDLE hComm = (HANDLE)portHandle;
- DWORD lpEvtMask;
- if(GetCommMask(hComm, &lpEvtMask)){
- return (jint)lpEvtMask;
- }
- else {
- return -1;
- }
-}
-
-/*
- * Change RTS line state (ON || OFF)
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setRTS
- (JNIEnv *env, jobject object, jlong portHandle, jboolean enabled){
- HANDLE hComm = (HANDLE)portHandle;
- if(enabled == JNI_TRUE){
- return (EscapeCommFunction(hComm, SETRTS) ? JNI_TRUE : JNI_FALSE);
- }
- else {
- return (EscapeCommFunction(hComm, CLRRTS) ? JNI_TRUE : JNI_FALSE);
- }
-}
-
-/*
- * Change DTR line state (ON || OFF)
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setDTR
- (JNIEnv *env, jobject object, jlong portHandle, jboolean enabled){
- HANDLE hComm = (HANDLE)portHandle;
- if(enabled == JNI_TRUE){
- return (EscapeCommFunction(hComm, SETDTR) ? JNI_TRUE : JNI_FALSE);
- }
- else {
- return (EscapeCommFunction(hComm, CLRDTR) ? JNI_TRUE : JNI_FALSE);
- }
-}
-
-/*
- * Write data to port
- * portHandle - port handle
- * buffer - byte array for sending
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_writeBytes
- (JNIEnv *env, jobject object, jlong portHandle, jbyteArray buffer){
- HANDLE hComm = (HANDLE)portHandle;
- DWORD lpNumberOfBytesTransferred;
- DWORD lpNumberOfBytesWritten;
- OVERLAPPED *overlapped = new OVERLAPPED();
- jboolean returnValue = JNI_FALSE;
- jbyte* jBuffer = env->GetByteArrayElements(buffer, JNI_FALSE);
- overlapped->hEvent = CreateEventA(NULL, true, false, NULL);
- if(WriteFile(hComm, jBuffer, (DWORD)env->GetArrayLength(buffer), &lpNumberOfBytesWritten, overlapped)){
- returnValue = JNI_TRUE;
- }
- else if(GetLastError() == ERROR_IO_PENDING){
- if(WaitForSingleObject(overlapped->hEvent, INFINITE) == WAIT_OBJECT_0){
- if(GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false)){
- returnValue = JNI_TRUE;
- }
- }
- }
- env->ReleaseByteArrayElements(buffer, jBuffer, 0);
- CloseHandle(overlapped->hEvent);
- delete overlapped;
- return returnValue;
-}
-
-/*
- * Read data from port
- * portHandle - port handle
- * byteCount - count of bytes for reading
- */
-JNIEXPORT jbyteArray JNICALL Java_jssc_SerialNativeInterface_readBytes
- (JNIEnv *env, jobject object, jlong portHandle, jint byteCount){
- HANDLE hComm = (HANDLE)portHandle;
- DWORD lpNumberOfBytesTransferred;
- DWORD lpNumberOfBytesRead;
- OVERLAPPED *overlapped = new OVERLAPPED();
- jbyte lpBuffer[byteCount];
- jbyteArray returnArray = env->NewByteArray(byteCount);
- overlapped->hEvent = CreateEventA(NULL, true, false, NULL);
- if(ReadFile(hComm, lpBuffer, (DWORD)byteCount, &lpNumberOfBytesRead, overlapped)){
- env->SetByteArrayRegion(returnArray, 0, byteCount, lpBuffer);
- }
- else if(GetLastError() == ERROR_IO_PENDING){
- if(WaitForSingleObject(overlapped->hEvent, INFINITE) == WAIT_OBJECT_0){
- if(GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false)){
- env->SetByteArrayRegion(returnArray, 0, byteCount, lpBuffer);
- }
- }
- }
- CloseHandle(overlapped->hEvent);
- delete overlapped;
- return returnArray;
-}
-
-/*
- * Get bytes count in serial port buffers (Input and Output)
- */
-JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getBuffersBytesCount
- (JNIEnv *env, jobject object, jlong portHandle){
- HANDLE hComm = (HANDLE)portHandle;
- jint returnValues[2];
- returnValues[0] = -1;
- returnValues[1] = -1;
- jintArray returnArray = env->NewIntArray(2);
- DWORD lpErrors;
- COMSTAT *comstat = new COMSTAT();
- if(ClearCommError(hComm, &lpErrors, comstat)){
- returnValues[0] = (jint)comstat->cbInQue;
- returnValues[1] = (jint)comstat->cbOutQue;
- }
- else {
- returnValues[0] = -1;
- returnValues[1] = -1;
- }
- delete comstat;
- env->SetIntArrayRegion(returnArray, 0, 2, returnValues);
- return returnArray;
-}
-
-//since 0.8 ->
-const jint FLOWCONTROL_NONE = 0;
-const jint FLOWCONTROL_RTSCTS_IN = 1;
-const jint FLOWCONTROL_RTSCTS_OUT = 2;
-const jint FLOWCONTROL_XONXOFF_IN = 4;
-const jint FLOWCONTROL_XONXOFF_OUT = 8;
-//<- since 0.8
-
-/*
- * Setting flow control mode
- *
- * since 0.8
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_setFlowControlMode
- (JNIEnv *env, jobject object, jlong portHandle, jint mask){
- HANDLE hComm = (HANDLE)portHandle;
- jboolean returnValue = JNI_FALSE;
- DCB *dcb = new DCB();
- if(GetCommState(hComm, dcb)){
- dcb->fRtsControl = RTS_CONTROL_ENABLE;
- dcb->fOutxCtsFlow = FALSE;
- dcb->fOutX = FALSE;
- dcb->fInX = FALSE;
- if(mask != FLOWCONTROL_NONE){
- if((mask & FLOWCONTROL_RTSCTS_IN) == FLOWCONTROL_RTSCTS_IN){
- dcb->fRtsControl = RTS_CONTROL_HANDSHAKE;
- }
- if((mask & FLOWCONTROL_RTSCTS_OUT) == FLOWCONTROL_RTSCTS_OUT){
- dcb->fOutxCtsFlow = TRUE;
- }
- if((mask & FLOWCONTROL_XONXOFF_IN) == FLOWCONTROL_XONXOFF_IN){
- dcb->fInX = TRUE;
- }
- if((mask & FLOWCONTROL_XONXOFF_OUT) == FLOWCONTROL_XONXOFF_OUT){
- dcb->fOutX = TRUE;
- }
- }
- if(SetCommState(hComm, dcb)){
- returnValue = JNI_TRUE;
- }
- }
- delete dcb;
- return returnValue;
-}
-
-/*
- * Getting flow control mode
- *
- * since 0.8
- */
-JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_getFlowControlMode
- (JNIEnv *env, jobject object, jlong portHandle){
- HANDLE hComm = (HANDLE)portHandle;
- jint returnValue = 0;
- DCB *dcb = new DCB();
- if(GetCommState(hComm, dcb)){
- if(dcb->fRtsControl == RTS_CONTROL_HANDSHAKE){
- returnValue |= FLOWCONTROL_RTSCTS_IN;
- }
- if(dcb->fOutxCtsFlow == TRUE){
- returnValue |= FLOWCONTROL_RTSCTS_OUT;
- }
- if(dcb->fInX == TRUE){
- returnValue |= FLOWCONTROL_XONXOFF_IN;
- }
- if(dcb->fOutX == TRUE){
- returnValue |= FLOWCONTROL_XONXOFF_OUT;
- }
- }
- delete dcb;
- return returnValue;
-}
-
-/*
- * Send break for setted duration
- *
- * since 0.8
- */
-JNIEXPORT jboolean JNICALL Java_jssc_SerialNativeInterface_sendBreak
- (JNIEnv *env, jobject object, jlong portHandle, jint duration){
- HANDLE hComm = (HANDLE)portHandle;
- jboolean returnValue = JNI_FALSE;
- if(duration > 0){
- if(SetCommBreak(hComm) > 0){
- Sleep(duration);
- if(ClearCommBreak(hComm) > 0){
- returnValue = JNI_TRUE;
- }
- }
- }
- return returnValue;
-}
-
-/*
- * Wait event
- * portHandle - port handle
- */
-JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_waitEvents
- (JNIEnv *env, jobject object, jlong portHandle) {
- HANDLE hComm = (HANDLE)portHandle;
- DWORD lpEvtMask = 0;
- DWORD lpNumberOfBytesTransferred = 0;
- OVERLAPPED *overlapped = new OVERLAPPED();
- jclass intClass = env->FindClass("[I");
- jobjectArray returnArray;
- boolean functionSuccessful = false;
- overlapped->hEvent = CreateEventA(NULL, true, false, NULL);
- if(WaitCommEvent(hComm, &lpEvtMask, overlapped)){
- functionSuccessful = true;
- }
- else if(GetLastError() == ERROR_IO_PENDING){
- if(WaitForSingleObject(overlapped->hEvent, INFINITE) == WAIT_OBJECT_0){
- if(GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false)){
- functionSuccessful = true;
- }
- }
- }
- if(functionSuccessful){
- boolean executeGetCommModemStatus = false;
- boolean executeClearCommError = false;
- DWORD events[9];//fixed since 0.8 (old value is 8)
- jint eventsCount = 0;
- if((EV_BREAK & lpEvtMask) == EV_BREAK){
- events[eventsCount] = EV_BREAK;
- eventsCount++;
- }
- if((EV_CTS & lpEvtMask) == EV_CTS){
- events[eventsCount] = EV_CTS;
- eventsCount++;
- executeGetCommModemStatus = true;
- }
- if((EV_DSR & lpEvtMask) == EV_DSR){
- events[eventsCount] = EV_DSR;
- eventsCount++;
- executeGetCommModemStatus = true;
- }
- if((EV_ERR & lpEvtMask) == EV_ERR){
- events[eventsCount] = EV_ERR;
- eventsCount++;
- executeClearCommError = true;
- }
- if((EV_RING & lpEvtMask) == EV_RING){
- events[eventsCount] = EV_RING;
- eventsCount++;
- executeGetCommModemStatus = true;
- }
- if((EV_RLSD & lpEvtMask) == EV_RLSD){
- events[eventsCount] = EV_RLSD;
- eventsCount++;
- executeGetCommModemStatus = true;
- }
- if((EV_RXCHAR & lpEvtMask) == EV_RXCHAR){
- events[eventsCount] = EV_RXCHAR;
- eventsCount++;
- executeClearCommError = true;
- }
- if((EV_RXFLAG & lpEvtMask) == EV_RXFLAG){
- events[eventsCount] = EV_RXFLAG;
- eventsCount++;
- executeClearCommError = true;
- }
- if((EV_TXEMPTY & lpEvtMask) == EV_TXEMPTY){
- events[eventsCount] = EV_TXEMPTY;
- eventsCount++;
- executeClearCommError = true;
- }
- /*
- * Execute GetCommModemStatus function if it's needed (get lines status)
- */
- jint statusCTS = 0;
- jint statusDSR = 0;
- jint statusRING = 0;
- jint statusRLSD = 0;
- boolean successGetCommModemStatus = false;
- if(executeGetCommModemStatus){
- DWORD lpModemStat;
- if(GetCommModemStatus(hComm, &lpModemStat)){
- successGetCommModemStatus = true;
- if((MS_CTS_ON & lpModemStat) == MS_CTS_ON){
- statusCTS = 1;
- }
- if((MS_DSR_ON & lpModemStat) == MS_DSR_ON){
- statusDSR = 1;
- }
- if((MS_RING_ON & lpModemStat) == MS_RING_ON){
- statusRING = 1;
- }
- if((MS_RLSD_ON & lpModemStat) == MS_RLSD_ON){
- statusRLSD = 1;
- }
- }
- else {
- jint lastError = (jint)GetLastError();
- statusCTS = lastError;
- statusDSR = lastError;
- statusRING = lastError;
- statusRLSD = lastError;
- }
- }
- /*
- * Execute ClearCommError function if it's needed (get count of bytes in buffers and errors)
- */
- jint bytesCountIn = 0;
- jint bytesCountOut = 0;
- jint communicationsErrors = 0;
- boolean successClearCommError = false;
- if(executeClearCommError){
- DWORD lpErrors;
- COMSTAT *comstat = new COMSTAT();
- if(ClearCommError(hComm, &lpErrors, comstat)){
- successClearCommError = true;
- bytesCountIn = (jint)comstat->cbInQue;
- bytesCountOut = (jint)comstat->cbOutQue;
- communicationsErrors = (jint)lpErrors;
- }
- else {
- jint lastError = (jint)GetLastError();
- bytesCountIn = lastError;
- bytesCountOut = lastError;
- communicationsErrors = lastError;
- }
- delete comstat;
- }
- /*
- * Create int[][] for events values
- */
- returnArray = env->NewObjectArray(eventsCount, intClass, NULL);
- /*
- * Set events values
- */
- for(jint i = 0; i < eventsCount; i++){
- jint returnValues[2];
- switch(events[i]){
- case EV_BREAK:
- returnValues[0] = (jint)events[i];
- returnValues[1] = 0;
- goto forEnd;
- case EV_CTS:
- returnValues[1] = statusCTS;
- goto modemStatus;
- case EV_DSR:
- returnValues[1] = statusDSR;
- goto modemStatus;
- case EV_ERR:
- returnValues[1] = communicationsErrors;
- goto bytesAndErrors;
- case EV_RING:
- returnValues[1] = statusRING;
- goto modemStatus;
- case EV_RLSD:
- returnValues[1] = statusRLSD;
- goto modemStatus;
- case EV_RXCHAR:
- returnValues[1] = bytesCountIn;
- goto bytesAndErrors;
- case EV_RXFLAG:
- returnValues[1] = bytesCountIn;
- goto bytesAndErrors;
- case EV_TXEMPTY:
- returnValues[1] = bytesCountOut;
- goto bytesAndErrors;
- default:
- returnValues[0] = (jint)events[i];
- returnValues[1] = 0;
- goto forEnd;
- };
- modemStatus: {
- if(successGetCommModemStatus){
- returnValues[0] = (jint)events[i];
- }
- else {
- returnValues[0] = -1;
- }
- goto forEnd;
- }
- bytesAndErrors: {
- if(successClearCommError){
- returnValues[0] = (jint)events[i];
- }
- else {
- returnValues[0] = -1;
- }
- goto forEnd;
- }
- forEnd: {
- jintArray singleResultArray = env->NewIntArray(2);
- env->SetIntArrayRegion(singleResultArray, 0, 2, returnValues);
- env->SetObjectArrayElement(returnArray, i, singleResultArray);
- };
- }
- }
- else {
- returnArray = env->NewObjectArray(1, intClass, NULL);
- jint returnValues[2];
- returnValues[0] = -1;
- returnValues[1] = (jint)GetLastError();
- jintArray singleResultArray = env->NewIntArray(2);
- env->SetIntArrayRegion(singleResultArray, 0, 2, returnValues);
- env->SetObjectArrayElement(returnArray, 0, singleResultArray);
- };
- CloseHandle(overlapped->hEvent);
- delete overlapped;
- return returnArray;
-}
-
-/*
- * Get serial port names
- */
-JNIEXPORT jobjectArray JNICALL Java_jssc_SerialNativeInterface_getSerialPortNames
- (JNIEnv *env, jobject object){
- HKEY phkResult;
- LPCSTR lpSubKey = "HARDWARE\\DEVICEMAP\\SERIALCOMM\\";
- jobjectArray returnArray = NULL;
- if(RegOpenKeyExA(HKEY_LOCAL_MACHINE, lpSubKey, 0, KEY_READ, &phkResult) == ERROR_SUCCESS){
- boolean hasMoreElements = true;
- DWORD keysCount = 0;
- char valueName[256];
- DWORD valueNameSize;
- DWORD enumResult;
- while(hasMoreElements){
- valueNameSize = 256;
- enumResult = RegEnumValueA(phkResult, keysCount, valueName, &valueNameSize, NULL, NULL, NULL, NULL);
- if(enumResult == ERROR_SUCCESS){
- keysCount++;
- }
- else if(enumResult == ERROR_NO_MORE_ITEMS){
- hasMoreElements = false;
- }
- else {
- hasMoreElements = false;
- }
- }
- if(keysCount > 0){
- jclass stringClass = env->FindClass("java/lang/String");
- returnArray = env->NewObjectArray((jsize)keysCount, stringClass, NULL);
- char lpValueName[256];
- DWORD lpcchValueName;
- byte lpData[256];
- DWORD lpcbData;
- DWORD result;
- for(DWORD i = 0; i < keysCount; i++){
- lpcchValueName = 256;
- lpcbData = 256;
- result = RegEnumValueA(phkResult, i, lpValueName, &lpcchValueName, NULL, NULL, lpData, &lpcbData);
- if(result == ERROR_SUCCESS){
- env->SetObjectArrayElement(returnArray, i, env->NewStringUTF((char*)lpData));
- }
- }
- }
- CloseHandle(phkResult);
- }
- return returnArray;
-}
-
-/*
- * Get lines status
- *
- * returnValues[0] - CTS
- * returnValues[1] - DSR
- * returnValues[2] - RING
- * returnValues[3] - RLSD
- *
- */
-JNIEXPORT jintArray JNICALL Java_jssc_SerialNativeInterface_getLinesStatus
- (JNIEnv *env, jobject object, jlong portHandle){
- HANDLE hComm = (HANDLE)portHandle;
- DWORD lpModemStat;
- jint returnValues[4];
- for(jint i = 0; i < 4; i++){
- returnValues[i] = 0;
- }
- jintArray returnArray = env->NewIntArray(4);
- if(GetCommModemStatus(hComm, &lpModemStat)){
- if((MS_CTS_ON & lpModemStat) == MS_CTS_ON){
- returnValues[0] = 1;
- }
- if((MS_DSR_ON & lpModemStat) == MS_DSR_ON){
- returnValues[1] = 1;
- }
- if((MS_RING_ON & lpModemStat) == MS_RING_ON){
- returnValues[2] = 1;
- }
- if((MS_RLSD_ON & lpModemStat) == MS_RLSD_ON){
- returnValues[3] = 1;
- }
- }
- env->SetIntArrayRegion(returnArray, 0, 4, returnValues);
- return returnArray;
-}
diff --git a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/jssc-2.8.0-src.jar b/NatBrailleTools/lib/jSSC-2.8.0-Release/src/jssc-2.8.0-src.jar
deleted file mode 100644
index e87d8ef..0000000
Binary files a/NatBrailleTools/lib/jSSC-2.8.0-Release/src/jssc-2.8.0-src.jar and /dev/null differ
diff --git a/NatBrailleTools/lib/jssc-2.9.2.jar b/NatBrailleTools/lib/jssc-2.9.2.jar
new file mode 100644
index 0000000..4679b8a
Binary files /dev/null and b/NatBrailleTools/lib/jssc-2.9.2.jar differ