start to clean up tone

Author: hathach

.travis.yml.bck

@@ -291,16 +291,17 @@ bool HardwarePWM::takeOwnership(uintptr_t token)
     return false;
   }
 
-  if (this->_owner_token != 0) return false;
-  if (this->usedChannelCount() != 0) return false;
-  if (this->enabled()) return false;
+  if ( this->_owner_token != 0 ) return false;
+  if ( this->usedChannelCount() != 0 ) return false;
+  if ( this->enabled() ) return false;
 
-  if (isInISR())
+  if ( isInISR() )
   {
     UBaseType_t intr_status = taskENTER_CRITICAL_FROM_ISR();
     _owner_token = token;
     taskEXIT_CRITICAL_FROM_ISR(intr_status);
-  }else
+  }
+  else
   {
     taskENTER_CRITICAL();
     _owner_token = token;
@@ -333,12 +334,13 @@ bool HardwarePWM::releaseOwnership(uintptr_t token)
     return false; // if it's enabled, do not allow ownership to be released, even with no pins in use
   }
 
-  if (isInISR())
+  if ( isInISR() )
   {
     UBaseType_t intr_status = taskENTER_CRITICAL_FROM_ISR();
     _owner_token = 0;
     taskEXIT_CRITICAL_FROM_ISR(intr_status);
-  }else
+  }
+  else
   {
     taskENTER_CRITICAL();
     _owner_token = 0;

cores/nRF5/HardwarePWM.cpp

@@ -48,22 +48,16 @@ static HardwarePWM  * const _HwPWM       = HwPWMx[2];
 // Defined a struct, to simplify validation testing ... also provides context when debugging
 class TonePwmConfig {
     private:
-        const nrf_pwm_clk_t      clock_frequency = NRF_PWM_CLK_125kHz;
-        const nrf_pwm_mode_t     pwm_mode        = NRF_PWM_MODE_UP;
-        const nrf_pwm_dec_step_t step_mode       = NRF_PWM_STEP_AUTO;
-        const nrf_pwm_dec_load_t load_mode       = NRF_PWM_LOAD_COMMON;
         const uintptr_t          toneToken       = 0x656e6f54; //< 'T' 'o' 'n' 'e'
-    private:
         uint64_t pulse_count;         //< total number of PWM pulses
         uint32_t seq0_refresh;        //< count of pulses for each SEQ0 iteration
         uint32_t seq1_refresh;        //< count of pulses for each SEQ1 iteration
         uint16_t loop_count;          //< how many times to restart SEQ0/SEQ1?
         uint16_t time_period;         //< how many clock cycles allocated to each PWM pulse?
         uint16_t duty_with_polarity;  //< SEQ[N].PTR will point here, length == 1
-        uint8_t arduino_pin;          //< the arduino pin for playback
-        uint8_t nrf_pin;              //< the nrf pin for playback
         nrf_pwm_task_t task_to_start; //< Whether to start playback at SEQ0 or SEQ1
         nrf_pwm_short_mask_t shorts;  //< shortcuts to enable
+
     public:
         bool ensurePwmPeripheralOwnership(void);
         bool initializeFromPulseCountAndTimePeriod(uint64_t pulse_count, uint16_t time_period);
@@ -98,6 +92,7 @@ constexpr static uint16_t _calculate_time_period(uint32_t frequency) {
     // which fits in 16 bits.
     return 125000 / frequency;
 };
+
 constexpr static uint64_t _calculate_pulse_count(uint32_t frequency, uint32_t duration) {
     // range for frequency == [20..25000],
     // range for duration  == [ 1..0xFFFF_FFFF]
@@ -111,6 +106,7 @@ constexpr static uint64_t _calculate_pulse_count(uint32_t frequency, uint32_t du
             (duration / 1000ULL) * frequency :
         (((uint64_t)duration) * frequency / 1000ULL);
 };
+
 static int _bits_used(unsigned long      x) {
     if (0 == x) return 0;
     unsigned int result = 0;
@@ -119,6 +115,7 @@ static int _bits_used(unsigned long      x) {
     } while (x >>= 1);
     return result;
 }
+
 static int _bits_used(unsigned long long x) {
     if (0 == x) return 0;
     unsigned int result = 0;
@@ -193,6 +190,7 @@ void tone(uint8_t pin, unsigned int frequency, unsigned long duration)
     }
     return;
 }
+
 void noTone(uint8_t pin)
 {
     ( void )pin; // avoid unreferenced parameter compiler warning
@@ -310,6 +308,7 @@ bool TonePwmConfig::initializeFromPulseCountAndTimePeriod(uint64_t pulse_count_x
     }
     return true;
 }
+
 bool TonePwmConfig::applyConfiguration(uint32_t pin) {
     if (pin >= PINS_COUNT) {
         return false;
@@ -319,20 +318,17 @@ bool TonePwmConfig::applyConfiguration(uint32_t pin) {
     }
     this->stopPlayback(false);
 
-    this->arduino_pin = pin;
-    this->nrf_pin = g_ADigitalPinMap[pin];
-
     uint32_t pins[NRF_PWM_CHANNEL_COUNT] = {
-        this->nrf_pin,
+        g_ADigitalPinMap[pin],
         NRF_PWM_PIN_NOT_CONNECTED,
         NRF_PWM_PIN_NOT_CONNECTED,
         NRF_PWM_PIN_NOT_CONNECTED
     };
 
     nrf_pwm_pins_set(_PWMInstance, pins); // must set pins before enabling
     nrf_pwm_enable(_PWMInstance);
-    nrf_pwm_configure(_PWMInstance, TonePwmConfig::clock_frequency, TonePwmConfig::pwm_mode, this->time_period);
-    nrf_pwm_decoder_set(_PWMInstance, TonePwmConfig::load_mode, TonePwmConfig::step_mode);
+    nrf_pwm_configure(_PWMInstance, NRF_PWM_CLK_125kHz, NRF_PWM_MODE_UP, this->time_period);
+    nrf_pwm_decoder_set(_PWMInstance, NRF_PWM_LOAD_COMMON, NRF_PWM_STEP_AUTO);
     nrf_pwm_shorts_set(_PWMInstance, this->shorts);
     nrf_pwm_int_set(_PWMInstance, 0);
 
@@ -362,6 +358,7 @@ bool TonePwmConfig::applyConfiguration(uint32_t pin) {
     nrf_pwm_event_clear(_PWMInstance, NRF_PWM_EVENT_LOOPSDONE);
     return true;
 }
+
 bool TonePwmConfig::startPlayback(void) {
     if (!this->ensurePwmPeripheralOwnership()) {
         LOG_LV1("TON", "PWM peripheral not available for playback");
@@ -370,6 +367,7 @@ bool TonePwmConfig::startPlayback(void) {
     nrf_pwm_task_trigger(_PWMInstance, this->task_to_start);
     return true;
 }
+
 bool TonePwmConfig::stopPlayback(bool releaseOwnership) {
 
     bool notInIsr = !isInISR();