Skip to content

Commit 4d8e434

Browse files
CommanderPhoCommanderPho
committed
Bumped package versions, and updated polling rate from 50ms to 20ms
1 parent e99671a commit 4d8e434

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎Installer/phoBehavioralBoxLabjackController.nsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
; -------------------------------
66
; Start
7-
!define PRODUCT_VERSION "1.0.0.6s"
8-
!define VERSION "1.0.0.6s"
7+
!define PRODUCT_VERSION "1.0.0.7"
8+
!define VERSION "1.0.0.7"
99

1010
!define MUI_PRODUCT "phoBehavioralBoxLabjackController"
1111
!define MUI_FILE "phoBehavioralBoxLabjackController"

‎ProgramVersion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#pragma once
2-
#define SOFTWARE_VERSION "1.0.0.6s"
2+
#define SOFTWARE_VERSION "1.0.0.7"

‎device_info.vcxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,84 +94,84 @@
9494
<Xml Include="resources\charts.xml" />
9595
</ItemGroup>
9696
<ItemGroup>
97-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wtd.dll">
97+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wtd.dll">
9898
<FileType>Document</FileType>
9999
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
100100
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
101101
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
102102
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
103103
</CopyFileToFolders>
104-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttpd.dll">
104+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttpd.dll">
105105
<FileType>Document</FileType>
106106
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
107107
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
108108
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
109109
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
110110
</CopyFileToFolders>
111-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1d.dll">
111+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1d.dll">
112112
<FileType>Document</FileType>
113113
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
114114
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
115115
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
116116
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
117117
</CopyFileToFolders>
118-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1d.dll">
118+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1d.dll">
119119
<FileType>Document</FileType>
120120
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
121121
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
122122
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
123123
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
124124
</CopyFileToFolders>
125-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdfd.dll">
125+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdfd.dll">
126126
<FileType>Document</FileType>
127127
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
128128
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
129129
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
130130
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
131131
</CopyFileToFolders>
132-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wt.dll">
132+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wt.dll">
133133
<FileType>Document</FileType>
134134
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
135135
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
136136
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
137137
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
138138
</CopyFileToFolders>
139-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttp.dll">
139+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttp.dll">
140140
<FileType>Document</FileType>
141141
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
142142
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
143143
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
144144
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
145145
</CopyFileToFolders>
146-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttest.dll">
146+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttest.dll">
147147
<FileType>Document</FileType>
148148
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
149149
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
150150
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
151151
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
152152
</CopyFileToFolders>
153-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttestd.dll">
153+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttestd.dll">
154154
<FileType>Document</FileType>
155155
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
156156
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
157157
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
158158
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
159159
</CopyFileToFolders>
160-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1.dll">
160+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1.dll">
161161
<FileType>Document</FileType>
162162
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
163163
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
164164
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
165165
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
166166
</CopyFileToFolders>
167-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdf.dll">
167+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdf.dll">
168168
<FileType>Document</FileType>
169169
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
170170
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
171171
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
172172
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
173173
</CopyFileToFolders>
174-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1.dll">
174+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1.dll">
175175
<FileType>Document</FileType>
176176
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
177177
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -194,7 +194,7 @@
194194
<ProjectGuid>{CA30395F-5251-40D8-8C39-297793F13B1E}</ProjectGuid>
195195
<RootNamespace>pho_behavioral_box_labjack</RootNamespace>
196196
<Keyword>Win32Proj</Keyword>
197-
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
197+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
198198
<ProjectName>phoBehavioralBoxLabjackController</ProjectName>
199199
</PropertyGroup>
200200
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -355,12 +355,12 @@
355355
</ItemDefinitionGroup>
356356
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
357357
<ImportGroup Label="ExtensionTargets">
358-
<Import Project="packages\nlohmann.json.3.7.0\build\native\nlohmann.json.targets" Condition="Exists('packages\nlohmann.json.3.7.0\build\native\nlohmann.json.targets')" />
358+
<Import Project="packages\nlohmann.json.3.9.1\build\native\nlohmann.json.targets" Condition="Exists('packages\nlohmann.json.3.9.1\build\native\nlohmann.json.targets')" />
359359
</ImportGroup>
360360
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
361361
<PropertyGroup>
362362
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
363363
</PropertyGroup>
364-
<Error Condition="!Exists('packages\nlohmann.json.3.7.0\build\native\nlohmann.json.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\nlohmann.json.3.7.0\build\native\nlohmann.json.targets'))" />
364+
<Error Condition="!Exists('packages\nlohmann.json.3.9.1\build\native\nlohmann.json.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\nlohmann.json.3.9.1\build\native\nlohmann.json.targets'))" />
365365
</Target>
366366
</Project>

‎device_info.vcxproj.filters‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -291,40 +291,40 @@
291291
<None Include="packages.config" />
292292
</ItemGroup>
293293
<ItemGroup>
294-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1d.dll">
294+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1d.dll">
295295
<Filter>Required DLLs\Debug</Filter>
296296
</CopyFileToFolders>
297-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdfd.dll">
297+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdfd.dll">
298298
<Filter>Required DLLs\Debug</Filter>
299299
</CopyFileToFolders>
300-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1d.dll">
300+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1d.dll">
301301
<Filter>Required DLLs\Debug</Filter>
302302
</CopyFileToFolders>
303-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wtd.dll">
303+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wtd.dll">
304304
<Filter>Required DLLs\Debug</Filter>
305305
</CopyFileToFolders>
306-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttpd.dll">
306+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttpd.dll">
307307
<Filter>Required DLLs\Debug</Filter>
308308
</CopyFileToFolders>
309-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wt.dll">
309+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wt.dll">
310310
<Filter>Required DLLs\Release</Filter>
311311
</CopyFileToFolders>
312-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttp.dll">
312+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wthttp.dll">
313313
<Filter>Required DLLs\Release</Filter>
314314
</CopyFileToFolders>
315-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1.dll">
315+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libssl-1_1.dll">
316316
<Filter>Required DLLs\Release</Filter>
317317
</CopyFileToFolders>
318-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1.dll">
318+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libcrypto-1_1.dll">
319319
<Filter>Required DLLs\Release</Filter>
320320
</CopyFileToFolders>
321-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdf.dll">
321+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\libhpdf.dll">
322322
<Filter>Required DLLs\Release</Filter>
323323
</CopyFileToFolders>
324-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttest.dll">
324+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttest.dll">
325325
<Filter>Required DLLs\Release</Filter>
326326
</CopyFileToFolders>
327-
<CopyFileToFolders Include="..\..\..\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttestd.dll">
327+
<CopyFileToFolders Include="C:\Program Files\Wt 4.1.0 msvs2019 x64\bin\wttestd.dll">
328328
<Filter>Required DLLs\Debug</Filter>
329329
</CopyFileToFolders>
330330
</ItemGroup>

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="nlohmann.json" version="3.7.0" targetFramework="native" />
3+
<package id="nlohmann.json" version="3.9.1" targetFramework="native" />
44
</packages>

‎src/Main.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int main(int argc, char** argv)
5959
{
6060
std::cout << "BehavioralBoxLabjackController:" << std::endl;
6161
std::cout << "\t Version " << SOFTWARE_VERSION << std::endl;
62-
std::cout << "\t Pho Hale 2019" << std::endl << std::endl;
62+
std::cout << "\t Pho Hale 2021" << std::endl << std::endl;
6363
std::shared_ptr<ConfigurationManager> configMan = std::make_shared<ConfigurationManager>();
6464

6565
// Get the hostname

‎src/config.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Specifies what ports to open
99
// number of tasks that can run simultaneously
1010
#define MAX_NUM_THREAD_PER_LABJACK 1
1111

12-
#define LABJACK_UPDATE_LOOP_FREQUENCY_MILLISEC 50
12+
#define LABJACK_UPDATE_LOOP_FREQUENCY_MILLISEC 20
1313

1414
// The maximum number of simultaneous labjacks that can be connected to this computer
15-
#define max_number_labjacks 8
15+
#define max_number_labjacks 4
1616

1717
////// Daylight Cycle Settings:
1818
// globalDaylightStartHour: defines the hour of the day (in a 24-hour format) at which the Visible LEDS are turned on (illuminated) (simulating daylight for the mouse).

0 commit comments

Comments
 (0)