Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

patch stm32 pins_debugging #22896

Merged
merged 11 commits into from
Apr 21, 2022
+40 −30
Merged

patch stm32 pins_debugging #22896

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d9e613e
patch stm32 pins_debugging
ellensp Oct 6, 2021
f807ae1
Update pinsDebug.h
thinkyhead Oct 9, 2021
7f3fcd3
Update M43.cpp
thinkyhead Oct 9, 2021
be897c3
Update pinsDebug.h
thinkyhead Oct 9, 2021
bfe8ce7
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22896
thinkyhead Oct 9, 2021
13ce885
Merge 'upstream/bugfix-2.0.x' into pr/22896
thinkyhead Oct 13, 2021
f7a2845
test for analog pins higher than NUM_DIGITAL_PINS
ellensp Nov 3, 2021
87629c1
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/22896
thinkyhead Dec 11, 2021
3214b6d
Fix digital_pin_to_analog_pin
thinkyhead Dec 12, 2021
9559bdb
Try NUM_DIGITAL_PINS 112
thinkyhead Dec 12, 2021
7e4e211
tweaking pinsDebug …
thinkyhead Dec 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Marlin/src/HAL/STM32/pinsDebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const XrefInfo pin_xref[] PROGMEM = {
/**
* Translation of routines & variables used by pinsDebug.h
*/
#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
#define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS + NUM_ANALOG_INPUTS
#define VALID_PIN(ANUM) ((ANUM) >= 0 && (ANUM) < NUMBER_PINS_TOTAL)
#define digitalRead_mod(Ard_num) extDigitalRead(Ard_num) // must use Arduino pin numbers when doing reads
#define PRINT_PIN(Q)
Expand Down Expand Up @@ -196,10 +196,12 @@ void port_print(const pin_t Ard_num) {
SERIAL_ECHO_SP(7);

// Print number to be used with M42
sprintf_P(buffer, PSTR(" M42 P%d "), Ard_num);
SERIAL_ECHO(buffer);
if (Ard_num < 10) SERIAL_CHAR(' ');
if (Ard_num < 100) SERIAL_CHAR(' ');
int calc_p = Ard_num % (NUM_DIGITAL_PINS + 1);
if (Ard_num > NUM_DIGITAL_PINS && calc_p > 7) calc_p += 8;
SERIAL_ECHOPGM(" M42 P", calc_p);
SERIAL_CHAR(' ');
if (calc_p < 10) SERIAL_CHAR(' ');
if (calc_p < 100) SERIAL_CHAR(' ');
}

bool pwm_status(const pin_t Ard_num) {
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/config/M43.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ void GcodeSuite::M43() {

// 'P' Get the range of pins to test or watch
uint8_t first_pin = PARSED_PIN_INDEX('P', 0),
last_pin = parser.seenval('P') ? first_pin : NUMBER_PINS_TOTAL - 1;
last_pin = parser.seenval('P') ? first_pin : TERN(HAL_STM32, NUM_DIGITAL_PINS, NUMBER_PINS_TOTAL) - 1;
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved

if (first_pin > last_pin) return;

Expand Down