noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uart-fix' into new-extension 

Conflicts:
	hardware/sam/cores/sam/Arduino.h
This commit is contained in:
Cristian Maglie 2011-11-18 11:55:03 +01:00
parent bd9da76fbe 713cf88328
commit 062278262d
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hardware/sam/cores/sam/Arduino.h
View File

@ -35,7 +35,7 @@ extern "C"{
#define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L ) #define clockCyclesPerMicrosecond() ( SystemCoreClock / 1000000L )
#define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SystemCoreClock / 1000L) ) #define clockCyclesToMicroseconds(a) ( ((a) * 1000L) / (SystemCoreClock / 1000L) )
#define microsecondsToClockCycles(a) ( ((a) * (SystemCoreClock / 1000L)) / 1000L ) #define microsecondsToClockCycles(a) ( (a) * (SystemCoreClock / 1000000L) )
#include "wiring.h" #include "wiring.h"
@ -53,15 +53,13 @@ extern void loop( void ) ;
// //
// These perform slightly better as macros compared to inline functions // 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 digitalPinToBitMask( ulPin ) ( g_APinDescription[ulPin]->dwPin )
/*
#define digitalPinToTimer( P ) ( ) #define digitalPinToTimer( P ) ( )
#define analogInPinToBit( P ) ( P ) #define analogInPinToBit( P ) ( P )
#define portOutputRegister( P ) ( ) #define portOutputRegister( P ) ( )
#define portInputRegister( P ) ( ) #define portInputRegister( P ) ( )
#define portModeRegister( P ) ( ) #define portModeRegister( P ) ( )
*/
//#define NOT_A_PIN 0 // defined in pio.h/EPioType //#define NOT_A_PIN 0 // defined in pio.h/EPioType
#define NOT_A_PORT 0 #define NOT_A_PORT 0
@ -85,7 +83,7 @@ typedef enum _EExt_Interrupts
typedef void (*voidFuncPtr)( void ) ; typedef void (*voidFuncPtr)( void ) ;
/* Define attribute */ /* Define attribute */
#if defined ( __CC_ARM ) /* Keil <EFBFBD>Vision 4 */ #if defined ( __CC_ARM ) /* Keil uVision 4 */
#define WEAK (__attribute__ ((weak))) #define WEAK (__attribute__ ((weak)))
#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */ #elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
#define WEAK __weak #define WEAK __weak
@ -149,6 +147,7 @@ extern const PinDescription g_APinDescription[] ;
#include "Tone.h" #include "Tone.h"
#include "WMath.h" #include "WMath.h"
#include "HardwareSerial.h" #include "HardwareSerial.h"
#include "wiring_pulse.h"
#endif // __cplusplus #endif // __cplusplus
#endif // Arduino_h #endif // Arduino_h

6
hardware/sam/cores/sam/UARTClass.cpp
View File

@ -120,10 +120,8 @@ void UARTClass::flush( void )
void UARTClass::write( const uint8_t uc_data ) void UARTClass::write( const uint8_t uc_data )
{ {
/* Check if the transmitter is ready */ /* Check if the transmitter is ready */
if ( (_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY ) while ( (_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY )
{ ;
return ;
}
/* Send character */ /* Send character */
_pUart->UART_THR = uc_data ; _pUart->UART_THR = uc_data ;

25
hardware/sam/cores/sam/wiring_pulse.c.disabled → hardware/sam/cores/sam/wiring_pulse.cpp
View File

@ -16,47 +16,46 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "Arduino.h"
#include "wiring_private.h" #include "wiring_private.h"
/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH /* 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 * 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 * to 3 minutes in length, but must be called at least a few dozen microseconds
* before the start of the pulse. */ * before the start of the pulse. */
extern uint32_t pulseIn( uint32_t ulPin, uint32_t ulState, uint32_t ulTimeout ) 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 // cache the port and bit of the pin in order to speed up the
// pulse width measuring loop and achieve finer resolution. calling // pulse width measuring loop and achieve finer resolution. calling
// digitalRead() instead yields much coarser resolution. // digitalRead() instead yields much coarser resolution.
uint8_t bit = digitalPinToBitMask(pin); PinDescription p = g_APinDescription[pin];
uint8_t port = digitalPinToPort(pin); uint32_t width = 0; // keep initialization out of time critical area
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 // convert the timeout from microseconds to a number of times through
// the initial loop; it takes 16 clock cycles per iteration. // the initial loop; it takes 22 clock cycles per iteration.
unsigned long numloops = 0; uint32_t numloops = 0;
unsigned long maxloops = microsecondsToClockCycles(timeout) / 16; uint32_t maxloops = microsecondsToClockCycles(timeout) / 22;
// wait for any previous pulse to end // wait for any previous pulse to end
while ((*portInputRegister(port) & bit) == stateMask) while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) == state)
if (numloops++ == maxloops) if (numloops++ == maxloops)
return 0; return 0;
// wait for the pulse to start // wait for the pulse to start
while ((*portInputRegister(port) & bit) != stateMask) while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) != state)
if (numloops++ == maxloops) if (numloops++ == maxloops)
return 0; return 0;
// wait for the pulse to stop // wait for the pulse to stop
while ((*portInputRegister(port) & bit) == stateMask) { while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) == state) {
if (numloops++ == maxloops) if (numloops++ == maxloops)
return 0; return 0;
width++; width++;
} }
// convert the reading to microseconds. The loop has been determined // convert the reading to microseconds. The loop has been determined
// to be 20 clock cycles long and have about 16 clocks between the edge // 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 // and the start of the loop. There will be some error introduced by
// the interrupt handlers. // the interrupt handlers.
return clockCyclesToMicroseconds(width * 21 + 16); return clockCyclesToMicroseconds(width * 22 + 16);
} }