From 08adc54377ded6edd4a58ea3001b28b94290c741 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 14 Nov 2011 13:17:38 +0100 Subject: [PATCH 1/3] UARTClass fix for only-first-char-sent issue. --- hardware/sam/cores/sam/UARTClass.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hardware/sam/cores/sam/UARTClass.cpp b/hardware/sam/cores/sam/UARTClass.cpp index 6bd79c022..76a60d3b3 100644 --- a/hardware/sam/cores/sam/UARTClass.cpp +++ b/hardware/sam/cores/sam/UARTClass.cpp @@ -120,10 +120,8 @@ void UARTClass::flush( void ) void UARTClass::write( const uint8_t uc_data ) { /* Check if the transmitter is ready */ - if ( (_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY ) - { - return ; - } + while ( (_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY ) + ; /* Send character */ _pUart->UART_THR = uc_data ; From 3b0a174f2c728669123d2b4bd6196429bc49d51d Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 16 Nov 2011 23:53:46 +0100 Subject: [PATCH 2/3] Pulse API ported. --- hardware/sam/cores/sam/Arduino.h | 7 +-- hardware/sam/cores/sam/wiring_pulse.cpp | 61 +++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 hardware/sam/cores/sam/wiring_pulse.cpp diff --git a/hardware/sam/cores/sam/Arduino.h b/hardware/sam/cores/sam/Arduino.h index eecd19467..955b12553 100644 --- a/hardware/sam/cores/sam/Arduino.h +++ b/hardware/sam/cores/sam/Arduino.h @@ -35,7 +35,7 @@ extern "C"{ #define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L ) #define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SystemCoreClock / 1000L) ) -#define microsecondsToClockCycles(a) ( ((a) * (SystemCoreClock / 1000L)) / 1000L ) +#define microsecondsToClockCycles(a) ( (a) * (SystemCoreClock / 1000000L) ) #include "wiring.h" @@ -53,7 +53,7 @@ extern void loop( void ) ; // // These perform slightly better as macros compared to inline functions // -#define digitalPinToPort( ulPin ) ( g_APinDescription[ulPin]->pPort ) +#define digitalPinToPort( ulPin ) ( g_APinDescription[ulPin]->pPort->PIO_PDSR ) #define digitalPinToBitMask( ulPin ) ( g_APinDescription[ulPin]->dwPin ) #define digitalPinToTimer( P ) ( ) #define analogInPinToBit( P ) ( P ) @@ -83,7 +83,7 @@ typedef enum _EExt_Interrupts typedef void (*voidFuncPtr)( void ) ; /* Define attribute */ -#if defined ( __CC_ARM ) /* Keil µVision 4 */ +#if defined ( __CC_ARM ) /* Keil Vision 4 */ #define WEAK (__attribute__ ((weak))) #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #define WEAK __weak @@ -147,6 +147,7 @@ extern const PinDescription g_APinDescription[] ; #include "Tone.h" #include "WMath.h" #include "HardwareSerial.h" +#include "wiring_pulse.h" #endif // __cplusplus #endif // Arduino_h diff --git a/hardware/sam/cores/sam/wiring_pulse.cpp b/hardware/sam/cores/sam/wiring_pulse.cpp new file mode 100644 index 000000000..40f1261ae --- /dev/null +++ b/hardware/sam/cores/sam/wiring_pulse.cpp @@ -0,0 +1,61 @@ +/* + Copyright (c) 2011 Arduino. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include "Arduino.h" +#include "wiring_private.h" + +/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH + * or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds + * to 3 minutes in length, but must be called at least a few dozen microseconds + * before the start of the pulse. */ +extern uint32_t pulseIn( uint32_t pin, uint32_t state, uint32_t timeout ) +{ + // cache the port and bit of the pin in order to speed up the + // pulse width measuring loop and achieve finer resolution. calling + // digitalRead() instead yields much coarser resolution. + PinDescription p = g_APinDescription[pin]; + uint32_t width = 0; // keep initialization out of time critical area + + // convert the timeout from microseconds to a number of times through + // the initial loop; it takes 22 clock cycles per iteration. + uint32_t numloops = 0; + uint32_t maxloops = microsecondsToClockCycles(timeout) / 22; + + // wait for any previous pulse to end + while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) == state) + if (numloops++ == maxloops) + return 0; + + // wait for the pulse to start + while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) != state) + if (numloops++ == maxloops) + return 0; + + // wait for the pulse to stop + while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) == state) { + if (numloops++ == maxloops) + return 0; + width++; + } + + // convert the reading to microseconds. The loop has been determined + // to be 22 clock cycles long and have about 16 clocks between the edge + // and the start of the loop. There will be some error introduced by + // the interrupt handlers. + return clockCyclesToMicroseconds(width * 22 + 16); +} From 713cf88328b361b04142ca243ae6943ca4e1a846 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 17 Nov 2011 09:13:25 +0100 Subject: [PATCH 3/3] Removed disabled file --- .../sam/cores/sam/wiring_pulse.c.disabled | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 hardware/sam/cores/sam/wiring_pulse.c.disabled diff --git a/hardware/sam/cores/sam/wiring_pulse.c.disabled b/hardware/sam/cores/sam/wiring_pulse.c.disabled deleted file mode 100644 index 3e91c0432..000000000 --- a/hardware/sam/cores/sam/wiring_pulse.c.disabled +++ /dev/null @@ -1,62 +0,0 @@ -/* - Copyright (c) 2011 Arduino. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#include "wiring_private.h" - -/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH - * or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds - * to 3 minutes in length, but must be called at least a few dozen microseconds - * before the start of the pulse. */ -extern uint32_t pulseIn( uint32_t ulPin, uint32_t ulState, uint32_t ulTimeout ) -{ - // cache the port and bit of the pin in order to speed up the - // pulse width measuring loop and achieve finer resolution. calling - // digitalRead() instead yields much coarser resolution. - uint8_t bit = digitalPinToBitMask(pin); - uint8_t port = digitalPinToPort(pin); - uint8_t stateMask = (state ? bit : 0); - unsigned long width = 0; // keep initialization out of time critical area - - // convert the timeout from microseconds to a number of times through - // the initial loop; it takes 16 clock cycles per iteration. - unsigned long numloops = 0; - unsigned long maxloops = microsecondsToClockCycles(timeout) / 16; - - // wait for any previous pulse to end - while ((*portInputRegister(port) & bit) == stateMask) - if (numloops++ == maxloops) - return 0; - - // wait for the pulse to start - while ((*portInputRegister(port) & bit) != stateMask) - if (numloops++ == maxloops) - return 0; - - // wait for the pulse to stop - while ((*portInputRegister(port) & bit) == stateMask) { - if (numloops++ == maxloops) - return 0; - width++; - } - - // convert the reading to microseconds. The loop has been determined - // to be 20 clock cycles long and have about 16 clocks between the edge - // and the start of the loop. There will be some error introduced by - // the interrupt handlers. - return clockCyclesToMicroseconds(width * 21 + 16); -}