diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | MatrixOrbital.c | 337 | ||||
| -rw-r--r-- | display.c | 29 | ||||
| -rw-r--r-- | display.h | 10 | ||||
| -rw-r--r-- | system.c | 59 |
5 files changed, 335 insertions, 103 deletions
@@ -2,9 +2,6 @@ CC=gcc -m486 -g -Wall -I. -DVERSION=\"V0.5\" all: lcd4linux -system: system.c system.h config.c config.h filter.c filter.h - ${CC} -DSTANDALONE -lm -o system system.c config.c filter.c - #lcd4linux: lcd4linux.c config.c lcd2041.c system.c isdn.c filter.c Makefile # ${CC} -lm -o lcd4linux lcd4linux.c config.c lcd2041.c system.c isdn.c filter.c diff --git a/MatrixOrbital.c b/MatrixOrbital.c index c5dc6a7..56e2091 100644 --- a/MatrixOrbital.c +++ b/MatrixOrbital.c @@ -9,58 +9,336 @@ #include "config.h" #include "display.h" +#define XRES 5 +#define YRES 8 +#define CHARS 8 + static DISPLAY Display; -static char *Device=NULL; +static char *Port=NULL; +static int Device=-1; -int MO_init (DISPLAY *Self) +typedef struct { + int len1; + int len2; + int type; + int segment; +} BAR; + +typedef struct { + int len1; + int len2; + int type; + int used; + int ascii; +} SEGMENT; + +static char Txt[4][40]; +static BAR Bar[4][40]; + +static int nSegment=2; +static SEGMENT Segment[256] = {{ len1: 0, len2: 0, type:255, used:0, ascii:32 }, + { len1:XRES, len2:XRES, type:255, used:0, ascii:255 }}; + +#define CL 0x0b + + +static int MO_open (void) { - char *port; + int fd; + struct termios portset; - printf ("initializing MatrixOrbital...\n"); + fd = open(Port, O_RDWR | O_NOCTTY | O_NDELAY); + if (fd==-1) { + fprintf (stderr, "MatrixOrbital: open(%s) failed: %s\n", Port, strerror(errno)); + return -1; + } + if (tcgetattr(fd, &portset)==-1) { + fprintf (stderr, "MatrixOrbital: tcgetattr(%s) failed: %s\n", Port, strerror(errno)); + return -1; + } + cfmakeraw(&portset); + cfsetospeed(&portset, B19200); + if (tcsetattr(fd, TCSANOW, &portset)==-1) { + fprintf (stderr, "MatrixOrbital: tcsetattr(%s) failed: %s\n", Port, strerror(errno)); + return -1; + } + return fd; +} - if (Device) { - free (Device); - Device=NULL; +static void MO_write (char *string, int len) +{ + if (Device==-1) return; + if (write (Device, string, len)==-1) { + if (errno==EAGAIN) { + usleep(1000); + if (write (Device, string, len)>=0) return; + } + fprintf (stderr, "MatrixOrbital: write(%s) failed: %s\n", Port, strerror(errno)); } +} - port=cfg_get ("port"); - if (port==NULL || *port=='\0') { - fprintf (stderr, "MatrixOrbital: no 'port' entry in %s\n", cfg_file()); - return -1; +static int MO_contrast (void) +{ + char buffer[4]; + int contrast; + + contrast=atoi(cfg_get("contrast")); + if (contrast==0) contrast=160; + snprintf (buffer, 4, "\376P%c", contrast); + MO_write (buffer, 3); + return 0; +} + +static void MO_process_bars (void) +{ + int row, col; + int i, j; + + for (i=2; i<nSegment && Segment[i].used; i++); + for (j=i+1; j<nSegment; j++) { + if (Segment[j].used) + Segment[i++]=Segment[j]; } - Device=strdup(port); + nSegment=i; - lcd=lcd_open(); - if (lcd==-1) return -1; + for (row=0; row<Display.rows; row++) { + for (col=0; col<Display.cols; col++) { + if (Bar[row][col].type==0) continue; + for (i=0; i<nSegment; i++) { + if (Segment[i].type & Bar[row][col].type && + Segment[i].len1== Bar[row][col].len1 && + Segment[i].len2== Bar[row][col].len2) break; + } + if (i==nSegment) { + nSegment++; + Segment[i].len1=Bar[row][col].len1; + Segment[i].len2=Bar[row][col].len2; + Segment[i].type=Bar[row][col].type; + Segment[i].used=0; + Segment[i].ascii=-1; + } + Bar[row][col].segment=i; + } + } +} + +#define sqr(x) ((x)*(x)) + +static void MO_compact_bars (void) +{ + int i, j, r, c, min; + int pack_i, pack_j; + int error[nSegment][nSegment]; - lcd_clear(); - lcd_write ("\376B", 3); // backlight on - lcd_write ("\376K", 2); // cursor off - lcd_write ("\376T", 2); // blink off - lcd_write ("\376D", 2); // line wrapping off - lcd_write ("\376R", 2); // auto scroll off - lcd_write ("\376V", 2); // GPO off + if (nSegment>CHARS+2) { + for (i=2; i<nSegment; i++) { + for (j=0; j<nSegment; j++) { + error[i][j]=65535; + if (i==j) continue; + if (Segment[i].used) continue; + if (!(Segment[i].type & Segment[j].type)) continue; + if (Segment[i].len1==0 && Segment[j].len1!=0) continue; + if (Segment[i].len2==0 && Segment[j].len2!=0) continue; + if (Segment[i].len1==XRES && Segment[j].len1!=XRES) continue; + if (Segment[i].len2==XRES && Segment[j].len2!=XRES) continue; + if (Segment[i].len1==Segment[i].len2 && Segment[j].len1!=Segment[j].len2) continue; + error[i][j]=sqr(Segment[i].len1-Segment[j].len1)+sqr(Segment[i].len2-Segment[j].len2); + } + } - return 0; + while (nSegment>CHARS+2) { + min=65535; + pack_i=-1; + for (i=2; i<nSegment; i++) { + for (j=0; j<nSegment; j++) { + if (error[i][j]<min) { + min=error[i][j]; + pack_i=i; + pack_j=j; + } + } + } + if (pack_i==-1) { + fprintf (stderr, "MatrixOrbital: unable to compact bar characters\n"); + nSegment=CHARS; + break; + } + + nSegment--; + Segment[pack_i]=Segment[nSegment]; + + for (i=0; i<nSegment; i++) { + error[pack_i][i]=error[nSegment][i]; + error[i][pack_i]=error[i][nSegment]; + } + + for (r=0; r<Display.rows; r++) { + for (c=0; c<Display.cols; c++) { + if (Bar[r][c].segment==pack_i) + Bar[r][c].segment=pack_j; + if (Bar[r][c].segment==nSegment) + Bar[r][c].segment=pack_i; + } + } + } + } +} + +static void MO_define_chars (void) +{ + int i, j, c; + char buffer[12]="\376N"; + char Pixel[] = {0, 16, 24, 28, 30, 31}; + + for (i=2; i<nSegment; i++) { + if (Segment[i].used) continue; + if (Segment[i].ascii!=-1) continue; + for (c=0; c<CHARS; c++) { + for (j=2; j<nSegment; j++) { + if (Segment[j].ascii==c) break; + } + if (j==nSegment) break; + } + Segment[i].ascii=c; + buffer[2]=c; + buffer[3]=Pixel[Segment[i].len1]; + buffer[4]=Pixel[Segment[i].len1]; + buffer[5]=Pixel[Segment[i].len1]; + buffer[6]=Pixel[Segment[i].len1]; + buffer[7]=Pixel[Segment[i].len2]; + buffer[8]=Pixel[Segment[i].len2]; + buffer[9]=Pixel[Segment[i].len2]; + buffer[10]=Pixel[Segment[i].len2]; + MO_write (buffer, 11); + } } int MO_clear (void) { + int row, col; + + for (row=0; row<Display.rows; row++) { + for (col=0; col<Display.cols; col++) { + Txt[row][col]=CL; + Bar[row][col].len1=-1; + Bar[row][col].len2=-1; + Bar[row][col].type=0; + Bar[row][col].segment=-1; + } + } + MO_write ("\014", 1); return 0; } -int MO_put (int x, int y, char *text) +int MO_init (DISPLAY *Self) { + char *port; + + Display=*Self; + + if (Port) { + free (Port); + Port=NULL; + } + + port=cfg_get ("port"); + if (port==NULL || *port=='\0') { + fprintf (stderr, "MatrixOrbital: no 'port' entry in %s\n", cfg_file()); + return -1; + } + Port=strdup(port); + + Device=MO_open(); + if (Device==-1) return -1; + + MO_clear(); + MO_contrast(); + + MO_write ("\376B", 3); // backlight on + MO_write ("\376K", 2); // cursor off + MO_write ("\376T", 2); // blink off + MO_write ("\376D", 2); // line wrapping off + MO_write ("\376R", 2); // auto scroll off + MO_write ("\376V", 2); // GPO off + + return 0; +} + +int MO_put (int row, int col, char *text) +{ + char *p=&Txt[row][col]; + char *t=text; + + while (*t && col++<=Display.cols) { + *p++=*t++; + } return 0; } -int MO_bar (int type, int x, int y, int max, int len1, int len2) +int MO_bar (int type, int row, int col, int max, int len1, int len2) { + if (len1<1) len1=1; + else if (len1>max) len1=max; + + if (len2<1) len2=1; + else if (len2>max) len2=max; + + while (max>0 && col<=Display.cols) { + Bar[row][col].type=type; + Bar[row][col].segment=-1; + if (len1>=XRES) { + Bar[row][col].len1=XRES; + len1-=XRES; + } else { + Bar[row][col].len1=len1; + len1=0; + } + if (len2>=XRES) { + Bar[row][col].len2=XRES; + len2-=XRES; + } else { + Bar[row][col].len2=len2; + len2=0; + } + max-=XRES; + col++; + } return 0; } int MO_flush (void) { + char buffer[256]="\376G"; + char *p; + int s, row, col; + + MO_process_bars(); + MO_compact_bars(); + MO_define_chars(); + + for (s=0; s<nSegment; s++) { + Segment[s].used=0; + } + + for (row=0; row<Display.rows; row++) { + buffer[3]=row+1; + for (col=0; col<Display.cols; col++) { + s=Bar[row][col].segment; + if (s!=-1) { + Segment[s].used=1; + Txt[row][col]=Segment[s].ascii; + } + } + for (col=0; col<Display.cols; col++) { + if (Txt[row][col]==CL) continue; + buffer[2]=col+1; + for (p=buffer+4; col<Display.cols; col++, p++) { + if (Txt[row][col]==CL) break; + *p=Txt[row][col]; + } + MO_write (buffer, p-buffer); + } + } return 0; } @@ -68,11 +346,10 @@ int MO_flush (void) #define BARS ( BAR_L | BAR_R | BAR_U | BAR_D | BAR_S ) DISPLAY MatrixOrbital[] = { - { "LCD0821", 8, 2, 5, 8, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, - { "LCD1621", 16, 2, 5, 8, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, - { "LCD2021", 20, 2, 5, 8, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, - { "LCD2041", 20, 4, 5, 8, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, - { "LCD4021", 40, 2, 5, 8, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, + { "LCD0821", 2, 8, XRES, YRES, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, + { "LCD1621", 2, 16, XRES, YRES, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, + { "LCD2021", 2, 20, XRES, YRES, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, + { "LCD2041", 4, 20, XRES, YRES, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, + { "LCD4021", 2, 40, XRES, YRES, BARS, MO_init, MO_clear, MO_put, MO_bar, MO_flush }, { "" } }; - @@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.2 2000/03/06 06:04:06 reinelt Exp $ +/* $Id: display.c,v 1.3 2000/03/10 10:49:53 reinelt Exp $ * * framework for device drivers * @@ -20,6 +20,10 @@ * * * $Log: display.c,v $ + * Revision 1.3 2000/03/10 10:49:53 reinelt + * + * MatrixOrbital driver finished + * * Revision 1.2 2000/03/06 06:04:06 reinelt * * minor cleanups @@ -30,6 +34,7 @@ #include <stdlib.h> #include <stdio.h> +#include "config.h" #include "display.h" extern DISPLAY MatrixOrbital[]; @@ -59,27 +64,25 @@ int lcd_init (char *display) int lcd_clear (void) { - return 0; + return Display->clear(); } -int lcd_put (int x, int y, char *text) +int lcd_put (int row, int col, char *text) { - return 0; + if (row<1 || row>Display->rows) return -1; + if (col<1 || col>Display->cols) return -1; + return Display->put(row-1, col-1, text); } -int lcd_bar (int type, int x, int y, int max, int len1, int len2) +int lcd_bar (int type, int row, int col, int max, int len1, int len2) { - return 0; + if (row<1 || row>Display->rows) return -1; + if (col<1 || col>Display->cols) return -1; + return Display->bar(type, row-1, col-1, max, len1, len2); } int lcd_flush (void) { - return 0; + return Display->flush(); } -void main (void) { - - lcd_init ("junk"); - lcd_init ("LCD2041"); - -} @@ -1,4 +1,4 @@ -/* $Id: display.h,v 1.3 2000/03/06 06:04:06 reinelt Exp $ +/* $Id: display.h,v 1.4 2000/03/10 10:49:53 reinelt Exp $ * * framework for device drivers * @@ -20,6 +20,10 @@ * * * $Log: display.h,v $ + * Revision 1.4 2000/03/10 10:49:53 reinelt + * + * MatrixOrbital driver finished + * * Revision 1.3 2000/03/06 06:04:06 reinelt * * minor cleanups @@ -60,8 +64,8 @@ typedef struct { int lcd_init (char *display); int lcd_clear (void); -int lcd_put (int x, int y, char *text); -int lcd_bar (int type, int x, int y, int max, int len1, int len2); +int lcd_put (int row, int col, char *text); +int lcd_bar (int type, int row, int col, int max, int len1, int len2); int lcd_flush (void); #endif @@ -1,4 +1,4 @@ -/* $Id: system.c,v 1.3 2000/03/07 11:01:34 reinelt Exp $ +/* $Id: system.c,v 1.4 2000/03/10 10:49:53 reinelt Exp $ * * system status retreivement * @@ -20,6 +20,10 @@ * * * $Log: system.c,v $ + * Revision 1.4 2000/03/10 10:49:53 reinelt + * + * MatrixOrbital driver finished + * * Revision 1.3 2000/03/07 11:01:34 reinelt * * system.c cleanup @@ -424,56 +428,3 @@ int Sensor (int index, double *val, double *min, double *max) *val=value; return 0; } - - -#ifdef STANDALONE - -int tick, tack, tau; - -void main (void) -{ - char *cfg_file="./lcd4linux.conf.sample"; - double load1, load2, load3; - double user, nice, system, idle; - int r, w; - int rx, tx; - double val, min, max; - - if (cfg_read (cfg_file)==-1) - exit (1); - - tick=atoi(cfg_get("tick")); - tack=atoi(cfg_get("tack")); - tau=atoi(cfg_get("tau")); - - printf ("System : %s\n", System()); - printf ("Release : %s\n", Release ()); - printf ("Processor : %s\n", Processor ()); - printf ("Memory : %d MB\n", Memory ()); - - while (1) { - - Load (&load1, &load2, &load3); - printf ("Load : %f %f %f\n", load1, load2, load3); - - Busy (&user, &nice, &system, &idle); - printf ("Busy : %f %f %f %f\n", user, nice, system, idle); - - Disk (&r, &w); - printf ("Disk : %d %d\n", r, w); - - Net (&rx, &tx); - printf ("Net : %d %d\n", rx, tx); - - Sensor (1, &val, &min, &max); - printf ("Sensor 1 : %f %f %f\n", val, min, max); - - Sensor (2, &val, &min, &max); - printf ("Sensor 2 : %f %f %f\n", val, min, max); - - usleep(tack*1000); - } - -} - -#endif |