bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fixed compiler warning for Sanguino compile

Browse Source
This commit is contained in:
Daid
2012-02-26 17:35:01 +01:00
parent 66d50562b6
commit 286d5003fa
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Marlin/Sanguino/cores/arduino/pins_arduino.c
View File

@@ -67,28 +67,28 @@
const uint8_t PROGMEM port_to_mode_PGM[] = const uint8_t PROGMEM port_to_mode_PGM[] =
{ {
NOT_A_PORT, NOT_A_PORT,
(uint8_t) &DDRA, (uint8_t) (uint16_t) &DDRA,
(uint8_t) &DDRB, (uint8_t) (uint16_t) &DDRB,
(uint8_t) &DDRC, (uint8_t) (uint16_t) &DDRC,
(uint8_t) &DDRD, (uint8_t) (uint16_t) &DDRD,
}; };
const uint8_t PROGMEM port_to_output_PGM[] = const uint8_t PROGMEM port_to_output_PGM[] =
{ {
NOT_A_PORT, NOT_A_PORT,
(uint8_t) &PORTA, (uint8_t) (uint16_t) &PORTA,
(uint8_t) &PORTB, (uint8_t) (uint16_t) &PORTB,
(uint8_t) &PORTC, (uint8_t) (uint16_t) &PORTC,
(uint8_t) &PORTD, (uint8_t) (uint16_t) &PORTD,
}; };
const uint8_t PROGMEM port_to_input_PGM[] = const uint8_t PROGMEM port_to_input_PGM[] =
{ {
NOT_A_PORT, NOT_A_PORT,
(uint8_t) &PINA, (uint8_t) (uint16_t) &PINA,
(uint8_t) &PINB, (uint8_t) (uint16_t) &PINB,
(uint8_t) &PINC, (uint8_t) (uint16_t) &PINC,
(uint8_t) &PIND, (uint8_t) (uint16_t) &PIND,
}; };
const uint8_t PROGMEM digital_pin_to_port_PGM[] = const uint8_t PROGMEM digital_pin_to_port_PGM[] =

6
Marlin/Sanguino/cores/arduino/pins_arduino.h
View File

@@ -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 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 digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
#define analogInPinToBit(P) (P) #define analogInPinToBit(P) (P)
#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_byte( port_to_output_PGM + (P))) ) #define portOutputRegister(P) ( (volatile uint8_t *)( (uint16_t) pgm_read_byte( port_to_output_PGM + (P))) )
#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_byte( port_to_input_PGM + (P))) ) #define portInputRegister(P) ( (volatile uint8_t *)( (uint16_t) pgm_read_byte( port_to_input_PGM + (P))) )
#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_byte( port_to_mode_PGM + (P))) ) #define portModeRegister(P) ( (volatile uint8_t *)( (uint16_t) pgm_read_byte( port_to_mode_PGM + (P))) )
#endif #endif

2
Marlin/Sanguino/cores/arduino/wiring_private.h
View File

@@ -27,7 +27,7 @@
#include <math.h> #include <math.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <avr/delay.h> #include <util/delay.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>

1
Marlin/pins.h
View File

@@ -539,6 +539,7 @@
* *
****************************************************************************************/ ****************************************************************************************/
#if MOTHERBOARD == 62 #if MOTHERBOARD == 62
#undef MOTHERBOARD
#define MOTHERBOARD 6 #define MOTHERBOARD 6
#define SANGUINOLOLU_V_1_2 #define SANGUINOLOLU_V_1_2
#endif #endif