Merge upstream changes from Marlin 2.1.2.1
This commit is contained in:
@@ -47,10 +47,10 @@ WEAK const PinMap PinMap_ADC[] = {
|
||||
//{PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
|
||||
//{PA_1, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
|
||||
//{PA_1, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
|
||||
{PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 LCD RX
|
||||
{PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 LCD RX
|
||||
//{PA_2, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
|
||||
//{PA_2, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
|
||||
{PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 LCD TX
|
||||
{PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 LCD TX
|
||||
//{PA_3, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
|
||||
//{PA_3, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
|
||||
//{PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
|
||||
|
@@ -37,121 +37,120 @@ extern "C" {
|
||||
* Pins
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
#define PA1 0
|
||||
#define PA2 1
|
||||
#define PA3 2
|
||||
#define PA4 3
|
||||
#define PA5 4
|
||||
#define PA6 5
|
||||
#define PA7 6
|
||||
#define PA8 7
|
||||
#define PA9 8
|
||||
#define PA10 9
|
||||
#define PA11 10
|
||||
#define PA12 11
|
||||
#define PA13 12
|
||||
#define PA14 13
|
||||
#define PA15 14
|
||||
#define PB0 15
|
||||
#define PB1 16
|
||||
#define PB2 17
|
||||
#define PB3 18
|
||||
#define PB4 19
|
||||
#define PB5 20
|
||||
#define PB6 21
|
||||
#define PB7 22
|
||||
#define PB8 23
|
||||
#define PB9 24
|
||||
#define PB10 25
|
||||
#define PB11 26
|
||||
#define PB12 27
|
||||
#define PB13 28
|
||||
#define PB14 29
|
||||
#define PB15 30
|
||||
#define PC2 31
|
||||
#define PC3 32
|
||||
#define PC4 33
|
||||
#define PC5 34
|
||||
#define PC6 35
|
||||
#define PC7 36
|
||||
#define PC8 37
|
||||
#define PC9 38
|
||||
#define PC10 39
|
||||
#define PC11 40
|
||||
#define PC12 41
|
||||
#define PC13 42
|
||||
#define PC14 43
|
||||
#define PC15 44
|
||||
#define PD0 45
|
||||
#define PD1 46
|
||||
#define PD2 47
|
||||
#define PD3 48
|
||||
#define PD4 49
|
||||
#define PD5 50
|
||||
#define PD6 51
|
||||
#define PD7 52
|
||||
#define PD8 53
|
||||
#define PD9 54
|
||||
#define PD10 55
|
||||
#define PD11 56
|
||||
#define PD12 57
|
||||
#define PD13 58
|
||||
#define PD14 59
|
||||
#define PD15 60
|
||||
#define PE0 61
|
||||
#define PE1 62
|
||||
#define PE11 63
|
||||
#define PE3 64
|
||||
#define PE4 65
|
||||
#define PE5 66
|
||||
#define PE6 67
|
||||
#define PE7 68
|
||||
#define PE8 69
|
||||
#define PE9 70
|
||||
#define PE10 71
|
||||
#define PA1 0
|
||||
#define PA2 1
|
||||
#define PA3 2
|
||||
#define PA4 3
|
||||
#define PA5 4
|
||||
#define PA6 5
|
||||
#define PA7 6
|
||||
#define PA8 7
|
||||
#define PA9 8
|
||||
#define PA10 9
|
||||
#define PA11 10
|
||||
#define PA12 11
|
||||
#define PA13 12
|
||||
#define PA14 13
|
||||
#define PA15 14
|
||||
#define PB0 15
|
||||
#define PB1 16
|
||||
#define PB2 17
|
||||
#define PB3 18
|
||||
#define PB4 19
|
||||
#define PB5 20
|
||||
#define PB6 21
|
||||
#define PB7 22
|
||||
#define PB8 23
|
||||
#define PB9 24
|
||||
#define PB10 25
|
||||
#define PB11 26
|
||||
#define PB12 27
|
||||
#define PB13 28
|
||||
#define PB14 29
|
||||
#define PB15 30
|
||||
#define PC2 31
|
||||
#define PC3 32
|
||||
#define PC4 33
|
||||
#define PC5 34
|
||||
#define PC6 35
|
||||
#define PC7 36
|
||||
#define PC8 37
|
||||
#define PC9 38
|
||||
#define PC10 39
|
||||
#define PC11 40
|
||||
#define PC12 41
|
||||
#define PC13 42
|
||||
#define PC14 43
|
||||
#define PC15 44
|
||||
#define PD0 45
|
||||
#define PD1 46
|
||||
#define PD2 47
|
||||
#define PD3 48
|
||||
#define PD4 49
|
||||
#define PD5 50
|
||||
#define PD6 51
|
||||
#define PD7 52
|
||||
#define PD8 53
|
||||
#define PD9 54
|
||||
#define PD10 55
|
||||
#define PD11 56
|
||||
#define PD12 57
|
||||
#define PD13 58
|
||||
#define PD14 59
|
||||
#define PD15 60
|
||||
#define PE0 61
|
||||
#define PE1 62
|
||||
#define PE11 63
|
||||
#define PE3 64
|
||||
#define PE4 65
|
||||
#define PE5 66
|
||||
#define PE6 67
|
||||
#define PE7 68
|
||||
#define PE8 69
|
||||
#define PE9 70
|
||||
#define PE10 71
|
||||
#define PE2 72
|
||||
#define PE12 73
|
||||
#define PE13 74
|
||||
#define PE14 75
|
||||
#define PE15 76
|
||||
#define PF0 77
|
||||
#define PF1 78
|
||||
#define PF2 79
|
||||
#define PF6 80
|
||||
#define PF7 81
|
||||
#define PF8 82
|
||||
#define PF9 83
|
||||
#define PF11 84
|
||||
#define PF12 85
|
||||
#define PF13 86
|
||||
#define PF14 87
|
||||
#define PF15 88
|
||||
#define PG0 89
|
||||
#define PG1 90
|
||||
#define PG2 91
|
||||
#define PG3 92
|
||||
#define PG4 93
|
||||
#define PG5 94
|
||||
#define PG6 95
|
||||
#define PG7 96
|
||||
#define PG8 97
|
||||
#define PG9 98
|
||||
#define PG10 99
|
||||
#define PG11 100
|
||||
#define PG12 101
|
||||
#define PG13 102
|
||||
#define PG14 103
|
||||
#define PG15 104
|
||||
#define PH0 105
|
||||
#define PH1 106
|
||||
#define PA0 107
|
||||
#define PC1 108
|
||||
#define PC0 109
|
||||
#define PF10 110
|
||||
#define PF5 111
|
||||
#define PF4 112
|
||||
#define PF3 113
|
||||
#define PE12 73
|
||||
#define PE13 74
|
||||
#define PE14 75
|
||||
#define PE15 76
|
||||
#define PF0 77
|
||||
#define PF1 78
|
||||
#define PF2 79
|
||||
#define PF6 80
|
||||
#define PF7 81
|
||||
#define PF8 82
|
||||
#define PF9 83
|
||||
#define PF11 84
|
||||
#define PF12 85
|
||||
#define PF13 86
|
||||
#define PF14 87
|
||||
#define PF15 88
|
||||
#define PG0 89
|
||||
#define PG1 90
|
||||
#define PG2 91
|
||||
#define PG3 92
|
||||
#define PG4 93
|
||||
#define PG5 94
|
||||
#define PG6 95
|
||||
#define PG7 96
|
||||
#define PG8 97
|
||||
#define PG9 98
|
||||
#define PG10 99
|
||||
#define PG11 100
|
||||
#define PG12 101
|
||||
#define PG13 102
|
||||
#define PG14 103
|
||||
#define PG15 104
|
||||
#define PH0 105
|
||||
#define PH1 106
|
||||
#define PA0 107
|
||||
#define PC1 108
|
||||
#define PC0 109
|
||||
#define PF10 110
|
||||
#define PF5 111
|
||||
#define PF4 112
|
||||
#define PF3 113
|
||||
|
||||
// This must be a literal
|
||||
#define NUM_DIGITAL_PINS 114
|
||||
@@ -196,7 +195,7 @@ extern "C" {
|
||||
#define PIN_SERIAL_TX PA9
|
||||
|
||||
// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number
|
||||
// Used when user instantiate a hardware Serial using its peripheral name.
|
||||
// Used when the user instantiates a hardware Serial using its peripheral name.
|
||||
// Example: HardwareSerial mySerial(USART3);
|
||||
// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined.
|
||||
#define PIN_SERIAL1_RX PA10
|
||||
@@ -210,6 +209,7 @@ extern "C" {
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
/*----------------------------------------------------------------------------
|
||||
* Arduino objects - C++ only
|
||||
*----------------------------------------------------------------------------*/
|
||||
@@ -230,8 +230,7 @@ extern "C" {
|
||||
//
|
||||
// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX
|
||||
// pins are NOT connected to anything by default.
|
||||
#define SERIAL_PORT_MONITOR Serial
|
||||
#define SERIAL_PORT_HARDWARE Serial1
|
||||
#define SERIAL_PORT_MONITOR Serial
|
||||
#define SERIAL_PORT_HARDWARE Serial1
|
||||
#define SERIAL_PORT_HARDWARE_OPEN Serial2
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user