Dev#127

Merged

JongChern merged 181 commits intomasterfrom

Jan 31, 2024

Commits on Jun 12, 2018

AA-222
jyong15
committed

Commits on Oct 10, 2018

AA-211
jyong15
committed
AA-211 some minor updates
JongChern
committed
AA-211
jyong15
committed
Merge remote-tracking branch 'origin/AA-211' into AA-211
jyong15
committed

Commits on Oct 11, 2018

AA-231 minor fix due to some problems with using concurrenthashmaps on
JongChern
committed

Commits on Oct 3, 2019

AA-237
jyong15
committed

Commits on Mar 5, 2020

update
JongChern
committed

Commits on Mar 16, 2020

ASM-861 #time 1h updates to include Verisense
marknolan
committed

Commits on Mar 18, 2020

ASM-861 #time 5m resolved errors with build
marknolan
committed

Commits on Mar 19, 2020

Commits on Mar 20, 2020

ASM-861 #time 5m added Verisense channel bitmaps
marknolan
committed

Commits on Mar 23, 2020

Commits on Mar 31, 2020

Commits on Apr 1, 2020

ASM-1041 #time 5m created new function to return full version number str
marknolan
committed

Commits on Apr 3, 2020

ASM-1041 #time 10m added support for Verisense Dev Board
marknolan
committed

Commits on Apr 4, 2020

ASM-1041 #time 10m updated PPG calibration
marknolan
committed

Commits on Apr 6, 2020

ASM-1041 #time 1h more integration of PPG module
marknolan
committed

Commits on Apr 7, 2020

Commits on Apr 16, 2020

ASM-861 #time 2h further support for gyro
marknolan
committed

Commits on May 8, 2020

ASM-861 10m fixed maven reference repos

admin
authored and
admin
committed

Commits on May 21, 2020

ASM-1132 #time 10m changes for new PPG chip
marknolan
committed

Commits on Jun 2, 2020

ASM-1132 #time 1m added new Verisense PPG definitions
marknolan
committed

Commits on Sep 29, 2020

update proto + grpc
JongChern
committed

Commits on Oct 1, 2020

Commits on Oct 2, 2020

Commits on Oct 9, 2020

minor
JongChern
committed

Commits on Oct 13, 2020

commit JS and eclipse launch files
JongChern
committed

Commits on Oct 15, 2020

now functional
JongChern
committed

Commits on Oct 20, 2020

Merge remote-tracking branch 'origin/NEUR-1465' into NEUR-1479
JongChern
committed

Commits on Oct 22, 2020

update
JongChern
committed

Commits on Oct 28, 2020

Merge pull request #42 from ShimmerEngineering/NEUR-1479
JongChern
authored

Commits on Nov 6, 2020

add MSG_ID_SOURCE_S3_UPLOAD_MANAGER
MAzalya
committed

Commits on Nov 10, 2020

minor
JongChern
committed

Commits on Nov 13, 2020

Merge pull request #43 from ShimmerEngineering/NEUR-1482_MA
JongChern
authored

Commits on Nov 16, 2020

new msg id
JongChern
committed

Commits on Nov 17, 2020

add new MSG_ID_BT_TO_DB_RECORDING
MAzalya
committed

Commits on Nov 20, 2020

Merge pull request #45 from ShimmerEngineering/NEUR-1490
JongChern
authored

Commits on Nov 29, 2020

Commits on Dec 1, 2020

Commits on Dec 2, 2020

NOL-10 #time 1h
jyong15
committed

Commits on Dec 4, 2020

NOL-3 #time 1h
jyong15
committed

Commits on Dec 10, 2020

minor
JongChern
committed

Commits on Dec 14, 2020

fix made
JongChern
committed

Commits on Dec 17, 2020

Commits on Dec 21, 2020

Merge remote-tracking branch 'origin/Dev' into NEUR-1480_test
JongChern
committed

Commits on Dec 28, 2020

Merge pull request #51 from ShimmerEngineering/NEUR-1480_test
JongChern
authored

Commits on Jan 7, 2021

NOL-10 #time 1h
jyong15
committed

Commits on Jan 8, 2021

NOL-10 #time 2h
jyong15
committed

Commits on Jan 14, 2021

NOL-10 #time 3h
jyong15
committed

Commits on Jan 21, 2021

Commits on Feb 19, 2021

Commits on Feb 25, 2021

update batt status timer period
MAzalya
committed

Commits on Apr 9, 2021

update
JongChern
committed

Commits on Apr 14, 2021

Commits on May 12, 2021

JA-49 #time 2hrs added api access via jfrog proof of concept
RuMolloy
committed

Commits on May 14, 2021

Commits on May 17, 2021

JA-49 #time 20m added gradle build file for ShimmerDriverPC
RuMolloy
committed

Commits on May 18, 2021

Commits on May 19, 2021

Commits on May 20, 2021

Commits on May 21, 2021

Commits on May 24, 2021

minor refactor
JongChern
committed

Commits on May 25, 2021

Commits on Jun 21, 2021

ASM-1736 #time 15m adding constants to driver for Verisense GSR support
marknolan
committed

Commits on Jun 22, 2021

Merge remote-tracking branch 'origin/Dev' into ASM-861
marknolan
committed

Commits on Jun 29, 2021

ASM-1736 #time 4h vbatt and gsr working in verisense file parser
marknolan
committed

Commits on Jul 1, 2021

ASM-1736 #time 5m update to ADC ref voltage for Verisense
marknolan
committed

Commits on Jul 27, 2021

ASM-1736 #time 15m addressing review comments
marknolan
committed

Commits on Aug 3, 2021

ASM-1736 #time 5m commit of channel unit = score
marknolan
committed

Commits on Aug 4, 2021

ASM-1736 #time 30m addressing review comments
marknolan
committed

Commits on Aug 6, 2021

Commits on Mar 4, 2022

add logic to purge upon successful connection on serial port
JongChern
committed

Commits on Mar 14, 2022

Add timer for connecting state
weiwentan23
committed

Commits on Mar 17, 2022

minor update
weiwentan23
committed
Merge pull request #71 from ShimmerEngineering/NOL-48_WW
JongChern
authored

Commits on Mar 29, 2022

Add log message for connecting timer
weiwentan23
committed

Commits on Apr 8, 2022

JA-74 #time 1h minor fixes
marknolan
committed

Commits on Jun 30, 2022

Merge pull request #74 from ShimmerEngineering/JA-74
marknolan
authored

Commits on Sep 6, 2022

dealing with issues from a previous merge

RameshChhetri
authored and
RameshChhetri
committed

Commits on Sep 9, 2022

Commits on Sep 13, 2022

JA-79 #time 10m updated default CRC mode
marknolan
committed

Commits on Sep 14, 2022

Commits on Sep 20, 2022

Commits on Sep 21, 2022

Commits on Sep 23, 2022

Merge pull request #85 from ShimmerEngineering/JA-79
jyong15
authored

Commits on Oct 4, 2022

remove SET_BLINK_LED Ack check
Tan Wei Wen
committed
Merge remote-tracking branch 'origin/Dev' into JA-80
Tan Wei Wen
committed
Add set blink led button
Tan Wei Wen
committed
CON-663 #time 1h updates to support customer Shimmer3 sensor model
marknolan
committed

Commits on Oct 11, 2022

Commits on Oct 14, 2022

CON-663 #time 5m addressing PR comment
marknolan
authored

Commits on Oct 18, 2022

Merge pull request #90 from ShimmerEngineering/CON-663
marknolan
authored

Commits on Oct 19, 2022

Commits on Oct 21, 2022

Merge pull request #92 from ShimmerEngineering/JA-74
marknolan
authored

Commits on Oct 27, 2022

Commits on Nov 3, 2022

CON-670 #time 15m moved CRC management solely to ShimmerBluetooth
marknolan
committed

Commits on Nov 8, 2022

fix SD and BT channels issue
MAzalya
committed

Commits on Nov 14, 2022

Commits on Jan 26, 2023

Commits on Feb 16, 2023

ASM-2156 #time 1h fixed possibility out-of-range GSR values to be parsed
marknolan
committed

Commits on Feb 27, 2023

ASM-2156 #time 5m implemented alternative approach to GSR range limiting
marknolan
committed

Commits on Mar 14, 2023

Merge pull request #99 from ShimmerEngineering/ASM-2156_2
marknolan
authored

Commits on Jul 21, 2023

minor
JongChern
committed

Commits on Jul 24, 2023

Commits on Aug 28, 2023

Commits on Aug 29, 2023

Commits on Aug 30, 2023

Merge pull request #122 from ShimmerEngineering/JA-91
JongChern
authored