some minor fixes

.gitignore

@@ -1,9 +1,10 @@
-# anki-connector
-node_modules/**
-.gradle/**
-build/**
-bin/**
-.classpath
-.project
-.settings/**
-.idea/
+# anki-connector
+node_modules/**
+.gradle/**
+build/**
+bin/**
+.classpath
+.project
+.settings/**
+.idea/
+/.nb-gradle/

.travis.yml

@@ -1,3 +1,7 @@
+before_install:
+ - sudo apt-get update
+ - sudo apt-get install -y libudev-dev
+
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2016 adesso AG
+Copyright (c) 2018-2019 Bastian Tenbergen, The State University of New York at Oswego
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,15 +1,19 @@
 # Anki Drive SDK for Java
 
 The Anki Drive SDK for Java is an implementation of the message protocols
-and data parsing routines necessary for communicating with Anki Drive vehicles.
+and data parsing routines necessary for communicating with Anki Drive and Overdrive vehicles. This library is an updated
+version of the one found [adessoAG/anki-drive-java](https://github.com/adessoAG/anki-drive-java). 
 
 *See [anki/drive-sdk](https://github.com/anki/drive-sdk) for the official
 SDK written in C.*
 
 ### Disclaimer
-The authors of this software are in no way affiliated to Anki.
+The authors of this software are in no way affiliated to Anki nor adesso AG.
 All naming rights for Anki, Anki Drive and Anki Overdrive are property of
-[Anki](http://anki.com).
+[Anki](http://anki.com), initial concept and implementation of the Java version by the folks at adesso.
+
+This is a forked repository from [adessoAG/anki-drive-java](https://github.com/adessoAG/anki-drive-java), which, sadly,
+appears to be abandoned. We are maintaining this SDK to serve our [tenbergen/Automotive-CPS](https://github.com/tenbergen/Automotive-CPS) project.
 
 ## About
 
@@ -32,16 +36,46 @@ To build and use the SDK in your own project you will need:
 To install the SDK and all required dependencies run the following commands:
 
 ```
-git clone https://github.com/yeckey/anki-drive-java
+git clone https://github.com/tenbergen/anki-drive-java
 cd anki-drive-java
 ./gradlew build
 ```
 
+### On MacOS
+
+Prerequisites for macOS:
+- Node.js v6.14.2 or later.
+- macOS 10.7 or later
+
+If you get a "node-pre-gyp build fail error" when running npm install run:
+```
+rm -rf node_modules/
+npm install --build-from-resource
+```
+
+Once connected, if your cars time out follow these steps:
+1. Stop the server
+2. From the Mac desktop, hold down the Shift+Option keys and then click on the Bluetooth menu item to reveal the hidden Debug menu
+3. Select “Reset the Bluetooth module” from the Debug menu list
+4. Once finished reboot your Mac
+
+### On Linux / Raspberry Pi
+
+Optional Dependency node-usb will not be installed. So, run:
+```
+sudo apt-get install libudev-dev
+```
+
+### On Windows
+
+Node.js server is currently not supported on Windows. However, you can run the Node.js server on a Linux device change
+`edu.oswego.cs.CPSLab.AnkiConnectionTest` to connect to the IP of the Raspberry Pi instead of `localhost`.
+
 ## Usage
 
 Start the Node.js gateway service:
 ```
-./gradlew npm_run
+sudo ./gradlew server
 ```
 
 ### Add the Java library
@@ -55,11 +89,11 @@ repositories {
 
 dependencies {
     // <Git commit-ish>: commit hash or tag
-    compile 'com.github.adessoAG:anki-drive-java:<Git commit-ish>'
+    compile 'com.github.tenbergen:anki-drive-java:-SNAPSHOT'
 }
 ```
 
-For the Maven instructions see the [JitPack.io website](https://jitpack.io/#adessoAG/anki-drive-java).
+For the Maven instructions see the [JitPack.io website](https://jitpack.io/tenbergen/anki-drive-java).
 
 ### API usage
 
@@ -73,7 +107,19 @@ Start scanning for vehicles:
 List<Vehicle> vehicles = anki.findVehicles();
 ```
 
+### Test File
+To try a connection, start the server and run:
+```
+./gradlew ankiConnectionTest
+```
+which will execute
+```java
+edu.oswego.cs.CPSLab.AnkiConnectionTest
+```
+
 ## Contributing
 
-Contributions are always welcome! Feel free to fork this repository and submit
+WINDOWS SERVER WANTED!
+
+Other contributions are welcome as well. Feel free to fork this repository and submit
 a pull request.

build.gradle

@@ -1,38 +1,87 @@
-buildscript {
-  repositories {
-    jcenter()
-  }
-
-  dependencies {
-    classpath 'com.moowork.gradle:gradle-node-plugin:0.13'
-  }
-}
-
-apply plugin: 'java'
-apply plugin: 'com.moowork.node'
-
-repositories {
-  jcenter()
-}
-
-dependencies {
-  compile 'org.reflections:reflections:0.9.10'
-}
-
-node {
-  version = '4.4.7'
-  npmVersion = '3.10.5'
-  distBaseUrl = 'https://nodejs.org/dist'
-  download = true
-
-  workDir = file("${project.buildDir}/nodejs")
-  nodeModulesDir = file("${project.projectDir}")
-}
-
-task fatJar(type: Jar) {
-    baseName = project.name + '-all'
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
-}
-
-processResources.dependsOn(['npmInstall'])
+buildscript {
+  repositories {
+    jcenter()
+    maven {
+      url "https://plugins.gradle.org/m2/"
+    }
+  }
+}
+
+plugins {
+    id "com.moowork.node" version "1.3.1"
+    id 'java-library'
+}
+
+apply plugin: 'java-library'
+apply plugin: 'maven'
+apply plugin: 'com.moowork.node'
+group = 'com.github.tenbergen'
+
+compileJava.options.fork = true
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+repositories {
+  jcenter()
+}
+
+dependencies {
+    //included by adessoAG/anki-drive-java, but maybe updated
+    compile 'org.reflections:reflections:0.9.11' //was 0.9.10
+    compile 'javax.xml.bind:jaxb-api:2.3.0'
+
+    //new dependencies included by BT
+
+    //dependencies for AnkiCommander (https://github.com/sha224/anki-commander)
+    implementation 'org.apache.sshd:sshd-core:2.2.0'
+    implementation 'org.jline:jline:3.10.0'
+    implementation 'org.slf4j:slf4j-api:1.7.26'
+    implementation 'org.slf4j:slf4j-simple:1.7.26'
+}
+
+node {
+  version = '8.12.0'    //was '4.4.7'
+  npmVersion = '6.4.1'  //was '3.10.5'
+  distBaseUrl = 'https://nodejs.org/dist'
+  download = true
+
+  workDir = file("${project.buildDir}/nodejs")
+  nodeModulesDir = file("${project.projectDir}")
+}
+
+task fatJar(type: Jar) {
+    baseName = project.name + '-all'
+    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
+    with jar
+}
+
+task server(type: NodeTask, dependsOn: npmInstall) {
+    script = file('src/main/nodejs/server.js')
+    ignoreExitValue = true
+}
+
+//added exec task for Anki Commander SSH test server
+task ssh(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'com.shakhar.anki.commander.AnkiSshd'
+}
+
+//added exec task for AnkiConnection test program
+task ankiConnectionTest(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'edu.oswego.cs.CPSLab.AnkiConnectionTest'
+}
+
+//added exec task for RoadmapScanner test program
+task scanTrack(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    main = 'edu.oswego.cs.CPSLab.RoadmapScannerTest'
+}
+
+//processResources.dependsOn(['npmInstall']) // moved to server task because only that needs node. Fixed Jitpack issues.

gradle.properties

@@ -0,0 +1,2 @@
+targetJavaVersion=JavaVersion.VERSION_1_8
+org.gradle.jvm.version=JavaVersion.VERSION_1_8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Aug 25 11:24:49 CEST 2016
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+#Thu Feb 07 12:31:46 EST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

jitpack.yml

@@ -0,0 +1,14 @@
+sudo: required
+dist: trusty
+addons:
+  apt:
+    packages:
+    - libudev-dev
+
+before_install:
+  - apt-get update
+  - apt-get install -y libudev-dev
+
+language: java
+jdk:
+  - openjdk8