WaveDAQ/drs4eb
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recompiled under Windows

Browse Source
This commit is contained in:
ritt
2017-01-09 17:06:59 +01:00
parent 8461281a67
commit 9e6aa0e059
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
software/drscl/drscl.exe
BIN
View File
Binary file not shown.
software/drscl/drscl.vcxproj
+5 -5
View File
@@ -56,7 +56,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>C:\meg\online\drivers\drs;c:\midas\include;c:\mxml;c:\midas\drivers\vme\sis3100\windows\;c:\meg\online\drivers\ace\;c:\meg\online\drivers\drs\libusb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\drs4eb\software\include;C:\drs4eb\software;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;HAVE_USB;HAVE_LIBUSB10;CF_VIA_USBx;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -75,7 +75,7 @@
<Culture>0x0807</Culture>
</ResourceCompile>
<Link>
<OutputFile>.\Release/drscl.exe</OutputFile>
<OutputFile>./drscl.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\Release/drscl.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
@@ -93,7 +93,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>C:\meg\online\drivers\drs;c:\midas\include;c:\mxml;c:\midas\drivers\vme\sis3100\windows\;c:\meg\online\drivers\ace\;c:\midas\mscb\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>C:\drs4eb\software\include;C:\drs4eb\software;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_USB;HAVE_LIBUSB10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -131,8 +131,8 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\averager.cpp" />
<ClCompile Include="..\DRS.cpp" />
<ClCompile Include="..\src\averager.cpp" />
<ClCompile Include="..\src\DRS.cpp" />
<ClCompile Include="drscl.cpp" />
<ClCompile Include="..\..\..\..\..\midas\drivers\usb\musbstd.c" />
<ClCompile Include="..\..\..\..\..\mxml\mxml.c" />
software/drscl/drscl.vcxproj.filters
+4 -4
View File
@@ -15,9 +15,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\DRS.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="drscl.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -30,7 +27,10 @@
<ClCompile Include="..\..\..\..\..\mxml\strlcpy.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\averager.cpp">
<ClCompile Include="..\src\averager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\DRS.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
software/src/DRS.cpp
+2 -2
View File
@@ -2320,7 +2320,7 @@ int DRSBoard::SetSyncDelay(int ticks)
int DRSBoard::SetReadoutDelay(float milliseconds)
{
unsigned int ticks = milliseconds * 30303;
unsigned int ticks = (unsigned int)(milliseconds * 30303);
if (fBoardType == 9) {
Write(T_CTRL, REG_READOUT_DELAY, &ticks, 4);
return 1;
@@ -3194,7 +3194,7 @@ int DRSBoard::ChipTest(int flag)
if (t >= 0.99 && delta_t == 0.1) delta_t = 1;
if (t >= 9.99 && delta_t == 1) delta_t = 10;
SetReadoutDelay(t);
SetReadoutDelay((float)t);
// average over 10 waveforms
printf(".");