Skip to content

Commit 1097457

Browse files
MAKOMOMAKOMO
committed
- adds MQTT support
- adds support for ROEST sample and production roasters
1 parent bc7a39b commit 1097457

114 files changed

Lines changed: 82721 additions & 76605 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/help_dialogs/Input_files/eventbuttons.xlsx‎

34 Bytes
Binary file not shown.

‎doc/help_dialogs/Input_files/eventsliders.xlsx‎

59 Bytes
Binary file not shown.

‎doc/help_dialogs/Input_files/mqtt.xlsx‎

6.54 KB
Binary file not shown.

‎doc/help_dialogs/Input_files/s7.xlsx‎

-25 Bytes
Binary file not shown.

‎doc/help_dialogs/Input_files/symbolic.xlsx‎

139 Bytes
Binary file not shown.

‎doc/help_dialogs/Output_html/eventbuttons_help.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,11 @@
507507
<td>shellyrelay(n,b)</td>
508508
<td>switches Shelly plug number &lt;n&gt; ON if b is true or 1, and OFF otherwise</td>
509509
</tr>
510+
<tr>
511+
<td>&#160;</td>
512+
<td>publish(&lt;topic&gt;, &lt;value&gt;)</td>
513+
<td>converts the given data to JSON and publish it on the MQTT server to the given topic</td>
514+
</tr>
510515
<tr>
511516
<td>Hottop Heater</td>
512517
<td>&#160;</td>

‎doc/help_dialogs/Output_html/eventsliders_help.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,12 @@
453453
<td>switches Shelly plug number &lt;n&gt; ON if b is true or 1, and OFF otherwise</td>
454454
<td>&#160;</td>
455455
</tr>
456+
<tr>
457+
<td>&#160;</td>
458+
<td>publish(&lt;topic&gt;, &lt;value&gt;)</td>
459+
<td>converts the given data to JSON and publish it on the MQTT server to the given topic</td>
460+
<td>&#160;</td>
461+
</tr>
456462
<tr>
457463
<td>S7 Command</td>
458464
<td>_</td>

‎doc/help_dialogs/Output_html/mqtt_help.html‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<head><style> td, th {border: 1px solid #ddd; padding: 6px;} th {padding-top: 6px;padding-bottom: 6px;text-align: left;background-color: #0C6AA6; color: white;} </style></head> <body><b>PORTS CONFIGURATION</b><table width="100%" border="1" padding="1" border-collapse="collapse">
2+
<thead>
3+
<tr>
4+
<th>MQTT SETTINGS</th>
5+
</tr>
6+
</thead>
7+
<tbody>
8+
<tr>
9+
<td>The MQTT communication is respecting the broker&#39;s host IP and port for communication over TCP or WebSockets using the MQTT protocol v3.1, v3.1.1, or v5. Encryption can be enabled by ticking the TLS option. Connect timeout and keepalive periods can be configured in seconds, and access credentials can be set.</td>
10+
</tr>
11+
<tr>
12+
<td>Artisan establishes a connection with the broker and subscribes to the specified topics if the ON button is pressed. Each input extracts its data from the payloads received for the main topic or, if provided, the input-specific topics. For each input, a JMESPath (jmespath.org) expression is used to determine how to extract the data for that input is extracted from the received payload.</td>
13+
</tr>
14+
<tr>
15+
<td>For example, for the payload {&quot;foo&quot;: {&quot;bar&quot;: [1, 2]}}, the JMESPath expression foo.bar[0] will result in the value 1.</td>
16+
</tr>
17+
<tr>
18+
<td>If mode is set to C or F, readings are automatically converted to the temperature unit set for display.</td>
19+
</tr>
20+
</tbody>
21+
</table></body>

‎doc/help_dialogs/Output_html/s7_help.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<td>The PID Control dialog can operate a connected PID using the given PID registers to set the p-i-d parameters and the set value (SV). S7 commands can be specified to turn the PID on and off from that PID Control dialog. See the help page in the Events Dialog for documentation of available S7 write commands.</td>
2525
</tr>
2626
<tr>
27-
<td>The Scan button opens a simple MODBUS scanner to search for data holding registers in the connected device.</td>
27+
<td>The Scan button opens a simple S7 scanner to search for data holding registers in the connected device.</td>
2828
</tr>
2929
<tr>
30-
<td>Refer to the User Manual of your MODBUS device for information specific to the setup required for your device.</td>
30+
<td>Refer to the User Manual of your S7 device for information specific to the setup required for your device.</td>
3131
</tr>
3232
</tbody>
3333
</table></body>

‎doc/help_dialogs/Output_html/symbolic_help.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,12 @@
384384
<td>Conditional. Evaluates to the value of the expression &lt;true-expr&gt; if the condition &lt;cond&gt; holds, otherwise to the value of the expression &lt;false-expr&gt;. The rules of Python are applied to decide if a value holds or not. Thus the boolean values &quot;True&quot; and &quot;False&quot; have the obvious semantic. Any number unequal to 0 evaluates to True and 0 evaluates to False. The value &quot;None&quot; is also evaluated to False.</td>
385385
</tr>
386386
</tbody>
387+
</table><table width="100%" border="1" padding="1" border-collapse="collapse">
388+
<tbody>
389+
<tr>
390+
<td>Note: If any of the referenced symbolic variables contained in a symbolic expression evaluates to the error value -1, the whole expression evaluates to -1. This can be prevented by surrounding the whole expression by regular brackets. Thus, with Y1 evaluating to -1, the expression &quot;Y1 + 1&quot; evaluates to -1, but &quot;(Y1 + 1)&quot; evaluates to 0.</td>
391+
</tr>
392+
</tbody>
387393
</table><br/><br/><b>MATHEMATICAL FORMULAS</b><table width="100%" border="1" padding="1" border-collapse="collapse">
388394
<thead>
389395
<tr>

0 commit comments

Comments
 (0)