ioc: bootloader: Disable LED, add X and Z commands, clean up

.gitignore

@@ -1,6 +1,3 @@
-# Directories
-doc
-
 # AVR temp files
 *.srec
 *.s

doc/ioc.md

@@ -0,0 +1,11 @@
+# IOC
+
+## Firmware
+### General
+* All serial links run at 19200 baud
+
+### Bootloader
+* The bootloader is a standard Arduino bootloader with the following additions
+	* Use ASCII command 'X' to enable loop-through mode. Everything received on UART RX will be forwarded to UART TX until the next reset.
+	* Use ASCII command 'Z' to immediately launch into the user firmware
+* Use the following avrdude command to program: `avrdude -p m8 -P /dev/ttyUSBx -c arduino -b 19200 -U flash:w:$(TARGET).hex`

ioc/avr-bootloader/main.c

@@ -7,6 +7,7 @@
 /*                                                        */
 /* Hacked by DojoCorp - ZGZ - MMX - IVR                   */
 /* Hacked by David A. Mellis                              */
+/* Hacked by Markus Koch                                  */
 /*                                                        */
 /* This program is free software; you can redistribute it */
 /* and/or modify it under the terms of the GNU General    */
@@ -38,19 +39,7 @@
 #include <avr/interrupt.h>
 #include <util/delay.h>
 
-//#define F_CPU			16000000
-
-/* We, Malmoitians, like slow interaction
- * therefore the slow baud rate ;-)
- */
-//#define BAUD_RATE		9600
-
-/* 6.000.000 is more or less 8 seconds at the
- * speed configured here
- */
-//#define MAX_TIME_COUNT	6000000
 #define MAX_TIME_COUNT (F_CPU>>1)
-///#define MAX_TIME_COUNT_MORATORY	1600000
 
 /* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
 #define HW_VER	 0x02
@@ -61,18 +50,18 @@
 // avr-gcc compiler v3.1.x and older doesn't support outb() and inb()
 //      if necessary, convert outb and inb to outp and inp
 #ifndef outb
-	#define outb(sfr,val)  (_SFR_BYTE(sfr) = (val))
+#define outb(sfr,val)  (_SFR_BYTE(sfr) = (val))
 #endif
 #ifndef inb
-	#define inb(sfr) _SFR_BYTE(sfr)
+#define inb(sfr) _SFR_BYTE(sfr)
 #endif
 
 /* defines for future compatibility */
 #ifndef cbi
-	#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
+#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
 #endif
 #ifndef sbi
-	#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
+#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
 #endif
 
 /* Adjust to suit whatever pin your hardware uses to enter the bootloader */
@@ -80,12 +69,6 @@
 #define eeprom_rw(addr)   eeprom_read_word ((uint16_t *)(addr))
 #define eeprom_wb(addr, val)   eeprom_write_byte ((uint8_t *)(addr), (uint8_t)(val))
 
-/* Onboard LED is connected to pin PB5 */
-#define LED_DDR  DDRB
-#define LED_PORT PORTB
-#define LED_PIN  PINB
-#define LED      PINB5
-
 
 #define SIG1	0x1E	// Yep, Atmel is the only manufacturer of AVR micros.  Single source :(
 #define SIG2	0x93
@@ -130,18 +113,19 @@ int main(void)
 	uint8_t ch,ch2;
 	uint16_t w;
 
-  //cbi(BL_DDR,BL);
+	/* Disable interrupts */
-  //sbi(BL_PORT,BL);
+	cli();
+
+	/* Pre-init I/O */
+	DDRB = 0;
+	DDRC = 0;
+	DDRD = 0;
+	PORTB = 0;
+	PORTC = 0;
+	PORTD = 0;
 
 	asm volatile("nop\n\t");
 
-  /* check if flash is programmed already, if not start bootloader anyway */
-  //if(pgm_read_byte_near(0x0000) != 0xFF) {
-
-    /* check if bootloader pin is set low */
-    //if(bit_is_set(BL_PIN,BL)) app_start();
-  //}
-
 	/* initialize UART(s) depending on CPU defined */
 	/* m8 */
 	UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; 	// set baud rate
@@ -149,59 +133,27 @@ int main(void)
 	UCSRB = (1<<RXEN)|(1<<TXEN);  // enable Rx & Tx
 	UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0);  // config USART; 8N1
 
-  //UBRRL = (uint8_t)(F_CPU/(BAUD_RATE*16L)-1);
-  //UBRRH = (F_CPU/(BAUD_RATE*16L)-1) >> 8;
-  //UCSRA = 0x00;
-  //UCSRC = 0x86;
-  //UCSRB = _BV(TXEN)|_BV(RXEN);
-
-
-  /* this was giving uisp problems, so I removed it; without it, the boot
-     works on with uisp and avrdude on the mac (at least). */
-  //putch('\0');
-
-  //uint32_t l;
-  //uint32_t time_count;
-  //time_count=0;
-
-  /* set LED pin as output */
-  sbi(LED_DDR,LED);
 	for (i = 0; i < 16; i++) {
-		outb(LED_PORT, inb(LED_PORT) ^ _BV(LED));
 		_delay_loop_2(0);
 	}
 
-	//for (l=0; l<40000000; l++)
-		//outb(LED_PORT, inb(LED_PORT) ^= _BV(LED));
-
-  /* flash onboard LED three times to signal entering of bootloader */
-  //for(i=0; i<3; ++i) {
-    //for(l=0; l<40000000; ++l);
-    //sbi(LED_PORT,LED);
-    //for(l=0; l<40000000; ++l);
-    //cbi(LED_PORT,LED);
-  //}
-
- /* see comment at previous call to putch() */
- //putch('\0'); // this line is needed for the synchronization of the programmer
-
 	/* forever */
 	for (;;) {
-    //if((inb(UCSRA) & _BV(RXC))){
+		//if ((inb(UCSRA) & _BV(RXC))){
 		/* get character from UART */
 		ch = getch();
 		
 		/* A bunch of if...else if... gives smaller code than switch...case ! */
 
 		/* Hello is anyone home ? */
-		if(ch=='0') {
+		if (ch == '0') {
 			nothing_response();
 		}
 
 		/* Request programmer ID */
 		/* Not using PROGMEM string due to boot block in m128 being beyond 64kB boundry  */
 		/* Would need to selectively manipulate RAMPZ, and it's only 9 characters anyway so who cares.  */
-		else if(ch=='1') {
+		else if (ch == '1') {
 			if (getch() == ' ') {
 				putch(0x14);
 				putch('A');
@@ -216,43 +168,43 @@ int main(void)
 		}
 
 		/* AVR ISP/STK500 board commands  DON'T CARE so default nothing_response */
-		else if(ch=='@') {
+		else if (ch == '@') {
 			ch2 = getch();
 			if (ch2>0x85) getch();
 			nothing_response();
 		}
 
 		/* AVR ISP/STK500 board requests */
-		else if(ch=='A') {
+		else if (ch == 'A') {
 			ch2 = getch();
-		  if(ch2==0x80) byte_response(HW_VER);		// Hardware version
+			if (ch2==0x80) byte_response(HW_VER);		// Hardware version
-		  else if(ch2==0x81) byte_response(SW_MAJOR);	// Software major version
+			else if (ch2==0x81) byte_response(SW_MAJOR);	// Software major version
-		  else if(ch2==0x82) byte_response(SW_MINOR);	// Software minor version
+			else if (ch2==0x82) byte_response(SW_MINOR);	// Software minor version
-		  //else if(ch2==0x98) byte_response(0x03);		// Unknown but seems to be required by avr studio 3.56
+			//else if (ch2==0x98) byte_response(0x03);		// Unknown but seems to be required by avr studio 3.56
 			else byte_response(0x00);				// Covers various unnecessary responses we don't care about
 		}
 
 		/* Device Parameters  DON'T CARE, DEVICE IS FIXED  */
-		else if(ch=='B') {
+		else if (ch == 'B') {
 			getNch(20);
 			nothing_response();
 		}
 
 		/* Parallel programming stuff  DON'T CARE  */
-		else if(ch=='E') {
+		else if (ch == 'E') {
 			getNch(5);
 			nothing_response();
 		}
 
 		/* Enter programming mode  */
-		else if(ch=='P') {
+		else if (ch == 'P') {
 			nothing_response();
 			// FIXME: modified only here by DojoCorp, Mumbai, India, 20050626
 			//time_count=0; // exted the delay once entered prog.mode
 		}
 
 		/* Leave programming mode  */
-		else if(ch=='Q') {
+		else if (ch == 'Q') {
 			nothing_response();
 			//time_count=MAX_TIME_COUNT_MORATORY; 	// once the programming is done,
 			// we should start the application
@@ -261,33 +213,47 @@ int main(void)
 			// and give the programmer 1 sec to react
 		}
 
+		/* Loop UART until reset */
+		else if (ch == 'X') {
+			while (1) {
+				if (UCSRA & (1 << RXC)) {
+					UDR = UDR;
+				}
+			}
+		}
+
+		/* Start user code NOW */
+		else if (ch == 'Z') {
+			app_start();
+		}
+
 		/* Erase device, don't care as we will erase one page at a time anyway.  */
-		else if(ch=='R') {
+		else if (ch == 'R') {
 			nothing_response();
 		}
 
 		/* Set address, little endian. EEPROM in bytes, FLASH in words  */
 		/* Perhaps extra address bytes may be added in future to support > 128kB FLASH.  */
 		/* This might explain why little endian was used here, big endian used everywhere else.  */
-		else if(ch=='U') {
+		else if (ch == 'U') {
 			address.byte[0] = getch();
 			address.byte[1] = getch();
 			nothing_response();
 		}
 
 		/* Universal SPI programming command, disabled.  Would be used for fuses and lock bits.  */
-		else if(ch=='V') {
+		else if (ch == 'V') {
 			getNch(4);
 			byte_response(0x00);
 		}
 
 		/* Write memory, length is big endian and is in bytes  */
-		else if(ch=='d') {
+		else if (ch == 'd') {
 			length.byte[1] = getch();
 			length.byte[0] = getch();
 			flags.eeprom = 0;
 			if (getch() == 'E') flags.eeprom = 1;
-		  for (w=0;w<length.word;w++) {
+			for (w=0; w<length.word; w++) {
 				buff[w] = getch();	                        // Store data in buffer, can't keep up with serial data stream whilst programming pages
 			}
 			if (getch() == ' ') {
@@ -297,11 +263,6 @@ int main(void)
 						address.word++;
 					}
 				} else {					        //Write to FLASH one page at a time
-					//if (address.byte[1]>127) address_high = 0x01;	//Only possible with m128, m256 will need 3rd address byte. FIXME
-					//else address_high = 0x00;
-			
-					//address.word = address.word << 1;	        //address * 2 -> byte location
-					//if ((length.byte[0] & 0x01)) length.word++;	//Even up an odd number of bytes
 					cli();					//Disable interrupts, just to be sure
 					while(bit_is_set(EECR,EEWE));			//Wait for previous EEPROM writes to complete
 					asm volatile(
@@ -321,20 +282,12 @@ int main(void)
 					                        "cpi	r17,0x00	\n\t"	//If page_word_count=0 then erase page
 					                        "brne	no_page_erase	\n\t"
 					                        "rcall  wait_spm		\n\t"
-//							 "wait_spm1:		\n\t"
+
-//							 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
-//							 "andi	r16,1           \n\t"
-//							 "cpi	r16,1           \n\t"
-//							 "breq	wait_spm1       \n\t"
 					                        "ldi	r16,0x03	\n\t"	//Erase page pointed to by Z
 					                        "sts	%0,r16		\n\t"
 					                        "spm			\n\t"
 					                        "rcall  wait_spm		\n\t"
-//							 "wait_spm2:		\n\t"
+
-//							 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
-//							 "andi	r16,1           \n\t"
-//							 "cpi	r16,1           \n\t"
-//							 "breq	wait_spm2       \n\t"									 
 					                        "ldi	r16,0x11	\n\t"	//Re-enable RWW section
 					                        "sts	%0,r16		\n\t"
 					                        "spm			\n\t"
@@ -343,11 +296,7 @@ int main(void)
 					                        "ld	r1,Y+		\n\t"
 
 					                        "rcall  wait_spm		\n\t"
-//							 "wait_spm3:		\n\t"
+
-//							 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
-//							 "andi	r16,1           \n\t"
-//							 "cpi	r16,1           \n\t"
-//							 "breq	wait_spm3       \n\t"
 					                        "ldi	r16,0x01	\n\t"	//Load r0,r1 into FLASH page buffer
 					                        "sts	%0,r16		\n\t"
 					                        "spm			\n\t"
@@ -358,20 +307,12 @@ int main(void)
 					                        "write_page:		\n\t"
 					                        "clr	r17		\n\t"	//New page, write current one first
 					                        "rcall  wait_spm		\n\t"
-//							 "wait_spm4:		\n\t"
+
-//							 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
-//							 "andi	r16,1           \n\t"
-//							 "cpi	r16,1           \n\t"
-//							 "breq	wait_spm4       \n\t"
 					                        "ldi	r16,0x05	\n\t"	//Write page pointed to by Z
 					                        "sts	%0,r16		\n\t"
 					                        "spm			\n\t"
 					                        "rcall  wait_spm		\n\t"
-//							 "wait_spm5:		\n\t"
+
-//							 "lds	r16,%0		\n\t"	//Wait for previous spm to complete
-//							 "andi	r16,1           \n\t"
-//							 "cpi	r16,1           \n\t"
-//							 "breq	wait_spm5       \n\t"									 
 					                        "ldi	r16,0x11	\n\t"	//Re-enable RWW section
 					                        "sts	%0,r16		\n\t"
 					                        "spm			\n\t"
@@ -406,7 +347,7 @@ int main(void)
 		}
 
 		/* Read memory block mode, length is big endian.  */
-		else if(ch=='t') {
+		else if (ch == 't') {
 			length.byte[1] = getch();
 			length.byte[0] = getch();
 			if (getch() == 'E') flags.eeprom = 1;
@@ -416,7 +357,7 @@ int main(void)
 			}
 			if (getch() == ' ') {		                // Command terminator
 				putch(0x14);
-				for (w=0;w < length.word;w++) {		        // Can handle odd and even lengths okay
+				for (w=0; w < length.word; w++) {		        // Can handle odd and even lengths okay
 					if (flags.eeprom) {	                        // Byte access EEPROM read
 						putch(eeprom_rb(address.word));
 						address.word++;
@@ -430,7 +371,7 @@ int main(void)
 		}
 
 		/* Get device signature bytes  */
-		else if(ch=='u') {
+		else if (ch == 'u') {
 			if (getch() == ' ') {
 				putch(0x14);
 				putch(SIG1);
@@ -441,15 +382,9 @@ int main(void)
 		}
 
 		/* Read oscillator calibration byte */
-		else if(ch=='v') {
+		else if (ch == 'v') {
 			byte_response(0x00);
 		}
-//    } else {
-//			time_count++;
-//			if (time_count>=MAX_TIME_COUNT) {
-//				app_start();
-//			}
-//		}
 	} /* end of forever loop */
 }
 
@@ -477,9 +412,6 @@ void getNch(uint8_t count)
 {
 	uint8_t i;
 	for(i=0;i<count;i++) {
-    /* m8 */
-    //while(!(inb(UCSRA) & _BV(RXC)));
-    //inb(UDR);
 		getch(); // need to handle time out
 	}
 }
@@ -500,8 +432,3 @@ void nothing_response(void)
 		putch(0x10);
 	}
 }
-
-/* end of file ATmegaBOOT.c */
-
-
-

keyboard/avr/main.c

@@ -11,7 +11,7 @@
 
 #define DELAY_ROW_SWITCH() _delay_ms(1) //_delay_us(1)
 
-#define BAUDRATE 9600
+#define BAUDRATE 19200
 
 /* Keycode from include/linux/input.h */
 #define KEY_RESERVED		0

printer/avr/main.c

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <avr/pgmspace.h>
 
-#define BAUDRATE 9600
+#define BAUDRATE 19200
 
 inline void spi_process_data();