Changeset 224 for rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/wiring_analog.c

Timestamp:

Apr 30, 2016, 11:29:25 PM (8 years ago)

Author:

ertl-honda

Message:

1.7.10のファイルに更新

File:

• rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/wiring_analog.c (modified) (4 diffs)

rtos_arduino/trunk/arduino_lib/hardware/arduino/samd/cores/arduino/wiring_analog.c

@@ -31 +31 @@
 static int DAC_RESOLUTION = 10;
 
-// Wait for synchronization of registers between the clock domains
-static __inline__ void syncDAC() __attribute__((always_inline, unused));
-static void syncDAC() {
-  while (DAC->STATUS.bit.SYNCBUSY == 1)
-    ;
-}
-
 void analogReadResolution(int res) {
         _readResolution = res;
         while( ADC->STATUS.bit.SYNCBUSY == 1 )
   {
-    // Waiting for synchroinization
+    // Waiting for synchronization
   }
         if(res == 8) ADC->CTRLB.bit.RESSEL= ADC_CTRLB_RESSEL_8BIT_Val; 
@@ -69 +62 @@
   while( ADC->STATUS.bit.SYNCBUSY == 1 )
   {
-    // Waiting for synchroinization
+    // Waiting for synchronization
   }
   switch(ulMode)
@@ -91 +84 @@
   while( ADC->STATUS.bit.SYNCBUSY == 1 )
   {
-    // Waiting for synchroinization
+    // Waiting for synchronization
   }
 }
@@ -154 +147 @@
         DAC->DATA.reg = ulValue & 0x3FF;  // Dac on 10 bits.
                 DAC->CTRLA.bit.ENABLE = 1; // DAC Enabled
-                syncDAC();
+                while (DAC->STATUS.bit.SYNCBUSY == 1); //wait for synchronization
         return;
     }