Skip to content
Merged
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 @@ -14,7 +14,7 @@ public final class Panels {

public static final List<String> ALL = Collections.unmodifiableList(Arrays.asList(
"Low-noise accel", "Wide-range accel", "Gyro", "Mag", "Battery", "Pressure", "Temperature",
"ADC", "ExG", "GSR", "PPG", "Other"));
"ADC", "ExG", "GSR", "PPG", "Sound level", "Other"));

private static final Pattern ADC = Pattern.compile("(Int|Ext)_Exp_A\\d+");
private static final Pattern EXG = Pattern.compile("(ExG[12]_CH|Test_CHIP[12]_CH|ECG_|EMG_).*");
Expand Down Expand Up @@ -62,6 +62,10 @@ public static String of(String name) {
if (PPG.matcher(name).matches()) {
return "PPG";
}
// A panel of its own: a few dB of change would be lost on an axis shared with the battery's percentage
if (name.equals("Sound_Level")) {
return "Sound level";
}
return "Other";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ Recordings go to `Shimmer Capture` in Documents.
- **Stream tab:**
- Start, Stop and Record to CSV.
- The plot, in CAPTURE.md's panels by channel name: 5, 10 or 30 s, calibrated or raw, Clear. A
Shimmer3R's `Sound_Level` (nominal dB(A)) is in the Other panel, without the samples where the
unit has no level yet.
Shimmer3R's `Sound_Level` (nominal dB(A)) has a Sound level panel of its own, without the samples
where the unit has no level yet.
- **Event markers and audio...**: the event channel and the microphone (below).
- **Device tab:**
- Read battery, Read status, Toggle red LED (then the status, whose flag says whether it is on).
Expand Down Expand Up @@ -172,6 +172,6 @@ To try the microphone:
1. Connect, then open Event markers and audio.
2. Set Audio recording to Fingerprint only, tick Sound level, and click Write.
3. Check the line under the buttons for what the unit kept.
4. Start streaming: `Sound_Level` appears in the Other panel.
4. Start streaming: `Sound_Level` appears in the Sound level panel.
5. Stop streaming, start logging on the Device tab, then click Read audio status to see whether it
is recording audio.
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public void actionPerformed(ActionEvent e) {
mComboAudioMode.setToolTipText("What the unit saves from its microphone while it logs to its SD card (audio/ on the card)");
audio.add(mComboAudioMode, c);
c.gridx = 0; c.gridy = 1; c.gridwidth = 2;
mChkSoundLevel.setToolTipText("A channel in the data: in the plot's Other panel and the CSV. LogAndStream v1.01.026 on.");
mChkSoundLevel.setToolTipText("A channel in the data: in the plot's Sound level panel and the CSV. LogAndStream v1.01.026 on.");
audio.add(mChkSoundLevel, c);
c.gridwidth = 1;
JPanel audioButtons = new JPanel(new FlowLayout(FlowLayout.LEFT, 4, 0));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ public void channelsGoInThePanelsCaptureMdNames() {
assertEquals("GSR", Panels.of("GSR_Skin_Conductance"));
assertEquals("PPG", Panels.of("PPG_A13"));
assertEquals("PPG", Panels.of("PPG1_A12"));
assertEquals("Other", Panels.of("Sound_Level"));
assertEquals("Sound level", Panels.of("Sound_Level"));
assertEquals("Other", Panels.of("Batt_Percentage"));
assertNull(Panels.of("Timestamp"));
assertNull(Panels.of("System_Timestamp_Plot"));
Expand Down Expand Up @@ -433,7 +433,8 @@ public void theSoundLevelIsAColumnOfTheRecordingWithNaNWhereThereIsNoLevel() thr
assertEquals("-32768", rows[2].split(",")[raw]);
assertEquals("54.32", rows[3].split(",")[cal]);
assertEquals("5432", rows[3].split(",")[raw]);
assertEquals("Other", Panels.of("Sound_Level"));
assertEquals("Sound level", Panels.of("Sound_Level"));
assertEquals("Sound level", Panels.ALL.get(Panels.ALL.size() - 2));
}

}
Loading