electronics/lw35-upgrade
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Markus Koch 2019-11-10 19:48:24 +01:00
parent 1be8f62f3e
commit b4bc651445
3 changed files with 232 additions and 297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

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

11
doc/ioc.md Normal file
View File

@ -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`

133
ioc/avr-bootloader/main.c
View File

@ -7,6 +7,7 @@
/* */ /* */
/* Hacked by DojoCorp - ZGZ - MMX - IVR */ /* Hacked by DojoCorp - ZGZ - MMX - IVR */
/* Hacked by David A. Mellis */ /* Hacked by David A. Mellis */
/* Hacked by Markus Koch */
/* */ /* */
/* This program is free software; you can redistribute it */ /* This program is free software; you can redistribute it */
/* and/or modify it under the terms of the GNU General */ /* and/or modify it under the terms of the GNU General */
@ -38,19 +39,7 @@
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <util/delay.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 (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 */ /* SW_MAJOR and MINOR needs to be updated from time to time to avoid warning message from AVR Studio */
#define HW_VER 0x02 #define HW_VER 0x02
@ -80,12 +69,6 @@
#define eeprom_rw(addr) eeprom_read_word ((uint16_t *)(addr)) #define eeprom_rw(addr) eeprom_read_word ((uint16_t *)(addr))
#define eeprom_wb(addr, val) eeprom_write_byte ((uint8_t *)(addr), (uint8_t)(val)) #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 SIG1 0x1E // Yep, Atmel is the only manufacturer of AVR micros. Single source :(
#define SIG2 0x93 #define SIG2 0x93
@ -130,18 +113,19 @@ int main(void)
uint8_t ch,ch2; uint8_t ch,ch2;
uint16_t w; 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"); 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 */ /* initialize UART(s) depending on CPU defined */
/* m8 */ /* m8 */
UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; // set baud rate UBRRH = (((F_CPU/BAUD_RATE)/16)-1)>>8; // set baud rate
@ -149,42 +133,10 @@ int main(void)
UCSRB = (1<<RXEN)|(1<<TXEN); // enable Rx & Tx UCSRB = (1<<RXEN)|(1<<TXEN); // enable Rx & Tx
UCSRC = (1<<URSEL)|(1<<UCSZ1)|(1<<UCSZ0); // config USART; 8N1 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++) { for (i = 0; i < 16; i++) {
outb(LED_PORT, inb(LED_PORT) ^ _BV(LED));
_delay_loop_2(0); _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 */ /* forever */
for (;;) { for (;;) {
//if ((inb(UCSRA) & _BV(RXC))){ //if ((inb(UCSRA) & _BV(RXC))){
@ -261,6 +213,20 @@ int main(void)
// and give the programmer 1 sec to react // 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. */ /* 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(); nothing_response();
@ -297,11 +263,6 @@ int main(void)
address.word++; address.word++;
} }
} else { //Write to FLASH one page at a time } 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 cli(); //Disable interrupts, just to be sure
while(bit_is_set(EECR,EEWE)); //Wait for previous EEPROM writes to complete while(bit_is_set(EECR,EEWE)); //Wait for previous EEPROM writes to complete
asm volatile( asm volatile(
@ -321,20 +282,12 @@ int main(void)
"cpi r17,0x00 \n\t" //If page_word_count=0 then erase page "cpi r17,0x00 \n\t" //If page_word_count=0 then erase page
"brne no_page_erase \n\t" "brne no_page_erase \n\t"
"rcall wait_spm \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 "ldi r16,0x03 \n\t" //Erase page pointed to by Z
"sts %0,r16 \n\t" "sts %0,r16 \n\t"
"spm \n\t" "spm \n\t"
"rcall wait_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 "ldi r16,0x11 \n\t" //Re-enable RWW section
"sts %0,r16 \n\t" "sts %0,r16 \n\t"
"spm \n\t" "spm \n\t"
@ -343,11 +296,7 @@ int main(void)
"ld r1,Y+ \n\t" "ld r1,Y+ \n\t"
"rcall wait_spm \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 "ldi r16,0x01 \n\t" //Load r0,r1 into FLASH page buffer
"sts %0,r16 \n\t" "sts %0,r16 \n\t"
"spm \n\t" "spm \n\t"
@ -358,20 +307,12 @@ int main(void)
"write_page: \n\t" "write_page: \n\t"
"clr r17 \n\t" //New page, write current one first "clr r17 \n\t" //New page, write current one first
"rcall wait_spm \n\t" "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 "ldi r16,0x05 \n\t" //Write page pointed to by Z
"sts %0,r16 \n\t" "sts %0,r16 \n\t"
"spm \n\t" "spm \n\t"
"rcall wait_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 "ldi r16,0x11 \n\t" //Re-enable RWW section
"sts %0,r16 \n\t" "sts %0,r16 \n\t"
"spm \n\t" "spm \n\t"
@ -444,12 +385,6 @@ int main(void)
else if (ch == 'v') { else if (ch == 'v') {
byte_response(0x00); byte_response(0x00);
} }
// } else {
// time_count++;
// if (time_count>=MAX_TIME_COUNT) {
// app_start();
// }
// }
} /* end of forever loop */ } /* end of forever loop */
} }
@ -477,9 +412,6 @@ void getNch(uint8_t count)
{ {
uint8_t i; uint8_t i;
for(i=0;i<count;i++) { for(i=0;i<count;i++) {
/* m8 */
//while(!(inb(UCSRA) & _BV(RXC)));
//inb(UDR);
getch(); // need to handle time out getch(); // need to handle time out
} }
} }
@ -500,8 +432,3 @@ void nothing_response(void)
putch(0x10); putch(0x10);
} }
} }
/* end of file ATmegaBOOT.c */