Diff: rotary_encoder_base/rotary_encoder_base.cpp

Revision:

9:d1e6284a13ab

Parent:

7:3b51e2c660b6

--- a/rotary_encoder_base/rotary_encoder_base.cpp	Sat May 21 02:52:16 2016 +0000
+++ b/rotary_encoder_base/rotary_encoder_base.cpp	Sat May 21 03:19:33 2016 +0000
@@ -1,57 +1,28 @@
 #include "rotary_encoder_base.hpp"
 #include "rotary_encoder.hpp"
-#include "mbed.h"
+#include "rotary_encoder_base_impl.hpp"
 
 rotary_encoder_base::rotary_encoder_base(TIM_TypeDef* timer_type,
                                         uint32_t encoder_mode,
-                                        size_t resolution) : rotary_encoder(resolution) {
-    timer_handler_.Instance              = timer_type;
-    timer_handler_.Init.Period           = max_counts_;
-    timer_handler_.Init.CounterMode      = TIM_COUNTERMODE_UP;
-    timer_handler_.Init.Prescaler        = 0;
-    timer_handler_.Init.ClockDivision    = TIM_CLOCKDIVISION_DIV1;
-    
-    TIM_Encoder_InitTypeDef encoder;
-    encoder.EncoderMode = encoder_mode;
-    
-    encoder.IC1Filter       = 0x0F;
-    encoder.IC1Polarity     = TIM_INPUTCHANNELPOLARITY_RISING;
-    encoder.IC1Prescaler    = TIM_ICPSC_DIV4;
-    encoder.IC1Selection    = TIM_ICSELECTION_DIRECTTI;
+                                        size_t resolution) : rotary_encoder(resolution),
+                                                             encoder_(new rotary_encoder_base_impl(timer_type, encoder_mode, resolution)) {}
 
-    encoder.IC2Filter       = 0x0F;
-    encoder.IC2Polarity     = TIM_INPUTCHANNELPOLARITY_FALLING;
-    encoder.IC2Prescaler    = TIM_ICPSC_DIV4;
-    encoder.IC2Selection    = TIM_ICSELECTION_DIRECTTI;
-    
-    if (HAL_TIM_Encoder_Init(&timer_handler_, &encoder) != HAL_OK) {
-        error("couldn't init encoder\n");
-    }
+rotary_encoder_base::~rotary_encoder_base() {
+    delete encoder_;
 }
 
-rotary_encoder_base::~rotary_encoder_base() {}
-
 int32_t rotary_encoder_base::get_counts() const {
-    int32_t counts = timer_handler_.Instance->CNT;
-    
-    if (counts > (max_counts_ >> 1)) {
-        return counts - max_counts_;
-    }
-    return  counts;
+    return encoder_->get_counts();
 }
 
 void rotary_encoder_base::reset() {
-    timer_handler_.Instance->CNT = 0;
+    encoder_->reset();
 }
 
 void rotary_encoder_base::start() {
-    if(HAL_TIM_Encoder_Start(&timer_handler_, TIM_CHANNEL_1) != HAL_OK) {
-        error("couldn't start encoder\r\n");
-    }
+    encoder_->start();
 }
 
 void rotary_encoder_base::stop() {
-    if(HAL_TIM_Encoder_Stop(&timer_handler_, TIM_CHANNEL_1) != HAL_OK) {
-        error("couldn't start encoder\r\n");
-    }
+    encoder_->stop();
 }