Updating files

Author: H0sseini

GUI/ThermalGUI/ThermalControl.cs

@@ -20,7 +20,8 @@ public partial class ThermalControl : Form
         Dictionary<int, string> RIDList = new Dictionary<int, string>();
 
         //time to update screen
-        private int TCS_RUN_INTERVAL;
+        [DllImport("ThermalControlAlgorithm.dll", EntryPoint = "TCS_RUN_INTERVAL", CallingConvention = CallingConvention.Cdecl)]
+        public static extern ref int TCS_RUN_INTERVAL;
 
 
         public ThermalControl()

GUI/ThermalGUI/ThermalGUI.csproj

@@ -23,7 +23,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,8 +31,7 @@
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>5</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>

cpp/ThermalControlAlgorithm/ThermalControlAlgorithm.cpp

@@ -1,12 +1,14 @@
 
-//#include <iostream>
+#include <iostream>
 #include <string>
 //#include <chrono>
 #include <thread>
 #include "TCSInit.h"
 
 constexpr auto TCS_RESET_TIME = 1800;	// seconds to reset everything in TCS
-constexpr auto TCS_RUN_INTERVAL = 10; //seconds to run the tcs code. this parameter is sent to c# for visualization)
+extern "C" {
+	__declspec(dllexport) constexpr auto TCS_RUN_INTERVAL = 10; //seconds to run the tcs code. this parameter is sent to c# for visualization)
+}
 
 
 int recordSize = sizeof(CompsData);
@@ -54,6 +56,8 @@ void TCS(vector<TCSComponents>& tcsComponents)
 		}
 	}
 
+	cout << "TCS called" << endl;
+	
 }
 
 
@@ -438,8 +442,7 @@ extern "C" __declspec(dllexport) int mainFunc()
 
 
 	//Initializing components
-	//cout << "initializing" << endl;
-	InitializeData(tcsComponents);
+	cout << "initializing" << endl;
 	InitializeData(tcsBackup);
 	tcsComponents = tcsBackup;
 	RIDsize = GetRIDSize();
@@ -456,9 +459,8 @@ extern "C" __declspec(dllexport) int mainFunc()
 		});
 	thread reset_tcs([&]() {
 		while (true) {
-			//cout << "TCS Reset." << endl;
+			cout << "TCS Reset." << endl;
 			tcsComponents = tcsBackup;
-
 
 			this_thread::sleep_for(chrono::seconds(TCS_RESET_TIME));
 		}
@@ -469,4 +471,4 @@ extern "C" __declspec(dllexport) int mainFunc()
 
 
 	return 0;
-}
+}

cpp/ThermalControlAlgorithm/ThermalControlAlgorithm.vcxproj

@@ -45,11 +45,11 @@
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -127,12 +127,6 @@ copy "$(TargetDir)ThermalControlAlgorithm.dll" "$(SolutionDir)..\GUI\ThermalGUI\
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
-    <PostBuildEvent>
-      <Message>
-      </Message>
-      <Command>copy "$(TargetDir)ThermalControlAlgorithm.dll" "$(SolutionDir)..\GUI\ThermalGUI\bin\Release\"
-copy "$(TargetDir)ThermalControlAlgorithm.dll" "$(SolutionDir)..\GUI\ThermalGUI\bin\Debug\"</Command>
-    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="ThermalControlAlgorithm.cpp" />

cpp/ThermalControlAlgorithm/heaters.h

@@ -1,17 +1,17 @@
 unsigned char heats_bin[] = {
-  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
+  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
   0x19,  0x00,  0x00,  0x00,  0x02,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
-  0x01,  0x00,  0x00,  0x00,  0x1a,  0x00,  0x00,  0x00,  0x03,  0x00,  0x00,  0x00,
-  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x1b,  0x00,  0x00,  0x00,
-  0x04,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x1a,  0x00,  0x00,  0x00,  0x03,  0x00,  0x00,  0x00,
+  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x1b,  0x00,  0x00,  0x00,
+  0x04,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
   0x1c,  0x00,  0x00,  0x00,  0x05,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
-  0x01,  0x00,  0x00,  0x00,  0x1d,  0x00,  0x00,  0x00,  0x06,  0x00,  0x00,  0x00,
-  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x1e,  0x00,  0x00,  0x00,
-  0x07,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x1d,  0x00,  0x00,  0x00,  0x06,  0x00,  0x00,  0x00,
+  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x1e,  0x00,  0x00,  0x00,
+  0x07,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
   0x1f,  0x00,  0x00,  0x00,  0x08,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
-  0x01,  0x00,  0x00,  0x00,  0x20,  0x00,  0x00,  0x00,  0x09,  0x00,  0x00,  0x00,
-  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x21,  0x00,  0x00,  0x00,
-  0x0a,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,
+  0x00,  0x00,  0x00,  0x00,  0x20,  0x00,  0x00,  0x00,  0x09,  0x00,  0x00,  0x00,
+  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x21,  0x00,  0x00,  0x00,
+  0x0a,  0x00,  0x00,  0x00,  0x01,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,  0x00,
   0x22,  0x00,  0x00,  0x00,
 };
 unsigned int heats_bin_len = 160;