From 114b1917a4ff9f50e5744280ca6b78552cc31cf3 Mon Sep 17 00:00:00 2001 From: andy-b Date: Wed, 8 Oct 2003 13:39:53 +0000 Subject: [lcd4linux @ 2003-10-08 13:39:53 by andy-b] Cleaned up code in MilfordInstruments.c, and added descriptions for other display sizes (untested) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@262 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- MilfordInstruments.c | 98 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 27 deletions(-) diff --git a/MilfordInstruments.c b/MilfordInstruments.c index ae2b7f1..2818e26 100644 --- a/MilfordInstruments.c +++ b/MilfordInstruments.c @@ -1,18 +1,18 @@ -/* $Id: MilfordInstruments.c,v 1.2 2003/10/05 17:58:50 reinelt Exp $ +/* $Id: MilfordInstruments.c,v 1.3 2003/10/08 13:39:53 andy-b Exp $ * - * driver for Milford Instruments serial display modules - * based on the MatrixOrbital driver by M. Reinelt + * driver for Milford Instruments 'BPK' piggy-back serial interface board + * for standard Hitachi 44780 compatible lcd modules. * - * Copyright 2003 Andy Baxter + * Written 2003 by Andy Baxter * - * This file is part of LCD4Linux. + * based on the MatrixOrbital driver by M. Reinelt * - * LCD4Linux is free software; you can redistribute it and/or modify + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2, or (at your option) * any later version. * - * LCD4Linux is distributed in the hope that it will be useful, + * This program 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 General Public License for more details. @@ -23,8 +23,8 @@ * * * $Log: MilfordInstruments.c,v $ - * Revision 1.2 2003/10/05 17:58:50 reinelt - * libtool junk; copyright messages cleaned up + * Revision 1.3 2003/10/08 13:39:53 andy-b + * Cleaned up code in MilfordInstruments.c, and added descriptions for other display sizes (untested) * * Revision 1.1 2003/09/29 06:58:36 reinelt * new driver for Milford Instruments MI420 by Andy Baxter @@ -118,10 +118,10 @@ static void MI_write (char *string, int len) static void MI_define_char (int ascii, char *buffer) { - char cmd[3]="\376x"; + char cmd[2]="\376x"; if (ascii<8) { - cmd[2]=(char)(64+ascii*8); - MI_write (cmd, 3); + cmd[1]=(char)(64+ascii*8); + MI_write (cmd, 2); MI_write (buffer, 8); } } @@ -210,21 +210,13 @@ static int MI_init (LCD *Self) void MI_goto (int row, int col) { char cmd[2]="\376x"; - char ddbase=0; - switch (row) { - case 0: - ddbase=128; - break; - case 1: - ddbase=192; - break; - case 2: - ddbase=148; - break; - case 3: - ddbase=212; - break; - } + char ddbase=128; + if (row & 1) { // i.e. if row is 1 or 3 + ddbase += 64; + }; + if (row & 2) { // i.e. if row is 0 or 2. + ddbase += 20; + }; cmd[1]=(char)(ddbase+col); MI_write(cmd,2); } @@ -315,6 +307,57 @@ int MI_quit (void) LCD MilfordInstruments[] = { + { name: "MI216", + rows: 2, + cols: 16, + xres: XRES, + yres: YRES, + bars: BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2, + icons: 0, + gpos: 0, + init: MI_init, + clear: MI_clear, + put: MI_put, + bar: MI_bar, + icon: MI_icon, + gpo: NULL, + flush: MI_flush, + quit: MI_quit + }, + { name: "MI220", + rows: 2, + cols: 20, + xres: XRES, + yres: YRES, + bars: BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2, + icons: 0, + gpos: 0, + init: MI_init, + clear: MI_clear, + put: MI_put, + bar: MI_bar, + icon: MI_icon, + gpo: NULL, + flush: MI_flush, + quit: MI_quit + }, + { name: "MI240", + rows: 2, + cols: 40, + xres: XRES, + yres: YRES, + bars: BAR_L | BAR_R | BAR_U | BAR_D | BAR_H2, + icons: 0, + gpos: 0, + init: MI_init, + clear: MI_clear, + put: MI_put, + bar: MI_bar, + icon: MI_icon, + gpo: NULL, + flush: MI_flush, + quit: MI_quit + }, { name: "MI420", rows: 4, cols: 20, @@ -332,5 +375,6 @@ LCD MilfordInstruments[] = { flush: MI_flush, quit: MI_quit }, + { NULL } }; -- cgit v1.2.3 cCrohan2-5/+13 2015-04-01Release 0+git20150208.f2053b3-1Jonathan McCrohan1-2/+2 2015-04-01Describe changes made in snapshotJonathan McCrohan1-0/+3 2015-04-01New Upstream Snapshot (commit f2053b3)Jonathan McCrohan1-0/+6 2015-04-01Imported Upstream version 0+git20150208.f2053b3upstream/0+git20150208.f2053b3Jonathan McCrohan32-333/+483 2014-12-28Release 0+git20141218.b46a22c-1debian/0+git20141218.b46a22c-1Jonathan McCrohan1-2/+2 2014-12-28Updated AU DVB-T files; Thanks Brian Burch! (Closes LP: #1393280)Jonathan McCrohan1-0/+1 2014-12-28New Upstream Snapshot (commit b46a22c)Jonathan McCrohan1-0/+6 2014-12-28Imported Upstream version 0+git20141218.b46a22cupstream/0+git20141218.b46a22cJonathan McCrohan535-639/+317 2014-10-20Release 0+git20141009.d26b627-1debian/0+git20141009.d26b627-1Jonathan McCrohan1-2/+2 2014-10-20Fix up packaging to account for move to DVBv5Jonathan McCrohan2-2/+6 2014-10-20delete d/dtv-scan-files.install; Upstream now supplies a MakefileJonathan McCrohan2-4/+1 2014-10-15d/control: update Standards Version to 3.9.6Jonathan McCrohan2-1/+3 2014-10-15d/control: add Build-Depends on dvb-toolsJonathan McCrohan2-1/+2 2014-10-15New Upstream Snapshot (commit d26b627)Jonathan McCrohan1-0/+10 2014-10-15Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627Jonathan McCrohan2010-11120/+159271 2014-07-23Release 0+git20140611.14bd6c7-1debian/0+git20140611.14bd6c7-1Jonathan McCrohan1-2/+2 2014-07-23New Upstream Snapshot (commit 14bd6c7)Jonathan McCrohan1-2/+3 2014-07-23Imported Upstream version 0+git20140611.14bd6c7upstream/0+git20140611.14bd6c7Jonathan McCrohan7-11/+60 2014-05-13New Upstream Snapshot (commit 1246b27)Jonathan McCrohan1-0/+6 2014-05-13Imported Upstream version 0+git20140512.1246b27upstream/0+git20140512.1246b27Jonathan McCrohan391-301/+3983 2014-04-05Release 0+git20140326.cfc2975-1debian/0+git20140326.cfc2975-1Jonathan McCrohan1-2/+2 2014-04-05d/control: update Homepage (upstream has moved from Gitweb to cgit)Jonathan McCrohan2-1/+2 2014-04-05New Upstream Snapshot (commit cfc2975)Jonathan McCrohan1-0/+6 2014-04-05Imported Upstream version 0+git20140326.cfc2975upstream/0+git20140326.cfc2975Jonathan McCrohan118-656/+877 2014-01-16Release 0+git20140107.1850cf8-1debian/0+git20140107.1850cf8-1Jonathan McCrohan1-2/+2 2014-01-16Update Standards Version to 3.9.5Jonathan McCrohan2-1/+9