Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Simon
2016-06-10 09:58:31 +01:00
10 changed files with 81 additions and 61 deletions

View File

@@ -84,8 +84,10 @@ Debug=0
[System Fusion Network]
Enable=1
Address=c4fm.duckdns.org
Port=42000
LocalAddress=127.0.0.1
LocalPort=3200
GwyAddress=c4fm.duckdns.org
GwyPort=4200
Debug=0
[TFT Serial]