Changeset a6ede08 for bootscripts

Timestamp:

May 15, 2006, 4:14:50 PM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f588912

Parents:

4631c1c

Message:

r3512@server: jim | 2006-05-15 16:13:26 -0700
Updated LCD Support

Location:

bootscripts

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• lfs/init.d/functions (modified) (4 diffs)
• lfs/sysconfig/lcd (added)
• lfs/sysconfig/lcd-raq2 (modified) (1 diff)
• lfs/sysconfig/lcd-raq3 (modified) (1 diff)

bootscripts/Changelog

@@ +1 @@
+jim - May 15, 2006
+        * Hide all the output information from the LCD Program
+        * Added support for 1 line LCD screens
+        * Added a generic sysconfig/lcd
+
 jim - May 10, 2006
         * Fixed an error when the LCD device is not available

bootscripts/Makefile

@@ -145 +145 @@
         if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd-raq3          ${EXTDIR}/sysconfig/lcd; fi
 
+install-lcd: 
+        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd              ${EXTDIR}/sysconfig/lcd; fi
+
 .PHONY: all create-dirs create-service-dir install install-consolelog \
-        install-service-mtu minimal install-raq2 install-raq3
+        install-service-mtu minimal install-lcd install-raq2 install-raq3

bootscripts/lfs/init.d/functions

@@ -90 +90 @@
         if [ "$LCD_PROG" ]; then
                 LCD_OUT1="${1:0:$LCD_CHAR}"
-                $LCD_PROG "$LCD_OUT1"
+                $LCD_PROG "$LCD_OUT1" > /dev/null 2>&1
         fi
 
@@ -138 +138 @@
         boot_mesg_flush "[  OK  ]"
         if [ "$LCD_PROG" ]; then
-                LCD_OUT2="[  OK  ]"
-                $LCD_PROG "$LCD_OUT1" "$LCD_OUT2"
+                if [ "$LCD_LINES" = "2" ]; then
+                        LCD_OUT2="[  OK  ]"
+                        $LCD_PROG "$LCD_OUT1" "$LCD_OUT2" > /dev/null 2>&1
+                else
+                        LCD_OUT2="${LCD_OUT1:0:12} OK"
+                        $LCD_PROG "$LCD_OUT2" > /dev/null 2>&1
+                fi                      
         fi
 }
@@ -149 +154 @@
         boot_mesg_flush "[ FAIL ]"
         if [ "$LCD_PROG" ]; then
-                LCD_OUT2="[  FAIL  ]"
-                $LCD_PROG "$LCD_OUT1" "$LCD_OUT2"
+                if [ "$LCD_LINES" = "2" ]; then
+                        LCD_OUT2="[ FAIL  ]"
+                        $LCD_PROG "$LCD_OUT1" "$LCD_OUT2" > /dev/null 2>&1
+                else
+                        LCD_OUT2="${LCD_OUT1:0:10} FAIL"
+                        $LCD_PROG "$LCD_OUT2" > /dev/null 2>&1
+                fi
         fi
 }
@@ -159 +169 @@
         echo -e "${NORMAL}"
         if [ "$LCD_PROG" ]; then
-                LCD_OUT2="[  WARN  ]"
-                $LCD_PROG "$LCD_OUT1" "$LCD_OUT2"
+                if [ "$LCD_LINES" = "2" ]; then
+                        LCD_OUT2="[ WARN  ]"
+                        $LCD_PROG "$LCD_OUT1" "$LCD_OUT2" > /dev/null 2>&1
+                else
+                        LCD_OUT2="${LCD_OUT1:0:10} WARN"
+                        $LCD_PROG "$LCD_OUT2" > /dev/null 2>&1
+                fi                      
         fi
         boot_mesg_flush "[ WARN ]"

bootscripts/lfs/sysconfig/lcd-raq2

@@ -12 +12 @@
 ########################################################################
 
+# Set the # of lines for the LCD Display
+#
+LCD_LINES=2
+
 # The executable that writes to the LCD
 #

bootscripts/lfs/sysconfig/lcd-raq3

@@ -12 +12 @@
 ########################################################################
 
+# Set the # of lines for the LCD Display
+#
+LCD_LINES=2
+
 # The executable that writes to the LCD
 #