system display: T2564: Added test model

* data/templates/system-display/LCDd.conf.tmpl
* interface-definitions/system-display.xml.in

May need to ba backed out, test code only for USB CrystalFontz CF533

2 files changed, 17 insertions, 38 deletions

diff --git a/data/templates/system-display/LCDd.conf.tmpl b/data/templates/system-display/LCDd.conf.tmpl
index 0ef796c76..1dd646202 100644
--- a/data/templates/system-display/LCDd.conf.tmpl
+++ b/data/templates/system-display/LCDd.conf.tmpl
@@ -60,6 +60,10 @@ Driver=sdeclcd
 Driver=hd44780
 {%- endif %}
 
+{%- if model == 'test' %}
+Driver=CFontzPacket
+{%- endif %}
+
 # Tells the driver to bind to the given interface. [default: 127.0.0.1]
 #Bind=127.0.0.1
 
@@ -191,44 +195,15 @@ Reboot=no
 
 ## CrystalFontz packet driver (for CFA533, CFA631, CFA633 & CFA635) ##
 [CFontzPacket]
-
-# Select the LCD model [default: 633; legal: 533, 631, 633, 635]
-Model=633
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS1
-
-# Set the initial contrast [default: 560; legal: 0 - 1000]
+{%- if model == 'test' %}
+Model=533
+Device=/dev/serial/by-bus/usb0b1.1p1.0
 Contrast=350
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
 Brightness=1000
-
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
 OffBrightness=50
-
-# Reinitialize the LCD's BIOS on driver start. [default: no; legal: yes, no]
 Reboot=yes
-
-# Enable the USB flag if the device is connected to an USB port. For
-# serial ports leave it disabled. [default: no; legal: yes, no]
-#USB=yes
-
-# Very old 633 firmware versions do not support partial screen updates using
-# 'Send Data to LCD' command (31). For those devices it may be necessary to
-# enable this flag. [default: no; legal: yes, no]
-#OldFirmware=yes
-
-# Override the LCD size known for the selected model. Usually setting this
-# value should not be necessary.
-#Size=20x4
-
-# Override the default communication speed known for the selected model.
-# Default value depends on model [legal: 19200, 115200]
-#Speed=115200
-
+USB=yes
+{%- endif %}
 
 
 ## Curses driver ##
@@ -546,7 +521,7 @@ Speed=19200
 [hd44780]
 {%- if model == 'ezio' %}
 ConnectionType=ezio
-Device=/dev/ttyS1
+Device=/dev/ttyUSB0
 Keypad=yes
 Size=16x2
 KeyMatrix_4_1=Enter
diff --git a/interface-definitions/system-display.xml.in b/interface-definitions/system-display.xml.in
index 0439288a0..fbd897996 100644
--- a/interface-definitions/system-display.xml.in
+++ b/interface-definitions/system-display.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interfaceDefinition>
   <!--
-    system display model (sdec|ezio)
+    system display model (sdec|ezio|test)
     system display show host (cpu|cpu-all|cpu-hist|disk|load-hist|memory|proc|uptime)
                         network interface <intName> alias <alias>
                                 units (bps|Bps|pps)
@@ -26,10 +26,10 @@
             <properties>
               <help>Model of the display attached to this system [REQUIRED]</help>
               <completionHelp>
-                <list>sdec ezio</list>
+                <list>sdec ezio test</list>
               </completionHelp>
               <constraint>
-                <regex>(sdec|ezio)</regex>
+                <regex>(sdec|ezio|test)</regex>
               </constraint>
               <constraintErrorMessage>Invalid system display model</constraintErrorMessage>
               <valueHelp>
@@ -40,6 +40,10 @@
                 <format>ezio</format>
                 <description>Display model for Portwell, Caswell appliances with built-in EZIO-100 or EZIO-300 LCD</description>
               </valueHelp>
+              <valueHelp>
+                <format>test</format>
+                <description>Test model for USB CrystalFonz CF533</description>
+              </valueHelp>
             </properties>
           </leafNode><!--system display model-->
           <!-- system display disabled -->