Merge branch 'master' into spi

4 files changed, 0 insertions, 311 deletions

diff --git a/core/comm/HardwareSerial.cpp b/core/comm/HardwareSerial.cpp
deleted file mode 100644
index 42c5d61..0000000
--- a/core/comm/HardwareSerial.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/* *****************************************************************************
- * The MIT License
- *
- * Copyright (c) 2010 Perry Hung.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ****************************************************************************/
-
-/**
- *  @file HardwareSerial.cpp
- *
- *  @brief Wiring-like serial api
- */
-
-#include "wiring.h"
-#include "HardwareSerial.h"
-#include "usart.h"
-#include "gpio.h"
-#include "timers.h"
-
-#define USART1_TX_PORT             GPIOA_BASE
-#define USART1_TX_PIN              9
-#define USART1_RX_PORT             GPIOA_BASE
-#define USART1_RX_PIN              10
-
-#define USART2_TX_PORT             GPIOA_BASE
-#define USART2_TX_PIN              2
-#define USART2_RX_PORT             GPIOA_BASE
-#define USART2_RX_PIN              3
-
-#define USART3_TX_PORT             GPIOB_BASE
-#define USART3_TX_PIN              10
-#define USART3_RX_PORT             GPIOB_BASE
-#define USART3_RX_PIN              11
-
-HardwareSerial::HardwareSerial(uint8 usartNum) {
-    ASSERT(usartNum == 1 ||
-           usartNum == 2 ||
-           usartNum == 3);
-    this->usartNum = usartNum;
-}
-
-uint8 HardwareSerial::read(void) {
-    return usart_getc(usartNum);
-}
-
-uint32 HardwareSerial::available(void) {
-
-    return usart_data_available(usartNum);
-}
-
-void HardwareSerial::write(unsigned char ch) {
-    usart_putc(usartNum, ch);
-}
-
-void HardwareSerial::begin(uint32 baud) {
-    ASSERT(!(baud > USART_MAX_BAUD));
-
-    /* Set appropriate pin modes  */
-    switch (usartNum) {
-    case 1:
-        gpio_set_mode(USART1_TX_PORT, USART1_TX_PIN, GPIO_MODE_AF_OUTPUT_PP);
-        gpio_set_mode(USART1_RX_PORT, USART1_RX_PIN, GPIO_MODE_INPUT_FLOATING);
-        /* Turn off any pwm  */
-        timers_disable_channel(1, 2);
-        break;
-    case 2:
-        gpio_set_mode(USART2_TX_PORT, USART2_TX_PIN, GPIO_MODE_AF_OUTPUT_PP);
-        gpio_set_mode(USART2_RX_PORT, USART2_RX_PIN, GPIO_MODE_INPUT_FLOATING);
-        /* Turn off any pwm  */
-        timers_disable_channel(2, 3);
-        break;
-    case 3:
-        gpio_set_mode(USART3_TX_PORT, USART3_TX_PIN, GPIO_MODE_AF_OUTPUT_PP);
-        gpio_set_mode(USART3_RX_PORT, USART3_RX_PIN, GPIO_MODE_INPUT_FLOATING);
-        break;
-    default:
-        ASSERT(0);
-    }
-
-    usart_init(usartNum, baud);
-}
-
-HardwareSerial Serial1(1);
-HardwareSerial Serial2(2);
-HardwareSerial Serial3(3);
diff --git a/core/comm/HardwareSerial.h b/core/comm/HardwareSerial.h
deleted file mode 100644
index a488244..0000000
--- a/core/comm/HardwareSerial.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* *****************************************************************************
- * The MIT License
- *
- * Copyright (c) 2010 Perry Hung.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ****************************************************************************/
-
-/**
- *  @file HardwareSerial.h
- *
- *  @brief 
- */
-
-#ifndef _HARDWARESERIAL_H_
-#define _HARDWARESERIAL_H_
-
-#include "Print.h"
-
-class HardwareSerial : public Print {
-    private:
-        uint8 usartNum;
-    public:
-        HardwareSerial(uint8);
-        void begin(uint32);
-        uint32 available(void);
-        uint8 read(void);
-        void flush(void);
-        virtual void write(unsigned char);
-        using Print::write;
-};
-
-extern HardwareSerial Serial1;
-extern HardwareSerial Serial2;
-extern HardwareSerial Serial3;
-#endif
-
diff --git a/core/comm/HardwareUsb.cpp b/core/comm/HardwareUsb.cpp
deleted file mode 100644
index 2012c2e..0000000
--- a/core/comm/HardwareUsb.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/* *****************************************************************************
- * The MIT License
- *
- * Copyright (c) 2010 Andrew Meyer.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ****************************************************************************/
-
-/**
- *  @brief Wiring like serial api to USB virtual COM
- */
-
-#include "wiring.h"
-#include "HardwareUsb.h"
-#include "bootVect.h"
-#include "usb.h"
-
-HardwareUsb::HardwareUsb(void) {
-  mapleVectTable = (BootVectTable*)(BOOTLOADER_VECT_TABLE);
-  mapleVectTable->serial_tx_cb = usb_tx_cb;
-  mapleVectTable->serial_rx_cb = usb_rx_cb;
-  mapleVectTable->usb_local_obj_ptr = this;
-  rx_buffer_offset_in = 0;
-  rx_buffer_offset_out = 0;
-}
-
-uint8 HardwareUsb::read(void) {
-  uint8 outVal = rx_buffer[rx_buffer_offset_out++];
-
-#if 1
-  if (rx_buffer_offset_out == rx_buffer_offset_in) {
-    flush();
-  }
-#endif
-
-  return outVal;
-}
-
-uint8 HardwareUsb::available(void) {
-  ASSERT(rx_buffer_offset_out >= 0);
-  //  return rx_buffer_offset+1;
-  //  return usb_serialGetRecvLen();
-  return rx_buffer_offset_in - rx_buffer_offset_out;
-}
-
-void HardwareUsb::flush(void) {
-  rx_buffer_offset_in = 0;
-  rx_buffer_offset_out = 0;
-}
-
-void HardwareUsb::write(unsigned char ch) {
-  usb_serialWriteChar(ch);
-}
-
-void HardwareUsb::begin(void) {
-  /* placeholder for usb<->uart linking */
-}
-
-void HardwareUsb::usb_rx_cb(void) {
-   BootVectTable *vectTable = (BootVectTable*)(BOOTLOADER_VECT_TABLE);
-   HardwareUsb *thisPtr = (HardwareUsb*) vectTable->usb_local_obj_ptr;
-
-   uint8 numBytes = usb_serialGetRecvLen();
-
-#if 0
-   /* ONE-SHOT-TO-READ Version (buffer cleared on next recv interrupt */
-   usb_copyRecvBuffer(thisPtr->rx_buffer,numBytes);
-   thisPtr->rx_buffer_offset_in = numBytes;
-   thisPtr->rx_buffer_offset_out = 0;
-#else 
-  /* FIFO DISCARD OVERFLOW VERSION */
-  if ((thisPtr->rx_buffer_offset_in + numBytes) > (USB_SERIAL_BUF_SIZE)) {
-    numBytes = USB_SERIAL_BUF_SIZE - thisPtr->rx_buffer_offset_in;
-  }
-
-  if (numBytes > 0) {
-    ASSERT(thisPtr->rx_buffer_offset_in <= USB_SERIAL_BUF_SIZE);
-    usb_copyRecvBuffer(&(thisPtr->rx_buffer[thisPtr->rx_buffer_offset_in]),numBytes);
-    thisPtr->rx_buffer_offset_in += numBytes;
-  }
-#endif
-}
-
-void HardwareUsb::usb_tx_cb(void) {
-  /* placeholder for when serial dumps exceed buflen */
-}
diff --git a/core/comm/HardwareUsb.h b/core/comm/HardwareUsb.h
deleted file mode 100644
index ee13f40..0000000
--- a/core/comm/HardwareUsb.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* *****************************************************************************
- * The MIT License
- *
- * Copyright (c) 2010 Andrew Meyer.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- * ****************************************************************************/
-
-/**
- *  @brief Wiring like serial api to USB virtual COM
- */
-
-#ifndef _HARDWAREUSB_H_
-#define _HARDWAREUSB_H_
-
-#include "Print.h"
-#include "bootVect.h"
-#include "usb.h"
-
-class HardwareUsb : public Print {
-    private:
-        BootVectTable* mapleVectTable;
-	static void usb_rx_cb(void);
-	static void usb_tx_cb(void);
-	unsigned char rx_buffer[USB_SERIAL_BUF_SIZE];
-	int8 rx_buffer_offset_out;
-	int8 rx_buffer_offset_in;
-    public:
-        HardwareUsb(void);
-	void begin();
-	uint8 available(void);
-	uint8 read(void);
-	void flush(void);
-	virtual void write(unsigned char);
-	using Print::write;
-};
-
-#endif //_HARDWAREUSB_H