aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drv_BeckmannEgle.c15
-rw-r--r--drv_Crystalfontz.c10
-rw-r--r--drv_Curses.c10
-rw-r--r--drv_Cwlinux.c10
-rw-r--r--drv_HD44780.c10
-rw-r--r--drv_M50530.c10
-rw-r--r--drv_MatrixOrbital.c13
-rw-r--r--drv_MilfordInstruments.c11
-rw-r--r--drv_USBLCD.c10
-rw-r--r--drv_generic_text.c22
-rw-r--r--drv_generic_text.h8
11 files changed, 87 insertions, 42 deletions
diff --git a/drv_BeckmannEgle.c b/drv_BeckmannEgle.c
index 55d2197..6975a43 100644
--- a/drv_BeckmannEgle.c
+++ b/drv_BeckmannEgle.c
@@ -1,4 +1,4 @@
-/* $Id: drv_BeckmannEgle.c,v 1.5 2004/06/05 06:13:11 reinelt Exp $
+/* $Id: drv_BeckmannEgle.c,v 1.6 2004/06/05 06:41:39 reinelt Exp $
*
* driver for Beckmann+Egle mini terminals
* Copyright 2000 Michael Reinelt <reinelt@eunet.at>
@@ -22,6 +22,10 @@
*
*
* $Log: drv_BeckmannEgle.c,v $
+ * Revision 1.6 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.5 2004/06/05 06:13:11 reinelt
*
* splash screen for all text-based display drivers
@@ -64,7 +68,6 @@
#include "debug.h"
#include "cfg.h"
-#include "qprintf.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
@@ -75,7 +78,7 @@
#include "drv_generic_serial.h"
-static char Name[]="BeckmannEgle";
+static char Name[]="Beckmann+Egle";
typedef struct {
int type;
@@ -185,9 +188,7 @@ static int drv_BE_start (char *section, int quiet)
drv_BE_clear();
if (!quiet) {
- char buffer[40];
- qprintf(buffer, sizeof(buffer), "B+E %s", Models[Model].name);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (Name, Models[Model].name)) {
sleep (3);
drv_BE_clear();
}
@@ -300,7 +301,7 @@ int drv_BE_quit (void) {
drv_BE_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
drv_generic_serial_close();
diff --git a/drv_Crystalfontz.c b/drv_Crystalfontz.c
index d30eda3..eb35b98 100644
--- a/drv_Crystalfontz.c
+++ b/drv_Crystalfontz.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Crystalfontz.c,v 1.24 2004/06/05 06:13:11 reinelt Exp $
+/* $Id: drv_Crystalfontz.c,v 1.25 2004/06/05 06:41:39 reinelt Exp $
*
* new style driver for Crystalfontz display modules
*
@@ -23,6 +23,10 @@
*
*
* $Log: drv_Crystalfontz.c,v $
+ * Revision 1.25 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.24 2004/06/05 06:13:11 reinelt
*
* splash screen for all text-based display drivers
@@ -973,7 +977,7 @@ int drv_CF_init (char *section, int quiet)
if (!quiet) {
char buffer[40];
qprintf(buffer, sizeof(buffer), "%s %s", Name, Models[Model].name);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (buffer, "www.crystalfontz.com")) {
sleep (3);
drv_CF_clear();
}
@@ -1033,7 +1037,7 @@ int drv_CF_quit (void) {
drv_CF_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
drv_generic_serial_close();
diff --git a/drv_Curses.c b/drv_Curses.c
index 8b2fbf0..3143237 100644
--- a/drv_Curses.c
+++ b/drv_Curses.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Curses.c,v 1.3 2004/06/05 06:13:11 reinelt Exp $
+/* $Id: drv_Curses.c,v 1.4 2004/06/05 06:41:39 reinelt Exp $
*
* pure ncurses based text driver
*
@@ -26,6 +26,10 @@
*
*
* $Log: drv_Curses.c,v $
+ * Revision 1.4 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.3 2004/06/05 06:13:11 reinelt
*
* splash screen for all text-based display drivers
@@ -198,7 +202,7 @@ static int drv_Curs_start (char *section, int quiet)
if (!quiet) {
char buffer[40];
qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (buffer, NULL)) {
sleep (3);
drv_Curs_clear();
}
@@ -298,7 +302,7 @@ int drv_Curs_quit (void) {
drv_Curs_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
endwin();
diff --git a/drv_Cwlinux.c b/drv_Cwlinux.c
index 484560b..20b1175 100644
--- a/drv_Cwlinux.c
+++ b/drv_Cwlinux.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Cwlinux.c,v 1.13 2004/06/05 06:13:11 reinelt Exp $
+/* $Id: drv_Cwlinux.c,v 1.14 2004/06/05 06:41:39 reinelt Exp $
*
* new style driver for Cwlinux display modules
*
@@ -23,6 +23,10 @@
*
*
* $Log: drv_Cwlinux.c,v $
+ * Revision 1.14 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.13 2004/06/05 06:13:11 reinelt
*
* splash screen for all text-based display drivers
@@ -303,7 +307,7 @@ static int drv_CW_start (char *section, int quiet)
if (!quiet) {
char buffer[40];
qprintf(buffer, sizeof(buffer), "%s %s", Name, Models[Model].name);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (buffer, "www.cwlinux.com")) {
sleep (3);
drv_CW_clear();
}
@@ -440,7 +444,7 @@ int drv_CW_quit (void) {
drv_CW_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
drv_generic_serial_close();
diff --git a/drv_HD44780.c b/drv_HD44780.c
index 03df8ab..b646cf2 100644
--- a/drv_HD44780.c
+++ b/drv_HD44780.c
@@ -1,4 +1,4 @@
-/* $Id: drv_HD44780.c,v 1.27 2004/06/05 06:13:11 reinelt Exp $
+/* $Id: drv_HD44780.c,v 1.28 2004/06/05 06:41:39 reinelt Exp $
*
* new style driver for HD44780-based displays
*
@@ -29,6 +29,10 @@
*
*
* $Log: drv_HD44780.c,v $
+ * Revision 1.28 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.27 2004/06/05 06:13:11 reinelt
*
* splash screen for all text-based display drivers
@@ -746,7 +750,7 @@ static int drv_HD_start (char *section, int quiet)
if (!quiet) {
char buffer[40];
qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (buffer, NULL)) {
sleep (3);
drv_HD_clear();
}
@@ -876,7 +880,7 @@ int drv_HD_quit (void) {
drv_HD_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
// clear all signals
if (Bits==8) {
diff --git a/drv_M50530.c b/drv_M50530.c
index 920d56e..cad2008 100644
--- a/drv_M50530.c
+++ b/drv_M50530.c
@@ -1,4 +1,4 @@
-/* $Id: drv_M50530.c,v 1.9 2004/06/05 06:13:12 reinelt Exp $
+/* $Id: drv_M50530.c,v 1.10 2004/06/05 06:41:39 reinelt Exp $
*
* new style driver for M50530-based displays
*
@@ -23,6 +23,10 @@
*
*
* $Log: drv_M50530.c,v $
+ * Revision 1.10 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.9 2004/06/05 06:13:12 reinelt
*
* splash screen for all text-based display drivers
@@ -277,7 +281,7 @@ static int drv_M5_start (char *section, int quiet)
if (!quiet) {
char buffer[40];
qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (buffer, NULL)) {
sleep (3);
drv_M5_clear();
}
@@ -390,7 +394,7 @@ int drv_M5_quit (void) {
drv_M5_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
// clear all signals
drv_generic_parport_control (SIGNAL_EX|SIGNAL_IOC1|SIGNAL_IOC2|SIGNAL_GPO, 0);
diff --git a/drv_MatrixOrbital.c b/drv_MatrixOrbital.c
index d79ba19..2c8c2bb 100644
--- a/drv_MatrixOrbital.c
+++ b/drv_MatrixOrbital.c
@@ -1,4 +1,4 @@
-/* $Id: drv_MatrixOrbital.c,v 1.30 2004/06/05 06:13:12 reinelt Exp $
+/* $Id: drv_MatrixOrbital.c,v 1.31 2004/06/05 06:41:39 reinelt Exp $
*
* new style driver for Matrix Orbital serial display modules
*
@@ -23,6 +23,10 @@
*
*
* $Log: drv_MatrixOrbital.c,v $
+ * Revision 1.31 2004/06/05 06:41:39 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.30 2004/06/05 06:13:12 reinelt
*
* splash screen for all text-based display drivers
@@ -167,7 +171,6 @@
#include "debug.h"
#include "cfg.h"
-#include "qprintf.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
@@ -505,9 +508,7 @@ static int drv_MO_start (char *section, int quiet)
}
if (!quiet) {
- char buffer[40];
- qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (Models[Model].name, "MatrixOrbital")) {
sleep (3);
drv_MO_clear();
}
@@ -712,7 +713,7 @@ int drv_MO_quit (void) {
drv_MO_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
drv_generic_serial_close();
diff --git a/drv_MilfordInstruments.c b/drv_MilfordInstruments.c
index 14d9e62..f954a92 100644
--- a/drv_MilfordInstruments.c
+++ b/drv_MilfordInstruments.c
@@ -1,4 +1,4 @@
-/* $Id: drv_MilfordInstruments.c,v 1.7 2004/06/05 06:13:12 reinelt Exp $
+/* $Id: drv_MilfordInstruments.c,v 1.8 2004/06/05 06:41:40 reinelt Exp $
*
* driver for Milford Instruments 'BPK' piggy-back serial interface board
* for standard Hitachi 44780 compatible lcd modules.
@@ -27,6 +27,10 @@
*
*
* $Log: drv_MilfordInstruments.c,v $
+ * Revision 1.8 2004/06/05 06:41:40 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.7 2004/06/05 06:13:12 reinelt
*
* splash screen for all text-based display drivers
@@ -70,7 +74,6 @@
#include "debug.h"
#include "cfg.h"
-#include "qprintf.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
@@ -174,7 +177,7 @@ static int drv_MI_start (char *section, int quiet)
drv_generic_serial_write ("\376\014", 2); // cursor off
if (!quiet) {
- if (drv_generic_text_greet (Models[Model].name)) {
+ if (drv_generic_text_greet (Models[Model].name, "Milford Instruments")) {
sleep (3);
drv_MI_clear();
}
@@ -288,7 +291,7 @@ int drv_MI_quit (void) {
drv_MI_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
drv_generic_serial_close();
diff --git a/drv_USBLCD.c b/drv_USBLCD.c
index eb8d9bd..28d7d00 100644
--- a/drv_USBLCD.c
+++ b/drv_USBLCD.c
@@ -1,4 +1,4 @@
-/* $Id: drv_USBLCD.c,v 1.7 2004/06/05 06:13:12 reinelt Exp $
+/* $Id: drv_USBLCD.c,v 1.8 2004/06/05 06:41:40 reinelt Exp $
*
* new style driver for USBLCD displays
*
@@ -26,6 +26,10 @@
*
*
* $Log: drv_USBLCD.c,v $
+ * Revision 1.8 2004/06/05 06:41:40 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.7 2004/06/05 06:13:12 reinelt
*
* splash screen for all text-based display drivers
@@ -272,7 +276,7 @@ static int drv_UL_start (char *section, int quiet)
if (!quiet) {
char buffer[40];
qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
- if (drv_generic_text_greet (buffer)) {
+ if (drv_generic_text_greet (buffer, "http://www.usblcd.de")) {
sleep (3);
drv_UL_clear();
drv_UL_send();
@@ -395,7 +399,7 @@ int drv_UL_quit (void)
drv_UL_clear();
// say goodbye...
- drv_generic_text_greet ("goodbye!");
+ drv_generic_text_greet ("goodbye!", NULL);
// flush buffer
drv_UL_send();
diff --git a/drv_generic_text.c b/drv_generic_text.c
index 55b4e0c..a8d1d1d 100644
--- a/drv_generic_text.c
+++ b/drv_generic_text.c
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_text.c,v 1.16 2004/06/02 10:09:22 reinelt Exp $
+/* $Id: drv_generic_text.c,v 1.17 2004/06/05 06:41:40 reinelt Exp $
*
* generic driver helper for text-based displays
*
@@ -23,6 +23,10 @@
*
*
* $Log: drv_generic_text.c,v $
+ * Revision 1.17 2004/06/05 06:41:40 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.16 2004/06/02 10:09:22 reinelt
*
* splash screen for HD44780
@@ -301,7 +305,7 @@ int drv_generic_text_init (char *section, char *driver)
// say hello to the user
-int drv_generic_text_greet (char *message)
+int drv_generic_text_greet (char *msg1, char *msg2)
{
int i;
int flag = 0;
@@ -338,14 +342,22 @@ int drv_generic_text_greet (char *message)
}
}
- if (message && DROWS >= 3) {
- int len = strlen(message);
+ if (msg1 && DROWS >= 3) {
+ int len = strlen(msg1);
if ( len <= DCOLS) {
- drv_generic_text_real_write (2, (DCOLS-len)/2, message, len);
+ drv_generic_text_real_write (2, (DCOLS-len)/2, msg1, len);
flag = 1;
}
}
+ if (msg2 && DROWS >= 4) {
+ int len = strlen(msg2);
+ if ( len <= DCOLS) {
+ drv_generic_text_real_write (3, (DCOLS-len)/2, msg2, len);
+ flag = 1;
+ }
+ }
+
return flag;
}
diff --git a/drv_generic_text.h b/drv_generic_text.h
index 90737d8..9bf9b4a 100644
--- a/drv_generic_text.h
+++ b/drv_generic_text.h
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_text.h,v 1.11 2004/06/02 10:09:22 reinelt Exp $
+/* $Id: drv_generic_text.h,v 1.12 2004/06/05 06:41:40 reinelt Exp $
*
* generic driver helper for text-based displays
*
@@ -23,6 +23,10 @@
*
*
* $Log: drv_generic_text.h,v $
+ * Revision 1.12 2004/06/05 06:41:40 reinelt
+ *
+ * chancged splash screen again
+ *
* Revision 1.11 2004/06/02 10:09:22 reinelt
*
* splash screen for HD44780
@@ -92,7 +96,7 @@ void (*drv_generic_text_real_defchar)(int ascii, unsigned char *buffer);
// generic functions and widget callbacks
int drv_generic_text_init (char *section, char *driver);
-int drv_generic_text_greet (char *message);
+int drv_generic_text_greet (char *msg1, char *msg2);
int drv_generic_text_draw (WIDGET *W);
int drv_generic_text_icon_init (void);
int drv_generic_text_icon_draw (WIDGET *W);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 16:27:21 +0000