update code base to Marlin 2.0.9.2
This commit is contained in:
Stefan Kalscheuer
160
Marlin/src/pins/pinsDebug.h
Executable file → Normal file
160
Marlin/src/pins/pinsDebug.h
Executable file → Normal file
@@ -2,6 +2,9 @@
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||
*
|
||||
* Based on Sprinter and grbl.
|
||||
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
@@ -13,7 +16,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -31,7 +34,6 @@
|
||||
*
|
||||
* Both passes use the same pin list. The list contains two macro names. The
|
||||
* actual macro definitions are changed depending on which pass is being done.
|
||||
*
|
||||
*/
|
||||
|
||||
// first pass - put the name strings into FLASH
|
||||
@@ -42,38 +44,26 @@
|
||||
#define REPORT_NAME_ANALOG(COUNTER, NAME) _ADD_PIN(#NAME, COUNTER)
|
||||
|
||||
#include "pinsDebug_list.h"
|
||||
#line 46
|
||||
#line 48
|
||||
|
||||
// manually add pins that have names that are macros which don't play well with these macros
|
||||
#if (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY || defined(ARDUINO_ARCH_SAM) || defined(TARGET_LPC1768))
|
||||
#if SERIAL_PORT == 0
|
||||
#if ANY(AVR_ATmega2560_FAMILY, AVR_ATmega1284_FAMILY, ARDUINO_ARCH_SAM, TARGET_LPC1768)
|
||||
#if CONF_SERIAL_IS(0)
|
||||
static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
|
||||
static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
|
||||
#elif SERIAL_PORT == 1
|
||||
#endif
|
||||
#if CONF_SERIAL_IS(1)
|
||||
static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
|
||||
static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
|
||||
#elif SERIAL_PORT == 2
|
||||
#endif
|
||||
#if CONF_SERIAL_IS(2)
|
||||
static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
|
||||
static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
|
||||
#elif SERIAL_PORT == 3
|
||||
#endif
|
||||
#if CONF_SERIAL_IS(3)
|
||||
static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
|
||||
static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
|
||||
#endif
|
||||
#ifdef SERIAL_PORT_2
|
||||
#if SERIAL_PORT_2 == 0
|
||||
static const char RXD_NAME_0[] PROGMEM = { "RXD0" };
|
||||
static const char TXD_NAME_0[] PROGMEM = { "TXD0" };
|
||||
#elif SERIAL_PORT_2 == 1
|
||||
static const char RXD_NAME_1[] PROGMEM = { "RXD1" };
|
||||
static const char TXD_NAME_1[] PROGMEM = { "TXD1" };
|
||||
#elif SERIAL_PORT_2 == 2
|
||||
static const char RXD_NAME_2[] PROGMEM = { "RXD2" };
|
||||
static const char TXD_NAME_2[] PROGMEM = { "TXD2" };
|
||||
#elif SERIAL_PORT_2 == 3
|
||||
static const char RXD_NAME_3[] PROGMEM = { "RXD3" };
|
||||
static const char TXD_NAME_3[] PROGMEM = { "TXD3" };
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -104,87 +94,68 @@ const PinInfo pin_array[] PROGMEM = {
|
||||
* Each entry takes up 6 bytes in FLASH:
|
||||
* 2 byte pointer to location of the name string
|
||||
* 2 bytes containing the pin number
|
||||
* analog pin numbers were convereted to digital when the array was created
|
||||
* analog pin numbers were converted to digital when the array was created
|
||||
* 2 bytes containing the digital/analog bool flag
|
||||
*/
|
||||
|
||||
// manually add pins ...
|
||||
#if SERIAL_PORT == 0
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
#if CONF_SERIAL_IS(0)
|
||||
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
|
||||
{ RXD_NAME_0, 0, true },
|
||||
{ TXD_NAME_0, 1, true },
|
||||
#elif AVR_ATmega1284_FAMILY
|
||||
{ RXD_NAME_0, 8, true },
|
||||
{ TXD_NAME_0, 9, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
#elif defined(TARGET_LPC1768) // TX P0_02 RX P0_03
|
||||
{ RXD_NAME_0, 3, true },
|
||||
{ TXD_NAME_0, 2, true },
|
||||
#endif
|
||||
#elif SERIAL_PORT == 1
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
#endif
|
||||
|
||||
#if CONF_SERIAL_IS(1)
|
||||
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
|
||||
{ RXD_NAME_1, 19, true },
|
||||
{ TXD_NAME_1, 18, true },
|
||||
#elif AVR_ATmega1284_FAMILY
|
||||
{ RXD_NAME_1, 10, true },
|
||||
{ TXD_NAME_1, 11, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
{ RXD_NAME_1, 16, true },
|
||||
{ TXD_NAME_1, 15, true },
|
||||
#endif
|
||||
#elif SERIAL_PORT == 2
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
{ RXD_NAME_2, 17, true },
|
||||
{ TXD_NAME_2, 16, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
{ RXD_NAME_2, 11, true },
|
||||
{ TXD_NAME_2, 10, true },
|
||||
#endif
|
||||
#elif SERIAL_PORT == 3
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
{ RXD_NAME_3, 15, true },
|
||||
{ TXD_NAME_3, 14, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
{ RXD_NAME_3, 1, true },
|
||||
{ TXD_NAME_3, 0, true },
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef SERIAL_PORT_2
|
||||
#if SERIAL_PORT_2 == 0
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
{ RXD_NAME_0, 0, true },
|
||||
{ TXD_NAME_0, 1, true },
|
||||
#elif AVR_ATmega1284_FAMILY
|
||||
{ RXD_NAME_0, 8, true },
|
||||
{ TXD_NAME_0, 9, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
{ RXD_NAME_0, 3, true },
|
||||
{ TXD_NAME_0, 2, true },
|
||||
#endif
|
||||
#elif SERIAL_PORT_2 == 1
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
{ RXD_NAME_1, 19, true },
|
||||
{ TXD_NAME_1, 18, true },
|
||||
#elif AVR_ATmega1284_FAMILY
|
||||
{ RXD_NAME_1, 10, true },
|
||||
{ TXD_NAME_1, 11, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
#ifdef LPC_PINCFG_UART1_P2_00 // TX P2_00 RX P2_01
|
||||
{ RXD_NAME_1, 0x41, true },
|
||||
{ TXD_NAME_1, 0x40, true },
|
||||
#else // TX P0_15 RX P0_16
|
||||
{ RXD_NAME_1, 16, true },
|
||||
{ TXD_NAME_1, 15, true },
|
||||
#endif
|
||||
#elif SERIAL_PORT_2 == 2
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
{ RXD_NAME_2, 17, true },
|
||||
{ TXD_NAME_2, 16, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if CONF_SERIAL_IS(2)
|
||||
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
|
||||
{ RXD_NAME_2, 17, true },
|
||||
{ TXD_NAME_2, 16, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
#ifdef LPC_PINCFG_UART2_P2_08 // TX P2_08 RX P2_09
|
||||
{ RXD_NAME_2, 0x49, true },
|
||||
{ TXD_NAME_2, 0x48, true },
|
||||
#else // TX P0_10 RX P0_11
|
||||
{ RXD_NAME_2, 11, true },
|
||||
{ TXD_NAME_2, 10, true },
|
||||
#endif
|
||||
#elif SERIAL_PORT_2 == 3
|
||||
#if (AVR_ATmega2560_FAMILY || defined(ARDUINO_ARCH_SAM))
|
||||
{ RXD_NAME_3, 15, true },
|
||||
{ TXD_NAME_3, 14, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if CONF_SERIAL_IS(3)
|
||||
#if EITHER(AVR_ATmega2560_FAMILY, ARDUINO_ARCH_SAM)
|
||||
{ RXD_NAME_3, 15, true },
|
||||
{ TXD_NAME_3, 14, true },
|
||||
#elif defined(TARGET_LPC1768)
|
||||
#ifdef LPC_PINCFG_UART3_P0_25 // TX P0_25 RX P0_26
|
||||
{ RXD_NAME_3, 0x1A, true },
|
||||
{ TXD_NAME_3, 0x19, true },
|
||||
#elif defined(LPC_PINCFG_UART3_P4_28) // TX P4_28 RX P4_29
|
||||
{ RXD_NAME_3, 0x9D, true },
|
||||
{ TXD_NAME_3, 0x9C, true },
|
||||
#else // TX P0_00 RX P0_01
|
||||
{ RXD_NAME_3, 1, true },
|
||||
{ TXD_NAME_3, 0, true },
|
||||
#endif
|
||||
@@ -192,7 +163,7 @@ const PinInfo pin_array[] PROGMEM = {
|
||||
#endif
|
||||
|
||||
#include "pinsDebug_list.h"
|
||||
#line 172
|
||||
#line 167
|
||||
|
||||
};
|
||||
|
||||
@@ -203,7 +174,7 @@ const PinInfo pin_array[] PROGMEM = {
|
||||
#endif
|
||||
|
||||
static void print_input_or_output(const bool isout) {
|
||||
serialprintPGM(isout ? PSTR("Output = ") : PSTR("Input = "));
|
||||
SERIAL_ECHOPGM_P(isout ? PSTR("Output = ") : PSTR("Input = "));
|
||||
}
|
||||
|
||||
// pretty report with PWM info
|
||||
@@ -231,15 +202,12 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
|
||||
LOOP_L_N(x, COUNT(pin_array)) { // scan entire array and report all instances of this pin
|
||||
if (GET_ARRAY_PIN(x) == pin) {
|
||||
if (!found) { // report digital and analog pin number only on the first time through
|
||||
if (start_string) serialprintPGM(start_string);
|
||||
serialprintPGM(PSTR("PIN: "));
|
||||
if (start_string) SERIAL_ECHOPGM_P(start_string);
|
||||
SERIAL_ECHOPGM("PIN: ");
|
||||
PRINT_PIN(pin);
|
||||
PRINT_PORT(pin);
|
||||
if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
|
||||
sprintf_P(buffer, PSTR(" (A%2d) "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); // analog pin number
|
||||
SERIAL_ECHO(buffer);
|
||||
}
|
||||
else SERIAL_ECHO_SP(8); // add padding if not an analog pin
|
||||
if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) PRINT_PIN_ANALOG(pin); // analog pin number
|
||||
else SERIAL_ECHO_SP(8); // add padding if not an analog pin
|
||||
}
|
||||
else {
|
||||
SERIAL_CHAR('.');
|
||||
@@ -282,16 +250,12 @@ inline void report_pin_state_extended(pin_t pin, const bool ignore, const bool e
|
||||
} // end of for loop
|
||||
|
||||
if (!found) {
|
||||
if (start_string) serialprintPGM(start_string);
|
||||
serialprintPGM(PSTR("PIN: "));
|
||||
if (start_string) SERIAL_ECHOPGM_P(start_string);
|
||||
SERIAL_ECHOPGM("PIN: ");
|
||||
PRINT_PIN(pin);
|
||||
PRINT_PORT(pin);
|
||||
if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) {
|
||||
sprintf_P(buffer, PSTR(" (A%2d) "), DIGITAL_PIN_TO_ANALOG_PIN(pin)); // analog pin number
|
||||
SERIAL_ECHO(buffer);
|
||||
}
|
||||
else
|
||||
SERIAL_ECHO_SP(8); // add padding if not an analog pin
|
||||
if (int8_t(DIGITAL_PIN_TO_ANALOG_PIN(pin)) >= 0) PRINT_PIN_ANALOG(pin); // analog pin number
|
||||
else SERIAL_ECHO_SP(8); // add padding if not an analog pin
|
||||
SERIAL_ECHOPGM("<unused/unknown>");
|
||||
if (extended) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user