Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ShimmerEngineering/ShimmerJavaExamples
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ShimmerEngineering/ShimmerJavaExamples
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: JA-64
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 126 files changed
  • 2 contributors

Commits on Oct 4, 2021

  1. adding verisensormapexample

    @JongChern
    JongChern committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    46b05c5 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Create SensorAndVeriSensorMapsExample.java 

    consolidate both SensorMapsExample and VeriSensorMapExample
    weiwentan23 committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    68b213e View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. update for JA-64, combine both verisense and shimmer example

    weiwentan23 committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    8a4c57c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. Add bluetooth friendly name text field

    weiwentan23 committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    9f661e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. remove isVerisenseDevice variable and some update on bluetooth friendly 

    name text field
    weiwentan23 committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    92102f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. refactor example name

    @JongChern
    JongChern committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    5eaa868 View commit details
    Browse the repository at this point in the history

  2. update text field and button size

    weiwentan23 committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    88298c0 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2021

  1. updates, now supports bin fil sync

    @JongChern
    JongChern committed Oct 21, 2021
    Configuration menu
    Copy the full SHA
    f188af6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from ShimmerEngineering/JA-64_WW 

    JA-64
    @JongChern
    JongChern authored Oct 21, 2021
    Configuration menu
    Copy the full SHA
    9db38ef View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2021

  1. bin file path update

    @JongChern
    JongChern committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    dc14e4f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'JA-64' of 

    https://github.com/ShimmerEngineering/ShimmerJavaExamples.git into JA-64

Conflicts:
	ShimmerBasicExamples/build.gradle
	ShimmerBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
    @JongChern
    JongChern committed Nov 4, 2021
    Configuration menu
    Copy the full SHA
    299c282 View commit details
    Browse the repository at this point in the history
Loading