Permalink
Browse files

Fixed compiler warning for Sanguino compile

  • Loading branch information...
daid committed Feb 26, 2012
1 parent 66d5056 commit 286d5003fadab0a19ae4eddade6fcc8c1cc7a753
@@ -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[] =
@@ -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
@@ -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>
View
@@ -539,6 +539,7 @@
*
****************************************************************************************/
#if MOTHERBOARD == 62
+#undef MOTHERBOARD
#define MOTHERBOARD 6
#define SANGUINOLOLU_V_1_2
#endif

0 comments on commit 286d500

Please sign in to comment.