不韋 呂 / UIT_ADDA

Class library for internal ADC and DAC connected by SPI. ADC is triggered by TIM2. This library support clock generator using TIM3 for switched-capacitor filter to smooth output signal of DAC. This library includes derivative class to support interrupt occured in end of AD conversion. Slave select of SPI for DAC is generated using TIM4. Validated for ST Nucleo F401RE, F411RE.　New version. 内蔵 ADC と，SPI 接続の DAC のためのクラスライブラリ．ADC の変換開始トリガは TIM2 で発生．DAC の出力信号を平滑化するためのスイッチトキャパシタフィルタ用のクロックは TIM3 を使用．DAC の SPI 用スレーブ選択信号は TIM4 で発生．ST Nucleo F401RE，F411RE で動作を確認．新バージョン

Dependents:   UIT2_MovingAverage UIT2_AllpassReverb UIT2_CombReverb UIT2_FIR_LPF_Symmetry ... more

Diff: ADC_Base.cpp

Revision:
13:f2b8af192558
Parent:
9:72fe42a4323c
Child:
15:ab7eb29b69ea
--- a/ADC_Base.cpp	Mon Dec 01 07:13:33 2014 +0000
+++ b/ADC_Base.cpp	Fri Dec 19 06:01:15 2014 +0000
@@ -3,7 +3,7 @@
 //      To get bit definition for register in
 //      peripheral, see "stm32f401xe.h"
 //
-// 2014/11/12, Copyright (c) 2014 MIKAMI, Naoki
+// 2014/12/19, Copyright (c) 2014 MIKAMI, Naoki
 //------------------------------------------------------
 
 #include "ADC_Base.hpp"
@@ -12,26 +12,44 @@
 {
     ADC_Base::ADC_Base(PinName pin1, int frequency,
                        PinName pin2, PinName pin3)
-        : adc_(pin1), PIN1_(pin1), PIN2_(pin2),
-          PIN3_(pin3), myAdc_(ADC1)
+        : adc_(pin1), /*PIN1_(pin1), PIN2_(pin2),
+          PIN3_(pin3), */myAdc_(ADC1)
     {
         myAdc_->CR2 = ADC_EXTERNALTRIGCONVEDGE_RISING   // External Trigger on the rising edge
                     | ADC_EXTERNALTRIGCONV_T2_TRGO      // Use Timer2 TRGO event
                     | ADC_CR2_ADON;                     // Enable ADC
 
-        if (pin2 != NC) adc2_ = new AnalogIn(pin2);
-        if (pin3 != NC) adc3_ = new AnalogIn(pin3);
+        ch1_ = GetChannel(pin1);
+        if (pin2 != NC)
+        {
+            adc2_ = new AnalogIn(pin2);
+            ch2_ = GetChannel(pin2);
+        }
+        if (pin3 != NC)
+        {
+            adc3_ = new AnalogIn(pin3);
+            ch3_ = GetChannel(pin3);
+        }
         SetTim2(frequency);
         Select1stChannel();
     }
 
+    // Extract channel number
+    uint8_t ADC_Base::GetChannel(PinName pin)
+    {
+        uint8_t ch = 0;
+        if ((pin & 0x30) == 0x00) ch = pin;
+        if ((pin & 0x30) == 0x10) ch = (pin & 0x01) + 8;
+        if ((pin & 0x30) == 0x20) ch = (pin & 0x07) + 10;
+        return ch;
+    }
+
     void ADC_Base::SetTim2(int frequency)
     {
         __TIM2_CLK_ENABLE();    // Supply clock, See "stm32f4xx_hal_rcc.h"
         
         SystemCoreClockUpdate();    // Update core clock (for F411RE)
                                     // See system_stm32f4xx.h
-
         TIM_TypeDef* myTim = TIM2;
 
         myTim->CR2 = TIM_CR2_MMS_1; // Update event: as trigger out
@@ -41,5 +59,3 @@
     }
 }
 
-
-