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

если в ШИМ нужен максимальный уровень, используется digitalWrite(), чтобы не было просадок еле заметных

Browse Source
This commit is contained in:
KLASSENTS 2025-08-01 13:24:49 +07:00
parent 1ab5125fc8
commit cd3e2268c6
1 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cores/arduino/wiring_analog.c
View File

@ -104,9 +104,17 @@ It is recommended to enable the timer in the following order:
*/ */
void analogWrite(uint32_t PinNumber, uint32_t writeVal) void analogWrite(uint32_t PinNumber, uint32_t writeVal)
{ {
if (writeVal > WriteValMax) writeVal = WriteValMax; if (writeVal >= WriteValMax)
{
// if we need max value, use digitalWrite to supply constant level
digitalWrite(PinNumber, HIGH);
}
else
{
// if we need less then max, use pwm
int8_t pwmState = digitalPinPwmIsOn(PinNumber);
if (digitalPinPwmIsOn(PinNumber) > 0) // pin has pwm and pwm is already on if (pwmState > 0) // pin has pwm and pwm is already on
{ {
// we can only change writeVal if it is differ from current value // we can only change writeVal if it is differ from current value
TIMER32_TypeDef* timer = pwmPinToTimer(PinNumber); TIMER32_TypeDef* timer = pwmPinToTimer(PinNumber);
@ -117,10 +125,10 @@ void analogWrite(uint32_t PinNumber, uint32_t writeVal)
timer->CHANNELS[pwmPinToTimerChannel(PinNumber)].OCR = newOCR; timer->CHANNELS[pwmPinToTimerChannel(PinNumber)].OCR = newOCR;
} }
} }
else if (digitalPinPwmIsOn(PinNumber) == 0) // pin has pwm and pwm is off else if (pwmState == 0) // pin has pwm and pwm is off
{ {
// init pin as pwm // init pin as pwm
uint32_t OCRval = (uint32_t) (((uint64_t)pwmTopVal * writeVal) / WriteValMax); uint32_t OCRval = (pwmTopVal * writeVal) / WriteValMax;
// initialization of the required timer // initialization of the required timer
htimer32.Instance = pwmPinToTimer(PinNumber); htimer32.Instance = pwmPinToTimer(PinNumber);
@ -153,6 +161,7 @@ void analogWrite(uint32_t PinNumber, uint32_t writeVal)
} }
else // pin doesn't have pwm else // pin doesn't have pwm
ErrorMsgHandler("analogWrite(): invalid pwm pin number"); ErrorMsgHandler("analogWrite(): invalid pwm pin number");
}
} }
// Set the resolution of analogWrite parameters // Set the resolution of analogWrite parameters