X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=firmware%2Fs88w-r.c;h=b537584c19ddb698fe9e44ecc4904de47a44568f;hb=a99e18c8e7ec3276ba6a881d1eaccf2d7fc26ea6;hp=dbd1ef175d9a7ea95279dc5bccfe85fe12c557f5;hpb=238cd5e5bd9c6fa86ae85f5eb7a8ce00158f2f7c;p=model-railway-devices.git

diff --git a/firmware/s88w-r.c b/firmware/s88w-r.c
index dbd1ef1..b537584 100644
--- a/firmware/s88w-r.c
+++ b/firmware/s88w-r.c
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 
@@ -34,6 +34,8 @@ D5 - S88 RESET
 #define LOAD     PIND4
 #define RESET    PIND5
 
+#define LCD_DISABLE PINB4
+
 #define BIT(n)   (1<<(n))
 
 void receive(uint8_t);
@@ -44,7 +46,9 @@ volatile uint8_t rx_buf[7];
 volatile uint8_t rx_fill = 0xFF;
 volatile uint8_t input[128] = { 0 };
 volatile uint8_t latch[128] = { 0 };
-uint8_t log_pos = 0;
+volatile uint8_t lcd_enabled = 0;
+uint8_t log_row = 0;
+uint8_t log_col = 0;
 
 int main()
 {
@@ -64,14 +68,11 @@ int main()
 
 	sei();
 
-	lcd_clear();
-	for(i=0; i<20; ++i)
-		lcd_write('0');
-
 	while(1)
 	{
-		uint8_t d_pins;
+		uint8_t b_pins, d_pins;
 
+		b_pins = PINB;
 		d_pins = PIND;
 
 		if(d_pins&BIT(CLOCK))
@@ -112,6 +113,28 @@ int main()
 			for(i=0; i<128; ++i)
 				latch[i] = input[i];
 		}
+
+		if(b_pins&BIT(LCD_DISABLE))
+		{
+			if(lcd_enabled)
+			{
+				lcd_enabled = 0;
+
+				lcd_clear();
+			}
+		}
+		else if(!lcd_enabled)
+		{
+			lcd_enabled = 1;
+			log_row = 0;
+			log_col = 0;
+
+			lcd_clear();
+			for(i=0; i<20; ++i)
+				lcd_write(hexdigit(input[9-i/2]>>(4-i%2*4)));
+			lcd_gotoxy(0, 1);
+			lcd_write(255);
+		}
 	}
 }
 
@@ -144,10 +167,12 @@ void receive(uint8_t c)
 					latch[j/2] = input[j/2];
 				}
 
-				lcd_gotoxy(19-offset-nibbles, 0);
-				for(i=0; i<=nibbles; ++i)
-					lcd_write(rx_buf[3+i]);
-				log_pos |= 0x80;
+				if(lcd_enabled)
+				{
+					lcd_gotoxy(19-offset-nibbles, 0);
+					for(i=0; i<=nibbles; ++i)
+						lcd_write(rx_buf[3+i]);
+				}
 			}
 		}
 		rx_fill = 0xFF;
@@ -160,14 +185,21 @@ void receive(uint8_t c)
 			rx_fill = 0xFF;
 	}
 
-	lcd_gotoxy(log_pos%20, 1+log_pos/20);
-	lcd_write(c);
-	++log_pos;
-	if(log_pos>=60)
-		log_pos = 0;
-	if(log_pos%20==0)
-		lcd_gotoxy(log_pos%20, 1+log_pos/20);
-	lcd_write(255);
+	if(lcd_enabled)
+	{
+		lcd_gotoxy(log_col, 1+log_row);
+		lcd_write(c);
+		++log_col;
+		if(log_col>=20)
+		{
+			log_col = 0;
+			++log_row;
+			if(log_row>=3)
+				log_row = 0;
+			lcd_gotoxy(log_col, 1+log_row);
+		}
+		lcd_write(255);
+	}
 }
 
 SERIAL_SET_CALLBACK(receive)