Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple issues fixed #17

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e290db4
Fix a ton of fuckups, including: broken assumtions which cause sleeps…
xxxajk Apr 26, 2016
464646c
STK500V2: Reduce error count from 5 to 2. Make errors actually work d…
xxxajk Dec 5, 2016
bebf410
Add UartWiFi, Skeletal UartBluetooth
xxxajk Jan 19, 2018
1834da3
Update README.md
xxxajk Jan 19, 2018
c4bc324
constructor stuff
xxxajk Jan 19, 2018
baf4d9b
fix thread state
xxxajk Jan 22, 2018
8665f6d
refactor typo
xxxajk Jan 22, 2018
30a1152
Bluetooth attempt, as server mode
xxxajk Jan 22, 2018
3bf88fd
Deprecate misspelled "ReadListener", add initial WinChipHead CH34x code
xxxajk Aug 2, 2018
2f06087
Fix bluetooth skeleton
xxxajk Aug 2, 2018
4798a2e
add ability to compile with Ant, cuz gradle sucks!
xxxajk Aug 2, 2018
7dcde1d
Working CH34x, tested with physicaloidtest
xxxajk Aug 3, 2018
c3e0bc3
Fully working CH34x! Horray!
xxxajk Aug 3, 2018
f49a15a
consistency between gradle and ant's sdk-level
DRSDavidSoft Aug 5, 2018
cc0110f
update gitignore
DRSDavidSoft Aug 5, 2018
6ac7566
initial travis config
DRSDavidSoft Aug 5, 2018
0881fbf
display ant version
DRSDavidSoft Aug 5, 2018
7086621
fix ant build
DRSDavidSoft Aug 5, 2018
b8d60af
removed install directive
DRSDavidSoft Aug 5, 2018
44a2911
upload support
DRSDavidSoft Aug 5, 2018
91bfae7
display result link
DRSDavidSoft Aug 5, 2018
858f406
fix script
DRSDavidSoft Aug 5, 2018
bad2d17
escaped echo
DRSDavidSoft Aug 5, 2018
c322521
update README with WCH
DRSDavidSoft Aug 5, 2018
f400696
Merge pull request #4 from DRSDavidSoft/master
xxxajk Aug 5, 2018
00cc7b0
Update README.md
xxxajk Aug 5, 2018
6b38aa5
Clean up WCH, Bump library version
xxxajk Aug 5, 2018
df33b92
cleanup
xxxajk Sep 29, 2018
cfdb122
FTDI without closed source jar
xxxajk Sep 29, 2018
d2ef20d
fix stupid bug
xxxajk Sep 29, 2018
48b1c5e
flip modem bits
xxxajk Sep 29, 2018
0e1fb4e
finish buffering and dtr/rts, works
xxxajk Sep 29, 2018
0307131
FTDI sucks, works like an 8250 on the TX side. Regardless, my java co…
xxxajk Sep 30, 2018
c106016
Update README.md
xxxajk Sep 30, 2018
54f03b2
Update README.md
xxxajk Sep 30, 2018
fdcbc0e
final ftdi tweaks, prep for CDC-ACM to-do's
xxxajk Oct 1, 2018
6a1dbb4
Merge branch 'master' of github.com:xxxajk/PhysicaloidLibrary
xxxajk Oct 1, 2018
77eff40
Fix FTDI, RTS/DTR were backwards. Add API call to enable/disable debu…
xxxajk Nov 16, 2018
00c11ad
improved compatibility of DCCDuino boards (1A86, 7523)
jangminhyeok Dec 10, 2021
e575801
Merge pull request #25 from K-STEAM/master
xxxajk Dec 11, 2021
a047891
Target API 31 for S+ Problem Fixed
jangminhyeok May 22, 2022
5c2f052
Target API 31 or above for S+ Problem fixed with SDK version check.
jangminhyeok May 26, 2022
9cd1716
Merge pull request #28 from K-STEAM/master
xxxajk May 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# General temp. files
*~
*.tmp

# Eclipse project files
#.classpath
#.project

# built application files
#*.apk
*.apk
*.ap_

# files for the dex VM
Expand All @@ -12,14 +16,18 @@
# Java class files
*.class

# generated files
# Generated files
bin/
gen/
out/
lint.xml

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Eclipse project files
#.classpath
#.project
Expand All @@ -31,20 +39,34 @@ release.properties
pom.xml.*

# Ant
build.xml
#build.xml
ant.properties
local.properties
proguard.cfg
proguard-project.txt

# Gradle files
.gradle/
build/

# Log Files
*.log

# Netbeans files
.netbeans.xml

# Intellij project files
*.iml
*.ipr
*.iws
.idea/
out/
gen-external-apklibs/

# Gradle
.gradle
build
# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Keystore files
*.jks
32 changes: 32 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
language: android
#install: ant deps

android:

components:

# The BuildTools version used by the Physicaloid project
- build-tools-18.0.1

# The SDK version used to compile the Physicaloid project
- android-18

# List of the specified system images,
# to run emulator(s) during the tests
#- sys-img-armeabi-v7a-android-18
#- sys-img-armeabi-v7a-android-26

before_install:
- wget --no-check-certificate https://www.apache.org/dist/ant/binaries/apache-ant-1.9.13-bin.tar.gz
- tar -xzvf apache-ant-1.9.13-bin.tar.gz
- export PATH=`pwd`/apache-ant-1.9.13/bin:$PATH
- echo $(ant -version)

script:
- cd ./SampleProjects/PhysicaloidTest
- ant -v debug

after_success:
- cp bin/PhysicaloidTest-debug.apk ./result.apk
- link=$(curl -F "[email protected]" https://file.io?expires=1m | jq --raw-output '.link')
- echo "Uploaded the result to $link"
8 changes: 4 additions & 4 deletions PhysicaloidLibrary/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.physicaloid"
android:versionCode="1"
android:versionName="1.0" >
android:versionCode="20000"
android:versionName="02.00.00" >

<uses-sdk
android:minSdkVersion="12"
android:targetSdkVersion="12" />
android:minSdkVersion="19"
android:targetSdkVersion="19" />

</manifest>
Binary file removed PhysicaloidLibrary/bin/physicaloidlibrary.jar
Binary file not shown.
92 changes: 92 additions & 0 deletions PhysicaloidLibrary/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="PhysicaloidLibrary" default="help">

<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked into
Version Control Systems. -->
<property file="local.properties" />

<!-- The ant.properties file can be created by you. It is only edited by the
'android' tool to add properties to it.
This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:

source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.

For other overridable properties, look at the beginning of the rules
files in the SDK, at tools/ant/build.xml

Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.

This file is an integral part of the build system for your
application and should be checked into Version Control Systems.

-->
<property file="ant.properties" />

<!-- if sdk.dir was not set from one of the property file, then
get it from the ANDROID_HOME env var.
This must be done before we load project.properties since
the proguard config can use sdk.dir -->
<property environment="env" />
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
<isset property="env.ANDROID_HOME" />
</condition>

<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.

This contains project specific properties such as project target, and library
dependencies. Lower level build properties are stored in ant.properties
(or in .classpath for Eclipse projects).

This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
<loadproperties srcFile="project.properties" />

<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>

<!--
Import per project custom build rules if present at the root of the project.
This is the place to put custom intermediary targets such as:
-pre-build
-pre-compile
-post-compile (This is typically used for code obfuscation.
Compiled code location: ${out.classes.absolute.dir}
If this is not done in place, override ${out.dex.input.absolute.dir})
-post-package
-post-build
-pre-clean
-->
<import file="custom_rules.xml" optional="true" />

<!-- Import the actual build file.

To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
<import> task.
- customize it to your needs.
- Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task.
- customize to your needs.

***********************
****** IMPORTANT ******
***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project"
-->
<!-- version-tag: 1 -->
<import file="${sdk.dir}/tools/ant/build.xml" />

</project>
Binary file removed PhysicaloidLibrary/libs/d2xx.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion PhysicaloidLibrary/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-12
target=android-18
android.library=true
Loading