Diff: F446_ADC_Interrupt.hpp

Revision:

1:6b9f2af6613d

Parent:

0:c945b4fe9a48

Child:

4:03e91e464ce5

--- a/F446_ADC_Interrupt.hpp	Fri Nov 11 06:28:48 2016 +0000
+++ b/F446_ADC_Interrupt.hpp	Sat Nov 12 04:08:31 2016 +0000
@@ -6,7 +6,7 @@
 //  割り込みによりアナログ信号を入力するクラス（ヘッダ）
 //      AdcDual クラスの派生クラス
 //
-//  2016/11/11, Copyright (c) 2016 MIKAMI, Naoki
+//  2016/11/12, Copyright (c) 2016 MIKAMI, Naoki
 //----------------------------------------------------------
 
 #ifndef F446_ADC_DUAL_INTERRUPT_HPP
@@ -22,15 +22,15 @@
         AdcDual_Intr(int frequency) : AdcDual(frequency)
         {   ADC2->CR1 |= ADC_CR1_EOCIE; }
 
-        // -1.0f <= data1, data2 <= 1.0f
-        virtual void Read(float &ad2, float &ad1)
+        // -1.0f <= ad1, ad2 <= 1.0f
+        virtual void Read(float &ad1, float &ad2)
         {
             ad1 = ToFloat(ADC2->DR);
             ad2 = ToFloat(ADC3->DR);
         }
 
-        // 0 <= data1, data2 <= 4095
-        virtual void Read(uint16_t &ad2, uint16_t &ad1)
+        // 0 <= ad1, ad2 <= 4095
+        virtual void Read(uint16_t &ad1, uint16_t &ad2)
         {
             ad1 = ADC2->DR;
             ad2 = ADC3->DR;
@@ -53,4 +53,4 @@
         AdcDual_Intr& operator=(const AdcDual_Intr&);     
     };
 }
-#endif  // F446_ADC_DUAL_INTERRUPT_HPP
\ No newline at end of file
+#endif  // F446_ADC_DUAL_INTERRUPT_HPP