Merge branch 'dev' into main

strawlab · Feb 7, 2021 · ab23c53 · ab23c53
2 parents a2e35e4 + e3d2dc4
commit ab23c53
Show file tree

Hide file tree

Showing 14 changed files with 1,525 additions and 556 deletions.
diff --git a/Programs/Serial_003/Miriam_Serial/Miriam/App.config b/Programs/Serial_003/Miriam_Serial/Miriam/App.config
@@ -31,6 +31,27 @@
             <setting name="settBoxTemperatureThreshold" serializeAs="String">
                 <value>45</value>
             </setting>
+            <setting name="meltTemperatureUp" serializeAs="String">
+                <value>80</value>
+            </setting>
+            <setting name="meltTemperatureMid" serializeAs="String">
+                <value>80</value>
+            </setting>
+            <setting name="meltTemperatureExtra" serializeAs="String">
+                <value>80</value>
+            </setting>
+            <setting name="meltInterval" serializeAs="String">
+                <value>30</value>
+            </setting>
+            <setting name="meltTolerance" serializeAs="String">
+                <value>1</value>
+            </setting>
+            <setting name="meltingEnabled" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="filenamePrefix" serializeAs="String">
+                <value>miriam</value>
+            </setting>
         </Miriam_Serial.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/Programs/Serial_003/Miriam_Serial/Miriam/Control.Designer.cs b/Programs/Serial_003/Miriam_Serial/Miriam/Control.Designer.cs