[beken-72xx] Fix stopping PWM, use pin-scoped PWM struct (#215)

* Fixed stopping PWM * Clang-formatted as required * Use separate memory block for each pwm pin
libretiny-eu · Dec 8, 2023 · 7bd6d1d · 7bd6d1d
1 parent bb7fcd5
commit 7bd6d1d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/cores/beken-72xx/arduino/src/wiring.c b/cores/beken-72xx/arduino/src/wiring.c
@@ -108,9 +108,9 @@ void pinRemoveMode(PinInfo *pin, uint32_t mask) {
 		pinDisable(pin, PIN_IRQ);
 	}
 	if ((mask & PIN_PWM) && (pin->enabled & PIN_PWM)) {
-		data->pwm->cfg.bits.en = PWM_DISABLE;
+		data->pwm.cfg.bits.en = PWM_DISABLE;
 		__wrap_bk_printf_disable();
-		sddev_control(PWM_DEV_NAME, CMD_PWM_DEINIT_PARAM, data->pwm);
+		sddev_control(PWM_DEV_NAME, CMD_PWM_DEINIT_PARAM, &data->pwm);
 		__wrap_bk_printf_enable();
 		pinDisable(pin, PIN_PWM);
 	}

diff --git a/cores/beken-72xx/arduino/src/wiring_analog.c b/cores/beken-72xx/arduino/src/wiring_analog.c
@@ -51,7 +51,6 @@ static uint8_t gpioToAdc(GPIO_INDEX gpio) {
 	return 0;
 }
 
-static pwm_param_t pwm;
 static uint16_t adcData[1];
 
 uint16_t analogReadVoltage(pin_size_t pinNumber) {
@@ -90,35 +89,35 @@ void analogWrite(pin_size_t pinNumber, int value) {
 	float percent	   = value * 1.0 / ((1 << _analogWriteResolution) - 1);
 	uint32_t frequency = 26 * _analogWritePeriod - 1;
 	uint32_t dutyCycle = percent * frequency;
-	pwm.channel		   = gpioToPwm(pin->gpio);
+	data->pwm.channel  = gpioToPwm(pin->gpio);
+	uint32_t channel   = data->pwm.channel;
 #if CFG_SOC_NAME != SOC_BK7231N
-	pwm.duty_cycle = dutyCycle;
+	data->pwm.duty_cycle = dutyCycle;
 #else
-	pwm.duty_cycle1 = dutyCycle;
-	pwm.duty_cycle2 = 0;
-	pwm.duty_cycle3 = 0;
+	data->pwm.duty_cycle1 = dutyCycle;
+	data->pwm.duty_cycle2 = 0;
+	data->pwm.duty_cycle3 = 0;
 #endif
 
 	if (dutyCycle) {
 		if (!pinEnabled(pin, PIN_PWM)) {
 			// enable PWM and set its value
-			pwm.cfg.bits.en		= PWM_ENABLE;
-			pwm.cfg.bits.int_en = PWM_INT_DIS;
-			pwm.cfg.bits.mode	= PWM_PWM_MODE;
-			pwm.cfg.bits.clk	= PWM_CLK_26M;
-			pwm.end_value		= frequency;
-			pwm.p_Int_Handler	= NULL;
+			data->pwm.cfg.bits.en	  = PWM_ENABLE;
+			data->pwm.cfg.bits.int_en = PWM_INT_DIS;
+			data->pwm.cfg.bits.mode	  = PWM_PWM_MODE;
+			data->pwm.cfg.bits.clk	  = PWM_CLK_26M;
+			data->pwm.end_value		  = frequency;
+			data->pwm.p_Int_Handler	  = NULL;
 			__wrap_bk_printf_disable();
-			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_PARAM, &pwm);
-			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_HIGH, &pwm.channel);
-			sddev_control(PWM_DEV_NAME, CMD_PWM_UNIT_ENABLE, &pwm.channel);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_PARAM, &data->pwm);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_HIGH, &channel);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_UNIT_ENABLE, &channel);
 			__wrap_bk_printf_enable();
-			// pass global PWM object pointer
-			data->pwm = &pwm;
 			pinEnable(pin, PIN_PWM);
 		} else {
+			sddev_control(PWM_DEV_NAME, CMD_PWM_INIT_LEVL_SET_HIGH, &channel);
 			// update duty cycle
-			sddev_control(PWM_DEV_NAME, CMD_PWM_SET_DUTY_CYCLE, &pwm);
+			sddev_control(PWM_DEV_NAME, CMD_PWM_SET_DUTY_CYCLE, &data->pwm);
 		}
 	} else {
 		if (pinEnabled(pin, PIN_PWM)) {

diff --git a/cores/beken-72xx/arduino/src/wiring_data.h b/cores/beken-72xx/arduino/src/wiring_data.h
@@ -10,7 +10,7 @@ extern "C" {
 #endif
 
 struct PinData_s {
-	pwm_param_t *pwm;
+	pwm_param_t pwm;
 	PinMode gpioMode;
 	PinStatus irqMode;
 	void *irqHandler;