diff --git a/CMakeLists.txt b/CMakeLists.txt index 81cf828..a66e7a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ if(MSVC) target_compile_options(${PLUGIN_NAME} PRIVATE /sdl- /W0) install(TARGETS ${PLUGIN_NAME} RUNTIME DESTINATION ${GUI_BIN_DIR}/plugins CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES}) + install(FILES $ DESTINATION ${GUI_BIN_DIR}/plugins OPTIONAL) set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../libs) elseif(LINUX) diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp index 3bdae56..344a55f 100644 --- a/Source/Devices/Neuropixels_1.cpp +++ b/Source/Devices/Neuropixels_1.cpp @@ -138,6 +138,7 @@ void Neuropixels_1::addFrame(oni_frame_t* frame) for (int i = 0; i < framesPerSuperFrame; i++) { + int newDataOffset = dataOffset + i * 36; // 36 = 32 ADCs + type + 2 counters if (i == 0) // LFP data { int superCountOffset = superFrameCount % superFramesPerUltraFrame; @@ -152,7 +153,7 @@ void Neuropixels_1::addFrame(oni_frame_t* frame) int chanIndex = adcToChannel[adc] + superCountOffset * 2; // map the ADC to muxed channel lfpSamples[(chanIndex * numUltraFrames) + ultraFrameCount ] = - float(*(dataPtr + adcToFrameIndex[adc] + dataOffset) >> 5) * 0.195f; + float(*(dataPtr + adcToFrameIndex[adc] + newDataOffset) >> 5); } } @@ -163,7 +164,7 @@ void Neuropixels_1::addFrame(oni_frame_t* frame) { int chanIndex = adcToChannel[adc] + chanOffset; // map the ADC to muxed channel. apSamples[(chanIndex * superFramesPerUltraFrame * numUltraFrames) + superFrameCount] = - float(*(dataPtr + adcToFrameIndex[adc] + dataOffset) >> 5) * 0.195f; + float(*(dataPtr + adcToFrameIndex[adc] + newDataOffset) >> 5); } } }