arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

sam: Fixed initialization of UART/USART mode register

Browse Source
This commit is contained in:
Cristian Maglie
2015-01-14 00:08:59 +01:00
parent 7e9cf6d612
commit 00f23d3aad
4 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/arduino/sam/cores/arduino/UARTClass.cpp
View File

@ -35,17 +35,18 @@ UARTClass::UARTClass( Uart *pUart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer *p
// Public Methods ////////////////////////////////////////////////////////////// // Public Methods //////////////////////////////////////////////////////////////
void UARTClass::begin( const uint32_t dwBaudRate ) void UARTClass::begin(const uint32_t dwBaudRate)
{ {
begin(dwBaudRate, Mode_8N1); begin(dwBaudRate, Mode_8N1);
} }
void UARTClass::begin(const uint32_t dwBaudRate, const UARTModes config) void UARTClass::begin(const uint32_t dwBaudRate, const UARTModes config)
{ {
init(dwBaudRate, static_cast<uint32_t>(config)); uint32_t modeReg = static_cast<uint32_t>(config) & 0x00000E00;
init(dwBaudRate, modeReg | UART_MR_CHMODE_NORMAL);
} }
void UARTClass::init(const uint32_t dwBaudRate, const uint32_t config) void UARTClass::init(const uint32_t dwBaudRate, const uint32_t modeReg)
{ {
// Configure PMC // Configure PMC
pmc_enable_periph_clk( _dwId ); pmc_enable_periph_clk( _dwId );
@ -57,7 +58,7 @@ void UARTClass::init(const uint32_t dwBaudRate, const uint32_t config)
_pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS; _pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS;
// Configure mode // Configure mode
_pUart->UART_MR = (config & 0x00000E00) | UART_MR_CHMODE_NORMAL; _pUart->UART_MR = modeReg;
// Configure baudrate (asynchronous, no oversampling) // Configure baudrate (asynchronous, no oversampling)
_pUart->UART_BRGR = (SystemCoreClock / dwBaudRate) >> 4; _pUart->UART_BRGR = (SystemCoreClock / dwBaudRate) >> 4;

18
hardware/arduino/sam/cores/arduino/USARTClass.cpp
View File

@ -32,8 +32,22 @@ USARTClass::USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffe
// Public Methods ////////////////////////////////////////////////////////////// // Public Methods //////////////////////////////////////////////////////////////
void USARTClass::begin( const uint32_t dwBaudRate, const USARTModes config ) void USARTClass::begin(const uint32_t dwBaudRate)
{ {
UARTClass::init(dwBaudRate, static_cast<uint32_t>(config)); begin(dwBaudRate, Mode_8N1);
}
void USARTClass::begin(const uint32_t dwBaudRate, const UARTModes config)
{
uint32_t modeReg = static_cast<uint32_t>(config);
modeReg |= US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHMODE_NORMAL;
init(dwBaudRate, modeReg);
}
void USARTClass::begin(const uint32_t dwBaudRate, const USARTModes config)
{
uint32_t modeReg = static_cast<uint32_t>(config);
modeReg |= US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHMODE_NORMAL;
init(dwBaudRate, modeReg);
} }

15
hardware/arduino/sam/cores/arduino/USARTClass.h
View File

@ -65,11 +65,8 @@
class USARTClass : public UARTClass class USARTClass : public UARTClass
{ {
protected:
Usart* _pUsart;
public: public:
// 8 bit modes are inherited from UARTClass // 8x1 bit modes are inherited from UARTClass
enum USARTModes { enum USARTModes {
Mode_5N1 = US_MR_CHRL_5_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT, Mode_5N1 = US_MR_CHRL_5_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT,
Mode_6N1 = US_MR_CHRL_6_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT, Mode_6N1 = US_MR_CHRL_6_BIT | US_MR_PAR_NO | US_MR_NBSTOP_1_BIT,
@ -108,10 +105,14 @@ class USARTClass : public UARTClass
Mode_8S2 = US_MR_CHRL_8_BIT | US_MR_PAR_SPACE | US_MR_NBSTOP_2_BIT, Mode_8S2 = US_MR_CHRL_8_BIT | US_MR_PAR_SPACE | US_MR_NBSTOP_2_BIT,
}; };
USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer, RingBuffer* pTx_buffer ); USARTClass(Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer, RingBuffer* pTx_buffer);
void begin( const uint32_t dwBaudRate , const USARTModes config ); void begin(const uint32_t dwBaudRate);
using UARTClass::begin; // Needed only for polymorphic methods void begin(const uint32_t dwBaudRate, const USARTModes config);
void begin(const uint32_t dwBaudRate, const UARTModes config);
protected:
Usart* _pUsart;
}; };
#endif // _USART_CLASS_ #endif // _USART_CLASS_