Initial commit of version 1.0.3

.gitignore

@@ -0,0 +1,3 @@
+*.swp
+*.swo
+*~

README.md

@@ -0,0 +1,6 @@
+LinnStrument
+============
+
+This is the firmware for LinnStrument, running on an Arduino Due processor.
+
+To build these sources yourself, make sure to first read arduino_fixes/README.md, otherwise you will get compilation errors.

arduino_fixes/1.5.6-r2/UARTClass.cpp

@@ -0,0 +1,143 @@
+/*
+  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 <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "UARTClass.h"
+
+// Constructors ////////////////////////////////////////////////////////////////
+
+UARTClass::UARTClass( Uart* pUart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer )
+{
+  _rx_buffer = pRx_buffer ;
+
+  _pUart=pUart ;
+  _dwIrq=dwIrq ;
+  _dwId=dwId ;
+}
+
+// Public Methods //////////////////////////////////////////////////////////////
+
+void UARTClass::begin( const uint32_t dwBaudRate )
+{
+  // Configure PMC
+  pmc_enable_periph_clk( _dwId ) ;
+
+  // Disable PDC channel
+  _pUart->UART_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS ;
+
+  // Reset and disable receiver and transmitter
+  _pUart->UART_CR = UART_CR_RSTRX | UART_CR_RSTTX | UART_CR_RXDIS | UART_CR_TXDIS ;
+
+  // Configure mode
+  _pUart->UART_MR = UART_MR_PAR_NO | UART_MR_CHMODE_NORMAL ;
+
+  // Configure baudrate (asynchronous, no oversampling)
+  _pUart->UART_BRGR = (SystemCoreClock / dwBaudRate) >> 4 ;
+
+  // Configure interrupts
+  _pUart->UART_IDR = 0xFFFFFFFF;
+  _pUart->UART_IER = UART_IER_RXRDY | UART_IER_OVRE | UART_IER_FRAME;
+
+  // Enable UART interrupt in NVIC
+  NVIC_EnableIRQ(_dwIrq);
+
+  // Enable receiver and transmitter
+  _pUart->UART_CR = UART_CR_RXEN | UART_CR_TXEN ;
+}
+
+void UARTClass::end( void )
+{
+  // clear any received data
+  _rx_buffer->_iHead = _rx_buffer->_iTail ;
+
+  // Disable UART interrupt in NVIC
+  NVIC_DisableIRQ( _dwIrq ) ;
+
+  // Wait for any outstanding data to be sent
+  flush();
+
+  pmc_disable_periph_clk( _dwId ) ;
+}
+
+int UARTClass::available( void )
+{
+  return (uint32_t)(SERIAL_BUFFER_SIZE + _rx_buffer->_iHead - _rx_buffer->_iTail) % SERIAL_BUFFER_SIZE ;
+}
+
+int UARTClass::peek( void )
+{
+  if ( _rx_buffer->_iHead == _rx_buffer->_iTail )
+    return -1 ;
+
+  return _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
+}
+
+int UARTClass::read( void )
+{
+  // if the head isn't ahead of the tail, we don't have any characters
+  if ( _rx_buffer->_iHead == _rx_buffer->_iTail )
+    return -1 ;
+
+  uint8_t uc = _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
+  _rx_buffer->_iTail = (unsigned int)(_rx_buffer->_iTail + 1) % SERIAL_BUFFER_SIZE ;
+  return uc ;
+}
+
+void UARTClass::flush( void )
+{
+  // Wait for transmission to complete
+  while ((_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY)
+    ;
+}
+
+size_t UARTClass::write( const uint8_t uc_data )
+{
+  return write(uc_data, true);
+}
+
+size_t UARTClass::write( const uint8_t uc_data, const bool wait )
+{
+  // Check if the transmitter is ready
+  while ((_pUart->UART_SR & UART_SR_TXRDY) != UART_SR_TXRDY) {
+    if ( !wait ) return 0;
+  }
+
+  // Send character
+  _pUart->UART_THR = uc_data;
+  return 1;
+}
+
+void UARTClass::IrqHandler( void )
+{
+  uint32_t status = _pUart->UART_SR;
+
+  // Did we receive data ?
+  if ((status & UART_SR_RXRDY) == UART_SR_RXRDY)
+    _rx_buffer->store_char(_pUart->UART_RHR);
+
+  // Acknowledge errors
+  if ((status & UART_SR_OVRE) == UART_SR_OVRE ||
+		  (status & UART_SR_FRAME) == UART_SR_FRAME)
+  {
+	// TODO: error reporting outside ISR
+    _pUart->UART_CR |= UART_CR_RSTSTA;
+  }
+}
+

arduino_fixes/1.5.6-r2/UARTClass.h

@@ -0,0 +1,62 @@
+/*
+  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
+*/
+
+#ifndef _UART_CLASS_
+#define _UART_CLASS_
+
+#include "HardwareSerial.h"
+#include "RingBuffer.h"
+
+// Includes Atmel CMSIS
+#include <chip.h>
+
+class UARTClass : public HardwareSerial
+{
+  protected:
+    RingBuffer *_rx_buffer ;
+
+  protected:
+    Uart* _pUart ;
+    IRQn_Type _dwIrq ;
+    uint32_t _dwId ;
+
+  public:
+    UARTClass( Uart* pUart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer ) ;
+
+    void begin( const uint32_t dwBaudRate ) ;
+    void end( void ) ;
+    int available( void ) ;
+    int peek( void ) ;
+    int read( void ) ;
+    void flush( void ) ;
+    size_t write( const uint8_t c ) ;
+    size_t write( const uint8_t c, const bool wait ) ;
+
+    void IrqHandler( void ) ;
+
+#if defined __GNUC__ /* GCC CS3 */
+    using Print::write ; // pull in write(str) and write(buf, size) from Print
+#elif defined __ICCARM__ /* IAR Ewarm 5.41+ */
+//    virtual void write( const char *str ) ;
+//    virtual void write( const uint8_t *buffer, size_t size ) ;
+#endif
+
+    operator bool() { return true; }; // UART always active
+};
+
+#endif // _UART_CLASS_

arduino_fixes/1.5.6-r2/USARTClass.cpp

@@ -0,0 +1,144 @@
+/*
+  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 <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "USARTClass.h"
+
+// Constructors ////////////////////////////////////////////////////////////////
+
+USARTClass::USARTClass( Usart* pUsart, IRQn_Type dwIrq, uint32_t dwId, RingBuffer* pRx_buffer )
+{
+  _rx_buffer = pRx_buffer ;
+
+  _pUsart=pUsart ;
+  _dwIrq=dwIrq ;
+  _dwId=dwId ;
+}
+
+// Public Methods //////////////////////////////////////////////////////////////
+
+void USARTClass::begin( const uint32_t dwBaudRate )
+{
+  // Configure PMC
+  pmc_enable_periph_clk( _dwId ) ;
+
+  // Disable PDC channel
+  _pUsart->US_PTCR = US_PTCR_RXTDIS | US_PTCR_TXTDIS ;
+
+  // Reset and disable receiver and transmitter
+  _pUsart->US_CR = US_CR_RSTRX | US_CR_RSTTX | US_CR_RXDIS | US_CR_TXDIS ;
+
+  // Configure mode
+  _pUsart->US_MR = US_MR_USART_MODE_NORMAL | US_MR_USCLKS_MCK | US_MR_CHRL_8_BIT | US_MR_PAR_NO |
+                   US_MR_NBSTOP_1_BIT | US_MR_CHMODE_NORMAL;
+
+  // Configure baudrate, asynchronous no oversampling
+  _pUsart->US_BRGR = (SystemCoreClock / dwBaudRate) / 16 ;
+
+  // Configure interrupts
+  _pUsart->US_IDR = 0xFFFFFFFF;
+  _pUsart->US_IER = US_IER_RXRDY | US_IER_OVRE | US_IER_FRAME;
+
+  // Enable UART interrupt in NVIC
+  NVIC_EnableIRQ( _dwIrq ) ;
+
+  // Enable receiver and transmitter
+  _pUsart->US_CR = US_CR_RXEN | US_CR_TXEN ;
+}
+
+void USARTClass::end( void )
+{
+  // clear any received data
+  _rx_buffer->_iHead = _rx_buffer->_iTail ;
+
+  // Disable UART interrupt in NVIC
+  NVIC_DisableIRQ( _dwIrq ) ;
+
+  // Wait for any outstanding data to be sent
+  flush();
+
+  pmc_disable_periph_clk( _dwId ) ;
+}
+
+int USARTClass::available( void )
+{
+  return (uint32_t)(SERIAL_BUFFER_SIZE + _rx_buffer->_iHead - _rx_buffer->_iTail) % SERIAL_BUFFER_SIZE ;
+}
+
+int USARTClass::peek( void )
+{
+  if ( _rx_buffer->_iHead == _rx_buffer->_iTail )
+    return -1 ;
+
+  return _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
+}
+
+int USARTClass::read( void )
+{
+  // if the head isn't ahead of the tail, we don't have any characters
+  if ( _rx_buffer->_iHead == _rx_buffer->_iTail )
+    return -1 ;
+
+  uint8_t uc = _rx_buffer->_aucBuffer[_rx_buffer->_iTail] ;
+  _rx_buffer->_iTail = (unsigned int)(_rx_buffer->_iTail + 1) % SERIAL_BUFFER_SIZE ;
+  return uc ;
+}
+
+void USARTClass::flush( void )
+{
+  // Wait for transmission to complete
+  while ((_pUsart->US_CSR & US_CSR_TXRDY) != US_CSR_TXRDY)
+	;
+}
+
+size_t USARTClass::write( const uint8_t uc_data )
+{
+  return write(uc_data, true);
+}
+
+size_t USARTClass::write( const uint8_t uc_data, const bool wait )
+{
+  // Check if the transmitter is ready
+  while ((_pUsart->US_CSR & US_CSR_TXRDY) != US_CSR_TXRDY) {
+    if ( !wait ) return 0;
+  }
+
+  // Send character
+  _pUsart->US_THR = uc_data ;
+  return 1;
+}
+
+void USARTClass::IrqHandler( void )
+{
+  uint32_t status = _pUsart->US_CSR;
+
+  // Did we receive data ?
+  if ((status & US_CSR_RXRDY) == US_CSR_RXRDY)
+    _rx_buffer->store_char( _pUsart->US_RHR ) ;
+
+  // Acknowledge errors
+  if ((status & US_CSR_OVRE) == US_CSR_OVRE ||
+		  (status & US_CSR_FRAME) == US_CSR_FRAME)
+  {
+	// TODO: error reporting outside ISR
+    _pUsart->US_CR |= US_CR_RSTSTA;
+  }
+}
+