From edd7580880bdd2ab17bd1c625028467bd895b3c8 Mon Sep 17 00:00:00 2001 From: Dominique Dumont Date: Fri, 14 Jun 2013 13:31:10 +0200 Subject: [PATCH] Removed LcdProc model (now in its own Perl distribution) --- MODELS | 2 +- examples/lcdproc/LCDd.conf | 1206 ----------------------------- examples/lcdproc/lcdconf2model.pl | 379 --------- lib/Config/Model/system.d/lcdproc | 1 - script/cme | 2 +- script/gen_LCDd_model.pl | 44 -- t/model_tests.d/lcdd-examples/t0 | 32 - t/model_tests.d/lcdd-test-conf.pl | 32 - 8 files changed, 2 insertions(+), 1696 deletions(-) delete mode 100644 examples/lcdproc/LCDd.conf delete mode 100644 examples/lcdproc/lcdconf2model.pl delete mode 100644 lib/Config/Model/system.d/lcdproc delete mode 100755 script/gen_LCDd_model.pl delete mode 100644 t/model_tests.d/lcdd-examples/t0 delete mode 100644 t/model_tests.d/lcdd-test-conf.pl diff --git a/MODELS b/MODELS index 1b6cf08b8..6ce43d5b0 100644 --- a/MODELS +++ b/MODELS @@ -2,7 +2,6 @@ This distribution provides models for the following files (following Debian's config file locations) : - /etc/popularity-contest.conf (for Popcon) -- /etc/LCDd.conf (for lcdproc) - /etc/fstab Models for users: @@ -15,3 +14,4 @@ Other models: - /etc/ssh/ssh_config in Config::Model::OpenSsh - ~/.ssh/config in Config::Model::OpenSsh - ./debian/copyright ./debian/control ... in Config::Model::Dpkg +- /etc/LCDd.conf (for lcdproc) in Config::Model::LcdProc diff --git a/examples/lcdproc/LCDd.conf b/examples/lcdproc/LCDd.conf deleted file mode 100644 index 998676896..000000000 --- a/examples/lcdproc/LCDd.conf +++ /dev/null @@ -1,1206 +0,0 @@ -# LCDd.conf -- configuration file for the LCDproc server daemon LCDd -# -# This file contains the configuration for the LCDd server. -# -# The format is ini-file-like. It is divided into sections that start at -# markers that look like [section]. Comments are all line-based comments, -# and are lines that start with '#' or ';'. -# -# The server has a 'central' section named [server]. For the menu there is -# a section called [menu]. Further each driver has a section which -# defines how the driver acts. -# -# The drivers are activated by specifying them in a driver= line in the -# server section, like: -# -# Driver=curses -# -# This tells LCDd to use the curses driver. -# The first driver that is loaded and is capable of output defines the -# size of the display. The default driver to use is curses. -# If the driver is specified using the -d command line option, -# the Driver= options in the config file are ignored. -# -# The drivers read their own options from the respective sections. - - - -## Server section with all kinds of settings for the LCDd server ## -[server] - -# Where can we find the driver modules ? -# IMPORTANT: Make sure to change this setting to reflect your -# specific setup! Otherwise LCDd won't be able to find -# the driver modules and will thus not be able to -# function properly. -# NOTE: Always place a slash as last character ! -DriverPath=server/drivers/ - -# Tells the server to load the given drivers. Multiple lines can be given. -# The name of the driver is case sensitive and determines the section -# where to look for further configuration options of the specific driver -# as well as the name of the dynamic driver module to load at runtime. -# The latter one can be changed by giving a File= directive in the -# driver specific section. -# -# The following drivers are supported: -# bayrad, CFontz, CFontzPacket, curses, CwLnx, ea65, -# EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, imonlcd, -# IOWarrior, irman, joy, lb216, lcdm001, lcterm, lirc, lis, MD8800, -# mdm166a, ms6931, mtc_s16209x, MtxOrb, mx5000, NoritakeVFD, picolcd, -# pyramid, sed1330, sed1520, serialPOS, serialVFD, shuttleVFD, sli, -# stv5730, svga, t6963, text, tyan, ula200, vlsys_m428, xosd -Driver=curses - -# Tells the driver to bind to the given interface -Bind=127.0.0.1 - -# Listen on this specified port; defaults to 13666. -Port=13666 - -# Sets the reporting level; defaults to 2 (warnings and errors only). -#ReportLevel=3 - -# Should we report to syslog instead of stderr ? [default: no; legal: yes, no] -#ReportToSyslog=yes - -# User to run as. LCDd will drop its root privileges, if any, -# and run as this user instead. -User=nobody - -# The server will stay in the foreground if set to true. -#Foreground=no - -# Hello message: each entry represents a display line; default: builtin -#Hello=" Welcome to" -#Hello=" LCDproc!" - -# GoodBye message: each entry represents a display line; default: builtin -#GoodBye="Thanks for using" -#GoodBye=" LCDproc!" - -# Sets the default time in seconds to displays a screen. -WaitTime=5 - -# If set to no, LCDd will start with screen rotation disabled. This has the -# same effect as if the ToggleRotateKey had been pressed. Rotation will start -# if the ToggleRotateKey is pressed. Note that this setting does not turn off -# priority sorting of screens. [default: on; legal: on, off] -#AutoRotate=no - -# If yes, the the serverscreen will be rotated as a usual info screen. If no, -# it will be a background screen, only visible when no other screens are -# active. The special value 'blank' is similar to no, but only a blank screen -# is displayed. [default: on; legal: on, off, blank] -#ServerScreen=no - -# Set master backlight setting. If set to 'open' a client may control the -# backlight for its own screens (only). [default: open; legal: off, open, on] -#Backlight=open - -# Set master heartbeat setting. If set to 'open' a client may control the -# heartbeat for its own screens (only). [default: open; legal: off, open, on] -#Heartbeat=open - -# set title scrolling speed [default: 10; legal: 0-10] -#TitleSpeed=10 - -# The "...Key=" lines define what the server does with keypresses that -# don't go to any client. The ToggleRotateKey stops rotation of screens, while -# the PrevScreenKey and NextScreenKey go back / forward one screen (even if -# rotation is disabled. -# Assign the key string returned by the driver to the ...Key setting. These -# are the defaults: -ToggleRotateKey=Enter -PrevScreenKey=Left -NextScreenKey=Right -#ScrollUpKey=Up -#ScrollDownKey=Down - - -## The menu section. The menu is an internal LCDproc client. ## -[menu] -# You can configure what keys the menu should use. Note that the MenuKey -# will be reserved exclusively, the others work in shared mode. - -# Up to six keys are supported. The MenuKey (to enter and exit the menu), the -# EnterKey (to select values) and at least one movement keys are required. -# These are the default key assignments: -MenuKey=Escape -EnterKey=Enter -UpKey=Up -DownKey=Down -#LeftKey=Left -#RightKey=Right - - -### Driver sections are below this line, in alphabetical order ### - - -## EMAC BayRAD driver ## -[bayrad] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/lcd - -# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200] -Speed=9600 - - - -## CrystalFontz driver (for CF632 & CF634) ## -[CFontz] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/ttyS0 -# Select the LCD size [default: 20x4] -Size=20x4 -# Set the initial contrast [default: 560; legal: 0 - 1000] -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=0 -# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, -# 115200] -Speed=9600 -# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no] -NewFirmware=no -# Reinitialize the LCD's BIOS [default: no; legal: yes, no] -# normally you shouldn't need this -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/ttyUSB0 - -# Set the initial contrast [default: 560; legal: 0 - 1000] -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 - - - -## Curses driver ## -[curses] - -# color settings -# foreground color [default: blue] -Foreground=blue -# background color when "backlight" is off [default: cyan] -Background=cyan -# background color when "backlight" is on [default: red] -Backlight=red - -# display size [default: 20x4] -Size=20x4 - -# What position (X,Y) to start the left top corner at... -# Default: (7,7) -TopLeftX=7 -TopLeftY=7 - -# use ASC symbols for icons & bars [default: no; legal: yes, no] -UseACS=no - -# draw Border [default: yes; legal: yes, no] -DrawBorder=yes - - - -## Cwlinux driver ## -[CwLnx] - -# Select the LCD model [default: 12232; legal: 12232, 12832, 1602] -Model=12232 - -# Select the output device to use [default: /dev/lcd] -Device=/dev/ttyUSB0 - -# Select the LCD size. Default depends on model: -# 12232: 20x4 -# 12832: 21x4 -# 1602: 16x2 -Size=20x4 - -# Set the communication speed [default: 19200; legal: 9600, 19200] -Speed=19200 - -# Reinitialize the LCD's BIOS [default: no; legal: yes, no] -# normally you shouldn't need this -Reboot=no - -# If you have a keypad connected. Keypad layout is currently not -# configureable from the config file. -Keypad=yes - -# If you have a non-standard keypad you can associate any keystrings to keys. -# There are 6 input keys in the CwLnx hardware that generate characters -# from 'A' to 'F'. -# -# The following is the built-in default mapping hardcoded in the driver. -# You can leave those unchanged if you have a standard keypad. -# You can change it if you want to report other keystrings or have a non -# standard keypad. -# KeyMap_A=Up -# KeyMap_B=Down -# KeyMap_C=Left -# KeyMap_D=Right -# KeyMap_E=Enter -# KeyMap_F=Escape - -# keypad_test_mode permits one to test keypad assignment -# Default value is no -#keypad_test_mode=yes - - - -## ea65 driver for the display in AOpen XC Cube AV EA65 media barebones ## -[ea65] - -# Device is fixed /dev/ttyS1 -# Width and Height are fixed 9x1 - -# As the VFD is self luminescent we don't have a backlight -# But we can use the backlight functions to control the front LEDs -# Brightness 0 to 299 -> LEDs off -# Brightness 300 to 699 -> LEDs half bright -# Brightness 700 to 1000 -> LEDs full bright -Brightness=500 -# OffBrightness is the the value used for the 'backlight off' state -OffBrightness=0 - - - -## EyeboxOne driver ## -[EyeboxOne] - -# Select the output device to use [default: /dev/ttyS1] -Device=/dev/ttyS1 - -# Set the display size [default: 20x4] -Size=20x4 - -# Switch on the backlight? [default: yes] -Backlight=yes - -# Switch on the cursor? [default: no] -Cursor=no - -# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200] -Speed=19200 - -# Enter Key is a \r character, so it's hardcoded in the driver -LeftKey=D -RightKey=C -UpKey=A -DownKey=B -EscapeKey=P - -# You can find out which key of your display sends which -# character by setting keypad_test_mode to yes and running -# LCDd. LCDd will output all characters it receives. -# Afterwards you can modify the settings above and set -# keypad_set_mode to no again. -keypad_test_mode=no - - - -## g15 driver for Logitech G15 Keyboard LCDs ## -[g15] - -# Display size (currently unused) -size=20x5 - - - -## glcd generic graphical display driver -[glcd] -# Select what type of connection. See documentation for types. -ConnectionType=t6963 - -# Width and height of the display in pixel. The supported sizes may depend on -# the ConnectionType. [default: 128x64; legal: 1x1 - 640x480] -#Size=128x64 - -# t6963: Parallel port to use [default: 0x378; legal: 0x200 - 0x400] -#Port=0x378 - -# t6963: Use LPT port in bi-directional mode. This should work on most LPT port -# and is required for proper timing! [default: yes; legal: yes, no] -#bidirectional=yes - -# t6963: Insert additional delays into reads / writes. [default: no; -# legal: yes, no] -#delayBus=no - -# If LCDproc has been compiled with FreeType 2 support this option can be used -# to turn if off intentionally. [default: yes; legal: yes, no] -#useFT2=no - -# Path to font file to use for FreeType rendering. This font must be monospace -# and should contain some special Unicode characters like arrows (Andale Mono -# is recommended and can be fetched at http://corefonts.sf.net). -normal_font=/usr/local/lib/X11/fonts/TTF/andalemo.ttf - -# Some fonts miss the Unicode characters used to represent icons. In this case -# the built-in 5x8 font can used if this option is turned off. [default: yes; -# legal: yes, no] -#fontHasIcons=no - - - -## glcdlib meta driver for graphical LCDs ## -[glcdlib] - -## mandatory: - -# which graphical display supported by graphlcd-base to use [default: image] -# (see /etc/graphlcd.conf for possible drivers) -Driver=noritake800 - -# no=use graphlcd bitmap fonts (they have only one size / font file) -# yes=use fonts supported by FreeType2 (needs Freetype2 support in -# libglcdprocdriver and its dependants) -UseFT2=yes - -# text resolution in fixed width characters [default: 16x4] -# (if it won't fit according to available physical pixel resolution -# and the minimum available font face size in pixels, then -# 'DebugBorder' will automatically be turned on) -TextResolution=20x4 - -# path to font file to use -FontFile=/usr/share/fonts/corefonts/courbd.ttf - -## these only apply if UseFT2=yes: - -# character encoding to use -CharEncoding=iso8859-2 - -# minimum size in pixels in which fonts should be rendered -MinFontFaceSize=7x12 - -## optional: -Brightness=50 # Brightness (in %) if applicable -Contrast=50 # Contrast (in %) if applicable -Backlight=no # Backlight if applicable -UpsideDown=no # flip image upside down -Invert=no # invert light/dark pixels -ShowDebugFrame=no # turns on/off 1 pixel thick debugging - # border within the usable text area, - # for setting up TextResolution and - # MinFontFaceSize (if using FT2); -ShowBigBorder=no # border around the unused area -ShowThinBorder=yes # border around the unused area -PixelShiftX=0 -PixelShiftY=2 - - - -## Matrix Orbital GLK driver ## -[glk] - -# select the serial device to use [default: /dev/lcd] -Device=/dev/lcd - -# set the initial contrast value [default: 560; legal: 0 - 1000] -Contrast=560 - -# set the serial port speed [default: 19200; legal: 9600, 19200, 38400] -Speed=19200 - - - -## Hitachi HD44780 driver ## -[hd44780] - -# Select what type of connection. See documentation for types. -ConnectionType=4bit - -# Port where the LPT is. Usual value are: 0x278, 0x378 and 0x3BC -Port=0x378 - -# Device of the serial interface [default: /dev/lcd] -Device=/dev/ttyS0 - -# Bitrate of the serial port (0 for interface default) -Speed=0 - -# If you have a keypad connected. -# You may also need to configure the keypad layout further on in this file. -Keypad=no - -# Set the initial contrast (bwctusb and lcd2usb) [default: 500; legal: 0 - 1000] -Contrast=0 - -# Set brightness of the backlight (lcd2usb only) [default: 0; legal: 0 - 1000] -#Brightness=1000 -#OffBrightness=0 - -# If you have a switchable backlight. -Backlight=no - -# If you have the additional output port ("bargraph") and you want to -# be able to control it with the lcdproc OUTPUT command -OutputPort=no - -# Specifies if the last line is pixel addressable (yes) or it controls an -# underline effect (no). [default: yes; legal: yes, no] -#Lastline=yes - -# Specifies the size of the LCD. -# In case of multiple combined displays, this should be the total size. -Size=20x4 - -# For multiple combined displays: how many lines does each display have. -# Vspan=2,2 means both displays have 2 lines. -#vspan=2,2 - -# If you have an HD66712, a KS0073 or another 'almost HD44780-compatible', -# set this flag to get into extended mode (4-line linear). -#ExtendedMode=yes - -# In extended mode, on some controllers like the ST7036 (in 3 line mode) -# the next line in DDRAM won't start 0x20 higher. [default: 0x20] -#LineAddress=0x10 - -# Character map to to map ISO-8859-1 to the LCD's character set -# [default: hd44780_default; legal: hd44780_default, hd44780_euro, ea_ks0073, -# sed1278f_0b, hd44780_koi8_r, hd44780_cp1251, hd44780_8859_5, upd16314 ] -# (hd44780_koi8_r, hd44780_cp1251, hd44780_8859_5 and upd16314 are possible if -# compiled with additional charmaps) -CharMap=hd44780_default - -# If your display is slow and cannot keep up with the flow of data from -# LCDd, garbage can appear on the LCDd. Set this delay factor to 2 or 4 -# to increase the delays. Default: 1. -#DelayMult=2 - -# Some displays (e.g. vdr-wakeup) need a message from the driver to that it -# is still alive. When set to a value bigger then null the character in the -# upper left corner is updated every seconds. Default: 0. -#KeepAliveDisplay=0 - -# If you experience occasional garbage on your display you can use this -# option as workaround. If set to a value bigger than null it forces a -# full screen refresh seconds. Default: 0. -#RefreshDisplay=5 - -# You can reduce the inserted delays by setting this to false. -# On fast PCs it is possible your LCD does not respond correctly. -# Default: true. -DelayBus=true - -# If you have a keypad you can assign keystrings to the keys. -# See documentation for used terms and how to wire it. -# For example to give directly connected key 4 the string "Enter", use: -# KeyDirect_4=Enter -# For matrix keys use the X and Y coordinates of the key: -# KeyMatrix_1_3=Enter -KeyMatrix_4_1=Enter -KeyMatrix_4_2=Up -KeyMatrix_4_3=Down -KeyMatrix_4_4=Escape - - - -## ICP A106 driver ## -[icp_a106] -Device=/dev/ttyS1 - - - -## Code Mercenaries IO-Warrior driver ## -[IOWarrior] - -# display dimensions -Size=20x4 - -# serial number. Must be exactly as listed by usbview -# (if not given, the 1st IOWarrior found gets used) -#SerialNumber=00000674 - -# If you have an HD66712, a KS0073 or another 'almost HD44780-compatible', -# set this flag to get into extended mode (4-line linear). -#ExtendedMode=yes - -# Specifies if the last line is pixel addressable (yes) or it controls an -# underline effect (no). [default: yes; legal: yes, no] -#Lastline=yes - - - -## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ## -[imon] - -# select the device to use -Device=/dev/lcd0 - -# display dimensions -Size=16x2 - -# Character map to to map ISO-8859-1 to the displays character set. -# [default: none; legal: none, hd44780_euro, upd16314, hd44780_koi8_r, -# hd44780_cp1251, hd44780_8859_5 ] (upd16314, hd44780_koi8_r, -# hd44780_cp1251, hd44780_8859_5 are possible if compiled with additional -# charmaps) -CharMap=hd44780_euro - -## Soundgraph iMON LCD ## -[imonlcd] -# Specify which iMon protocol should be used -# [legal: 0, 1; default: 0] -# Choose 0 for 15c2:ffdc device, -# Choose 1 for 15c2:0038 device -Protocol=0 - -# Set the exit behavior [legal: 0-2; default: 1] -# 0 means leave shutdown message, -# 1 means show the big clock, -# 2 means blank device -#OnExit=2 - -# Select the output device to use [default: /dev/lcd0] -Device=/dev/lcd0 - -# Select the displays contrast [default: 200; legal: 0-1000] -Contrast=200 - -# Specify the size of the display in pixels [default: 96x16] -#Size=96x16 - -# Set the backlight state [default: on; legal: on, off] -#Backlight=on - -# Set the disc mode [legal: 0,1; default: 0] -# 0 => spin the "slim" disc - two disc segments, -# 1 => their complement spinning; -#DiscMode=0 - - - -## IrMan driver ## -[IrMan] -# in case of trouble with IrMan, try the Lirc emulator for IrMan - -# Select the input device to use -#Device=/dev/irman - -# Select the configuration file to use -#Config=/etc/irman.cfg - - - -## IRtrans driver ## -[irtrans] - -# Does the device have a backlight? [default: no; legal: yes, no] -#Backlight=no - -# IRTrans device to connect to [default: localhost] -#Hostname=localhost - -# display dimensions -Size=16x2 - - - -## Joystick driver ## -[joy] - -# Select the input device to use [default: /dev/js0] -Device=/dev/js0 - -# set the axis map -Map_Axis1neg=Left -Map_Axis1pos=Right -Map_Axis2neg=Up -Map_Axis2pos=Down - -# set the button map -Map_Button1=Enter -Map_Button2=Escape - - - -## LB216 driver ## -[lb216] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/lcd - -# Set the initial brightness [default: 255; legal: 0 - 255] -Brightness=255 - -# Set the communication speed [default: 9600; legal: 2400, 9600] -Speed=9600 - -# Reinitialize the LCD's BIOS [default: no; legal: yes, no] -Reboot=no - - - -## LCDM001 driver ## -[lcdm001] - -Device=/dev/ttyS1 - -# keypad settings -# Keyname Function -# Normal context Menu context -# ------- -------------- ------------ -# PauseKey Pause/Continue Enter/select -# BackKey Back(Go to previous screen) Up/Left -# ForwardKey Forward(Go to next screen) Down/Right -# MainMenuKey Open main menu Exit/Cancel -PauseKey=LeftKey -BackKey=UpKey -ForwardKey=DownKey -MainMenuKey=RightKey - -# You can rearrange the settings here. -# If your device is broken, have a look at server/drivers/lcdm001.h - - - -## HNE LCTerm driver ## -[lcterm] -Device=/dev/ttyS1 -Size=16x2 - - - -## LIRC input driver ## -[lirc] - -# Specify an alternative location of the lircrc file [default: ~/.lircrc] -#lircrc=/etc/lircrc.lcdproc - -# Must be the same as in your lircrc -#prog=lcdd - - - -## LIS MCE 2005 driver ## -[lis] - -# Set the initial brightness [default: 1000; legal: 0 - 1000] -# 0-250 = 25%, 251-500 = 50%, 501-750 = 75%, 751-1000 = 100% -#Brightness=1000 - -# Columns by lines [default: 20x2] -#Size=20x2 - -# USB Vendor ID [default: 0x0403] -# Change only if testing a compatible device. -#VendorID=0x0403 - -# USB Product ID [default: 0x6001] -# Change only if testing a compatible device. -#ProductID=0x6001 - - - -##The driver for the VFD of the Medion MD8800 PC ## -[MD8800] -# device to use [default: /dev/ttyS1] -#Device=/dev/ttyS1 - -# display size [default: 16x2] -#Size=16x2 - -# 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 - - - -## Futuba MDM166A Display -[mdm166a] -# Show self-running clock after LCDd shutdown -# Possible values: [default: no; legal: no, small, big] -Clock=big -# Dim display, no dimming gives full brightness [default: no, legal: yes, no] -Dimming=no -# Dim display in case LCDd is inactive [default: no, legal: yes, no] -OffDimming=yes - - - -## MSI MS-6931 driver for displays in 1HU servers ## -[ms6931] - -# device to use [default: /dev/ttyS1] -Device=/dev/ttyS1 - -# display size [default: 16x2] -#Size=16x2 - - - -## MTC-S16209x driver ## -[mtc_s16209x] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/lcd - -# Set the initial brightness [default: 255; legal: 0 - 255] -Brightness=255 - -# Reinitialize the LCD's BIOS [default: no; legal: yes, no] -Reboot=no - - - -## Matrix Orbital driver ## -[MtxOrb] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/ttyS0 - -# Set the display size [default: 20x4] -Size=20x4 - -# Set the display type [default: lcd; legal: lcd, lkd, vfd, vkd] -Type=lkd - -# Set the initial contrast [default: 480] -# NOTE: The driver will ignore this if the display -# is a vfd or vkd as they don't have this feature -Contrast=480 - -# Some old displays do not have an adjustable backlight but only can -# switch the backlight on/off. If you experience randomly appearing block -# characters, try setting this to false. [default: yes; legal: yes, no] -hasAdjustableBacklight=no - -# 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=0 - -# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200] -Speed=19200 - -# The following table translates from MtxOrb key letters to logical key names. -# By default no keys are mapped, meaning the keypad is not used at all. -#KeyMap_A=Left -#KeyMap_B=Right -#KeyMap_C=Up -#KeyMap_D=Down -#KeyMap_E=Enter -#KeyMap_F=Escape -# See the [menu] section for an explanation of the key mappings - -# You can find out which key of your display sends which -# character by setting keypad_test_mode to yes and running -# LCDd. LCDd will output all characters it receives. -# Afterwards you can modify the settings above and set -# keypad_set_mode to no again. -keypad_test_mode=no - - - -## mx5000 driver for LCD display on the Logitech MX5000 keyboard ## -[mx5000] - -# Select the output device to use [default: /dev/hiddev0] -Device = /dev/hiddev0 -# Time to wait in ms after the refresh screen has been sent [default: 1000] -WaitAfterRefresh = 1000 - - - -## Noritake VFD driver ## -[NoritakeVFD] -# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1 -# [default: /dev/lcd] -Device=/dev/ttyS0 -# Specifies the size of the LCD. -Size=20x4 -# 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 -# set the serial port speed [default: 9600, legal: 1200, 2400, 9600, 19200, 115200] -Speed=9600 -# Set serial data parity [default: 0; legal: 0-2 ] -# Meaning: 0(=none), 1(=odd), 2(=even) -Parity=0 -# re-initialize the VFD [default: no; legal: yes, no] -Reboot=no - - - -## Mini-box.com picoLCD (usblcd) driver ## -[picolcd] - -# KeyTimeout is the time in ms that LCDd spends waiting for a key press before -# cycling through other duties. Higher values make LCDd use less CPU time and -# make key presses more detectable. Lower values make LCDd more responsive -# but a little prone to missing key presses. 500 (.5 second) is the default -# and a balanced value. [default: 500; legal: 0 - 1000] -KeyTimeout=500 - -# Sets the initial state of the backlight upon start-up. -# [default: on; legal: on, off] -#Backlight=on - -# Set the initial brightness [default: 1000; legal: 0 - 1000]. Works only -# with the 20x4 device -Brightness=1000 - -# Set the brightness while the backlight is 'off' [default: 0; legal: 0 - 1000]. -# Works only with the 20x4 device. -#OffBrightness=0 - -# Set the initial contrast [default: 1000; legal: 0 - 1000] -Contrast=1000 - -# Light the keys? [default: on; legal: on, off] -Keylights=on - -# If Keylights is on, the you can unlight specific keys below: -# Key0 is the directional pad. Key1 - Key5 correspond to the F1 - F5 keys. -# There is no LED for the +/- keys. This is a handy way to indicate to users -# which keys are disabled. [default: on; legal: on, off] -Key0Light=on -Key1Light=on -Key2Light=on -Key3Light=on -Key4Light=on -Key5Light=on - -# Host name or IP address of the LIRC instance that is to receive IR codes -# If not set, or set to an empty value, IR support is disabled. -#LircHost=127.0.0.1 - -# UDP port on which LIRC is listening [default: 8765; legal: 1 - 65535] -LircPort=8765 - -# Threshold in jiffies of synthesized gap that triggers flushing the IR data -# to lirc [default: 100 ; max: 32767 ] -# 100 means 6.1ms. legal: 16 - 32767; Use 0 to disable. -LircFlushThreshold=100 - - - -## Pyramid LCD driver ## -[pyramid] - -# device to connect to [default: /dev/lcd] -Device=/dev/ttyUSB0 - - - -## Seiko Epson 1330 driver ## -[sed1330] - -# Port where the LPT is. Common values are 0x278, 0x378 and 0x3BC -Port=0x378 - -# Type of LCD module (legal: G321D, G121C, G242C, G191D, G2446, SP14Q002) -# Note: Currently only tested with G321D & SP14Q002. -Type=G321D - -# Width x Height of a character cell in pixels [legal: 6x7 - 8x16; default: 6x10] -CellSize=6x10 - -# Select what type of connection [legal: classic, bitshaker; default: classic] -ConnectionType=classic - - - -## Seiko Epson 1520 driver ## -[sed1520] - -# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC -Port=0x378 - -# Select the interface type (wiring) for the display. Supported values are -# 68 for 68-style connection (RESET level high) and 80 for 80-style connection -# (RESET level low). [legal: 68, 80; default: 80] -InterfaceType=68 - -# On fast machines it may be necessary to slow down transfer to the display. -# If this value is set to zero, delay is disabled. Any value greater than -# zero slows down each write by one microsecond. [legal: 0-1000; default: 1] -DelayMult=0 - - -## serial POS display driver ## -[serialPOS] - -# Device to use in serial mode [default: /dev/lcd] -Device=/dev/lcd - -# Specifies the size of the display in characters. [default: 16x2] -Size=16x2 - -# Set the communication protocol to use with the POS display. -# [default: AEDEX; legal: IEE, Epson, Emax, IBM, LogicControls, Ultimate] -Type=AEDEX - -# communication baud rate with the display [default: 9600; legal: 1200, 2400, -# 19200, 115200] -Speed=9600 - - - -## Serial VFD driver ## -## Drives various (see below) serial 5x7dot VFD's. ## -[serialVFD] - -# Specifies the displaytype.[default: 0] -# 0 NEC (FIPC8367 based) VFDs. -# 1 KD Rev 2.1. -# 2 Noritake VFDs (*). -# 3 Futaba VFDs -# 4 IEE S03601-95B -# 5 IEE S03601-96-080 (*) -# 6 Futaba NA202SD08FA (allmost IEE compatible) -# 7 Samsung 20S207DA4 and 20S207DA6 -# 8 Nixdorf BA6x / VT100 -# (* most should work, not tested yet.) -Type=0 - -# "no" if display connected serial, "yes" if connected parallel. [default: no] -# I.e. serial by default -use_parallel=no - -# Number of Custom-Characters. default is display type dependent -#Custom-Characters=0 - -# Portaddress where the LPT is. Used in parallel mode only. Usual values are -# 0x278, 0x378 and 0x3BC. -Port=0x378 - -# Set parallel port timing delay (us). Used in parallel mode only. -# [default: 2; legal: 0 - 255] -#PortWait=2 - -# Device to use in serial mode. Usual values are /dev/ttyS0 and /dev/ttyS1 -Device=/dev/ttyS1 - -# Specifies the size of the VFD. -Size=20x2 - -# Set the initial brightness [default: 1000; legal: 0 - 1000] -# (4 steps 0-250, 251-500, 501-750, 751-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 -# (4 steps 0-250, 251-500, 501-750, 751-1000) -OffBrightness=0 - -# set the serial port speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200] -Speed=9600 - -# enable ISO 8859 1 compatibility [default: yes; legal: yes, no] -#ISO_8859_1=yes - - - -## shuttleVFD driver ## -[shuttleVFD] -# No options - - - -## stv5730 driver ## -[stv5730] - -# Port the device is connected to [default: 0x378] -Port=0x378 - - -[SureElec] - -# Port the device is connected to (by default first USB serial port) -Device=/dev/ttyUSB0 - -# Edition level of the device (can be 1, 2 or 3) [default: 2] -#Edition=1 - -# set display size -# Note: The size can be obtained directly from device for edition 2 & 3. -#Size=16x2 - -# Set the initial contrast [default: 480; legal: 0 - 1000] -#Contrast=200 - -# Set the initial brightness [default: 480; legal: 1 - 1000] -#Brightness=480 - -# Set the initial off-brightness [default: 100; legal: 1 - 1000] -# This value is used when the display is normally -# switched off in case LCDd is inactive -#OffBrightness=100 - - -## SVGAlib driver ## -[svga] - -# svgalib mode to use [default: G320x240x256 ] -# legal values are supported svgalib modes -#Mode=G640x480x256 - -# set display size [default: 20x4] -Size=20x4 - -# Set the initial contrast [default: 500; legal: 0 - 1000] -# Can be set but does not change anything internally -Contrast=500 - -# Set the initial brightness [default: 1000; legal: 1 - 1000] -Brightness=1000 - -# Set the initial off-brightness [default: 500; legal: 1 - 1000] -# This value is used when the display is normally -# switched off in case LCDd is inactive -OffBrightness=500 - - - -## Text driver ## -[text] -# Set the display size [default: 20x4] -Size=20x4 - - - -## Toshiba T6963 driver ## -[t6963] - -# set display size in pixels [default: 128x64] -Size=128x64 - -# port to use [default: 0x378; legal: 0x200 - 0x400] -Port=0x378 - -# Use LPT port in bi-directional mode. This should work on most LPT port and -# is required for proper timing! [default: yes; legal: yes, no] -#bidirectional=yes - -# Insert additional delays into reads / writes. [default: no; legal: yes, no] -#delayBus=no - -# Clear graphic memory on start-up. [default: no; legal: yes, no] -#ClearGraphic=no - - - -## Tyan Barebones LCD driver (GS10 & GS12 series) ## -[tyan] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/lcd - -# Set the communication speed [default: 9600; legal: 4800, 9600] -Speed=9600 - -# set display size [default: 16x2] -Size=16x2 - - - -## ELV ula200 driver ## -[ula200] - -# Select the LCD size [default: 20x4] -Size=20x4 - -# If you have a non standard keypad you can associate any keystrings to keys. -# There are 6 input key in the CwLnx hardware that generate characters -# from 'A' to 'F'. -# -# The following it the built-in default mapping hardcoded in the driver. -# You can leave those unchanged if you have a standard keypad. -# You can change it if you want to report other keystrings or have a non -# standard keypad. -# KeyMap_A=Up -# KeyMap_B=Down -# KeyMap_C=Left -# KeyMap_D=Right -# KeyMap_E=Enter -# KeyMap_F=Escape - - - -## Wirz SLI LCD driver ## -[sli] - -# Select the output device to use [default: /dev/lcd] -Device=/dev/lcd - -# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200, -# 38400, 57600, 115200] -Speed=19200 - - - -## vlsys_m428 for VFD/IR combination in Moneual MonCaso 320 ## -[vlsys_m428] - -# Select the output device to use [default: /dev/ttyUSB0] -#Device=/dev/ttyUSB0 - - - -## OnScreen Display using libxosd ## -[xosd] - -# set display size [default: 20x4] -Size=20x4 - -# Offset in pixels from the top-left corner of the monitor [default: 0x0] -Offset=200x200 - -# X font to use, in XLFD format, as given by "xfontsel" -Font=-*-terminus-*-r-*-*-*-320-*-*-*-*-* - -# EOF diff --git a/examples/lcdproc/lcdconf2model.pl b/examples/lcdproc/lcdconf2model.pl deleted file mode 100644 index 768b7ae4c..000000000 --- a/examples/lcdproc/lcdconf2model.pl +++ /dev/null @@ -1,379 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; - -# This script uses all the information available in LCDd.conf to create a model -# for LCDd configuration file - -# How does this work ? - -# The convention used in LCDd.conf template file are written in a way which -# makes it relatively easy to parse to get all required information to build a model. -# All drivers are listed, most parameters have default values and legal values -# written in comments in a uniform way. Hence this file (and comments) can be parsed -# to retrieve information required for the model. - -# This script performs 3 tasks: -# 1/ parse LCDd.conf template -# 2/ mine the information there and translate them in a format suitable to create -# a model. Comments are used to provide default and legal values and also to provide -# user documentation -# 3/ Write the resulting LCDd model - -use Config::Model; -use Config::Model::Itself ; # to create the model -use Config::Model::Backend::IniFile; - -use 5.010; -use IO::File; -use IO::String; -use Getopt::Long; - -# initialise logs for Config;:Model -use Log::Log4perl qw(:easy); -my $log4perl_user_conf_file = $ENV{HOME} . '/.log4config-model'; -Log::Log4perl::init($log4perl_user_conf_file); - -my $verbose = 0; -my $show_model = 0; -my $result = GetOptions ("verbose" => \$verbose, - "model" => \$show_model); - -die "Unknown option. Expected -verbose or -show_model" unless $result ; - -# Dump stack trace in case of error -Config::Model::Exception::Any->Trace(1) ; - -# one model to rule them all -my $model = Config::Model->new(); - -########################### -# -# Step 1: parse LCDd.conf (INI file) - -# Problem: comments must also be retrieved and associated with INI -# class and parameters - -# Fortunately, Config::Model::Backend::IniFile can already perform this -# task. But Config::Model::Backend::IniFile must store its values in a -# configuration tree. - -# So let's create a model suitable for LCDd.conf that accepts any -# INI class and any INI parameter - -# The class is used to store any parameter found in an INI class -$model->create_config_class( - name => 'Dummy::Class', - accept => [ - 'Hello|GoodBye' => { type => 'list', - cargo => { qw/type leaf value_type uniline/} - }, - '.*' => {qw/type leaf value_type uniline/}, - ], -); - -# Store any INI class, and use Dummy::Class to hold parameters. - -# Note that a INI backend could be created here. But, some useful -# parameters are commented out in LCD.conf. Some some processing is -# required to be able to create a model with these commented parameters. -# See below for this processing. - -$model->create_config_class( - name => 'Dummy', - accept => [ '.*' => {qw/type node config_class_name Dummy::Class/}, ], -); - -# Now the dummy configuration class is created. Let's create a -# configuration tree to store the data from LCDd.conf - -my $dummy = $model->instance( - instance_name => 'dummy', - root_class_name => 'Dummy', -)-> config_root; - -# read LCDd.conf -my $lcd_file = IO::File->new('examples/lcdproc/LCDd.conf'); -my @lines = $lcd_file->getlines; - -# Here's the LCDd.conf pre-processing mentioned above - -# un-comment commented parameters -foreach (@lines) { s/^#(\w+=)/$1/ } - -# store the munged LCDd.conf in a IO::Handle usable by INI backend -my $ioh = IO::String->new( join( '', @lines ) ); - -# Create the INI backend -my $ini_backend = Config::Model::Backend::IniFile->new( node => $dummy ); - -# feed the munged LCDd.conf content into INI backend -$ini_backend->read( io_handle => $ioh ); - -############################################## -# -# Step 2: Mine the LCDd.conf information and create a model -# - -# Create a meta tree that will contain LCDd model -my $meta_root = $model->instance( - root_class_name => 'Itself::Model', - instance_name => 'meta_model', -) -> config_root; - -# Create LCDd configuration class and store the first comment from LCDd.conf as -# class description -$meta_root->grab("class:LCDd class_description")->store( $dummy->annotation ); - -# append my own text -my $extra_description = - "Model information extracted from template /etc/LCDd.conf" - . "\n\n=head1 BUGS\n\nThis model does not support to load several drivers. Loading " - . "several drivers is probably a marginal case. Please complain to the author if this " - . "assumption is false"; -$meta_root->load(qq!class:LCDd class_description.="\n\n$extra_description"!); - -# add legal stuff -$meta_root->load( qq! - class:LCDd - copyright:0="2011, Dominique Dumont" - copyright:1="1999-2011, William Ferrell and others" - license="GPL-2" -! -); - -# add INI backend (So LCDd model will be able to read INI files) -$meta_root->load( qq! - class:LCDd - read_config:0 - backend=ini_file - config_dir="/etc" - file="LCDd.conf" -! -); - -# Note: all the load calls above could be done as one call. But I choose -# to split them for better clarity - - -# This array contains all INI classes found in LCDd.conf, -# make sure to put server in first, and sort the rest -my @ini_classes = sort grep { $_ ne 'server'} $dummy->get_element_name; -unshift @ini_classes, 'server' ; - -# Now before actually mining LCDd.conf information, we must prepare -# subs to handle them. This is done using a dispatch table. -my %dispatch; - -# first create the default case which will be used for most parameters -# This subs is passed: the INI class name, the INI parameter name -# the comment attached to the parameter, the INI value, and an optional -# value type -$dispatch{_default_} = sub { - my ( $ini_class, $ini_param, $info_r, $ini_v, $value_type ) = @_; - - # prepare a string to create the ini_class model - my $load = qq!class:"$ini_class" element:$ini_param type=leaf !; - $value_type ||= 'uniline'; - - # get semantic information from comment (written between square brackets) - my $square_model = ''; - - my $square_rexp = '\[(\s*\w+\s*:[^\]]*)\]'; - while ($$info_r =~ /$square_rexp/ ) { - my $info = $1 ; - say "class $ini_class element $ini_param info: '$info'" if $verbose; - $$info_r =~ s/$square_rexp//; - $square_model .= ' '. info_to_model($info,$value_type) ; - } - - unless ($square_model) { - # or use the value found in INI file as default - $ini_v =~ s/^"//g; - $ini_v =~ s/"$//g; - $square_model .= qq! value_type=$value_type default="$ini_v"! if length($ini_v); - } - - # get model information from comment (written between curly brackets) - my $curly_model = ''; - my $curly_rexp = '{(\s*\w+.*)}' ; - while ($$info_r =~ /$curly_rexp/) { - my $model_snippet = $1 ; - say "class $ini_class element $ini_param model snippet: '$model_snippet'" - if $verbose; - $$info_r =~ s/$curly_rexp//; - $load .= ' '. $model_snippet ; - } - - # return a string containing model specifications - return $load.$square_model; -}; - -# Now let's take care of the special cases. This one deals with "Driver" -# parameter found in INI [server] class -$dispatch{"LCDd::server"}{Driver} = sub { - my ( $class, $elt, $info_r, $ini_v ) = @_; - my $load = qq!class:"$class" element:$elt type=leaf value_type=enum !; - my @drivers = split /\W+/, $$info_r; - while ( @drivers and ( shift @drivers ) !~ /supported/ ) { } - $load .= 'choice=' . join( ',', @drivers ) . ' '; - - #say $load; exit; - return $load; -}; - -# like default but ensure that parameter is integer -$dispatch{"LCDd::server"}{WaitTime} = $dispatch{"LCDd::server"}{ReportLevel} = - $dispatch{"LCDd::picolcd"}{LircFlushThreshold} = $dispatch{"LCDd::server"}{Port} = sub { - my ( $class, $elt, $info_r, $ini_v ) = @_; - return $dispatch{_default_}->( @_, 'integer' ); - }; - -# special dispatch case -my %override ; - -# ensure that default values are "Hello LCDproc" (or "GoodBye LCDproc") -$override{"LCDd::server"}{GoodBye} = $override{"LCDd::server"}{Hello} = sub { - my ( $class, $elt ) = @_; - my $ret = qq( class:"$class" element:$elt type=list ) ; - $ret .= 'cargo type=leaf value_type=uniline - ' ; - $ret .= 'default_with_init:0="\" '.$elt.'\"" ' ; - $ret .= 'default_with_init:1="\" LCDproc!\""'; - return $ret ; -}; - -# Now really mine LCDd.conf information - -# loop over all INI classes -foreach my $ini_class (@ini_classes) { - say "Handling INI class $ini_class" if $verbose; - my $ini_obj = $dummy->grab($ini_class); - my $config_class = "LCDd::$ini_class"; - - # create config class in case there's no parameter in INI file - $meta_root->load(qq!class:"LCDd::$ini_class" class_description="generated from LCDd.conf"!); - - # loop over all INI parameters and create LCDd::$ini_class elements - foreach my $ini_param ( $ini_obj->get_element_name ) { - my ($model_spec) ; - - # test for override - if (my $sub = $override{$config_class}{$ini_param}) { - # runs the override sub to get the model string - $model_spec = $sub->($config_class, $ini_param) ; - } - else { - # retrieve the correct sub from the orveride or dispatch table - my $sub = $dispatch{$config_class}{$ini_param} || $dispatch{_default_}; - - # retrieve INI value - my $ini_v = $ini_obj->grab_value($ini_param); - - # retrieve INI comment attached to $ini_param - my $ini_comment = $ini_obj->grab($ini_param)->annotation; - - # runs the sub to get the model string - $model_spec = $sub->($config_class, $ini_param, \$ini_comment, $ini_v) ; - - # escape embedded quotes - $ini_comment =~ s/"/\\"/g; - $ini_comment =~ s/\n*$//; - $model_spec .= qq! description="$ini_comment"! if length($ini_comment); - } - - # show the model without the doc (too verbose) - say "load -> $model_spec" if $show_model ; - - # load class specification in model - $meta_root->load($model_spec); - } - - # Now create a an $ini_class element in LCDd class (to link LCDd - # class and LCDd::$ini_class) - my $driver_class_spec = qq! - class:LCDd - element:$ini_class - ! ; - - if ( $ini_class eq 'server' or $ini_class eq 'menu' ) { - $driver_class_spec .= qq! - type=node - config_class_name="LCDd::$ini_class" - ! ; - } - else { - # Arrange a driver class is shown only if the driver was selected - # in the [server] class - $driver_class_spec .= qq! - type=warped_node - config_class_name="LCDd::$ini_class" - level=hidden - follow:selected="- server Driver" - rules:"\$selected eq '$ini_class'" - level=normal - !; - } - $meta_root->load($driver_class_spec); -} - -###################### -# -# Step3: write the model - - -# Itself constructor returns an object to read or write the data -# structure containing the model to be edited. force_write is required -# because writer object, being created *after* loading the model in the -# instance, is not aware of these changes. -my $rw_obj = Config::Model::Itself->new( - model_object => $meta_root, - model_dir => 'lib/Config/Model/models/', - force_write => 1, -); - -say "Writing all models in file (please wait)"; -$rw_obj->write_all; - -say "Done"; - -# this function extracts info specified between square brackets and returns a model snippet -sub info_to_model { - my ($info,$value_type) = @_ ; - - $info =~ s/\s+//g; - my @model ; - - # legal needs to be parsed first to setup value_type first - my %info = map { split /[:=]/,$_ ,2 ; } split /;/,$info ; - - # use this semantic information to better specify the parameter - my $legal = delete $info{legal} || ''; - given ($legal) { - when (/^(\d+)-(\d+)$/) { push @model, "value_type=integer min=$1 max=$2"} - when (/^([\w\,]+)$/) { push @model, "value_type=enum choice=$1"} - default { push @model, "value_type=$value_type"} - } - - foreach my $k (keys %info) { - my $v = $info{$k} ; - die "Undefined value. Something is wrong in info '$info'" unless defined $v ; - $v = '"'.$v.'"' unless $v=~/^"/ ; - - given ($k) { - when (/default/ ) { - # specify upstream default value if it was found in the comment - push @model ,qq!upstream_default=$v! if length($v); - } - when (/assert/ ) { - push @model ,qq!warn_unless:0 code=$v -!; - } - default { - push @model, "$k=$v" ; - } - } - } - - return join(' ',@model) ; -} - diff --git a/lib/Config/Model/system.d/lcdproc b/lib/Config/Model/system.d/lcdproc deleted file mode 100644 index bf1201157..000000000 --- a/lib/Config/Model/system.d/lcdproc +++ /dev/null @@ -1 +0,0 @@ -model = LCDd diff --git a/script/cme b/script/cme index 1929d9957..003fae7ed 100755 --- a/script/cme +++ b/script/cme @@ -478,7 +478,7 @@ and errors on STDOUT. Example: - cme check lcdproc + cme check fstab =head2 migrate diff --git a/script/gen_LCDd_model.pl b/script/gen_LCDd_model.pl deleted file mode 100755 index af29f9304..000000000 --- a/script/gen_LCDd_model.pl +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/perl - -# Copyright (c) 2011 Dominique Dumont. -# -# This file is part of Config-Model. -# -# Config-Model is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# Config-Model is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser Public License for more details. -# -# You should have received a copy of the GNU Lesser Public License -# along with Config-Model; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA - -use warnings FATAL => qw(all); -use lib qw/lib/ ; -use strict; - -my $target = "lib/Config/Model/models/LCDd.pl"; -my $script = "examples/lcdproc/lcdconf2model.pl"; -my $source = "examples/lcdproc/LCDd.conf" ; - -exit if -e $target and -M $target < -M $script and -M $target < -M $source ; - -eval { require Config::Model::Itself ;} ; -if ( $@ ) { - print "Config::Model::Itself is not available, skipping LCDd model generation\n"; - exit ; -} - -unless (my $return = do $script) { - warn "couldn't parse $script: $@" if $@; - warn "couldn't do $script: $!" unless defined $return; - warn "couldn't run $script" unless $return; -} - - diff --git a/t/model_tests.d/lcdd-examples/t0 b/t/model_tests.d/lcdd-examples/t0 deleted file mode 100644 index 67bea3ffe..000000000 --- a/t/model_tests.d/lcdd-examples/t0 +++ /dev/null @@ -1,32 +0,0 @@ -## yada - -[server] - -DriverPath=/usr/lib/lcdproc/ - -Driver=curses - -# Tells the driver to bind to the given interface -Bind=127.0.0.1 - -# Listen on this specified port; defaults to 13666. -Port=13666 - -Hello=" Bienvenue" -Hello=" LCDproc et Config::Model!" - - -[menu] - -# The following works excellent with 4 keys or more. -EnterKey=Enter -UpKey=Up -# Downkey and not donkey :-) -DownKey=Down - -## Curses driver ## -[curses] - - -Size=20x2 - diff --git a/t/model_tests.d/lcdd-test-conf.pl b/t/model_tests.d/lcdd-test-conf.pl deleted file mode 100644 index 6fe41292c..000000000 --- a/t/model_tests.d/lcdd-test-conf.pl +++ /dev/null @@ -1,32 +0,0 @@ - -$conf_file_name = "LCDd.conf" ; -$conf_dir = "etc" ; -$model_to_test = "LCDd" ; - -my @fix_warnings ; - -push @fix_warnings, - ( - #load_warnings => [ qr/code check returned false/ ], - load => "server DriverPath=/tmp/" , # just a work-around - ) - unless -d '/usr/lib/lcdproc/' ; - -@tests = ( - { # t0 - check => { - 'server Hello:0', qq!" Bienvenue"! , - 'server Hello:1', qq(" LCDproc et Config::Model!") , - 'server GoodBye:0', qq!" GoodBye"! , - 'server GoodBye:1', qq(" LCDproc!") , - 'server Driver', 'curses', - 'curses Size', '20x2', - }, - @fix_warnings , - errors => [ - # qr/value 2 > max limit 0/ => 'fs:"/var/chroot/lenny-i386/dev" fs_passno=0' , - ], - }, -); - -1;