resolved conflicts during merge of #282 from 1.7.3

eez-open · Oct 26, 2021 · 07f9b3f · 07f9b3f
1 parent 8583eef
commit 07f9b3f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/build/extensions/eez_bb3-1.7.3.zip b/build/extensions/eez_bb3-1.7.3.zip
diff --git a/build/extensions/eez_bb3_simulator-1.7.3.zip b/build/extensions/eez_bb3_simulator-1.7.3.zip
diff --git a/docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.14 - SCRipt.html b/docs/SCPI reference guide/Commands/EEZ BB3 SCPI reference 5.14 - SCRipt.html
@@ -16,6 +16,7 @@
 			p { text-align: justify; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; text-indent: 0; background: transparent; font-family: "Arial"; font-size: 10.5pt; font-weight: normal; font-style: normal; }
 			li { text-align: justify; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0; text-indent: 0; background: transparent; font-family: "Arial"; font-size: 10.5pt; font-weight: normal; font-style: normal; }
 			.cmd_code { text-align: left; font-family: "Courier New"; }
+			.cmd_code_Start { text-align: left; margin-top: 1.99mm; font-family: "Courier New"; }
 			.cmd_root { text-align: left; color: #0066cc; }
 			.scpi0 { text-align: left; }
 			.scpi1 { text-align: left; margin-left: 4.99mm; }
@@ -304,6 +305,7 @@
 				</td>
 				<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
 					<p class="cmd_root">SCRipt:RUN {&lt;filename&gt;}</p>
+					<p class="cmd_root">SCRipt:RUN?</p>
 				</td>
 			</tr>
 			<tr style="background: transparent;">
@@ -360,6 +362,8 @@
 				</td>
 				<td colspan="4" style="border-left: 0; border-right: 0; border-top: 0; border-bottom: 0; vertical-align: top; background: transparent; width: 87%;">
 					<p class="cmd_code">SCR:RUN &quot;/Scripts/Hello world.py&quot;</p>
+					<p class="cmd_code">SCR:RUN?</p>
+					<p class="cmd_code_Start">&quot;/Scripts/Hello world.py&quot;</p>
 				</td>
 			</tr>
 			<tr style="background: transparent;">

diff --git a/docs/SCPI reference guide/EEZ BB3 SCPI reference 5.14 - SCRipt.odt b/docs/SCPI reference guide/EEZ BB3 SCPI reference 5.14 - SCRipt.odt
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -89834,9 +89834,9 @@
       "idn": "Envox,EEZ BB3 (STM32)",
       "idfName": "EEZ BB3 STM32",
       "idfShortName": "EEZ-BB3-STM32",
-      "idfFirmwareVersion": "1.7.1",
+      "idfFirmwareVersion": "1.7.3",
       "idfGuid": "687b6dee-2093-4c36-afb7-cfc7ea2bf262",
-      "idfRevisionNumber": "1.7.1",
+      "idfRevisionNumber": "1.7.3",
       "idfDescription": "EEZ Bench box 3-module T&M chassis",
       "idfSupportedModels": "EEZ-BB3-STM32",
       "idfRevisionComments": "Initial version",
@@ -89854,9 +89854,9 @@
       "idn": "Envox,EEZ BB3 (Simulator)",
       "idfName": "EEZ BB3 Simulator",
       "idfShortName": "EEZ-BB3-SIM",
-      "idfFirmwareVersion": "1.7.1",
+      "idfFirmwareVersion": "1.7.3",
       "idfGuid": "7cab6860-e593-4ba2-ee68-57fe84460fa4",
-      "idfRevisionNumber": "1.7.1",
+      "idfRevisionNumber": "1.7.3",
       "idfDescription": "EEZ Bench box 3-module T&M chassis firmware simulator",
       "idfSupportedModels": "EEZ-BB3-SIM",
       "idfRevisionComments": "Initial version",