Fixed compiler warning for Sanguino compile

diff --git a/Marlin/Sanguino/cores/arduino/pins_arduino.c b/Marlin/Sanguino/cores/arduino/pins_arduino.c
index af3ba50529a64e2eb1de4849ee5fceb869a78141..d5fa6fea3b8c172d82f12e900b553b43f1eb58c6 100644 (file)
--- a/Marlin/Sanguino/cores/arduino/pins_arduino.c
+++ b/Marlin/Sanguino/cores/arduino/pins_arduino.c
@@ -67,28 +67,28 @@
 const uint8_t PROGMEM port_to_mode_PGM[] =
 {
        NOT_A_PORT,
-       (uint8_t) &DDRA,
-       (uint8_t) &DDRB,
-       (uint8_t) &DDRC,
-       (uint8_t) &DDRD,
+       (uint8_t) (uint16_t) &DDRA,
+       (uint8_t) (uint16_t) &DDRB,
+       (uint8_t) (uint16_t) &DDRC,
+       (uint8_t) (uint16_t) &DDRD,
 };
 
 const uint8_t PROGMEM port_to_output_PGM[] =
 {
        NOT_A_PORT,
-       (uint8_t) &PORTA,
-       (uint8_t) &PORTB,
-       (uint8_t) &PORTC,
-       (uint8_t) &PORTD,
+       (uint8_t) (uint16_t) &PORTA,
+       (uint8_t) (uint16_t) &PORTB,
+       (uint8_t) (uint16_t) &PORTC,
+       (uint8_t) (uint16_t) &PORTD,
 };
 
 const uint8_t PROGMEM port_to_input_PGM[] =
 {
        NOT_A_PORT,
-       (uint8_t) &PINA,
-       (uint8_t) &PINB,
-       (uint8_t) &PINC,
-       (uint8_t) &PIND,
+       (uint8_t) (uint16_t) &PINA,
+       (uint8_t) (uint16_t) &PINB,
+       (uint8_t) (uint16_t) &PINC,
+       (uint8_t) (uint16_t) &PIND,
 };
 
 const uint8_t PROGMEM digital_pin_to_port_PGM[] =

diff --git a/Marlin/Sanguino/cores/arduino/pins_arduino.h b/Marlin/Sanguino/cores/arduino/pins_arduino.h
index e0b7add867b406f8ec4f299e40b7cf9e82916dc0..fd7ee5c8c22485e6e627577da88928270340a662 100644 (file)
--- a/Marlin/Sanguino/cores/arduino/pins_arduino.h
+++ b/Marlin/Sanguino/cores/arduino/pins_arduino.h
@@ -58,8 +58,8 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
 #define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
 #define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
 #define analogInPinToBit(P) (P)
-#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_byte( port_to_output_PGM + (P))) )
-#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_byte( port_to_input_PGM + (P))) )
-#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_byte( port_to_mode_PGM + (P))) )
+#define portOutputRegister(P) ( (volatile uint8_t *)( (uint16_t) pgm_read_byte( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( (uint16_t) pgm_read_byte( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( (uint16_t) pgm_read_byte( port_to_mode_PGM + (P))) )
 
 #endif

diff --git a/Marlin/Sanguino/cores/arduino/wiring_private.h b/Marlin/Sanguino/cores/arduino/wiring_private.h
index 56c471353d68bbf15ccc558b6346869ea5ed0e61..7449c76ac3f1f7fd42e9b4d6056a599146beebb4 100644 (file)
--- a/Marlin/Sanguino/cores/arduino/wiring_private.h
+++ b/Marlin/Sanguino/cores/arduino/wiring_private.h
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <avr/delay.h>
+#include <util/delay.h>
 #include <stdio.h>
 #include <stdarg.h>
 

diff --git a/Marlin/pins.h b/Marlin/pins.h
index ebcfdd360f7059270877237e08fa64a67af5bf85..5d1b60611542189e59d3026b51d8c48173176c9d 100644 (file)
--- a/Marlin/pins.h
+++ b/Marlin/pins.h
@@ -539,6 +539,7 @@
 *
 ****************************************************************************************/
 #if MOTHERBOARD == 62
+#undef MOTHERBOARD
 #define MOTHERBOARD 6
 #define SANGUINOLOLU_V_1_2 
 #endif