Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,10 @@ public static class CompatibilityInfoForMaps{
private static final ShimmerVerObject svoShimmerGq802154Lr = new ShimmerVerObject(HW_ID.SHIMMER_GQ_802154_LR,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION);
private static final ShimmerVerObject svoShimmerGq802154Nr = new ShimmerVerObject(HW_ID.SHIMMER_GQ_802154_NR,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION);
private static final ShimmerVerObject svoShimmer2rGq = new ShimmerVerObject(HW_ID.SHIMMER_2R_GQ,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION);
/** The GQ 802.15.4 firmware on any hardware. The GQs above are matched on their hardware, but a
* Verisense in NeuroLynQ mode keeps its own hardware ID (61 to 68), so it is matched on the firmware it
* runs: nothing else runs GQ_802154. See ShimmerVerObject.isVerisenseNeuroLynQ(). */
private static final ShimmerVerObject svoVerisenseNeuroLynQ = new ShimmerVerObject(ShimmerVerDetails.ANY_VERSION,FW_ID.GQ_802154,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION,ShimmerVerDetails.ANY_VERSION);

private static final ShimmerVerObject svoExgSdLog = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.SDLOG,0,8,0,HW_ID_SR_CODES.EXP_BRD_EXG);
private static final ShimmerVerObject svoExgUnifiedSdLog = new ShimmerVerObject(HW_ID.SHIMMER_3,FW_ID.SDLOG,0,8,0,HW_ID_SR_CODES.EXP_BRD_EXG_UNIFIED);
Expand Down Expand Up @@ -1406,7 +1410,7 @@ public static class CompatibilityInfoForMaps{
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgGeneral = Arrays.asList(
svoExgSdLog, svoExgBtStream, svoExgLogAndStream,
svoExgUnifiedSdLog, svoExgUnifiedBtStream, svoExgUnifiedLogAndStream,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ,
svoShimmerECGmd, svoShimmer4Stock, svoStrokare, svoShimmer3RExgUnifiedLogAndStream);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgEmg = Arrays.asList(
Expand All @@ -1418,22 +1422,22 @@ public static class CompatibilityInfoForMaps{
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgEcg = Arrays.asList(
svoExgSdLog, svoExgBtStream, svoExgLogAndStream,
svoExgUnifiedSdLog, svoExgUnifiedBtStream, svoExgUnifiedLogAndStream,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ,
svoShimmerECGmd, svoShimmer4Stock, svoShimmer3RExgUnifiedLogAndStream);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgEcgGq = Arrays.asList(
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq);
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgTest = Arrays.asList(
svoExgSdLog, svoExgBtStream, svoExgLogAndStream,
svoExgUnifiedSdLog, svoExgUnifiedBtStream, svoExgUnifiedLogAndStream,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ,
svoShimmerECGmd, svoShimmer4Stock, svoShimmer3RExgUnifiedLogAndStream);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgThreeUnipolar = Arrays.asList(
svoExgSdLog, svoExgBtStream, svoExgLogAndStream,
svoExgUnifiedSdLog, svoExgUnifiedBtStream, svoExgUnifiedLogAndStream,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ,
svoShimmerECGmd, svoShimmer4Stock, svoShimmer3RExgUnifiedLogAndStream);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoExgRespiration = Arrays.asList(
Expand All @@ -1446,7 +1450,7 @@ public static class CompatibilityInfoForMaps{

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoAnyExpBoardStandardFW = Arrays.asList(
svoAnyIntExpBoardAndSdlog,svoAnyIntExpBoardAndBtStream,svoAnyIntExpBoardAndLogAndStream,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoAnyIntExpBoardAndLogAndStream3R,
svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ, svoAnyIntExpBoardAndLogAndStream3R,
svoShimmer4Stock, svoArduino, svoSweatch, svoStrokare);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoBattVoltage = Arrays.asList(
Expand All @@ -1457,7 +1461,7 @@ public static class CompatibilityInfoForMaps{
public static final List<ShimmerVerObject> listOfCompatibleVersionInfoGsr = Arrays.asList(
svoGsrSdLog, svoGsrBtStream, svoGsrLogAndStream, svoGsrGqBle,
svoGsrUnifiedSdLog, svoGsrUnifiedBtStream, svoGsrUnifiedLogAndStream,
svoGsrUnifiedGqBle, svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq,
svoGsrUnifiedGqBle, svoShimmerGq802154Lr, svoShimmerGq802154Nr, svoShimmer2rGq, svoVerisenseNeuroLynQ,
svoShimmer4Stock, svoShimmer3RGsrUnifiedLogAndStream,svoShimmer3RGsrNewImuLogAndStream);

public static final List<ShimmerVerObject> listOfCompatibleVersionInfoBMP180 = Arrays.asList(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ private void parseShimmerVerDetails() {
|| (mHardwareVersion==HW_ID.SHIMMER_GQ_BLE && mFirmwareIdentifier==FW_ID.GQ_BLE)
|| ((mHardwareVersion==HW_ID.SHIMMER_GQ_802154_NR || mHardwareVersion==HW_ID.SHIMMER_GQ_802154_LR) && mFirmwareIdentifier==FW_ID.GQ_802154)
|| (mHardwareVersion==HW_ID.SHIMMER_2R_GQ && mFirmwareIdentifier==FW_ID.GQ_802154)
|| isVerisenseNeuroLynQ()
|| mHardwareVersion==HW_ID.SPAN
|| mHardwareVersion==HW_ID.SHIMMER_4_SDK
|| mHardwareVersion==HW_ID.SWEATCH
Expand Down Expand Up @@ -410,6 +411,7 @@ public static boolean isSupportedRtcConfigViaUart(int hwVer, int fwId) {
|| (hwVer==HW_ID.SHIMMER_GQ_802154_NR)
|| (hwVer==HW_ID.SHIMMER_GQ_802154_LR)
|| (hwVer==HW_ID.SHIMMER_2R_GQ)
|| isVerisenseNeuroLynQ(hwVer, fwId)
|| (hwVer==HW_ID.SHIMMER_4_SDK)
|| (hwVer==HW_ID.SHIMMER_3R)){
return true;
Expand All @@ -427,6 +429,7 @@ public static boolean isSupportedConfigViaUart(int hwVer, int fwId) {
|| hwVer==HW_ID.SHIMMER_GQ_802154_NR
|| hwVer==HW_ID.SHIMMER_GQ_802154_LR
|| hwVer==HW_ID.SHIMMER_2R_GQ
|| isVerisenseNeuroLynQ(hwVer, fwId)
|| hwVer==HW_ID.SHIMMER_4_SDK){
return true;
}
Expand All @@ -445,7 +448,8 @@ public static boolean isSupportedSdCardAccess(int hwVer, int fwId) {
|| (hwVer==HW_ID.SHIMMER_GQ_BLE && fwId == FW_ID.GQ_BLE)
// || hwVer==HW_ID.SHIMMER_GQ_802154_NR
// || hwVer==HW_ID.SHIMMER_GQ_802154_LR
|| fwId==ShimmerVerDetails.FW_ID.GQ_802154
// A NeuroLynQ-mode Verisense runs the GQ's firmware but has no SD card
|| (fwId==ShimmerVerDetails.FW_ID.GQ_802154 && !isVerisenseNeuroLynQ(hwVer, fwId))
|| hwVer==HW_ID.SHIMMER_2R_GQ
|| (hwVer==HW_ID.SHIMMER_4_SDK && fwId == FW_ID.SHIMMER4_SDK_STOCK)
){
Expand Down Expand Up @@ -645,13 +649,26 @@ public boolean isShimmerGenGq(int hwVer) {
* @return
*/
public boolean isShimmerGenGq(int hwVer, int fwId) {
if(isShimmerGenGq(hwVer)){
if(isShimmerGenGq(hwVer) || isVerisenseNeuroLynQ(hwVer, fwId)){
// if(((hwVer==HW_ID.SHIMMER_GQ_802154_LR) || (hwVer==HW_ID.SHIMMER_GQ_802154_NR) || (hwVer==HW_ID.SHIMMER_2R_GQ))
// && (fwId==FW_ID.GQ_802154 || fwId==FW_ID.GQ_BLE)){
return true;
}
return false;
}

/**
* A Verisense in NeuroLynQ mode (verisense-firmware ASM_NeuroLynQ): Verisense
* hardware running the GQ 802.15.4 firmware. It reports its own hardware ID, but it
* answers and streams as a GQ does, so to the host it is a GQ (DEV-1047).
*/
public boolean isVerisenseNeuroLynQ() {
return isVerisenseNeuroLynQ(getHardwareVersion(), getFirmwareIdentifier());
}

public static boolean isVerisenseNeuroLynQ(int hwVer, int fwId) {
return isShimmerGenVerisense(hwVer) && fwId==FW_ID.GQ_802154;
}

public boolean isShimmerVideoDevice(){
return isShimmerVideoDevice(getHardwareVersion());
Expand All @@ -667,8 +684,10 @@ public static boolean isShimmerVideoDevice(int hardwareVersion) {
return false;
}

/** Verisense hardware running its own firmware. In NeuroLynQ mode it runs the GQ's
* firmware and sends GQ data instead, see {@link #isVerisenseNeuroLynQ()}. */
public boolean isShimmerGenVerisense() {
return isShimmerGenVerisense(getHardwareVersion());
return isShimmerGenVerisense(getHardwareVersion()) && !isVerisenseNeuroLynQ();
}

public static boolean isShimmerGenVerisense(int hwVer) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package com.shimmerresearch.driverUtilities;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import org.junit.Test;

import com.shimmerresearch.driverUtilities.ShimmerVerDetails.FW_ID;
import com.shimmerresearch.driverUtilities.ShimmerVerDetails.HW_ID;
import com.shimmerresearch.sensors.SensorADC.MICROCONTROLLER_ADC_PROPERTIES;

/**
* A Verisense in NeuroLynQ mode is a GQ to the host (DEV-1047).
* <p>
* Docked, it answers VER with its own hardware ID and the GQ's firmware ID. On the bench
* on 2026-09-24 that was hardware 68, firmware 9, v2.1.1, which the host used to leave as
* an unrecognised device with "Unknown" firmware.
*/
public class API_00014_VerisenseNeuroLynQVersionTest {

private static final ShimmerVerObject NODE = new ShimmerVerObject(HW_ID.VERISENSE_PULSE_PLUS, FW_ID.GQ_802154, 2, 1, 1);
private static final ShimmerVerObject STOCK_VERISENSE = new ShimmerVerObject(HW_ID.VERISENSE_PULSE_PLUS, FW_ID.VERISENSE, 2, 1, 1);
private static final ShimmerVerObject GQ = new ShimmerVerObject(HW_ID.SHIMMER_GQ_802154_NR, FW_ID.GQ_802154, 1, 1, 1);

@Test
public void aNeuroLynQVerisenseIsAGq() {
assertTrue(NODE.isVerisenseNeuroLynQ());
assertTrue(NODE.isShimmerGenGq());
assertFalse(NODE.isShimmerGenVerisense());
}

@Test
public void everyVerisenseRunningTheGqFirmwareIsAGq() {
for (int hwId : new int[] {HW_ID.VERISENSE_IMU, HW_ID.VERISENSE_GSR_PLUS, HW_ID.VERISENSE_PPG,
HW_ID.VERISENSE_DEV_BRD, HW_ID.VERISENSE_PULSE_PLUS}) {
assertTrue("hardware " + hwId, new ShimmerVerObject(hwId, FW_ID.GQ_802154, 2, 1, 1).isShimmerGenGq());
}
}

@Test
public void aStockVerisenseIsStillAVerisense() {
assertFalse(STOCK_VERISENSE.isVerisenseNeuroLynQ());
assertFalse(STOCK_VERISENSE.isShimmerGenGq());
assertTrue(STOCK_VERISENSE.isShimmerGenVerisense());
}

@Test
public void aGqIsUnchanged() {
assertTrue(GQ.isShimmerGenGq());
assertFalse(GQ.isVerisenseNeuroLynQ());
assertFalse(GQ.isShimmerGenVerisense());
}

@Test
public void itsFirmwareIsNamedAsAGqs() {
String gqFirmwareLabel = FW_ID.mMapOfFirmwareLabels.get(FW_ID.GQ_802154);
assertEquals(gqFirmwareLabel, NODE.mFirmwareIdentifierParsed);
assertEquals(gqFirmwareLabel + " v2.1.1", NODE.getFirmwareVersionParsed());
}

/** Docked, its InfoMem image and clock are read and written as a GQ's are */
@Test
public void itIsConfiguredOverTheDockLinkAsAGqIs() {
assertTrue(NODE.isSupportedConfigViaUart());
assertTrue(NODE.isSupportedRtcConfigViaUart());
assertFalse(STOCK_VERISENSE.isSupportedConfigViaUart());
assertFalse(STOCK_VERISENSE.isSupportedRtcConfigViaUart());
}

/** Unlike a GQ it has no SD card, and its USB has no mass storage */
@Test
public void itHasNoSdCard() {
assertFalse(NODE.isSupportedSdCardAccess());
assertTrue(GQ.isSupportedSdCardAccess());
}

/** It sends GQ data, already scaled to the GQ's ADC, so it takes the GQ's calibration */
@Test
public void itTakesTheGqsAdcProperties() {
assertEquals(MICROCONTROLLER_ADC_PROPERTIES.getMicrocontrollerAdcPropertiesForShimmerVersionObject(GQ),
MICROCONTROLLER_ADC_PROPERTIES.getMicrocontrollerAdcPropertiesForShimmerVersionObject(NODE));
assertEquals(MICROCONTROLLER_ADC_PROPERTIES.VERISENSE_1V8,
MICROCONTROLLER_ADC_PROPERTIES.getMicrocontrollerAdcPropertiesForShimmerVersionObject(STOCK_VERISENSE));
}
}
Loading