Skip to content

M42: Prevent unwanted pin mode switch to output #22493

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

Merged
merged 6 commits into from
Aug 5, 2021
Merged

M42: Prevent unwanted pin mode switch to output #22493

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a50387
M42: Prevent unwanted pin mode switch to output
tpruvot Aug 2, 2021
952680b
Forgot an input type...
tpruvot Aug 2, 2021
2e2c498
Update M42.cpp
thinkyhead Aug 2, 2021
123fc3f
M42: handle OD outputs for maple/STM32F1 too
tpruvot Aug 3, 2021
3877f5a
Tweak and test push
thinkyhead Aug 3, 2021
326fc36
Untweak and test push
thinkyhead Aug 4, 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
46 changes: 41 additions & 5 deletions Marlin/src/gcode/control/M42.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
#include "../../module/temperature.h"
#endif

#ifdef MAPLE_STM32F1
// these are enums on the F1...
#define INPUT_PULLDOWN INPUT_PULLDOWN
#define INPUT_ANALOG INPUT_ANALOG
#define OUTPUT_OPEN_DRAIN OUTPUT_OPEN_DRAIN
#endif

void protected_pin_err() {
SERIAL_ERROR_MSG(STR_ERR_PROTECTED_PIN);
}
Expand All @@ -55,13 +62,28 @@ void GcodeSuite::M42() {

if (!parser.boolval('I') && pin_is_protected(pin)) return protected_pin_err();

bool avoidWrite = false;
if (parser.seenval('M')) {
switch (parser.value_byte()) {
case 0: pinMode(pin, INPUT); break;
case 0: pinMode(pin, INPUT); avoidWrite = true; break;
case 1: pinMode(pin, OUTPUT); break;
case 2: pinMode(pin, INPUT_PULLUP); break;
#ifdef INPUT_PULLDOWN
case 3: pinMode(pin, INPUT_PULLDOWN); break;
case 2: pinMode(pin, INPUT_PULLUP); avoidWrite = true; break;
case 3:
#ifdef INPUT_PULLDOWN
pinMode(pin, INPUT_PULLDOWN);
avoidWrite = true;
#endif
break;
case 4:
#ifdef INPUT_ANALOG // STM32
pinMode(pin, INPUT_ANALOG);
#elif defined(MAPLE_STM32F1)
_SET_MODE(pin, GPIO_INPUT_ANALOG);
#endif
avoidWrite = true;
break;
#ifdef OUTPUT_OPEN_DRAIN
case 5: pinMode(pin, OUTPUT_OPEN_DRAIN); break;
#endif
default: SERIAL_ECHOLNPGM("Invalid Pin Mode"); return;
}
Expand Down Expand Up @@ -99,8 +121,22 @@ void GcodeSuite::M42() {
}
#endif

pinMode(pin, OUTPUT);
if (avoidWrite) {
SERIAL_ECHOLNPGM("?Cannot write to INPUT");
return;
}

// An OUTPUT_OPEN_DRAIN should not be changed to normal OUTPUT (STM32)
// Use M42 Px M1/5 S0/1 to set the output type and then set value
#ifndef OUTPUT_OPEN_DRAIN
pinMode(pin, OUTPUT);
#endif
extDigitalWrite(pin, pin_status);

#ifdef ARDUINO_ARCH_STM32
// A simple I/O will be set to 0 by analogWrite()
if (pin_status <= 1) return;
#endif
analogWrite(pin, pin_status);
}

Expand Down