From cf068bc0ac946391c940a79ee2e55e1ff87eb79a Mon Sep 17 00:00:00 2001 From: bnewbold Date: Thu, 27 May 2010 23:37:48 -0400 Subject: [for AJ] added new HardwareUsb implementation. hack. --- wirish/WProgram.h | 1 + wirish/comm/HardwareUsb.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++++ wirish/comm/HardwareUsb.h | 48 ++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 wirish/comm/HardwareUsb.cpp create mode 100644 wirish/comm/HardwareUsb.h (limited to 'wirish') diff --git a/wirish/WProgram.h b/wirish/WProgram.h index 36a9e6d..889219e 100644 --- a/wirish/WProgram.h +++ b/wirish/WProgram.h @@ -24,6 +24,7 @@ #include "wirish.h" #include "HardwareSerial.h" +#include "HardwareUsb.h" #include "math.h" void setup(); diff --git a/wirish/comm/HardwareUsb.cpp b/wirish/comm/HardwareUsb.cpp new file mode 100644 index 0000000..064bcc8 --- /dev/null +++ b/wirish/comm/HardwareUsb.cpp @@ -0,0 +1,60 @@ +/* ***************************************************************************** + * 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 new file mode 100644 index 0000000..e2af2e2 --- /dev/null +++ b/wirish/comm/HardwareUsb.h @@ -0,0 +1,48 @@ +/* ***************************************************************************** + * 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