Commit 04d884c
DEV-793 Fix GSR on second-generation SR61 (HW gate + gen-2 feedback resistors)
Validated against a 33k/100k/470k fixed-resistor sweep on a real SR61-5 (DEV-793 datasets B4a-c, FW v2.00.013):
1) doesHwSupportGsr() now includes SR61 minor >= 5, mirroring the firmware's ShimBrd_isGsrSupportedForHwVersion (SR62 any / SR68 >= 5 / SR61 >= 5). Previously SR61-5/6 GSR recordings parsed to nothing.
2) SensorGSRVerisense now selects the second-generation DC-GSR feedback-resistor set (21/150/562/1740 kOhm) for SR61 as well as Pulse+ - with the Shimmer3 set (40.2/287/1000/3300 kOhm) the computed resistance was ~1.9x high, which also masqueraded as range-boundary clamping for the 33k and 470k recordings. Post-fix readings are within 0.8-1.5% of the fitted resistors across ranges 0-2.
3) GSR + LSM6DSV compatibility lists now include the Verisense IMU (SR61) hardware id; runtime gates (doesHwSupportGsr / isPayloadDesignV13orAbove) keep gen-1 SR61 units excluded.
Known sub-1% difference vs C#/TS: those use a 0.4986 V GSR reference for gen-2 where this driver uses 0.5 V (~0.3% in resistance) - below resistor tolerance, left unchanged for now.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>1 parent 47a74d5 commit 04d884c
3 files changed
Lines changed: 22 additions & 8 deletions
File tree
- ShimmerDriver/src/main/java/com/shimmerresearch
- driver
- verisense
- sensors
Lines changed: 8 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2721 | 2721 | | |
2722 | 2722 | | |
2723 | 2723 | | |
| 2724 | + | |
| 2725 | + | |
| 2726 | + | |
2724 | 2727 | | |
2725 | | - | |
| 2728 | + | |
2726 | 2729 | | |
2727 | | - | |
2728 | | - | |
2729 | | - | |
| 2730 | + | |
| 2731 | + | |
| 2732 | + | |
2730 | 2733 | | |
2731 | | - | |
| 2734 | + | |
2732 | 2735 | | |
2733 | 2736 | | |
2734 | 2737 | | |
| |||
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1295 | 1295 | | |
1296 | 1296 | | |
1297 | 1297 | | |
1298 | | - | |
| 1298 | + | |
| 1299 | + | |
| 1300 | + | |
| 1301 | + | |
| 1302 | + | |
1299 | 1303 | | |
1300 | 1304 | | |
1301 | 1305 | | |
| |||
Lines changed: 9 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
117 | | - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
118 | 125 | | |
119 | 126 | | |
120 | 127 | | |
| |||
0 commit comments