diff --git a/api/mraa/pwm.h b/api/mraa/pwm.h index 87010d4..d6f17df 100644 --- a/api/mraa/pwm.h +++ b/api/mraa/pwm.h @@ -166,26 +166,6 @@ mraa_result_t mraa_pwm_owner(mraa_pwm_context dev, mraa_boolean_t owner); */ mraa_result_t mraa_pwm_close(mraa_pwm_context dev); -/** - * Set Both Period and DutyCycle on a PWM context - * - * @param dev The pwm context to use - * @param period represented in ms. - * @param duty dutycycle of the pwm signal. - * @return Result of operation - */ -mraa_result_t mraa_pwm_config_ms(mraa_pwm_context dev, int period, float duty); - -/** - * Set Both Period and DutyCycle on a PWM context. Duty represented as percentage. - * - * @param dev The pwm context to use - * @param period represented in ms. - * @param duty duty percantage. i.e. 50% = 0.5f - * @return Result of operation - */ -mraa_result_t mraa_pwm_config_percent(mraa_pwm_context dev, int period, float duty); - /** * Get the maximum pwm period in us * diff --git a/api/mraa/pwm.hpp b/api/mraa/pwm.hpp index a823e53..12967ad 100644 --- a/api/mraa/pwm.hpp +++ b/api/mraa/pwm.hpp @@ -178,30 +178,6 @@ class Pwm { return (Result) mraa_pwm_enable(m_pwm, enable); } - /** - * Set the period and duty of a PWM object. - * - * @param period represented in ms. - * @param duty represnted in ms as float. - * @return Result of operation - */ - Result - config_ms(int period, float duty) - { - return (Result) mraa_pwm_config_ms(m_pwm, period, duty); - } - /** - * Set the period and duty (percent) of a PWM object. - * - * @param period as represented in ms. - * @param duty percentage i.e. 50% = 0.5f - * @return Result of operation - */ - Result - config_percent(int period, float duty) - { - return (Result) mraa_pwm_config_percent(m_pwm, period, duty); - } /** * Get the maximum pwm period in us * diff --git a/src/pwm/pwm.c b/src/pwm/pwm.c index 6690f65..a5370bc 100644 --- a/src/pwm/pwm.c +++ b/src/pwm/pwm.c @@ -516,66 +516,6 @@ mraa_pwm_owner(mraa_pwm_context dev, mraa_boolean_t owner_new) return MRAA_SUCCESS; } -mraa_result_t -mraa_pwm_config_ms(mraa_pwm_context dev, int ms, float ms_float) -{ - int old_dutycycle, old_period, status; - - if (!dev) { - syslog(LOG_ERR, "pwm: config_ms: context is NULL"); - return MRAA_ERROR_INVALID_HANDLE; - } - - old_dutycycle = mraa_pwm_read_duty(dev); - old_period = mraa_pwm_read_period(dev); - status = mraa_pwm_period_us(dev, ms * 1000); - if (status != MRAA_SUCCESS) { - mraa_pwm_write_duty(dev, old_dutycycle); - return status; - } - status = mraa_pwm_write_duty(dev, 0); - if (status != MRAA_SUCCESS) { - return status; - } - status = mraa_pwm_pulsewidth_us(dev, ms_float * 1000); - if (status != MRAA_SUCCESS) { - mraa_pwm_write_duty(dev, old_dutycycle); - mraa_pwm_write_period(dev, old_period); - return status; - } - return MRAA_SUCCESS; -} - -mraa_result_t -mraa_pwm_config_percent(mraa_pwm_context dev, int ms, float percentage) -{ - int old_dutycycle, old_period, status; - - if (!dev) { - syslog(LOG_ERR, "pwm: config_percent: context is NULL"); - return MRAA_ERROR_INVALID_HANDLE; - } - - old_dutycycle = mraa_pwm_read_duty(dev); - old_period = mraa_pwm_read_period(dev); - status = mraa_pwm_period_us(dev, ms * 1000); - if (status != MRAA_SUCCESS) { - mraa_pwm_write_duty(dev, old_dutycycle); - return status; - } - status = mraa_pwm_write_duty(dev, 0); - if (status != MRAA_SUCCESS) { - return status; - } - status = mraa_pwm_pulsewidth_us(dev, (ms * 1000) * percentage); - if (status != MRAA_SUCCESS) { - mraa_pwm_write_duty(dev, old_dutycycle); - mraa_pwm_write_period(dev, old_period); - return status; - } - return MRAA_SUCCESS; -} - int mraa_pwm_get_max_period(mraa_pwm_context dev) {