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

Merge pull request #9003 from Bob-the-Kuhn/Due-PINS_DEBUG-&-related

Browse Source 
[2.0.x] add Due PINS_DEBUG support & misc improvements (replaces PR #8990)
This commit is contained in:
Bob-the-Kuhn
2018-01-02 18:47:53 -06:00
committed by GitHub
parent e9fc7bc69c adb9ecf3cc
commit eca5cc8669
9 changed files with 224 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/pins/pinsDebug.h
View File

@ -46,7 +46,7 @@
#line 47
// manually add pins that have names that are macros which don't play well with these macros
#if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY)
#if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM))
static const char RXD_NAME[] PROGMEM = { "RXD" };
static const char TXD_NAME[] PROGMEM = { "TXD" };
#endif
@ -85,7 +85,7 @@ const PinInfo pin_array[] PROGMEM = {
// manually add pins ...
#if SERIAL_PORT == 0
#if AVR_ATmega2560_FAMILY
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
{ RXD_NAME, 0, true },
{ TXD_NAME, 1, true },
#elif AVR_ATmega1284_FAMILY
@ -130,7 +130,7 @@ inline void report_pin_state_extended(pin_t pin, bool ignore, bool extended = fa
}
else {
SERIAL_CHAR('.');
SERIAL_ECHO_SP(26 + strlen(start_string)); // add padding if not the first instance found
SERIAL_ECHO_SP(MULTI_NAME_PAD + strlen(start_string)); // add padding if not the first instance found
}
PRINT_ARRAY_NAME(x);
if (extended) {

14
Marlin/src/pins/pinsDebug_list.h
View File

@ -27,7 +27,7 @@
// Pin list updated from 25 JUL 2017 Re-ARM branch - max length of pin name is 24
#line 0 // set __LINE__ to a known value for both passes
#line 31 // set __LINE__ to a known value for both passes
#if defined(EXT_AUX_A0) && EXT_AUX_A0 >= 0 && EXT_AUX_A0 < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(EXT_AUX_A0, __LINE__ )
@ -50,11 +50,13 @@
#if PIN_EXISTS(MAIN_VOLTAGE_MEASURE) && MAIN_VOLTAGE_MEASURE_PIN < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(MAIN_VOLTAGE_MEASURE_PIN, __LINE__ )
#endif
#if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(TC1, __LINE__ )
#endif
#if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(TC2, __LINE__ )
#if !defined(ARDUINO_ARCH_SAM) //TC1 & TC2 are macros in the SAM tool chain
#if defined(TC1) && TC1 >= 0 && TC1 < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(TC1, __LINE__ )
#endif
#if defined(TC2) && TC2 >= 0 && TC2 < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(TC2, __LINE__ )
#endif
#endif
#if PIN_EXISTS(TEMP_0) && TEMP_0_PIN < NUM_ANALOG_INPUTS
REPORT_NAME_ANALOG(TEMP_0_PIN, __LINE__ )

2
Marlin/src/pins/pins_RAMPS_FD_V1.h
View File

@ -96,6 +96,8 @@
#define TEMP_0_PIN 1 // Analog Input
#define TEMP_1_PIN 2 // Analog Input
#define TEMP_2_PIN 3 // Analog Input
#define TEMP_3_PIN -1 // fewer compiler warnings
#define TEMP_4_PIN -1 // fewer compiler warnings
#define TEMP_BED_PIN 0 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple