Revision 4:9a726b997366, committed 2020-08-04

Comitter:

kenjiArai

Date:

Tue Aug 04 03:59:07 2020 +0000

Parent:

3:61bea8bfe404

Commit message:

modified for running on mbed-os-6.2.0

Changed in this revision

diff -r 61bea8bfe404 -r 9a726b997366 freq_counter.cpp
--- a/freq_counter.cpp	Wed Oct 22 00:35:23 2014 +0000
+++ b/freq_counter.cpp	Tue Aug 04 03:59:07 2020 +0000
@@ -2,34 +2,28 @@
  * mbed Library program
  *      Frequency Counter Hardware relataed program
  *
- * Copyright (c) 2014 Kenji Arai / JH1PJL
- *  http://www.page.sannet.ne.jp/kenjia/index.html
- *  http://mbed.org/users/kenjiArai/
+ * Copyright (c) 2014,'20 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
  *      Additional functions and modification
  *      started: October   18th, 2014
- *      Revised: October   22nd, 2014
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *      Revised: August     4th, 2020
  */
-//-------------------------------------------------------------------------------------------------
-//  Reference program No.1 (see line 104)
-//-------------------------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//  Reference program No.1 (see line 122)
+//------------------------------------------------------------------------------
 //  5MHzOSC
-//      http://developer.mbed.org/users/mio/code/5MHzOSC/
+//      https://os.mbed.com/users/mio/code/5MHzOSC/
 //  by fuyono sakura
-//      http://developer.mbed.org/users/mio/
+//      https://os.mbed.com/users/mio/
 
-//-------------------------------------------------------------------------------------------------
-//  Reference program No.2 (see line 173)
-//-------------------------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+//  Reference program No.2 (see line 197)
+//------------------------------------------------------------------------------
 //  fc114
-//      http://developer.mbed.org/users/rutles/code/fc1114/
+//      https://os.mbed.com/users/rutles/code/fc1114/
 //  by Tetsuya Suzuki
-//      http://developer.mbed.org/users/rutles/
+//      https://os.mbed.com/users/rutles/
 
 #include "mbed.h"
 #include "freq_counter.h"
@@ -42,6 +36,7 @@
 void F_COUNTER::initialize(void)
 {
 #if defined(TARGET_LPC1768)
+#   warning "My board is gone, so I could NOT check updated SW on this board!!"
     LPC_SC->PCONP |= 1 << 22;       // 1)Power up TimerCounter3 (bit23)
     LPC_PINCON->PINSEL0 |= 3 << 8;  // 2)Set P0[23] to CAP3[0]
     LPC_TIM2->TCR  = 2;             // 3)Counter Reset (bit1<=1,bit0<=0)
@@ -57,7 +52,9 @@
     LPC_TMR32B0->CCR  = 0;          // Input Capture Disable)
     LPC_TMR32B0->PR  = 0;           // no prescale
     LPC_TMR32B0->TCR = 1;           // start
-#elif defined(TARGET_NUCLEO_F401RE) || defined(TARGET_NUCLEO_F411RE)
+#elif defined(TARGET_NUCLEO_F401RE)\
+    || defined(TARGET_NUCLEO_F411RE)\
+    || defined(TARGET_NUCLEO_F446RE)
     // PA0 -> Counter frequency input pin as Timer2 TI1
     GPIOA->AFR[0] &= 0xfffffff0;
     GPIOA->AFR[0] |= GPIO_AF1_TIM2;
@@ -65,7 +62,8 @@
     GPIOA->MODER |= 0x2;
     // Initialize Timer2(32bit) for an external up counter mode
     RCC->APB1ENR |= ((uint32_t)0x00000001);
-    TIM2->CR1 &= (uint16_t)(~(TIM_CR1_DIR | TIM_CR1_CMS | TIM_CR1_CKD));  // count_up + div by 1
+    // count_up + div by 1
+    TIM2->CR1 &= (uint16_t)(~(TIM_CR1_DIR | TIM_CR1_CMS | TIM_CR1_CKD));
     TIM2->ARR = 0xFFFFFFFF;
     TIM2->PSC = 0x0000;
     TIM2->CCMR1 &= (uint16_t)~TIM_CCMR1_IC1F;   // input filter
@@ -74,38 +72,59 @@
     TIM2->SMCR |= (uint16_t)(TIM_TS_TI1FP1 | TIM_SMCR_SMS); // external mode 1
     TIM2->CR1 |= TIM_CR1_CEN;   //Enable the TIM Counter
 #else
-#error "No support for this CPU"
+#   error "No support for this CPU"
 #endif
 }
 
-uint32_t F_COUNTER::read_frequency(float gate_time)
+uint32_t F_COUNTER::read_frequency(uint32_t gate_time)
+{
+    uint32_t f = rd_frq(gate_time);
+    if (gate_time == 10000000){         // 10sec
+        return f / 10;
+    } else if (gate_time == 100000){    // 1sec
+        return f;
+    } else if (gate_time == 100000){    // 100mS
+        return f * 10;
+    } else if (gate_time == 10000){     // 10mS
+        return f * 100;
+    } else {                            // Others (user defined)
+        float ff = (float)f * 1e6 / (float)gate_time;
+        return (uint32_t)ff;
+    }
+}
+
+uint32_t F_COUNTER::rd_frq(uint32_t gate_time)
 {
 #if defined(TARGET_LPC1768)
-    LPC_TIM2->TCR = 2;             // Reset the counter (bit1<=1,bit0<=0)
-    LPC_TIM2->TCR = 1;             // UnReset counter (bit1<=0,bit0<=1)
-    wait(gate_time);               // Gate time for count
-    freq = LPC_TIM2->TC;           // read counter
+    LPC_TIM2->TCR = 2;              // Reset the counter (bit1<=1,bit0<=0)
+    LPC_TIM2->TCR = 1;              // UnReset counter (bit1<=0,bit0<=1)
+    wait_us(gate_time);
+    freq = LPC_TIM2->TC;            // read counter
 #elif defined(TARGET_LPC1114)
     LPC_TMR32B0->TCR = 2;           // reset
     LPC_TMR32B0->TCR = 1;           // start
-    wait(gate_time);                // Gate time for count
+    wait_us(gate_time);
     freq = LPC_TMR32B0->TC;         // read counter
-#elif defined(TARGET_NUCLEO_F401RE) || defined(TARGET_NUCLEO_F411RE)
+#elif defined(TARGET_NUCLEO_F401RE)\
+    || defined(TARGET_NUCLEO_F411RE)\
+    || defined(TARGET_NUCLEO_F446RE)
     TIM2->CNT = 0;
-    wait(gate_time);                // Gate time for count
+    wait_us(gate_time);
     freq = TIM2->CNT;               // read counter
 #else
-#error "No support for this CPU"
+#   error "No support for this CPU"
 #endif
     return freq;
 }
 
+////////////////////////// Reference ///////////////////////////////////////////
 #if 0
 //
 //  CLOCK OUT to PWM1[6] Sample with Freq Counter using Cap2.0
 //  For LPC1768-mbed
 //
-//  Reference: 5MHz Clock Out Code and Comment - http://mbed.org/forum/mbed/topic/733/
+//  Reference:
+//      5MHz Clock Out Code and Comment - http://mbed.org/forum/mbed/topic/733/
 //
 //  !! To Self Measurement Output Clock, Connect p21 <-> p30 with jumper wire.
 //  2013.6.18 : Wrong comment about MR6 and Duty fix.
@@ -119,8 +138,8 @@
 // Reset Counter and Count Start
 void P30_RESET_CTR(void)
 {
-    LPC_TIM2->TCR = 2;             // Reset the counter (bit1<=1,bit0<=0)
-    LPC_TIM2->TCR = 1;             // UnReset counter (bit1<=0,bit0<=1)
+    LPC_TIM2->TCR = 2;  // Reset the counter (bit1<=1,bit0<=0)
+    LPC_TIM2->TCR = 1;  // UnReset counter (bit1<=0,bit0<=1)
 }
 
 // Get Counter Value
@@ -132,12 +151,12 @@
 // Setting p30 to Cap2.0
 void P30_INIT_CTR(void)
 {
-    LPC_SC->PCONP |= 1 << 22;               // 1)Power up TimerCounter2 (bit22)
-    LPC_PINCON->PINSEL0 |= 3 << 8;          // 2)Set P0[4] to CAP2[0]
-    LPC_TIM2->TCR = 2;                          // 3)Counter Reset (bit1<=1,bit0<=0)
-    LPC_TIM2->CTCR = 1;                     // 4)Count on riging edge Cap2[0]
-    LPC_TIM2->CCR = 0;                                          // 5)Input Capture Disabled
-    LPC_TIM2->TCR = 1;                          // 6)Counter Start (bit1<=0,bit0<=1)
+    LPC_SC->PCONP |= 1 << 22;       // 1)Power up TimerCounter2 (bit22)
+    LPC_PINCON->PINSEL0 |= 3 << 8;  // 2)Set P0[4] to CAP2[0]
+    LPC_TIM2->TCR = 2;              // 3)Counter Reset (bit1<=1,bit0<=0)
+    LPC_TIM2->CTCR = 1;             // 4)Count on riging edge Cap2[0]
+    LPC_TIM2->CCR = 0;              // 5)Input Capture Disabled
+    LPC_TIM2->TCR = 1;              // 6)Counter Start (bit1<=0,bit0<=1)
 }
 
 // Clock Output From pin21(PWM6)
@@ -145,19 +164,26 @@
 // if mbed is running at 96MHz, div is set 96 to Get 1MHz.
 void PWM6_SETCLK(int div)
 {
-    LPC_PWM1->TCR = (1 << 1);               // 1)Reset counter, disable PWM
+    // 1)Reset counter, disable PWM
+    LPC_PWM1->TCR = (1 << 1);
     LPC_SC->PCLKSEL0 &= ~(0x3 << 12);
-    LPC_SC->PCLKSEL0 |= (1 << 12);          // 2)Set peripheral clock divider to /1, i.e. system clock
-    LPC_PWM1->MR0 = div - 1;                // 3)Match Register 0 is shared period counter for all PWM1
-    LPC_PWM1->MR6 = (div + 1)>> 1;          //
-    LPC_PWM1->LER |= 1;                     // 4)Start updating at next period start
-    LPC_PWM1->TCR = (1 << 0) || (1 << 3);   // 5)Enable counter and PWM
+    // 2)Set peripheral clock divider to /1, i.e. system clock
+    LPC_SC->PCLKSEL0 |= (1 << 12);
+    // 3)Match Register 0 is shared period counter for all PWM1
+    LPC_PWM1->MR0 = div - 1;
+    LPC_PWM1->MR6 = (div + 1)>> 1;
+    // 4)Start updating at next period start
+    LPC_PWM1->LER |= 1;
+    // 5)Enable counter and PWM
+    LPC_PWM1->TCR = (1 << 0) || (1 << 3);
 }
 
 int main()
 {
-    PWM6_SETCLK(19) ; // Outout mbed's "PWM6" pin to 96MHZ/19 = 5.052MHz (Approx)
-    // PWM6_SETCLK(96) ; // Outout mbed's "PWM6" pin to 96MHZ/96 = 1.000MHz (Approx)
+    // Outout mbed's "PWM6" pin to 96MHZ/19 = 5.052MHz (Approx)
+    PWM6_SETCLK(19) ;
+    // Outout mbed's "PWM6" pin to 96MHZ/96 = 1.000MHz (Approx)
+    // PWM6_SETCLK(96) ;
     P30_INIT_CTR();
     while(1) {
         P30_RESET_CTR();
@@ -165,11 +191,9 @@
         printf("pin30 Freq = %d (Hz)\r\n",P30_GET_CTR());
     }
 }
-
 #endif
 
 #if 0
-
 // fc1114 - Frequency counter with i2c slave.
 // target: LPC1114FN28
 
@@ -229,5 +253,4 @@
         }
     }
 }
-
 #endif

diff -r 61bea8bfe404 -r 9a726b997366 freq_counter.h
--- a/freq_counter.h	Wed Oct 22 00:35:23 2014 +0000
+++ b/freq_counter.h	Tue Aug 04 03:59:07 2020 +0000
@@ -2,17 +2,12 @@
  * mbed Library program
  *      Frequency Counter Hardware relataed program
  *
- * Copyright (c) 2014 Kenji Arai / JH1PJL
- *  http://www.page.sannet.ne.jp/kenjia/index.html
- *  http://mbed.org/users/kenjiArai/
- *      Created: October   18th, 2014
- *      Revised: October   22nd, 2014
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) 2014,'20 Kenji Arai / JH1PJL
+ *  http://www7b.biglobe.ne.jp/~kenjia/
+ *  https://os.mbed.com/users/kenjiArai/
+ *      Additional functions and modification
+ *      started: October   18th, 2014
+ *      Revised: August     4th, 2020
  */
 
 #ifndef        MBED_F_COUNTER
@@ -26,21 +21,21 @@
  *           No way to change pin asｓign and timer module,
  *      mbed LPC1768  -> p30,
  *      mbed LPC1114FN28 -> dp14,
- *      Nucleo F401RE & Nucleo F411RE -> PA_0/A0
+ *      Nucleo F401RE,F411RE & F446RE -> PA_0/A0
  *
  * @code
  * #include "mbed.h"
  * #include "freq_counter.h"
  *
- * F_COUNTER fc(p30);       // for LPC1768
+ * //F_COUNTER fc(p30);     // for LPC1768
  * //F_COUNTER fc(dp14);    // for LPC1114
- * //F_COUNTER fc(PA_0);    // for F401 & F411
+ * F_COUNTER fc(PA_0);    // for F401,F411,F446
  *
  * int main() {
  *   uint32_t frequency = 0;
  *
  *   while(true) {
- *      freqency = fc.read_frequency(1.0);  // gate time: 1 sec
+ *      freqency = fc.read_frequency(1000000);  // gate time: 1 sec
  *      printf("%d [Hz]", frequency);
  *   }
  * }
@@ -56,15 +51,17 @@
     F_COUNTER(PinName f_in);
 
     /** Read measured frequency
-      * @param gate time
+      * @param gate time (uSec) gate = 1sec -> set 1000000
       * @return measured frequency
       */
-    uint32_t read_frequency(float gate_time);
+    uint32_t read_frequency(uint32_t gate_time);
 
 protected:
     DigitalIn _pin;
+    Timer _t;
 
     void initialize(void);
+    uint32_t rd_frq(uint32_t gate_time);
 
 private:
     uint32_t freq;