Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
3340f9b
DEV-895 Stop per-device reader threads from busy-spinning when idle
claude Jul 16, 2026
050410c
DEV-895 review fixes: self-join guards, un-synchronize LiteProtocol r…
claude Jul 16, 2026
2a2c7e9
Merge remote-tracking branch 'origin/master' into DEV-895
claude Sep 4, 2026
d305497
DEV-895 Avoid stacking idle sleep on processNextInstruction backoff
claude Sep 4, 2026
30462c8
DEV-895 Harden bounded teardown joins: null-safe snapshots, guard Pro…
claude Sep 4, 2026
254f490
DEV-895 Address review comments: interrupt-preserving idle sleep, int…
claude Sep 4, 2026
8883a0f
Merge master into DEV-895
claude Sep 7, 2026
15d722a
Merge remote-tracking branch 'origin/master' into DEV-895
MAzalya Oct 2, 2026
c89fcf4
Merge remote-tracking branch 'origin/master' into DEV-895
claude Oct 5, 2026
e36c891
DEV-895: harden IOThread/ProcessingThread teardown per PR #279 review
claude Oct 5, 2026
8e9e63f
DEV-895: keep a user disconnect from turning into CONNECTION_LOST
claude Oct 5, 2026
4f3c438
DEV-896: frame-clock-driven live X viewport, 1 px default stroke
claude Oct 5, 2026
5aeba04
DEV-896: frame clock review fixes - catch-up, per-plot stroke, multi-…
claude Oct 5, 2026
03106bf
DEV-896: frame clock anchored fallback for playback and sparse data
claude Oct 5, 2026
3dedf95
Merge pull request #279 from ShimmerResearch/DEV-895
MAzalya Oct 6, 2026
b6bf436
Wait for initialisation instead of a fixed sleep in byte-communicatio…
MAzalya Oct 7, 2026
dd35d04
DEV-1163 Add ShimmerObject.setLSM6DSVAccelRange
JongChern Oct 8, 2026
c1d7078
Merge pull request #322 from ShimmerResearch/DEV-1163_shimmer3r_sd_ln…
MAzalya Oct 9, 2026
f76a208
Merge pull request #321 from ShimmerResearch/fix_flaky_connect_test
JongChern Oct 12, 2026
c09344c
DEV-1115 Replace Process.onExit() so the MATLAB jar runs on Java 8
JongChern Oct 15, 2026
44f9f98
DEV-1115 Add one-click Release Java API workflow
JongChern Oct 15, 2026
1bd3a65
DEV-1115 Let a dry run continue past an already-released version
JongChern Oct 15, 2026
02b5380
DEV-1198 Dump all threads when a simulator connect times out
JongChern Oct 15, 2026
ffb9647
DEV-1198 Stop the simulator tests deadlocking on the read-status timer
JongChern Oct 15, 2026
cfbb8f1
Merge pull request #325 from ShimmerResearch/DEV-1198_connect_test_hang
JongChern Oct 15, 2026
934c25e
DEV-1198 Re-enable the three ShimmerDriverPC simulator test classes
JongChern Oct 15, 2026
95704a1
Merge remote-tracking branch 'origin/master' into DEV-1115_release_wo…
JongChern Oct 15, 2026
d5f5b44
DEV-1115 Pick the release version in the Run form, not an uprev PR
JongChern Oct 16, 2026
1751561
DEV-1115 Fix publish of shimmerdriverpc and refuse a 'local' publish
MAzalya Oct 16, 2026
d8ed6f7
Merge pull request #327 from ShimmerResearch/DEV-1115_release_fixes
JongChern Oct 18, 2026
77aaa3b
DEV-1115 Keep the packages:write token out of .git/config
JongChern Oct 18, 2026
9a40556
DEV-1115 Publish from a dispatch-only job; build job read-only
JongChern Oct 18, 2026
b819f4c
DEV-1115 Check every class in the MATLAB jar is Java 8
JongChern Oct 18, 2026
7663cdd
DEV-1115 Pin the actions/* steps to commit SHAs
JongChern Oct 18, 2026
667c93c
Merge pull request #324 from ShimmerResearch/DEV-1115_release_workflow
MAzalya Oct 19, 2026
12be52c
DEV-1262 Complete the command in flight only on its own in-stream reply
JongChern Oct 21, 2026
0e28afb
Merge pull request #330 from ShimmerResearch/DEV-1262_instream_respon…
JongChern Oct 21, 2026
b7fb77a
Merge branch 'master' into DEV-1198_reenable_excluded_driverpc_tests
JongChern Oct 21, 2026
dffb582
Merge pull request #326 from ShimmerResearch/DEV-1198_reenable_exclud…
JongChern Oct 21, 2026
36ed2b2
DEV-1269 Java HIL v1: the driver on real Shimmer3 and Shimmer3R over …
JongChern Oct 21, 2026
226d53f
DEV-1269 Java HIL: start SD logging the way Consensys does, retry a l…
JongChern Oct 21, 2026
0c8d467
DEV-1269 Java HIL: count command timeouts
JongChern Oct 21, 2026
8b8c792
DEV-1269 Java HIL: fail streamRest when the accel is NaN
JongChern Oct 21, 2026
35d441d
DEV-1269 Java HIL: fail a connect whose port is in use, instead of re…
JongChern Oct 22, 2026
9bb3d5d
DEV-1275 Report a Shimmer ready only once its connect sequence has ended
JongChern Oct 22, 2026
c36c380
DEV-1291 Take an in-stream ACK that comes with no data packet before it
JongChern Oct 22, 2026
f186c90
DEV-1266 Take the instruction list's two locks in one order
JongChern Oct 22, 2026
cb138a9
DEV-1269 Java HIL: queueStress, DEV-1266's deadlock on demand
JongChern Oct 22, 2026
eb2aa97
DEV-1269 Java HIL: report a sample a Shimmer3 skips for a battery reply
JongChern Oct 22, 2026
3847ae5
Merge pull request #331 from ShimmerResearch/DEV-1269_java_hil
JongChern Oct 22, 2026
8059433
Merge pull request #332 from ShimmerResearch/DEV-1291_instream_ack_af…
JongChern Oct 22, 2026
0cfa28a
Merge pull request #333 from ShimmerResearch/DEV-1275_ready_after_con…
JongChern Oct 22, 2026
927f57f
Merge pull request #334 from ShimmerResearch/DEV-1266_instruction_lis…
JongChern Oct 22, 2026
feee042
DEV-1269 Java HIL: check that every connect reports ready only at the…
JongChern Oct 22, 2026
13614c6
Merge pull request #335 from ShimmerResearch/DEV-1269_java_hil_ready_…
JongChern Oct 22, 2026
3db1ce0
DEV-1305: Java HIL rollover, idleStart and samplingRates scenarios
JongChern Oct 22, 2026
a0a7b5a
DEV-1306: a stop's reply no longer retires the wrong instruction
JongChern Oct 22, 2026
3be3459
Merge pull request #337 from ShimmerResearch/DEV-1306_stop_reply_reti…
JongChern Oct 23, 2026
86ab651
Merge pull request #336 from ShimmerResearch/DEV-1305_java_hil_parity
JongChern Oct 23, 2026
3f010ec
DEV-1310: deepClone() no longer copies the connection's queues
JongChern Oct 23, 2026
78ad1e3
DEV-1310: test the streaming queues a clone no longer copies
JongChern Oct 23, 2026
ee43fbd
Merge pull request #338 from ShimmerResearch/DEV-1310_deepclone_live_…
JongChern Oct 23, 2026
002b674
DEV-896 Size the live trace margin for post-stall catch-up; volatile …
MAzalya Oct 23, 2026
dd93b9c
Merge remote-tracking branch 'origin/master' into DEV-896_2
jyong15 Oct 27, 2026
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
412 changes: 412 additions & 0 deletions .github/workflows/release.yml

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,7 @@ ShimmerAndroidInstrumentDriver/gen/com/shimmerresearch/androidinstrumentdriver/B
ShimmerAndroidInstrumentDriver/gen/com/shimmerresearch/androidinstrumentdriver/R.java
gradle.properties
github.properties

# Java HIL (tools/hil): the local rig file and run output
tools/hil/rig-java.json
tools/hil/out/
21 changes: 21 additions & 0 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,27 @@ all: they are legacy Eclipse ADT Android projects.

Test results land in `**/build/test-results/test/*.xml`.

## Releasing
Releases are cut by the **Release Java API** workflow (`release.yml`), not from a developer machine,
and need no uprev PR:
1. Run the workflow on `master`. Leave `version` blank for the next patch after the last `API_v`
release, or type one. It tests and builds as CI does, publishes all three artifacts to GitHub
Packages in one `gradlew publish`, tags `API_v<version>`, and creates the GitHub Release with the
jars attached (not marked Latest — that stays with Consensys).
2. It also builds `ShimmerJavaClass.jar` for MATLAB and opens a PR replacing
`Shimmer-MATLAB-ID/libs/ShimmerJavaClass.jar` (needs the `MATLAB_REPO_TOKEN` secret). Review and
merge it.
3. Run `ShimmerAndroidAPI`'s own Release workflow, which builds against the newest Java release unless
told otherwise.

The version is not stored in the source: the three publishing blocks read `-PreleaseVersion`, which
the workflow passes, and fall back to `local`. The `API_v` tags are the record of what was released.

`ShimmerJavaClass.jar` must be Java 8 bytecode, because MATLAB may load it on Java 8. Build it locally
with `cd ShimmerDriverPC && ./gradlew shadowJar -PmatlabJava8`, which compiles all three projects with
`--release 8` — that also rejects any API newer than Java 8, so `Process.onExit()`, `var` and the like
fail the build here instead of throwing `NoSuchMethodError` inside MATLAB.

## Subprojects
| Project | Role |
|---|---|
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ Best examples to start with are

For help with using on Ubuntu please check the [wiki](https://github.com/ShimmerEngineering/Shimmer-Java-Android-API/wiki).

## Hardware tests

[`tools/hil`](tools/hil/README.md) runs the driver on real Shimmer3 and Shimmer3R units over
Bluetooth Classic: streaming, SD logging and in-stream commands while streaming, and reconnects, with
the driver's timers on. **Release Java API** requires a passing run on the commit it releases.

Rev 3.00
- Change to Handler MSGs

Expand Down
15 changes: 13 additions & 2 deletions ShimmerBluetoothManager/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ publishing {

groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
artifactId = 'shimmerbluetoothmanager' // Replace with the name of your package
version = '0.11.8_beta' // Replace with your package version
version = project.findProperty('releaseVersion') ?: 'local' // set by the Release Java API workflow (-PreleaseVersion)

// Jar publication
//(
Expand All @@ -40,7 +40,7 @@ publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/ShimmerEngineering/Shimmer-Java-Android-API")
url = uri("https://maven.pkg.github.com/ShimmerResearch/Shimmer-Java-Android-API")
credentials {
/* Create gradle.properties file in GRADLE_USER_HOME/.gradle/
(e.g. C:/Users/YourUsername/.gradle/) with the two lines listed below. Fill in your
Expand Down Expand Up @@ -68,3 +68,14 @@ dependencies {
// 'test.useTestNG()' to your build script.
testImplementation 'junit:junit:4.12'
}

// Without -PreleaseVersion the version is 'local', and GitHub Packages never lets a version be
// overwritten. Releases go through the Release Java API workflow; publishToMavenLocal is unaffected.
tasks.withType(PublishToMavenRepository).configureEach {
doFirst {
if (publication.version == 'local') {
throw new GradleException("Refusing to publish ${publication.artifactId} as version 'local'. " +
"Release with the Release Java API workflow, or pass -PreleaseVersion.")
}
}
}
15 changes: 13 additions & 2 deletions ShimmerDriver/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ publishing {

groupId = 'com.shimmerresearch' // Replace with your package's group/organization name
artifactId = 'shimmerdriver' // Replace with the name of your package
version = '0.11.8_beta' // Replace with your package version
version = project.findProperty('releaseVersion') ?: 'local' // set by the Release Java API workflow (-PreleaseVersion)

// Jar publication
//(
Expand All @@ -63,7 +63,7 @@ publishing {
repositories {
maven {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/ShimmerEngineering/Shimmer-Java-Android-API")
url = uri("https://maven.pkg.github.com/ShimmerResearch/Shimmer-Java-Android-API")
credentials {
/* Create gradle.properties file in GRADLE_USER_HOME/.gradle/
(e.g. C:/Users/YourUsername/.gradle/) with the two lines listed below. Fill in your
Expand Down Expand Up @@ -173,3 +173,14 @@ tasks.withType(Test).configureEach {
}
}


// Without -PreleaseVersion the version is 'local', and GitHub Packages never lets a version be
// overwritten. Releases go through the Release Java API workflow; publishToMavenLocal is unaffected.
tasks.withType(PublishToMavenRepository).configureEach {
doFirst {
if (publication.version == 'local') {
throw new GradleException("Refusing to publish ${publication.artifactId} as version 'local'. " +
"Release with the Release Java API workflow, or pass -PreleaseVersion.")
}
}
}
Loading
Loading