0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #8554 from tcm0116/2.0.x-cleanup

Browse source 
[2.0.x] Fix for #8525 and other cleanup
This commit is contained in:
Scott Lahteine 2017-11-25 18:19:54 -06:00 committed by GitHub
parent 27c5692b13 7bb1721f35
commit 7576ad7fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/HAL/HAL_AVR/fastio_AVR.h
View file

@ -55,10 +55,6 @@
#error "Pins for this chip not defined in Arduino.h! If you have a working pins definition, please contribute!" #error "Pins for this chip not defined in Arduino.h! If you have a working pins definition, please contribute!"
#endif #endif
#ifndef _BV
#define _BV(bit) (1UL << (bit))
#endif
/** /**
* Magic I/O routines * Magic I/O routines
* *

2
Marlin/src/HAL/HAL_DUE/HAL_Due.h
View file

@ -53,8 +53,6 @@
#define MYSERIAL customizedSerial #define MYSERIAL customizedSerial
#endif #endif
#define _BV(bit) (1 << (bit))
// We need the previous define before the include, or compilation bombs... // We need the previous define before the include, or compilation bombs...
#include "MarlinSerial_Due.h" #include "MarlinSerial_Due.h"

2
Marlin/src/HAL/HAL_LPC1768/include/arduino.h
View file

@ -38,8 +38,6 @@
#define OUTPUT 0x01 #define OUTPUT 0x01
#define INPUT_PULLUP 0x02 #define INPUT_PULLUP 0x02
#define _BV(bit) (1 << (bit))
#define E2END 0xFFF // EEPROM end address #define E2END 0xFFF // EEPROM end address
typedef uint8_t byte; typedef uint8_t byte;

4
Marlin/src/HAL/HAL_LPC1768/pinmapping.cpp
View file

@ -27,8 +27,8 @@
#include "../../gcode/parser.h" #include "../../gcode/parser.h"
// Get the digital pin for an analog index // Get the digital pin for an analog index
pin_t analogInputToDigitalPin(const uint8_t p) { pin_t analogInputToDigitalPin(const int8_t p) {
return (p < COUNT(adc_pin_table) ? adc_pin_table[p] : P_NC); return (WITHIN(p, 0, NUM_ANALOG_INPUTS) ? adc_pin_table[p] : P_NC);
} }
// Return the index of a pin number // Return the index of a pin number

4
Marlin/src/HAL/HAL_LPC1768/pinmapping.h
View file

@ -239,7 +239,7 @@ constexpr pin_t pin_map[] = {
P_NC, P_NC, P_NC, P_NC, P4_28, P4_29, P_NC, P_NC P_NC, P_NC, P_NC, P_NC, P4_28, P4_29, P_NC, P_NC
}; };
constexpr int16_t NUM_DIGITAL_PINS = COUNT(pin_map); constexpr int8_t NUM_DIGITAL_PINS = COUNT(pin_map);
constexpr pin_t adc_pin_table[] = { constexpr pin_t adc_pin_table[] = {
P0_23, P0_24, P0_25, P0_26, P1_30, P1_31, P0_23, P0_24, P0_25, P0_26, P1_30, P1_31,
@ -255,7 +255,7 @@ constexpr int16_t NUM_ANALOG_INPUTS = COUNT(adc_pin_table);
#define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09, P0_29, P0_30 #define HAL_SENSITIVE_PINS P0_06, P0_07, P0_08, P0_09, P0_29, P0_30
// Get the digital pin for an analog index // Get the digital pin for an analog index
pin_t analogInputToDigitalPin(const uint8_t p); pin_t analogInputToDigitalPin(const int8_t p);
// Return the index of a pin number // Return the index of a pin number
// The pin number given here is in the form ppp:nnnnn // The pin number given here is in the form ppp:nnnnn

2
Marlin/src/HAL/HAL_STM32F1/HAL_Stm32f1.h
View file

@ -77,8 +77,6 @@
#define MYSERIAL Serial3 #define MYSERIAL Serial3
#endif #endif
#define _BV(bit) (1 << (bit))
/** /**
* TODO: review this to return 1 for pins that are not analog input * TODO: review this to return 1 for pins that are not analog input
*/ */

3
Marlin/src/HAL/HAL_TEENSY35_36/HAL_Teensy.h
View file

@ -30,6 +30,9 @@
// Includes // Includes
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// _BV is re-defined in Arduino.h
#undef _BV
#include <Arduino.h> #include <Arduino.h>
// Redefine sq macro defined by teensy3/wiring.h // Redefine sq macro defined by teensy3/wiring.h

2
Marlin/src/inc/SanityCheck.h
View file

@ -637,7 +637,7 @@ static_assert(1 >= 0
, "Please enable only one probe option: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo." , "Please enable only one probe option: PROBE_MANUALLY, FIX_MOUNTED_PROBE, BLTOUCH, SOLENOID_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or Z Servo."
); );
#if HAS_BED_PROBE #if PROBE_SELECTED && DISABLED(PROBE_MANUALLY)
/** /**
* Z_PROBE_SLED is incompatible with DELTA * Z_PROBE_SLED is incompatible with DELTA

15
Marlin/src/pins/pins.h
View file

@ -485,9 +485,6 @@
#define MAX_EXTRUDERS 5 #define MAX_EXTRUDERS 5
#endif #endif
// Marlin needs to account for pins that equal -1
#define marlinAnalogInputToDigitalPin(p) ((p) == -1 ? -1 : analogInputToDigitalPin(p))
// //
// Assign auto fan pins if needed // Assign auto fan pins if needed
// //
@ -541,7 +538,7 @@
#endif // EXTRUDERS > 2 #endif // EXTRUDERS > 2
#endif // EXTRUDERS > 1 #endif // EXTRUDERS > 1
#define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_0_PIN), #define _H0_PINS HEATER_0_PIN, E0_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_0_PIN),
#define _H1_PINS #define _H1_PINS
#define _H2_PINS #define _H2_PINS
#define _H3_PINS #define _H3_PINS
@ -549,16 +546,16 @@
#if HOTENDS > 1 #if HOTENDS > 1
#undef _H1_PINS #undef _H1_PINS
#define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_1_PIN), #define _H1_PINS HEATER_1_PIN, E1_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_1_PIN),
#if HOTENDS > 2 #if HOTENDS > 2
#undef _H2_PINS #undef _H2_PINS
#define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_2_PIN), #define _H2_PINS HEATER_2_PIN, E2_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_2_PIN),
#if HOTENDS > 3 #if HOTENDS > 3
#undef _H3_PINS #undef _H3_PINS
#define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, marlinAnalogInputToDigitalPin(TEMP_3_PIN), #define _H3_PINS HEATER_3_PIN, E3_AUTO_FAN_PIN, analogInputToDigitalPin(TEMP_3_PIN),
#if HOTENDS > 4 #if HOTENDS > 4
#undef _H4_PINS #undef _H4_PINS
#define _H4_PINS HEATER_4_PIN, marlinAnalogInputToDigitalPin(TEMP_4_PIN), #define _H4_PINS HEATER_4_PIN, analogInputToDigitalPin(TEMP_4_PIN),
#endif // HOTENDS > 4 #endif // HOTENDS > 4
#endif // HOTENDS > 3 #endif // HOTENDS > 3
#endif // HOTENDS > 2 #endif // HOTENDS > 2
@ -579,7 +576,7 @@
#endif // MIXING_STEPPERS > 2 #endif // MIXING_STEPPERS > 2
#endif // MIXING_STEPPERS > 1 #endif // MIXING_STEPPERS > 1
#define BED_PINS HEATER_BED_PIN, marlinAnalogInputToDigitalPin(TEMP_BED_PIN), #define BED_PINS HEATER_BED_PIN, analogInputToDigitalPin(TEMP_BED_PIN),
// //
// Assign endstop pins for boards with only 3 connectors // Assign endstop pins for boards with only 3 connectors