mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 10:23:19 +02:00
Code Issues Releases Wiki Activity

Better solution to no_pin reporting.

Browse Source
This commit is contained in:
Mitch Bradley
2021-06-29 10:51:54 -10:00
parent 0ff2304992
commit d15ca365ab
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Grbl_Esp32/src/ControlPin.cpp
View File

@@ -10,7 +10,7 @@ void IRAM_ATTR ControlPin::handleISR() {
} }
void ControlPin::init() { void ControlPin::init() {
if (_pin.undefined() || _pin.name() == "NO_PIN") { if (_pin.undefined()) {
return; return;
} }
_pin.report(_legend); _pin.report(_legend);
@@ -23,11 +23,7 @@ void ControlPin::init() {
} }
void ControlPin::report(char* status) { void ControlPin::report(char* status) {
if (_pin.undefined()) { if (get()) {
return;
}
if (_pin.read()) {
addPinReport(status, _letter); addPinReport(status, _letter);
} }
} }

2
Grbl_Esp32/src/Pin.cpp
View File

@@ -117,7 +117,7 @@ const char* Pin::parse(StringRange tmp, Pins::PinDetail*& pinImplementation) {
} }
#endif #endif
if (prefix == "no_pin") { if (prefix == "no_pin") {
pinImplementation = new Pins::VoidPinDetail(); pinImplementation = undefinedPin;
} }
if (prefix == "void") { if (prefix == "void") {

4
Grbl_Esp32/src/UserOutput.cpp
View File

@@ -23,7 +23,7 @@
namespace UserOutput { namespace UserOutput {
DigitalOutput::DigitalOutput(uint8_t number, Pin& pin) : _number(number), _pin(pin) { DigitalOutput::DigitalOutput(uint8_t number, Pin& pin) : _number(number), _pin(pin) {
if (_pin.undefined() || _pin.name() == "NO_PIN") { if (_pin.undefined()) {
return; return;
} }
init(); init();
@@ -50,7 +50,7 @@ namespace UserOutput {
// ================================================================== // ==================================================================
AnalogOutput::AnalogOutput(uint8_t number, Pin& pin, float pwm_frequency) : _number(number), _pin(pin), _pwm_frequency(pwm_frequency) { AnalogOutput::AnalogOutput(uint8_t number, Pin& pin, float pwm_frequency) : _number(number), _pin(pin), _pwm_frequency(pwm_frequency) {
if (_pin.undefined() || _pin.name() == "NO_PIN") { if (_pin.undefined()) {
return; return;
} }