Skip to content

Commit 6d2cfa0

Browse files
committed
Address review comments
- Change some log statements to console instead of debug so users can get real-time feedback - Point all NPX searches to a single constant value for consistency
1 parent 60e5b6d commit 6d2cfa0

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

Source/OnixSource.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ bool OnixSource::checkHubFirmwareCompatibility(std::shared_ptr<Onix1> context, d
284284
auto majorVersion = (firmwareVersion & 0xFF00) >> 8;
285285
auto minorVersion = firmwareVersion & 0xFF;
286286

287-
LOGD("Breakout board firmware version: v", majorVersion, ".", minorVersion);
287+
LOGC("Breakout board firmware version: v", majorVersion, ".", minorVersion);
288288

289289
if (majorVersion != RequiredMajorVersion)
290290
{
@@ -409,7 +409,7 @@ bool OnixSource::initializeDevices(device_map_t deviceTable, bool updateStreamIn
409409

410410
auto EEPROM = std::make_unique<HeadStageEEPROM>(index, context);
411411
uint32_t hsid = EEPROM->GetHeadStageID();
412-
LOGD("Detected headstage ", onix_hub_str(hsid));
412+
LOGC("Detected headstage ", onix_hub_str(hsid));
413413

414414
if (hsid == ONIX_HUB_HSNP2E)
415415
{

Source/UI/NeuropixelsV1Interface.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -900,9 +900,7 @@ std::string NeuropixelsV1Interface::searchDirectoryForCalibrationFile(std::strin
900900
return "";
901901
}
902902

903-
static constexpr int recursiveLevels = 1;
904-
905-
auto calibrationFiles = SettingsInterface::searchDirectoryForFile(rootDirectory, filename, recursiveLevels);
903+
auto calibrationFiles = searchDirectoryForFile(rootDirectory, filename, SettingsInterface::NeuropixelsCalibrationFileRecursiveLevels);
906904

907905
if (calibrationFiles.size() != 1)
908906
{
@@ -911,7 +909,7 @@ std::string NeuropixelsV1Interface::searchDirectoryForCalibrationFile(std::strin
911909

912910
if (calibrationFiles.size() > 1)
913911
{
914-
msg += " Check logs for all files discovered.";
912+
msg += " Check console for all files discovered.";
915913
}
916914

917915
Onix1::showWarningMessageBoxAsync("Wrong Number of Calibration Files", msg);

Source/UI/NeuropixelsV2eProbeInterface.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,9 +573,8 @@ std::string NeuropixelsV2eProbeInterface::searchDirectoryForCalibrationFile(std:
573573
}
574574

575575
std::string filename = std::to_string(sn) + GainCalibrationFilename;
576-
static constexpr int recursiveLevels = 1;
577576

578-
auto calibrationFiles = SettingsInterface::searchDirectoryForFile(rootDirectory, filename, recursiveLevels);
577+
auto calibrationFiles = searchDirectoryForFile(rootDirectory, filename, SettingsInterface::NeuropixelsCalibrationFileRecursiveLevels);
579578

580579
if (calibrationFiles.size() != 1)
581580
{

Source/UI/SettingsInterface.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ namespace OnixSourcePlugin
151151
return rootElement.release();
152152
}
153153

154+
static constexpr int NeuropixelsCalibrationFileRecursiveLevels = 2;
155+
154156
// Given a File object defining the path to a directory, a filename to search for, and (optionally) the number of recursive levels to
155157
// iterate through, return a list of all files that match the given filename in the directory (or directories for recursive searches)
156158
static std::vector<File> searchDirectoryForFile(File directory, std::string filename, int recursiveLevels = 0)
@@ -174,7 +176,7 @@ namespace OnixSourcePlugin
174176
for (DirectoryEntry entry : RangedDirectoryIterator(directory, false, filename, File::findFiles, File::FollowSymlinks::no))
175177
{
176178
matchingFiles.emplace_back(entry.getFile());
177-
LOGD("Discovered file: ", entry.getFile().getFullPathName());
179+
LOGC("Discovered file: ", entry.getFile().getFullPathName());
178180
}
179181

180182
return matchingFiles;

0 commit comments

Comments
 (0)