ManuelW/grbl-LPC-CoreXY
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Sanguino compile patch

Browse Source 
@daapp : Sanguino compile serial USART path. Thanks!
This commit is contained in:
Sonny Jeon 2012-11-08 17:24:56 -07:00
parent 5e7a4b3ba8
commit baf137882b
2 changed files with 230 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
serial.c
View File

@ -91,7 +91,11 @@ void serial_write(uint8_t data) {
} }
// Data Register Empty Interrupt handler // Data Register Empty Interrupt handler
#ifdef __AVR_ATmega644P__
ISR(USART0_UDRE_vect)
#else
ISR(USART_UDRE_vect) ISR(USART_UDRE_vect)
#endif
{ {
// Temporary tx_buffer_tail (to optimize for volatile) // Temporary tx_buffer_tail (to optimize for volatile)
uint8_t tail = tx_buffer_tail; uint8_t tail = tx_buffer_tail;
@ -140,7 +144,11 @@ uint8_t serial_read()
} }
} }
#ifdef __AVR_ATmega644P__
ISR(USART0_RX_vect)
#else
ISR(USART_RX_vect) ISR(USART_RX_vect)
#endif
{ {
uint8_t data = UDR0; uint8_t data = UDR0;
uint8_t next_head; uint8_t next_head;

3
settings.c
View File

@ -103,7 +103,6 @@ uint8_t settings_read_startup_line(uint8_t n, char *line)
uint16_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK; uint16_t addr = n*(LINE_BUFFER_SIZE+1)+EEPROM_ADDR_STARTUP_BLOCK;
if (!(memcpy_from_eeprom_with_checksum((char*)line, addr, LINE_BUFFER_SIZE))) { if (!(memcpy_from_eeprom_with_checksum((char*)line, addr, LINE_BUFFER_SIZE))) {
// Reset line with default value // Reset line with default value
// TODO: Need to come up with a method to do this.
line[0] = 0; line[0] = 0;
settings_store_startup_line(n, line); settings_store_startup_line(n, line);
return(false); return(false);
@ -219,5 +218,5 @@ void settings_init() {
report_status_message(STATUS_SETTING_READ_FAIL); report_status_message(STATUS_SETTING_READ_FAIL);
} }
} }
// NOTE: Startup lines are handled and called by protocol_init(). // NOTE: Startup lines are handled and called by main.c at the end of initialization.
} }