Skip to content

Commit

Permalink
v1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisweather committed Jan 30, 2023
1 parent 4a54761 commit b6e5ef9
Show file tree
Hide file tree
Showing 16 changed files with 258 additions and 168 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
## Roc-MQTT-Display Changelog

### Roc-MQTT-Display release 1.10
2023-01-29 - tested with Arduino IDE 1.8.19 with latest versions of included libraries

- fixed an issue with scrolltext message field positioning - Thanks to Markus smn346
- added the option to use variable {rrtime} (Rocrail time) also in the departure field - Thanks to Markus smn346 for suggesting it!
- added station field to configuration, so every physical display can be assigned to a station, for future use
- added communication with other RM modules (for future use)
- Template - added ÖBB design templates - Thanks to Markus smn346 for sharing them!
- Hardware - added 3D printer data for Controller - Thanks to by Peter psuser1 for designing and sharing!

### Roc-MQTT-Display release 1.09
2022-11-14 - tested with Arduino IDE 1.8.19 with latest versions of included libraries

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Several controllers can run in parallel so the total number of displays is not l
A friend of mine was looking for an easy way to run displays with live data in his model railroad environment. Right after this conversation this project was born.
Since then it's a work in progress with already many nice features. If you want to share your experience with this code or have ideas for more features you are welcome to share them in the Issues or Discussions area. Have fun.

Latest Version 1.09
November 14, 2022
Latest Version 1.10
January 29, 2023

Thank you for your interest in the Roc-MQTT-Display project.
If you like the project please Star it here on GitHub and consider donating if you want to support further development.
Expand Down
8 changes: 4 additions & 4 deletions data/404.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand All @@ -15,7 +15,7 @@
<H1>Roc-MQTT-Display</H1>
</br>
<button type='button' class='button' title='Home' onclick='buttonHome()'>Home</button>
</br>
</br></br>
<script>
function buttonHome() {
window.open('/','_self');
Expand All @@ -26,7 +26,7 @@ <H1>Roc-MQTT-Display</H1>
<H2>404 - Requested Site Not Found</H2>
</br>
<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
26 changes: 12 additions & 14 deletions data/config.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand All @@ -22,13 +22,11 @@ <H1>Roc-MQTT-Display - Configuration</H1>
window.open('/download?file=/rmdcfg.txt','_blank');
}
</script>

<form action='/submitcfg' method='POST'>
<button type='button' class='button' title='Home' onclick='buttonHome()'>Home</button>
<button type='button' class='button' title='Download' onclick='buttonDownload()'>Download</button>
<input type='submit' class='button' title='Save settings' value='Save'>
</br>

</br></br>
<table id='tbl1'>
<tr><td>WIFI Devicename</td><td><input type='text' class='infield' name='f_WIFI_DEVICENAME' value='%WIFI_DEVICENAME%' title='Name of this controller in your Wifi network' size='19' maxlength='18' ></td></tr>
<tr><td>WIFI reconnect delay (ms)</td><td><input type='number' class='infield' name='f_WIFI_RECONDELAY' value='%WIFI_RECONDELAY%' title='Wait x ms until reconnect attempt in case of connection loss' size='7' maxlength='6' min='5000' ></td></tr>
Expand Down Expand Up @@ -65,14 +63,14 @@ <H1>Roc-MQTT-Display - Configuration</H1>
<td><input type='text' class='infield2' name='f_DPL_ID7' value='%DPL_ID7%' title='Name of display 8 connected to this controller, e.g. D08' size='4' maxlength='3' ></td>
</tr></table></td></tr>
<tr><td>Station</td><td><table id='tbl2'><tr>
<td><input type='text' class='infield2' name='f_DPL_STATION00' value='%DPL_STATION00%' title='Station, where this display is installed' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION01' value='%DPL_STATION01%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION02' value='%DPL_STATION02%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION03' value='%DPL_STATION03%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION04' value='%DPL_STATION04%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION05' value='%DPL_STATION05%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION06' value='%DPL_STATION06%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION07' value='%DPL_STATION07%' size='4' maxlength='3' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION00' value='%DPL_STATION00%' title='Station, where this display is installed' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION01' value='%DPL_STATION01%' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION02' value='%DPL_STATION02%' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION03' value='%DPL_STATION03%' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION04' value='%DPL_STATION04%' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION05' value='%DPL_STATION05%' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION06' value='%DPL_STATION06%' size='8' maxlength='7' ></td>
<td><input type='text' class='infield2' name='f_DPL_STATION07' value='%DPL_STATION07%' size='8' maxlength='7' ></td>
</tr></table></td></tr>
<tr><td>Track</td><td><table id='tbl2'><tr>
<td><input type='number' class='infield2' name='f_DPL_TRACK0' value='%DPL_TRACK0%' title='Track Number, where this display is installed' size='4' maxlength='2' min='1' max='99' ></td>
Expand Down Expand Up @@ -117,7 +115,7 @@ <H1>Roc-MQTT-Display - Configuration</H1>
</table>
</form>
<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
10 changes: 4 additions & 6 deletions data/index.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand All @@ -23,9 +23,7 @@ <H1>Roc-MQTT-Display</H1>
<button type='button' class='button' title='Template settings for Template 0-9' onclick='buttonTemplate2()'>Templates 2</button>
<button type='button' class='button' title='Documentation Wiki' onclick='buttonManual()'>Manual</button>
<button type='button' class='button' title='Restart the controller' onclick='buttonRestart()'>Restart</button>
</br>
</br>
</br>
</br></br></br>
<script>
function UpdateCheck(){
var cversion = 1 * ("%VER%");
Expand Down Expand Up @@ -63,7 +61,7 @@ <H1>Roc-MQTT-Display</H1>
}
</script>
<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
4 changes: 2 additions & 2 deletions data/rmd.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
*/

Expand Down
2 changes: 1 addition & 1 deletion data/rmdcfg.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"VER":"Version 1.09","WIFI_DEVICENAME":"RocMQTTdisplayC01","WIFI_RECONDELAY":5000,"OTA_HOSTNAME":"RocMQTTdisplayC01","OTA_PORT":8266,"NTP_SERVER":"0.europe.pool.ntp.org","NTP_TZ":"CET-1CEST,M3.5.0,M10.5.0/3","MQTT_IP":"","MQTT_PORT":1883,"MQTT_MSGSIZE":256,"MQTT_KEEPALIVE":15,"MQTT_RECONDELAY":10000,"MQTT_TOPIC1":"rocrail/service/info/clock","MQTT_TOPIC2":"rocrail/service/info/tx","MQTT_DELIMITER":";","MQTT_DEBUG":0,"MUX":112,"NUMDISP":2,"DISPWIDTH":128,"DISPHEIGHT":32,"STARTDELAY":200,"UPDSPEED":0,"SCREENSAVER":60,"DPL_ID0":"D01","DPL_ID1":"D02","DPL_ID2":"D03","DPL_ID3":"D04","DPL_ID4":"D05","DPL_ID5":"D06","DPL_ID6":"D07","DPL_ID7":"D08","DPL_STATION00":"","DPL_STATION01":"","DPL_STATION02":"","DPL_STATION03":"","DPL_STATION04":"","DPL_STATION05":"","DPL_STATION06":"","DPL_STATION07":"","DPL_TRACK0":1,"DPL_TRACK1":1,"DPL_TRACK2":1,"DPL_TRACK3":1,"DPL_TRACK4":1,"DPL_TRACK5":1,"DPL_TRACK6":1,"DPL_TRACK7":1,"DPL_FLIP0":0,"DPL_FLIP1":0,"DPL_FLIP2":0,"DPL_FLIP3":0,"DPL_FLIP4":0,"DPL_FLIP5":0,"DPL_FLIP6":0,"DPL_FLIP7":0,"DPL_CONTRAST0":1,"DPL_CONTRAST1":1,"DPL_CONTRAST2":1,"DPL_CONTRAST3":1,"DPL_CONTRAST4":1,"DPL_CONTRAST5":1,"DPL_CONTRAST6":1,"DPL_CONTRAST7":1,"DPL_SIDE0":0,"DPL_SIDE1":0,"DPL_SIDE2":0,"DPL_SIDE3":0,"DPL_SIDE4":0,"DPL_SIDE5":0,"DPL_SIDE6":0,"DPL_SIDE7":0}
{"VER":"Version 1.10","WIFI_DEVICENAME":"RocMQTTdisplayC01","WIFI_RECONDELAY":5000,"OTA_HOSTNAME":"RocMQTTdisplayC01","OTA_PORT":8266,"NTP_SERVER":"0.europe.pool.ntp.org","NTP_TZ":"CET-1CEST,M3.5.0,M10.5.0/3","MQTT_IP":"192.168.2.197","MQTT_PORT":1883,"MQTT_MSGSIZE":350,"MQTT_KEEPALIVE":15,"MQTT_RECONDELAY":10000,"MQTT_TOPIC1":"rocrail/service/info/clock","MQTT_TOPIC2":"rocrail/service/info/tx","MQTT_DELIMITER":";","MQTT_DEBUG":1,"MUX":112,"NUMDISP":3,"DISPWIDTH":128,"DISPHEIGHT":32,"STARTDELAY":200,"UPDSPEED":0,"SCREENSAVER":60,"DPL_ID0":"D01","DPL_ID1":"D02","DPL_ID2":"D03","DPL_ID3":"D04","DPL_ID4":"D05","DPL_ID5":"D06","DPL_ID6":"D07","DPL_ID7":"D08","DPL_STATION00":"","DPL_STATION01":"","DPL_STATION02":"","DPL_STATION03":"","DPL_STATION04":"","DPL_STATION05":"","DPL_STATION06":"","DPL_STATION07":"","DPL_TRACK0":1,"DPL_TRACK1":1,"DPL_TRACK2":1,"DPL_TRACK3":1,"DPL_TRACK4":1,"DPL_TRACK5":1,"DPL_TRACK6":1,"DPL_TRACK7":1,"DPL_FLIP0":0,"DPL_FLIP1":0,"DPL_FLIP2":0,"DPL_FLIP3":0,"DPL_FLIP4":0,"DPL_FLIP5":0,"DPL_FLIP6":0,"DPL_FLIP7":0,"DPL_CONTRAST0":1,"DPL_CONTRAST1":1,"DPL_CONTRAST2":1,"DPL_CONTRAST3":1,"DPL_CONTRAST4":1,"DPL_CONTRAST5":1,"DPL_CONTRAST6":1,"DPL_CONTRAST7":1,"DPL_SIDE0":0,"DPL_SIDE1":0,"DPL_SIDE2":0,"DPL_SIDE3":0,"DPL_SIDE4":0,"DPL_SIDE5":0,"DPL_SIDE6":0,"DPL_SIDE7":0}
10 changes: 4 additions & 6 deletions data/sec.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand All @@ -19,12 +19,10 @@ <H1>Roc-MQTT-Display - Access Settings</H1>
window.open('/','_self');
}
</script>

<form action='/submitsec' method='POST'>
<button type='button' class='button' title='Home' onclick='buttonHome()'>Home</button>
<input type='submit' class='button' title='Save settings' value='Save'>
</br>

</br></br>
<table id='tbl1'>
<tr><td>WIFI SSID</td><td><input type='text' class='infield' name='f_WIFI_SSID' value='%WIFI_SSID%' title='Name of your Wifi network' size='51' maxlength='50' ></td></tr>
<tr><td>WIFI PW</td><td><input type='password' class='infield' name='f_WIFI_PW' value='' title='Your Wifi password' size='51' maxlength='50' required ></td></tr>
Expand All @@ -35,7 +33,7 @@ <H1>Roc-MQTT-Display - Access Settings</H1>
</table>
</form>
<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
10 changes: 4 additions & 6 deletions data/tpl1.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand All @@ -22,13 +22,11 @@ <H1>Roc-MQTT-Display - Templates 1</H1>
window.open('/download?file=/rmdtpl.txt','_blank');
}
</script>

<form action='/submittpl1' method='POST'>
<button type='button' class='button' title='Home' onclick='buttonHome()'>Home</button>
<button type='button' class='button' title='Download' onclick='buttonDownload()'>Download</button>
<input type='submit' class='button' title='Save settings' value='Save'>
</br>

</br></br>
<table id='tbl1'>
<tr><td><a href='https://github.com/olikraus/u8g2/wiki/fntlistall' target='_blank'>Font 0</td><td> </td><td><input type='text' class='infield' name='f_TPL_FONT0' value='%TPL_FONT0%' title='Fontname from U8G2 font list (Read Only at the moment)' size='51' maxlength='50' readonly ></td></tr>
<tr><td>Font 1</td><td> </td><td><input type='text' class='infield' name='f_TPL_FONT1' value='%TPL_FONT1%' size='51' maxlength='50' readonly ></td></tr>
Expand Down Expand Up @@ -65,7 +63,7 @@ <H1>Roc-MQTT-Display - Templates 1</H1>
</table>
</form>
<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
7 changes: 3 additions & 4 deletions data/tpl2body.htm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<form name='formData' action='/submittpl2' method='POST'>
Expand Down Expand Up @@ -72,9 +72,8 @@
<tr><td></td><td>Box2H</td><td><input type='number' class='infield' name='f_TPL_6BOX2H0' value='%TPL_6BOX2H0%' title='height of black box left or right of message scrollbox' size='3' maxlength='3' min='0' ></td></tr>
</table>
</form>

<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
4 changes: 2 additions & 2 deletions data/tpl2head.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand Down
10 changes: 4 additions & 6 deletions data/tpl2imp.htm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<!--
Roc-MQTT-Display
Version 1.09
Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.
Version 1.10
Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.
https://github.com/chrisweather/RocMQTTdisplay
-->
<html>
Expand Down Expand Up @@ -41,11 +41,10 @@ <H1>Roc-MQTT-Display - Template Import</H1>
ta = "";
}
</script>

<button type='button' class='button' title='Home' onclick='buttonHome()'>Home</button>
<button type='button' class='button' title='Template settings for Template 0-9' onclick='buttonTemplate2()'>Templates 2</button>
<button type='button' class='button' title='Import Template' onclick='buttonImport()'>Import</button>

</br></br>
<table id='tbl1'>
<form id='formImpTpl' name='formImpTpl' action='/submittpl2imp' method='POST'>
<tr><td>
Expand All @@ -55,9 +54,8 @@ <H1>Roc-MQTT-Display - Template Import</H1>
</textarea></td></tr>
</form>
</table>

<footer>
<p>Copyright (c) 2020-2022 Christian Heinrichs. All rights reserved.</p>
<p>Copyright (c) 2020-2023 Christian Heinrichs. All rights reserved.</p>
<p><a href='https://github.com/chrisweather/RocMQTTdisplay' target='_blank'>https://github.com/chrisweather/RocMQTTdisplay</a></p>
</footer>
</body>
Expand Down
Loading

0 comments on commit b6e5ef9

Please sign in to comment.