Skip to content

Commit daaa66a

Browse files
committed
Fix data offset when reading data from frame
1 parent da8edf2 commit daaa66a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ if(MSVC)
6565
target_compile_options(${PLUGIN_NAME} PRIVATE /sdl- /W0)
6666

6767
install(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION ${GUI_BIN_DIR}/plugins CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
68+
install(FILES $<TARGET_PDB_FILE:${PLUGIN_NAME}> DESTINATION ${GUI_BIN_DIR}/plugins OPTIONAL)
6869

6970
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../libs)
7071
elseif(LINUX)

Source/Devices/Neuropixels_1.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ void Neuropixels_1::addFrame(oni_frame_t* frame)
138138

139139
for (int i = 0; i < framesPerSuperFrame; i++)
140140
{
141+
int newDataOffset = dataOffset + i * 36; // 36 = 32 ADCs + type + 2 counters
141142
if (i == 0) // LFP data
142143
{
143144
int superCountOffset = superFrameCount % superFramesPerUltraFrame;
@@ -152,7 +153,7 @@ void Neuropixels_1::addFrame(oni_frame_t* frame)
152153

153154
int chanIndex = adcToChannel[adc] + superCountOffset * 2; // map the ADC to muxed channel
154155
lfpSamples[(chanIndex * numUltraFrames) + ultraFrameCount ] =
155-
float(*(dataPtr + adcToFrameIndex[adc] + dataOffset) >> 5) * 0.195f;
156+
float(*(dataPtr + adcToFrameIndex[adc] + newDataOffset) >> 5);
156157

157158
}
158159
}
@@ -163,7 +164,7 @@ void Neuropixels_1::addFrame(oni_frame_t* frame)
163164
{
164165
int chanIndex = adcToChannel[adc] + chanOffset; // map the ADC to muxed channel.
165166
apSamples[(chanIndex * superFramesPerUltraFrame * numUltraFrames) + superFrameCount] =
166-
float(*(dataPtr + adcToFrameIndex[adc] + dataOffset) >> 5) * 0.195f;
167+
float(*(dataPtr + adcToFrameIndex[adc] + newDataOffset) >> 5);
167168
}
168169
}
169170
}

0 commit comments

Comments
 (0)