不韋 呂 / UIT_ADDA

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   UIT2_MovingAverage UIT2_AllpassReverb UIT2_CombReverb UIT2_FIR_LPF_Symmetry ... more

Files at this revision

API Documentation at this revision

Revision 16:0001d3e93bee, committed 2015-01-11

Comitter:
MikamiUitOpen
Date:
Sun Jan 11 02:20:04 2015 +0000
Parent:
15:ab7eb29b69ea
Child:
17:fd4f92ad4323
Commit message:
17

Changed in this revision

ADC_Base.cpp Show annotated file Show diff for this revision Revisions of this file
ADC_Interrupt.hpp Show annotated file Show diff for this revision Revisions of this file
DAC_MCP4922.cpp Show annotated file Show diff for this revision Revisions of this file
DAC_MCP4922.hpp Show annotated file Show diff for this revision Revisions of this file 
--- a/ADC_Base.cpp	Wed Dec 31 10:21:54 2014 +0000
+++ b/ADC_Base.cpp	Sun Jan 11 02:20:04 2015 +0000
@@ -57,5 +57,3 @@
         myTim->CR1 = TIM_CR1_CEN;   // Enable TIM2
     }
 }
-
-

--- a/ADC_Interrupt.hpp	Wed Dec 31 10:21:54 2014 +0000
+++ b/ADC_Interrupt.hpp	Sun Jan 11 02:20:04 2015 +0000
@@ -4,8 +4,8 @@
 // 2014/10/04, Copyright (c) 2014 MIKAMI, Naoki
 //------------------------------------------------------
 
-#ifndef ADC_INTERRUP_HPP
-#define ADC_INTERRUP_HPP
+#ifndef ADC_INTERRUPT_HPP
+#define ADC_INTERRUPT_HPP
 
 #include "ADC_Base.hpp"
 
@@ -62,4 +62,4 @@
         }        
     };
 }
-#endif  // ADC_INTERRUP_HPP
+#endif  // ADC_INTERRUPT_HPP

--- a/DAC_MCP4922.cpp	Wed Dec 31 10:21:54 2014 +0000
+++ b/DAC_MCP4922.cpp	Sun Jan 11 02:20:04 2015 +0000
@@ -1,7 +1,7 @@
 //------------------------------------------------------
 // Class for single DAC in MCP4922
 //
-// 2014/12/21, Copyright (c) 2014 MIKAMI, Naoki
+// 2015/01/03, Copyright (c) 2015 MIKAMI, Naoki
 //------------------------------------------------------
 
 #include "DAC_MCP4922.hpp"
@@ -9,7 +9,7 @@
 namespace Mikami
 {
     DAC_MCP4922::DAC_MCP4922(DAC dac, PinName mosi, PinName sclk,
-                             PinName cs, PinName ldac, int hz)
+                             PinName cs, PinName ldac)
         : wcr_(dac | 0x3000), spi_(mosi, NC, sclk),
           ld_(ldac, 0), mySpi_((SPI_TypeDef*)NULL)
     {
@@ -17,10 +17,16 @@
         if ( (mosi == PB_15) || (mosi == PC_3) ) mySpi_ = SPI2;
         if ( mosi == PC_12 )                     mySpi_ = SPI3;
 
-        // Set SPI format and bus frequency
+        // Set SPI format
         spi_.format(16, 0);
-        spi_.frequency(hz);
-            
+        // Clock source of F401 for SPI1    : 84 MHz,
+        //                      SPI2, SPI3  : 42 MHz
+        mySpi_->CR1 = (mySpi_->CR1 & ~SPI_CR1_BR);
+        if (mySpi_ == SPI1) mySpi_->CR1 += SPI_CR1_BR_0;
+#ifdef __STM32F411xE_H
+        mySpi_->CR1 += SPI_CR1_BR_0;
+#endif  // __STM32F411xE_H
+        
         // timer prescaler is set same value of boud rate for SPI
         uint16_t psc = (2 << ((mySpi_->CR1 >> 3) & 0x07)) - 1;
         ss_ = new Tim4_ss(psc, 18, cs);

--- a/DAC_MCP4922.hpp	Wed Dec 31 10:21:54 2014 +0000
+++ b/DAC_MCP4922.hpp	Sun Jan 11 02:20:04 2015 +0000
@@ -38,8 +38,7 @@
             PinName mosi = SPI_MOSI,    // D11
             PinName sclk = SPI_SCK,     // D13
             PinName cs   = SPI_CS,      // D10
-            PinName ldac = SPI_MISO,    // D12
-            int hz = 21000000);         // 21 MHz
+            PinName ldac = SPI_MISO);   // D12
 
         // -1.0f <= value <= 1.0f
         void Write(float value);