bugfix: softPwm/Tone use pin defined by a user, not GPIO
This commit is contained in:
committed by
Joshua Yang
parent
23f3f5a4e2
commit
8fb0f2f61f
@@ -286,10 +286,10 @@ static void _pinMode (int pin, int mode)
|
|||||||
*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
|
*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
|
||||||
break;
|
break;
|
||||||
case SOFT_PWM_OUTPUT:
|
case SOFT_PWM_OUTPUT:
|
||||||
softPwmCreate (pin, 0, 100);
|
softPwmCreate (origPin, 0, 100);
|
||||||
break;
|
break;
|
||||||
case SOFT_TONE_OUTPUT:
|
case SOFT_TONE_OUTPUT:
|
||||||
softToneCreate (pin);
|
softToneCreate (origPin);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
||||||
|
|||||||
@@ -340,10 +340,10 @@ static void _pinMode (int pin, int mode)
|
|||||||
*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
|
*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
|
||||||
break;
|
break;
|
||||||
case SOFT_PWM_OUTPUT:
|
case SOFT_PWM_OUTPUT:
|
||||||
softPwmCreate (pin, 0, 100);
|
softPwmCreate (origPin, 0, 100);
|
||||||
break;
|
break;
|
||||||
case SOFT_TONE_OUTPUT:
|
case SOFT_TONE_OUTPUT:
|
||||||
softToneCreate (pin);
|
softToneCreate (origPin);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
||||||
|
|||||||
@@ -291,10 +291,10 @@ static void _pinMode (int pin, int mode)
|
|||||||
*(gpio[bank] + (N1_GPIO_CON_OFFSET >> 2)) |= (1 << gpioToShiftReg(pin));
|
*(gpio[bank] + (N1_GPIO_CON_OFFSET >> 2)) |= (1 << gpioToShiftReg(pin));
|
||||||
break;
|
break;
|
||||||
case SOFT_PWM_OUTPUT:
|
case SOFT_PWM_OUTPUT:
|
||||||
softPwmCreate (pin, 0, 100);
|
softPwmCreate (origPin, 0, 100);
|
||||||
break;
|
break;
|
||||||
case SOFT_TONE_OUTPUT:
|
case SOFT_TONE_OUTPUT:
|
||||||
softToneCreate (pin);
|
softToneCreate (origPin);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
||||||
|
|||||||
@@ -358,10 +358,10 @@ static void _pinMode (int pin, int mode)
|
|||||||
*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
|
*(gpio + fsel) = (*(gpio + fsel) & ~(1 << shift));
|
||||||
break;
|
break;
|
||||||
case SOFT_PWM_OUTPUT:
|
case SOFT_PWM_OUTPUT:
|
||||||
softPwmCreate (pin, 0, 100);
|
softPwmCreate (origPin, 0, 100);
|
||||||
break;
|
break;
|
||||||
case SOFT_TONE_OUTPUT:
|
case SOFT_TONE_OUTPUT:
|
||||||
softToneCreate (pin);
|
softToneCreate (origPin);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
||||||
|
|||||||
@@ -391,10 +391,10 @@ static void _pinMode (int pin, int mode)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SOFT_PWM_OUTPUT:
|
case SOFT_PWM_OUTPUT:
|
||||||
softPwmCreate (pin, 0, 100);
|
softPwmCreate (origPin, 0, 100);
|
||||||
break;
|
break;
|
||||||
case SOFT_TONE_OUTPUT:
|
case SOFT_TONE_OUTPUT:
|
||||||
softToneCreate (pin);
|
softToneCreate (origPin);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
msg(MSG_WARN, "%s : Unknown Mode %d\n", __func__, mode);
|
||||||
|
|||||||
Reference in New Issue
Block a user