Elron_dev/elbear_arduino_bsp
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

сразу проверяется, включен ли шим, если он доступен на ноге

Browse Source
This commit is contained in:
KLASSENTS 2025-05-27 16:20:37 +07:00
parent 08dea74f86
commit fbc87f79b8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cores/arduino/wiring_digital.c
View File

@ -37,8 +37,8 @@ void pinMode(uint32_t PinNumber, uint32_t PinMode)
return; return;
} }
if (digitalPinHasPWM(PinNumber)) if (digitalPinPwmIsOn(PinNumber))
// if the pin can use PWM, disable PWM // if the pin use PWM, disable PWM
analogWriteStop(PinNumber); analogWriteStop(PinNumber);
// determine the port and the pin number in the port // determine the port and the pin number in the port
@ -104,7 +104,7 @@ __attribute__((noinline, section(".ram_text"))) void digitalWrite(uint32_t PinNu
} }
if (digitalPinPwmIsOn(PinNumber)) if (digitalPinPwmIsOn(PinNumber))
// if the pin can use PWM, disable PWM // if the pin use PWM, disable PWM
analogWriteStop(PinNumber); analogWriteStop(PinNumber);
if (Val == HIGH) if (Val == HIGH)
@ -123,7 +123,7 @@ __attribute__((noinline, section(".ram_text"))) int digitalRead(uint32_t PinNumb
} }
if (digitalPinPwmIsOn(PinNumber)) if (digitalPinPwmIsOn(PinNumber))
// if the pin can use PWM, disable PWM // if the pin use PWM, disable PWM
analogWriteStop(PinNumber); analogWriteStop(PinNumber);
return GPIO_READ_PIN(digitalPinToPort(PinNumber), digitalPinToBitMask(PinNumber)); return GPIO_READ_PIN(digitalPinToPort(PinNumber), digitalPinToBitMask(PinNumber));
@ -139,7 +139,7 @@ __attribute__((noinline, section(".ram_text"))) void digitalToggle(uint32_t PinN
} }
if (digitalPinPwmIsOn(PinNumber)) if (digitalPinPwmIsOn(PinNumber))
// if the pin can use PWM, disable PWM // if the pin use PWM, disable PWM
analogWriteStop(PinNumber); analogWriteStop(PinNumber);
GPIO_TOGGLE_PIN(digitalPinToPort(PinNumber), digitalPinToBitMask(PinNumber)); GPIO_TOGGLE_PIN(digitalPinToPort(PinNumber), digitalPinToBitMask(PinNumber));

2
cores/arduino/wiring_pulse.cpp
View File

@ -13,7 +13,7 @@ unsigned long pulseIn(int pin, int state, unsigned long timeout)
ErrorMsgHandler("pulseIn(): pin number exceeds the total number of pins"); ErrorMsgHandler("pulseIn(): pin number exceeds the total number of pins");
return -1; return -1;
} }
if (digitalPinHasPWM(pin)) if (digitalPinPwmIsOn(pin) > 0)
// pwm off // pwm off
analogWriteStop(pin); analogWriteStop(pin);