From 88d4b095e4590ab9bbafcf76e134d168f66c41b1 Mon Sep 17 00:00:00 2001 From: Perry Hung Date: Fri, 4 Jun 2010 00:43:21 -0400 Subject: Preliminary wirish USBSerial implementation. -updated examples -removed HardwareUSB -cleaned up a handful of includes --- wirish/comm/HardwareUsb.cpp | 60 --------------------------------------------- wirish/comm/HardwareUsb.h | 48 ------------------------------------ 2 files changed, 108 deletions(-) delete mode 100644 wirish/comm/HardwareUsb.cpp delete mode 100644 wirish/comm/HardwareUsb.h (limited to 'wirish/comm') diff --git a/wirish/comm/HardwareUsb.cpp b/wirish/comm/HardwareUsb.cpp deleted file mode 100644 index 064bcc8..0000000 --- a/wirish/comm/HardwareUsb.cpp +++ /dev/null @@ -1,60 +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 "wirish.h" -#include "HardwareUsb.h" -#include "usb.h" - -HardwareUsb::HardwareUsb(void) { -} - -uint8 HardwareUsb::read(void) { - uint8 outVal; - usbReceiveBytes(&outVal,1); - return outVal; -} - -uint8 HardwareUsb::available(void) { - return usbBytesAvailable(); -} - -void HardwareUsb::flush(void) { - uint8 totalBytes = usbBytesAvailable(); - uint8 recvBuf[totalBytes]; - usbReceiveBytes(recvBuf,totalBytes); -} - -void HardwareUsb::write(unsigned char ch) { - while (usbSendBytes(&ch, 1) == 0); -} - -void HardwareUsb::begin(void) { - /* placeholder for usb<->uart linking */ -} - -HardwareUsb Usb; diff --git a/wirish/comm/HardwareUsb.h b/wirish/comm/HardwareUsb.h deleted file mode 100644 index e2af2e2..0000000 --- a/wirish/comm/HardwareUsb.h +++ /dev/null @@ -1,48 +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. Dummy implmentation wrapping printChar() around usb.h for now. Todo: something better. - */ - -#ifndef _HARDWAREUSB_H_ -#define _HARDWAREUSB_H_ - -#include "Print.h" -#include "usb.h" - -class HardwareUsb : public Print { - public: - HardwareUsb(void); - void begin(); - uint8 available(void); - uint8 read(void); - void flush(void); - virtual void write(unsigned char); - using Print::write; -}; - -extern HardwareUsb Usb; - -#endif //_HARDWAREUSB_H/* ***************************************************************************** -- cgit v1.2.3