diff options
Diffstat (limited to 'arduino_libs')
21 files changed, 0 insertions, 2095 deletions
diff --git a/arduino_libs/ArduinoSerialManager.zip b/arduino_libs/ArduinoSerialManager.zip Binary files differdeleted file mode 100644 index 7693b72..0000000 --- a/arduino_libs/ArduinoSerialManager.zip +++ /dev/null diff --git a/arduino_libs/ByteBuffer/.svn/all-wcprops b/arduino_libs/ByteBuffer/.svn/all-wcprops deleted file mode 100755 index de5c62d..0000000 --- a/arduino_libs/ByteBuffer/.svn/all-wcprops +++ /dev/null @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 55 -/r/prg/!svn/ver/5368/trunk/arduino/libraries/ByteBuffer -END -ByteBuffer.h -K 25 -svn:wc:ra_dav:version-url -V 68 -/r/prg/!svn/ver/5368/trunk/arduino/libraries/ByteBuffer/ByteBuffer.h -END -ByteBuffer.cpp -K 25 -svn:wc:ra_dav:version-url -V 70 -/r/prg/!svn/ver/5812/trunk/arduino/libraries/ByteBuffer/ByteBuffer.cpp -END diff --git a/arduino_libs/ByteBuffer/.svn/entries b/arduino_libs/ByteBuffer/.svn/entries deleted file mode 100755 index 4c4a628..0000000 --- a/arduino_libs/ByteBuffer/.svn/entries +++ /dev/null @@ -1,120 +0,0 @@ -10 - -dir -5368 -https://svn.media.mit.edu/r/prg/trunk/arduino/libraries/ByteBuffer -https://svn.media.mit.edu/r/prg - - - -2010-07-20T00:54:42.918731Z -5368 -siggi - - - - - - - - - - - - - - -bd000cc4-1869-4481-ad02-c3af97ea9c83 - -ByteBuffer.h -file - - - - -2010-07-19T22:27:55.000000Z -3b6d84df8e69905675772beb574cce67 -2010-07-20T00:54:42.918731Z -5368 -siggi - - - - - - - - - - - - - - - - - - - - - -844 - -SerialPacketHandler.cpp -file -5810 - - - - - - - - - - - - - - - - - - - -deleted - -ByteBuffer.cpp -file -5812 - - - -2010-09-02T16:31:44.000000Z -d95900d573ac73c8ccf95b384f8ec258 -2010-09-02T18:42:42.362483Z -5812 -siggi - - - - - - - - - - - - - - - - - - - - - -3483 - diff --git a/arduino_libs/ByteBuffer/.svn/text-base/ByteBuffer.cpp.svn-base b/arduino_libs/ByteBuffer/.svn/text-base/ByteBuffer.cpp.svn-base deleted file mode 100755 index b91a586..0000000 --- a/arduino_libs/ByteBuffer/.svn/text-base/ByteBuffer.cpp.svn-base +++ /dev/null @@ -1,205 +0,0 @@ -/* - ByteBuffer.cpp - A circular buffer implementation for Arduino - Created by Sigurdur Orn, July 19, 2010. - */ - -#include "WProgram.h" -#include "ByteBuffer.h" - - -ByteBuffer::ByteBuffer(){ - -} - -void ByteBuffer::init(unsigned int buf_length){ - data = (byte*)malloc(sizeof(byte)*buf_length); - float_bytes = (byte*)malloc(sizeof(byte)*8); - capacity = buf_length; - position = 0; - length = 0; -} - -void ByteBuffer::clear(){ - position = 0; - length = 0; -} - -int ByteBuffer::getSize(){ - return length; -} - -int ByteBuffer::getCapacity(){ - return capacity; -} - -byte ByteBuffer::peek(unsigned int index){ - byte b = data[(position+index)%capacity]; - return b; -} - -int ByteBuffer::put(byte in){ - if(length < capacity){ - // save data byte at end of buffer - data[(position+length) % capacity] = in; - // increment the length - length++; - return 1; - } - // return failure - return 0; -} - -int ByteBuffer::putInFront(byte in){ - if(length < capacity){ - // save data byte at end of buffer - if( position == 0 ) - position = capacity-1; - else - position = (position-1)%capacity; - data[position] = in; - // increment the length - length++; - return 1; - } - // return failure - return 0; -} - -byte ByteBuffer::get(){ - byte b = 0; - if(length > 0){ - b = data[position]; - // move index down and decrement length - position = (position+1)%capacity; - length--; - } - - return b; -} - -byte ByteBuffer::getFromBack(){ - byte b = 0; - if(length > 0){ - b = data[(position+length-1)%capacity]; - length--; - } - - return b; -} - -// -// Ints -// - -int ByteBuffer::putIntInFront(int in){ - byte *pointer = (byte *)∈ - putInFront(pointer[0]); - putInFront(pointer[1]); -} - -int ByteBuffer::putInt(int in){ - byte *pointer = (byte *)∈ - put(pointer[1]); - put(pointer[0]); -} - - -int ByteBuffer::getInt(){ - int ret; - byte *pointer = (byte *)&ret; - pointer[1] = get(); - pointer[0] = get(); - return ret; -} - -int ByteBuffer::getIntFromBack(){ - int ret; - byte *pointer = (byte *)&ret; - pointer[0] = getFromBack(); - pointer[1] = getFromBack(); - return ret; -} - -// -// Longs -// - -int ByteBuffer::putLongInFront(long in){ - byte *pointer = (byte *)∈ - putInFront(pointer[0]); - putInFront(pointer[1]); - putInFront(pointer[2]); - putInFront(pointer[3]); -} - -int ByteBuffer::putLong(long in){ - byte *pointer = (byte *)∈ - put(pointer[3]); - put(pointer[2]); - put(pointer[1]); - put(pointer[0]); -} - - -long ByteBuffer::getLong(){ - long ret; - byte *pointer = (byte *)&ret; - pointer[3] = get(); - pointer[2] = get(); - pointer[1] = get(); - pointer[0] = get(); - return ret; -} - -long ByteBuffer::getLongFromBack(){ - long ret; - byte *pointer = (byte *)&ret; - pointer[0] = getFromBack(); - pointer[1] = getFromBack(); - pointer[2] = getFromBack(); - pointer[3] = getFromBack(); - return ret; -} - - -// -// Floats -// - -int ByteBuffer::putFloatInFront(float in){ - byte *pointer = (byte *)∈ - putInFront(pointer[0]); - putInFront(pointer[1]); - putInFront(pointer[2]); - putInFront(pointer[3]); -} - -int ByteBuffer::putFloat(float in){ - byte *pointer = (byte *)∈ - put(pointer[3]); - put(pointer[2]); - put(pointer[1]); - put(pointer[0]); -} - -float ByteBuffer::getFloat(){ - float ret; - byte *pointer = (byte *)&ret; - pointer[3] = get(); - pointer[2] = get(); - pointer[1] = get(); - pointer[0] = get(); - return ret; -} - -float ByteBuffer::getFloatFromBack(){ - float ret; - byte *pointer = (byte *)&ret; - pointer[0] = getFromBack(); - pointer[1] = getFromBack(); - pointer[2] = getFromBack(); - pointer[3] = getFromBack(); - return ret; -} - - diff --git a/arduino_libs/ByteBuffer/.svn/text-base/ByteBuffer.h.svn-base b/arduino_libs/ByteBuffer/.svn/text-base/ByteBuffer.h.svn-base deleted file mode 100755 index b100c2f..0000000 --- a/arduino_libs/ByteBuffer/.svn/text-base/ByteBuffer.h.svn-base +++ /dev/null @@ -1,57 +0,0 @@ -/* - ByteBuffer.h - A circular buffer implementation for Arduino - Created by Sigurdur Orn, July 19, 2010. - */ -#ifndef ByteBuffer_h -#define ByteBuffer_h - -#include "WProgram.h" - -class ByteBuffer -{ -public: - ByteBuffer(); - - void init(unsigned int buf_size); - - void clear(); - int getSize(); - int getCapacity(); - - int putInFront(byte in); - int put(byte in); - - byte get(); - byte getFromBack(); - - byte peek(unsigned int index); - - int putIntInFront(int in); - int putInt(int in); - - int putLongInFront(long in); - int putLong(long in); - - int getInt(); - int getIntFromBack(); - - long getLong(); - long getLongFromBack(); - - int putFloatInFront(float in); - int putFloat(float in); - - float getFloat(); - float getFloatFromBack(); - -private: - byte* data; - byte* float_bytes; - - unsigned int capacity; - unsigned int position; - unsigned int length; -}; - -#endif - diff --git a/arduino_libs/ByteBuffer/ByteBuffer.cpp b/arduino_libs/ByteBuffer/ByteBuffer.cpp deleted file mode 100755 index b151cef..0000000 --- a/arduino_libs/ByteBuffer/ByteBuffer.cpp +++ /dev/null @@ -1,212 +0,0 @@ -/* - ByteBuffer.cpp - A circular buffer implementation for Arduino - Created by Sigurdur Orn, July 19, 2010. - siggi@mit.edu - */ - -#include <util/atomic.h> -#include "WProgram.h" -#include "ByteBuffer.h" - - -ByteBuffer::ByteBuffer(){ - -} - -void ByteBuffer::init(unsigned int buf_length){ - data = (byte*)malloc(sizeof(byte)*buf_length); - capacity = buf_length; - position = 0; - length = 0; -} - -void ByteBuffer::deAllocate(){ - free(data); -} - -void ByteBuffer::clear(){ - position = 0; - length = 0; -} - -int ByteBuffer::getSize(){ - return length; -} - -int ByteBuffer::getCapacity(){ - return capacity; -} - -byte ByteBuffer::peek(unsigned int index){ - byte b = data[(position+index)%capacity]; - return b; -} - -int ByteBuffer::put(byte in){ - if(length < capacity){ - // save data byte at end of buffer - data[(position+length) % capacity] = in; - // increment the length - length++; - return 1; - } - // return failure - return 0; -} - -int ByteBuffer::putInFront(byte in){ - if(length < capacity){ - // save data byte at end of buffer - if( position == 0 ) - position = capacity-1; - else - position = (position-1)%capacity; - data[position] = in; - // increment the length - length++; - return 1; - } - // return failure - return 0; -} - -byte ByteBuffer::get(){ - byte b = 0; - - - if(length > 0){ - b = data[position]; - // move index down and decrement length - position = (position+1)%capacity; - length--; - } - - return b; -} - -byte ByteBuffer::getFromBack(){ - byte b = 0; - if(length > 0){ - b = data[(position+length-1)%capacity]; - length--; - } - - return b; -} - -// -// Ints -// - -int ByteBuffer::putIntInFront(int in){ - byte *pointer = (byte *)∈ - putInFront(pointer[0]); - putInFront(pointer[1]); -} - -int ByteBuffer::putInt(int in){ - byte *pointer = (byte *)∈ - put(pointer[1]); - put(pointer[0]); -} - - -int ByteBuffer::getInt(){ - int ret; - byte *pointer = (byte *)&ret; - pointer[1] = get(); - pointer[0] = get(); - return ret; -} - -int ByteBuffer::getIntFromBack(){ - int ret; - byte *pointer = (byte *)&ret; - pointer[0] = getFromBack(); - pointer[1] = getFromBack(); - return ret; -} - -// -// Longs -// - -int ByteBuffer::putLongInFront(long in){ - byte *pointer = (byte *)∈ - putInFront(pointer[0]); - putInFront(pointer[1]); - putInFront(pointer[2]); - putInFront(pointer[3]); -} - -int ByteBuffer::putLong(long in){ - byte *pointer = (byte *)∈ - put(pointer[3]); - put(pointer[2]); - put(pointer[1]); - put(pointer[0]); -} - - -long ByteBuffer::getLong(){ - long ret; - byte *pointer = (byte *)&ret; - pointer[3] = get(); - pointer[2] = get(); - pointer[1] = get(); - pointer[0] = get(); - return ret; -} - -long ByteBuffer::getLongFromBack(){ - long ret; - byte *pointer = (byte *)&ret; - pointer[0] = getFromBack(); - pointer[1] = getFromBack(); - pointer[2] = getFromBack(); - pointer[3] = getFromBack(); - return ret; -} - - -// -// Floats -// - -int ByteBuffer::putFloatInFront(float in){ - byte *pointer = (byte *)∈ - putInFront(pointer[0]); - putInFront(pointer[1]); - putInFront(pointer[2]); - putInFront(pointer[3]); -} - -int ByteBuffer::putFloat(float in){ - byte *pointer = (byte *)∈ - put(pointer[3]); - put(pointer[2]); - put(pointer[1]); - put(pointer[0]); -} - -float ByteBuffer::getFloat(){ - float ret; - byte *pointer = (byte *)&ret; - pointer[3] = get(); - pointer[2] = get(); - pointer[1] = get(); - pointer[0] = get(); - return ret; -} - -float ByteBuffer::getFloatFromBack(){ - float ret; - byte *pointer = (byte *)&ret; - pointer[0] = getFromBack(); - pointer[1] = getFromBack(); - pointer[2] = getFromBack(); - pointer[3] = getFromBack(); - return ret; -} - - diff --git a/arduino_libs/ByteBuffer/ByteBuffer.h b/arduino_libs/ByteBuffer/ByteBuffer.h deleted file mode 100755 index f6b4e48..0000000 --- a/arduino_libs/ByteBuffer/ByteBuffer.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - ByteBuffer.h - A circular buffer implementation for Arduino - Created by Sigurdur Orn, July 19, 2010. - siggi@mit.edu - */ - -#ifndef ByteBuffer_h -#define ByteBuffer_h - -#include "WProgram.h" - -class ByteBuffer -{ -public: - ByteBuffer(); - - // This method initializes the datastore of the buffer to a certain sizem the buffer should NOT be used before this call is made - void init(unsigned int buf_size); - - // This method resets the buffer into an original state (with no data) - void clear(); - - // This releases resources for this buffer, after this has been called the buffer should NOT be used - void deAllocate(); - - // Returns how much space is left in the buffer for more data - int getSize(); - - // Returns the maximum capacity of the buffer - int getCapacity(); - - // This method returns the byte that is located at index in the buffer but doesn't modify the buffer like the get methods (doesn't remove the retured byte from the buffer) - byte peek(unsigned int index); - - // - // Put methods, either a regular put in back or put in front - // - int putInFront(byte in); - int put(byte in); - - int putIntInFront(int in); - int putInt(int in); - - int putLongInFront(long in); - int putLong(long in); - - int putFloatInFront(float in); - int putFloat(float in); - - // - // Get methods, either a regular get from front or from back - // - byte get(); - byte getFromBack(); - - int getInt(); - int getIntFromBack(); - - long getLong(); - long getLongFromBack(); - - float getFloat(); - float getFloatFromBack(); - -private: - byte* data; - - unsigned int capacity; - unsigned int position; - unsigned int length; -}; - -#endif - diff --git a/arduino_libs/NewSoftSerial/Examples/NewSoftSerialTest/NewSoftSerialTest.pde b/arduino_libs/NewSoftSerial/Examples/NewSoftSerialTest/NewSoftSerialTest.pde deleted file mode 100644 index 0d9e815..0000000 --- a/arduino_libs/NewSoftSerial/Examples/NewSoftSerialTest/NewSoftSerialTest.pde +++ /dev/null @@ -1,25 +0,0 @@ -
-#include <NewSoftSerial.h>
-
-NewSoftSerial mySerial(2, 3);
-
-void setup()
-{
- Serial.begin(57600);
- Serial.println("Goodnight moon!");
-
- // set the data rate for the NewSoftSerial port
- mySerial.begin(4800);
- mySerial.println("Hello, world?");
-}
-
-void loop() // run over and over again
-{
-
- if (mySerial.available()) {
- Serial.print((char)mySerial.read());
- }
- if (Serial.available()) {
- mySerial.print((char)Serial.read());
- }
-}
diff --git a/arduino_libs/NewSoftSerial/Examples/TwoNSSTest/TwoNSSTest.pde b/arduino_libs/NewSoftSerial/Examples/TwoNSSTest/TwoNSSTest.pde deleted file mode 100644 index 73aa991..0000000 --- a/arduino_libs/NewSoftSerial/Examples/TwoNSSTest/TwoNSSTest.pde +++ /dev/null @@ -1,33 +0,0 @@ -#include <NewSoftSerial.h>
-
-NewSoftSerial nss(2, 3);
-NewSoftSerial nss2(4, 5);
-
-void setup()
-{
- nss2.begin(4800);
- nss.begin(4800);
- Serial.begin(115200);
-}
-
-void loop()
-{
- // Every 10 seconds switch from
- // one serial GPS device to the other
- if ((millis() / 10000) % 2 == 0)
- {
- if (nss.available())
- {
- Serial.print(nss.read(), BYTE);
- }
- }
-
- else
- {
- if (nss2.available())
- {
- Serial.print(nss2.read(), BYTE);
- }
- }
-}
-
diff --git a/arduino_libs/NewSoftSerial/NewSoftSerial.cpp b/arduino_libs/NewSoftSerial/NewSoftSerial.cpp deleted file mode 100644 index 463ab01..0000000 --- a/arduino_libs/NewSoftSerial/NewSoftSerial.cpp +++ /dev/null @@ -1,539 +0,0 @@ -/*
-NewSoftSerial.cpp - Multi-instance software serial library
-Copyright (c) 2006 David A. Mellis. All rights reserved.
--- Interrupt-driven receive and other improvements by ladyada
--- Tuning, circular buffer, derivation from class Print,
- multi-instance support, porting to 8MHz processors,
- various optimizations, PROGMEM delay tables, inverse logic and
- direct port writing by Mikal Hart
-
-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
-
-The latest version of this library can always be found at
-http://arduiniana.org.
-*/
-
-// When set, _DEBUG co-opts pins 11 and 13 for debugging with an
-// oscilloscope or logic analyzer. Beware: it also slightly modifies
-// the bit times, so don't rely on it too much at high baud rates
-#define _DEBUG 0
-#define _DEBUG_PIN1 11
-#define _DEBUG_PIN2 13
-//
-// Includes
-//
-#include <avr/interrupt.h>
-#include <avr/pgmspace.h>
-#include "WConstants.h"
-#include "pins_arduino.h"
-#include "NewSoftSerial.h"
-
-// Abstractions for maximum portability between processors
-// These are macros to associate pins to pin change interrupts
-#if !defined(digitalPinToPCICR) // Courtesy Paul Stoffregen
-#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega328P__)
-#define digitalPinToPCICR(p) (((p) >= 0 && (p) <= 21) ? (&PCICR) : ((uint8_t *)NULL))
-#define digitalPinToPCICRbit(p) (((p) <= 7) ? 2 : (((p) <= 13) ? 0 : 1))
-#define digitalPinToPCMSK(p) (((p) <= 7) ? (&PCMSK2) : (((p) <= 13) ? (&PCMSK0) : (((p) <= 21) ? (&PCMSK1) : ((uint8_t *)NULL))))
-#define digitalPinToPCMSKbit(p) (((p) <= 7) ? (p) : (((p) <= 13) ? ((p) - 8) : ((p) - 14)))
-#else
-#define digitalPinToPCICR(p) ((uint8_t *)NULL)
-#define digitalPinToPCICRbit(p) 0
-#define digitalPinToPCMSK(p) ((uint8_t *)NULL)
-#define digitalPinToPCMSKbit(p) 0
-#endif
-#endif
-
-//
-// Lookup table
-//
-typedef struct _DELAY_TABLE
-{
- long baud;
- unsigned short rx_delay_centering;
- unsigned short rx_delay_intrabit;
- unsigned short rx_delay_stopbit;
- unsigned short tx_delay;
-} DELAY_TABLE;
-
-#if F_CPU == 16000000
-
-static const DELAY_TABLE PROGMEM table[] =
-{
- // baud rxcenter rxintra rxstop tx
- { 115200, 1, 17, 17, 12, },
- { 57600, 10, 37, 37, 33, },
- { 38400, 25, 57, 57, 54, },
- { 31250, 31, 70, 70, 68, },
- { 28800, 34, 77, 77, 74, },
- { 19200, 54, 117, 117, 114, },
- { 14400, 74, 156, 156, 153, },
- { 9600, 114, 236, 236, 233, },
- { 4800, 233, 474, 474, 471, },
- { 2400, 471, 950, 950, 947, },
- { 1200, 947, 1902, 1902, 1899, },
- { 300, 3804, 7617, 7617, 7614, },
-};
-
-const int XMIT_START_ADJUSTMENT = 5;
-
-#elif F_CPU == 8000000
-
-static const DELAY_TABLE table[] PROGMEM =
-{
- // baud rxcenter rxintra rxstop tx
- { 115200, 1, 5, 5, 3, },
- { 57600, 1, 15, 15, 13, },
- { 38400, 2, 25, 26, 23, },
- { 31250, 7, 32, 33, 29, },
- { 28800, 11, 35, 35, 32, },
- { 19200, 20, 55, 55, 52, },
- { 14400, 30, 75, 75, 72, },
- { 9600, 50, 114, 114, 112, },
- { 4800, 110, 233, 233, 230, },
- { 2400, 229, 472, 472, 469, },
- { 1200, 467, 948, 948, 945, },
- { 300, 1895, 3805, 3805, 3802, },
-};
-
-const int XMIT_START_ADJUSTMENT = 4;
-
-#elif F_CPU == 20000000
-
-// 20MHz support courtesy of the good people at macegr.com.
-// Thanks, Garrett!
-
-static const DELAY_TABLE PROGMEM table[] =
-{
- // baud rxcenter rxintra rxstop tx
- { 115200, 3, 21, 21, 18, },
- { 57600, 20, 43, 43, 41, },
- { 38400, 37, 73, 73, 70, },
- { 31250, 45, 89, 89, 88, },
- { 28800, 46, 98, 98, 95, },
- { 19200, 71, 148, 148, 145, },
- { 14400, 96, 197, 197, 194, },
- { 9600, 146, 297, 297, 294, },
- { 4800, 296, 595, 595, 592, },
- { 2400, 592, 1189, 1189, 1186, },
- { 1200, 1187, 2379, 2379, 2376, },
- { 300, 4759, 9523, 9523, 9520, },
-};
-
-const int XMIT_START_ADJUSTMENT = 6;
-
-#else
-
-#error This version of NewSoftSerial supports only 20, 16 and 8MHz processors
-
-#endif
-
-//
-// Statics
-//
-NewSoftSerial *NewSoftSerial::active_object = 0;
-char NewSoftSerial::_receive_buffer[_NewSS_MAX_RX_BUFF];
-volatile uint8_t NewSoftSerial::_receive_buffer_tail = 0;
-volatile uint8_t NewSoftSerial::_receive_buffer_head = 0;
-
-//
-// Debugging
-//
-// This function generates a brief pulse
-// for debugging or measuring on an oscilloscope.
-inline void DebugPulse(uint8_t pin, uint8_t count)
-{
-#if _DEBUG
- volatile uint8_t *pport = portOutputRegister(digitalPinToPort(pin));
-
- uint8_t val = *pport;
- while (count--)
- {
- *pport = val | digitalPinToBitMask(pin);
- *pport = val;
- }
-#endif
-}
-
-//
-// Private methods
-//
-
-/* static */
-inline void NewSoftSerial::tunedDelay(uint16_t delay) {
- uint8_t tmp=0;
-
- asm volatile("sbiw %0, 0x01 \n\t"
- "ldi %1, 0xFF \n\t"
- "cpi %A0, 0xFF \n\t"
- "cpc %B0, %1 \n\t"
- "brne .-10 \n\t"
- : "+r" (delay), "+a" (tmp)
- : "0" (delay)
- );
-}
-
-// This function sets the current object as the "active"
-// one and returns true if it replaces another
-bool NewSoftSerial::activate(void)
-{
- if (active_object != this)
- {
- _buffer_overflow = false;
- uint8_t oldSREG = SREG;
- cli();
- _receive_buffer_head = _receive_buffer_tail = 0;
- active_object = this;
- SREG = oldSREG;
- return true;
- }
-
- return false;
-}
-
-//
-// The receive routine called by the interrupt handler
-//
-void NewSoftSerial::recv()
-{
-
-#if GCC_VERSION < 40302
-// Work-around for avr-gcc 4.3.0 OSX version bug
-// Preserve the registers that the compiler misses
-// (courtesy of Arduino forum user *etracer*)
- asm volatile(
- "push r18 \n\t"
- "push r19 \n\t"
- "push r20 \n\t"
- "push r21 \n\t"
- "push r22 \n\t"
- "push r23 \n\t"
- "push r26 \n\t"
- "push r27 \n\t"
- ::);
-#endif
-
- uint8_t d = 0;
-
- // If RX line is high, then we don't see any start bit
- // so interrupt is probably not for us
- if (_inverse_logic ? rx_pin_read() : !rx_pin_read())
- {
- // Wait approximately 1/2 of a bit width to "center" the sample
- tunedDelay(_rx_delay_centering);
- DebugPulse(_DEBUG_PIN2, 1);
-
- // Read each of the 8 bits
- for (uint8_t i=0x1; i; i <<= 1)
- {
- tunedDelay(_rx_delay_intrabit);
- DebugPulse(_DEBUG_PIN2, 1);
- uint8_t noti = ~i;
- if (rx_pin_read())
- d |= i;
- else // else clause added to ensure function timing is ~balanced
- d &= noti;
- }
-
- // skip the stop bit
- tunedDelay(_rx_delay_stopbit);
- DebugPulse(_DEBUG_PIN2, 1);
-
- if (_inverse_logic)
- d = ~d;
-
- // if buffer full, set the overflow flag and return
- if ((_receive_buffer_tail + 1) % _NewSS_MAX_RX_BUFF != _receive_buffer_head)
- {
- // save new data in buffer: tail points to where byte goes
- _receive_buffer[_receive_buffer_tail] = d; // save new byte
- _receive_buffer_tail = (_receive_buffer_tail + 1) % _NewSS_MAX_RX_BUFF;
- }
- else
- {
-#if _DEBUG // for scope: pulse pin as overflow indictator
- DebugPulse(_DEBUG_PIN1, 1);
-#endif
- _buffer_overflow = true;
- }
- }
-
-#if GCC_VERSION < 40302
-// Work-around for avr-gcc 4.3.0 OSX version bug
-// Restore the registers that the compiler misses
- asm volatile(
- "pop r27 \n\t"
- "pop r26 \n\t"
- "pop r23 \n\t"
- "pop r22 \n\t"
- "pop r21 \n\t"
- "pop r20 \n\t"
- "pop r19 \n\t"
- "pop r18 \n\t"
- ::);
-#endif
-}
-
-void NewSoftSerial::tx_pin_write(uint8_t pin_state)
-{
- if (pin_state == LOW)
- *_transmitPortRegister &= ~_transmitBitMask;
- else
- *_transmitPortRegister |= _transmitBitMask;
-}
-
-uint8_t NewSoftSerial::rx_pin_read()
-{
- return *_receivePortRegister & _receiveBitMask;
-}
-
-//
-// Interrupt handling
-//
-
-/* static */
-inline void NewSoftSerial::handle_interrupt()
-{
- if (active_object)
- {
- active_object->recv();
- }
-}
-
-#if defined(PCINT0_vect)
-ISR(PCINT0_vect)
-{
- NewSoftSerial::handle_interrupt();
-}
-#endif
-
-#if defined(PCINT1_vect)
-ISR(PCINT1_vect)
-{
- NewSoftSerial::handle_interrupt();
-}
-#endif
-
-#if defined(PCINT2_vect)
-ISR(PCINT2_vect)
-{
- NewSoftSerial::handle_interrupt();
-}
-#endif
-
-#if defined(PCINT3_vect)
-ISR(PCINT3_vect)
-{
- NewSoftSerial::handle_interrupt();
-}
-#endif
-
-//
-// Constructor
-//
-NewSoftSerial::NewSoftSerial(uint8_t receivePin, uint8_t transmitPin, bool inverse_logic /* = false */) :
- _rx_delay_centering(0),
- _rx_delay_intrabit(0),
- _rx_delay_stopbit(0),
- _tx_delay(0),
- _buffer_overflow(false),
- _inverse_logic(inverse_logic)
-{
- setTX(transmitPin);
- setRX(receivePin);
-}
-
-//
-// Destructor
-//
-NewSoftSerial::~NewSoftSerial()
-{
- end();
-}
-
-void NewSoftSerial::setTX(uint8_t tx)
-{
- pinMode(tx, OUTPUT);
- digitalWrite(tx, HIGH);
- _transmitBitMask = digitalPinToBitMask(tx);
- uint8_t port = digitalPinToPort(tx);
- _transmitPortRegister = portOutputRegister(port);
-}
-
-void NewSoftSerial::setRX(uint8_t rx)
-{
- pinMode(rx, INPUT);
- if (!_inverse_logic)
- digitalWrite(rx, HIGH); // pullup for normal logic!
- _receivePin = rx;
- _receiveBitMask = digitalPinToBitMask(rx);
- uint8_t port = digitalPinToPort(rx);
- _receivePortRegister = portInputRegister(port);
-}
-
-//
-// Public methods
-//
-
-void NewSoftSerial::begin(long speed)
-{
- _rx_delay_centering = _rx_delay_intrabit = _rx_delay_stopbit = _tx_delay = 0;
-
- for (unsigned i=0; i<sizeof(table)/sizeof(table[0]); ++i)
- {
- long baud = pgm_read_dword(&table[i].baud);
- if (baud == speed)
- {
- _rx_delay_centering = pgm_read_word(&table[i].rx_delay_centering);
- _rx_delay_intrabit = pgm_read_word(&table[i].rx_delay_intrabit);
- _rx_delay_stopbit = pgm_read_word(&table[i].rx_delay_stopbit);
- _tx_delay = pgm_read_word(&table[i].tx_delay);
- break;
- }
- }
-
- // Set up RX interrupts, but only if we have a valid RX baud rate
- if (_rx_delay_stopbit)
- {
- if (digitalPinToPCICR(_receivePin))
- {
- *digitalPinToPCICR(_receivePin) |= _BV(digitalPinToPCICRbit(_receivePin));
- *digitalPinToPCMSK(_receivePin) |= _BV(digitalPinToPCMSKbit(_receivePin));
- }
- tunedDelay(_tx_delay); // if we were low this establishes the end
- }
-
-#if _DEBUG
- pinMode(_DEBUG_PIN1, OUTPUT);
- pinMode(_DEBUG_PIN2, OUTPUT);
-#endif
-
- activate();
-}
-
-void NewSoftSerial::end()
-{
- if (digitalPinToPCMSK(_receivePin))
- *digitalPinToPCMSK(_receivePin) &= ~_BV(digitalPinToPCMSKbit(_receivePin));
-}
-
-
-// Read data from buffer
-int NewSoftSerial::read(void)
-{
- uint8_t d;
-
- // A newly activated object never has any rx data
- if (activate())
- return -1;
-
- // Empty buffer?
- if (_receive_buffer_head == _receive_buffer_tail)
- return -1;
-
- // Read from "head"
- d = _receive_buffer[_receive_buffer_head]; // grab next byte
- _receive_buffer_head = (_receive_buffer_head + 1) % _NewSS_MAX_RX_BUFF;
- return d;
-}
-
-uint8_t NewSoftSerial::available(void)
-{
- // A newly activated object never has any rx data
- if (activate())
- return 0;
-
- return (_receive_buffer_tail + _NewSS_MAX_RX_BUFF - _receive_buffer_head) % _NewSS_MAX_RX_BUFF;
-}
-
-void NewSoftSerial::write(uint8_t b)
-{
- if (_tx_delay == 0)
- return;
-
- activate();
-
- uint8_t oldSREG = SREG;
- cli(); // turn off interrupts for a clean txmit
-
- // Write the start bit
- tx_pin_write(_inverse_logic ? HIGH : LOW);
- tunedDelay(_tx_delay + XMIT_START_ADJUSTMENT);
-
- // Write each of the 8 bits
- if (_inverse_logic)
- {
- for (byte mask = 0x01; mask; mask <<= 1)
- {
- if (b & mask) // choose bit
- tx_pin_write(LOW); // send 1
- else
- tx_pin_write(HIGH); // send 0
-
- tunedDelay(_tx_delay);
- }
-
- tx_pin_write(LOW); // restore pin to natural state
- }
- else
- {
- for (byte mask = 0x01; mask; mask <<= 1)
- {
- if (b & mask) // choose bit
- tx_pin_write(HIGH); // send 1
- else
- tx_pin_write(LOW); // send 0
-
- tunedDelay(_tx_delay);
- }
-
- tx_pin_write(HIGH); // restore pin to natural state
- }
-
- SREG = oldSREG; // turn interrupts back on
- tunedDelay(_tx_delay);
-}
-
-#if !defined(cbi)
-#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit))
-#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit))
-#endif
-
-void NewSoftSerial::enable_timer0(bool enable)
-{
- if (enable)
-#if defined(__AVR_ATmega8__)
- sbi(TIMSK, TOIE0);
-#else
- sbi(TIMSK0, TOIE0);
-#endif
- else
-#if defined(__AVR_ATmega8__)
- cbi(TIMSK, TOIE0);
-#else
- cbi(TIMSK0, TOIE0);
-#endif
-}
-
-void NewSoftSerial::flush()
-{
- if (active_object == this)
- {
- uint8_t oldSREG = SREG;
- cli();
- _receive_buffer_head = _receive_buffer_tail = 0;
- SREG = oldSREG;
- }
-}
diff --git a/arduino_libs/NewSoftSerial/NewSoftSerial.h b/arduino_libs/NewSoftSerial/NewSoftSerial.h deleted file mode 100644 index 1e39201..0000000 --- a/arduino_libs/NewSoftSerial/NewSoftSerial.h +++ /dev/null @@ -1,107 +0,0 @@ -/*
-NewSoftSerial.h - Multi-instance software serial library
-Copyright (c) 2006 David A. Mellis. All rights reserved.
--- Interrupt-driven receive and other improvements by ladyada
--- Tuning, circular buffer, derivation from class Print,
- multi-instance support, porting to 8MHz processors,
- various optimizations, PROGMEM delay tables, inverse logic and
- direct port writing by Mikal Hart
-
-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
-
-The latest version of this library can always be found at
-http://arduiniana.org.
-*/
-
-#ifndef NewSoftSerial_h
-#define NewSoftSerial_h
-
-#include <inttypes.h>
-#include "Print.h"
-
-/******************************************************************************
-* Definitions
-******************************************************************************/
-
-#define _NewSS_MAX_RX_BUFF 64 // RX buffer size
-#define _NewSS_VERSION 10 // software version of this library
-#ifndef GCC_VERSION
-#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#endif
-
-class NewSoftSerial : public Print
-{
-private:
- // per object data
- uint8_t _receivePin;
- uint8_t _receiveBitMask;
- volatile uint8_t *_receivePortRegister;
- uint8_t _transmitBitMask;
- volatile uint8_t *_transmitPortRegister;
-
- uint16_t _rx_delay_centering;
- uint16_t _rx_delay_intrabit;
- uint16_t _rx_delay_stopbit;
- uint16_t _tx_delay;
-
- uint16_t _buffer_overflow:1;
- uint16_t _inverse_logic:1;
-
- // static data
- static char _receive_buffer[_NewSS_MAX_RX_BUFF];
- static volatile uint8_t _receive_buffer_tail;
- static volatile uint8_t _receive_buffer_head;
- static NewSoftSerial *active_object;
-
- // private methods
- void recv();
- bool activate();
- virtual void write(uint8_t byte);
- uint8_t rx_pin_read();
- void tx_pin_write(uint8_t pin_state);
- void setTX(uint8_t transmitPin);
- void setRX(uint8_t receivePin);
-
- // private static method for timing
- static inline void tunedDelay(uint16_t delay);
-
-public:
- // public methods
- NewSoftSerial(uint8_t receivePin, uint8_t transmitPin, bool inverse_logic = false);
- ~NewSoftSerial();
- void begin(long speed);
- void end();
- int read();
- uint8_t available(void);
- bool active() { return this == active_object; }
- bool overflow() { bool ret = _buffer_overflow; _buffer_overflow = false; return ret; }
- static int library_version() { return _NewSS_VERSION; }
- static void enable_timer0(bool enable);
- void flush();
-
- // public only for easy access by interrupt handlers
- static inline void handle_interrupt();
-};
-
-// Arduino 0012 workaround
-#undef int
-#undef char
-#undef long
-#undef byte
-#undef float
-#undef abs
-#undef round
-
-#endif
diff --git a/arduino_libs/NewSoftSerial/keywords.txt b/arduino_libs/NewSoftSerial/keywords.txt deleted file mode 100644 index 0a39bea..0000000 --- a/arduino_libs/NewSoftSerial/keywords.txt +++ /dev/null @@ -1,30 +0,0 @@ -####################################### -# Syntax Coloring Map for NewSoftSerial -####################################### - -####################################### -# Datatypes (KEYWORD1) -####################################### - -NewSoftSerial KEYWORD1 - -####################################### -# Methods and Functions (KEYWORD2) -####################################### - -setTX KEYWORD2 -setRX KEYWORD2 -begin KEYWORD2 -end KEYWORD2 -read KEYWORD2 -available KEYWORD2 -active KEYWORD2 -overflow KEYWORD2 -library_version KEYWORD2 -enable_timer0 KEYWORD2 -flush KEYWORD2 - -####################################### -# Constants (LITERAL1) -####################################### - diff --git a/arduino_libs/SerialManager/.DS_Store b/arduino_libs/SerialManager/.DS_Store Binary files differdeleted file mode 100755 index 5008ddf..0000000 --- a/arduino_libs/SerialManager/.DS_Store +++ /dev/null diff --git a/arduino_libs/SerialManager/.svn/all-wcprops b/arduino_libs/SerialManager/.svn/all-wcprops deleted file mode 100755 index e920984..0000000 --- a/arduino_libs/SerialManager/.svn/all-wcprops +++ /dev/null @@ -1,17 +0,0 @@ -K 25 -svn:wc:ra_dav:version-url -V 58 -/r/prg/!svn/ver/5369/trunk/arduino/libraries/SerialManager -END -SerialManager.h -K 25 -svn:wc:ra_dav:version-url -V 74 -/r/prg/!svn/ver/5812/trunk/arduino/libraries/SerialManager/SerialManager.h -END -SerialManager.cpp -K 25 -svn:wc:ra_dav:version-url -V 76 -/r/prg/!svn/ver/5812/trunk/arduino/libraries/SerialManager/SerialManager.cpp -END diff --git a/arduino_libs/SerialManager/.svn/entries b/arduino_libs/SerialManager/.svn/entries deleted file mode 100755 index a965507..0000000 --- a/arduino_libs/SerialManager/.svn/entries +++ /dev/null @@ -1,144 +0,0 @@ -10 - -dir -5369 -https://svn.media.mit.edu/r/prg/trunk/arduino/libraries/SerialManager -https://svn.media.mit.edu/r/prg - - - -2010-07-20T00:55:06.830758Z -5369 -siggi - - - - - - - - - - - - - - -bd000cc4-1869-4481-ad02-c3af97ea9c83 - -SerialManager.h -file -5812 - - - -2010-09-02T16:01:59.000000Z -81120736a5f09269c146fab073728dcf -2010-09-02T18:42:42.362483Z -5812 -siggi - - - - - - - - - - - - - - - - - - - - - -1242 - -SerialPacketHandler.cpp -file -5812 - - - - - - - - - - - - - - - - - - - -deleted - -SerialManager.cpp -file -5812 - - - -2010-09-02T16:02:09.000000Z -d7812d43c015d22e6970f3b8884d9b37 -2010-09-02T18:42:42.362483Z -5812 -siggi - - - - - - - - - - - - - - - - - - - - - -4793 - -SerialPacketHandler.h -file -5812 - - - - - - - - - - - - - - - - - - - -deleted - diff --git a/arduino_libs/SerialManager/.svn/text-base/SerialManager.cpp.svn-base b/arduino_libs/SerialManager/.svn/text-base/SerialManager.cpp.svn-base deleted file mode 100755 index ed06dbc..0000000 --- a/arduino_libs/SerialManager/.svn/text-base/SerialManager.cpp.svn-base +++ /dev/null @@ -1,197 +0,0 @@ -/* - SerialManager.cpp - Library for doing packetized serial comm with Arduinos. - Created by Sigurdur Orn, May 23, 2010. - */ - -#include "WProgram.h" -#include "SerialManager.h" -#include "ByteBuffer.h" - - -SerialManager::SerialManager(unsigned int in_buf_size, unsigned int out_buf_size){ - serial_in_checksum = 0; - - incoming_buffer = (ByteBuffer*)malloc(sizeof(ByteBuffer)); - outgoing_buffer = (ByteBuffer*)malloc(sizeof(ByteBuffer)); - temp_buffer = (ByteBuffer*)malloc(sizeof(ByteBuffer)); - - incoming_buffer->init(in_buf_size); - outgoing_buffer->init(out_buf_size); - temp_buffer->init(10); - - byte1 = 0; - byte2 = 0; - byte3 = 0; - byte4 = 0; - - handlePacketFunction = 0; -} - -void SerialManager::init(int serial_port, int baud_rate){ - _serial_port = serial_port; - - if( serial_port == 0) - Serial.begin(baud_rate); -#if defined(__AVR_ATmega1280__) - else if( serial_port == 1) - Serial1.begin(baud_rate); - else if( serial_port == 2) - Serial2.begin(baud_rate); - else if( serial_port == 3) - Serial3.begin(baud_rate); -#endif -} - - - -bool SerialManager::isBusySending(){ - return ( outgoing_buffer->getSize() > 0 ); -} - -// Sends a single byte -int SerialManager::sendSerialByte(byte b){ - return outgoing_buffer->put(b); -} - -// Sends a packet with a header and a checksum -int SerialManager::sendSerialPacket(ByteBuffer* packet_buffer){ - // Copy buffer and calc checksum - byte checksum = 0; - while( packet_buffer->getSize() > 0 ){ - byte b = packet_buffer->get(); - outgoing_buffer->put(b); - checksum += b; - } - - outgoing_buffer->put( checksum ); - outgoing_buffer->put( 1 ); - outgoing_buffer->put( 2 ); - outgoing_buffer->put( 3 ); - outgoing_buffer->put( 4 ); - - return 0; -} - -// Sends a raw packet with no header or checksum -int SerialManager::sendRawSerial(ByteBuffer* packet_buffer){ - while( packet_buffer->getSize() > 0 ){ - byte b = packet_buffer->get(); - outgoing_buffer->put(b); - } - - return 0; -} - -void SerialManager::update(){ - - // If we have received stuff - if( _serial_port == 0 ){ - while( Serial.available() != 0 ) { - byte incoming = Serial.read(); - handleIncomingByte(incoming); - } - } - -#if defined(__AVR_ATmega1280__) - else if( _serial_port == 1 ){ - while( Serial1.available() != 0 ) { - byte incoming = Serial1.read(); - handleIncomingByte(incoming); - } - } - else if( _serial_port == 2 ){ - while( Serial2.available() != 0 ) { - byte incoming = Serial2.read(); - handleIncomingByte(incoming); - } - } - else if( _serial_port == 3 ){ - while( Serial3.available() != 0 ) { - byte incoming = Serial3.read(); - handleIncomingByte(incoming); - } - } -#endif - - - // If we should be sending stuff - if( outgoing_buffer->getSize() > 0 ){ - // If serial port not currently busy - if( _serial_port == 0 ) - if(((UCSRA) & (1 << UDRE)) ) Serial.write( outgoing_buffer->get() ); - -#if defined(__AVR_ATmega1280__) - else if( _serial_port == 1 ) - if(((UCSRA1) & (1 << UDRE1)) ) Serial1.write( outgoing_buffer->get() ); - else if( _serial_port == 2 ) - if(((UCSRA2) & (1 << UDRE2)) ) Serial2.write( outgoing_buffer->get() ); - else if( _serial_port == 3 ) - if(((UCSRA3) & (1 << UDRE3)) ) Serial3.write( outgoing_buffer->get() ); -#endif - } -} - -void SerialManager::setPacketHandler(void (*packetHandlerFunction)(ByteBuffer*)){ - handlePacketFunction = packetHandlerFunction; -} - - -void SerialManager::handleIncomingByte(byte incoming){ - - // If buffer overflows then reset (we could do something smarter here) -// if( incoming_buffer->getSize() == incoming_buffer->getCapacity() ){ -// incoming_buffer->clear(); -// } - - incoming_buffer->put( incoming ); - serial_in_checksum += incoming; - - byte1 = byte2; - byte2 = byte3; - byte3 = byte4; - byte4 = incoming; - - // If we have a full packet ready - if( byte1==1 && byte2==2 && byte3==3 && byte4==4 ){ - // Remove header from buffer - incoming_buffer->getFromBack(); - incoming_buffer->getFromBack(); - incoming_buffer->getFromBack(); - incoming_buffer->getFromBack(); - - byte checksum_received = incoming_buffer->getFromBack(); - - // Remove the whole header from the calculated checksum - serial_in_checksum -= checksum_received + 10; - - // If checksums don't match, then do something () - if( checksum_received != serial_in_checksum ){ - temp_buffer->clear(); - temp_buffer->put(123); - temp_buffer->put(234); - temp_buffer->put( checksum_received ); - temp_buffer->put( serial_in_checksum ); - sendSerialPacket(temp_buffer); - } - - // We have a successful packet - else{ - - if( handlePacketFunction != 0 ) - handlePacketFunction(incoming_buffer); - else - handlePacketDefault(incoming_buffer); - } - - // Clear variables - incoming_buffer->clear(); - serial_in_checksum = 0; - } - -} - -void SerialManager::handlePacketDefault(ByteBuffer* packet){ - // We could do something here like send the data to the host again for debug - // Or just do nothing - return; -} diff --git a/arduino_libs/SerialManager/.svn/text-base/SerialManager.h.svn-base b/arduino_libs/SerialManager/.svn/text-base/SerialManager.h.svn-base deleted file mode 100755 index dcbdba6..0000000 --- a/arduino_libs/SerialManager/.svn/text-base/SerialManager.h.svn-base +++ /dev/null @@ -1,63 +0,0 @@ -/* - SerialManager.h - Library for doing packetized serial comm with Arduinos. - Created by Sigurdur Orn, May 23, 2010. - */ -#ifndef SerialManager_h -#define SerialManager_h - -#include "ByteBuffer.h" -#include "WProgram.h" - -typedef void (*voidFuncPtr)(ByteBuffer*); - -#if defined(__AVR_ATmega8__) - #define UCSRA UCSRA - #define UDRE UDRE -#else - #define UCSRA UCSR0A - #define UDRE UDRE0 -#endif - -#if defined(__AVR_ATmega1280__) - #define UCSRA1 UCSR1A - #define UDRE1 UDRE1 - #define UCSRA2 UCSR2A - #define UDRE2 UDRE2 - #define UCSRA3 UCSR3A - #define UDRE3 UDRE3 -#endif - - -class SerialManager -{ -public: - SerialManager(unsigned int in_buf_size, unsigned int out_buf_size); - void init(int serial_port, int baud_rate); - void setPacketHandler(void (*rx_func)(ByteBuffer*)); - - void update(); - bool isBusySending(); - - int sendSerialByte(byte b); - int sendSerialPacket(ByteBuffer* packet); - int sendRawSerial(ByteBuffer* packet); - -private: - void handleIncomingByte(byte incoming); - void handlePacketDefault(ByteBuffer* packet); - - voidFuncPtr handlePacketFunction; - - byte _serial_port; - ByteBuffer* incoming_buffer; - ByteBuffer* outgoing_buffer; - ByteBuffer* temp_buffer; - byte serial_in_checksum; - byte byte1; - byte byte2; - byte byte3; - byte byte4; -}; - -#endif - diff --git a/arduino_libs/SerialManager/SerialManager.cpp b/arduino_libs/SerialManager/SerialManager.cpp deleted file mode 100755 index 2e2d306..0000000 --- a/arduino_libs/SerialManager/SerialManager.cpp +++ /dev/null @@ -1,193 +0,0 @@ -/* - SerialManager.cpp - Library for doing packetized serial comm with Arduinos. - Created by Sigurdur Orn, May 23, 2010. - siggi@mit.edu - */ - -#include "WProgram.h" -#include "SerialManager.h" -#include "ByteBuffer.h" - - -SerialManager::SerialManager(unsigned int in_buf_size, unsigned int out_buf_size){ - serial_in_checksum = 0; - - incoming_buffer = (ByteBuffer*)malloc(sizeof(ByteBuffer)); - outgoing_buffer = (ByteBuffer*)malloc(sizeof(ByteBuffer)); - temp_buffer = (ByteBuffer*)malloc(sizeof(ByteBuffer)); - - incoming_buffer->init(in_buf_size); - outgoing_buffer->init(out_buf_size); - temp_buffer->init(10); - - byte1 = 0; - byte2 = 0; - byte3 = 0; - byte4 = 0; - - handlePacketFunction = 0; -} - -void SerialManager::init(int serial_port, int baud_rate){ - _serial_port = serial_port; - - if( serial_port == 0) - Serial.begin(baud_rate); -#if defined(__AVR_ATmega1280__) - else if( serial_port == 1) - Serial1.begin(baud_rate); - else if( serial_port == 2) - Serial2.begin(baud_rate); - else if( serial_port == 3) - Serial3.begin(baud_rate); -#endif -} - - - -bool SerialManager::isBusySending(){ - return ( outgoing_buffer->getSize() > 0 ); -} - -// Sends a single byte -int SerialManager::sendSerialByte(byte b){ - return outgoing_buffer->put(b); -} - -// Sends a packet with a header and a checksum -int SerialManager::sendSerialPacket(ByteBuffer* packet_buffer){ - // Copy buffer and calc checksum - byte checksum = 0; - while( packet_buffer->getSize() > 0 ){ - byte b = packet_buffer->get(); - outgoing_buffer->put(b); - checksum += b; - } - - outgoing_buffer->put( checksum ); - outgoing_buffer->put( 1 ); - outgoing_buffer->put( 2 ); - outgoing_buffer->put( 3 ); - outgoing_buffer->put( 4 ); - - return 0; -} - -// Sends a raw packet with no header or checksum -int SerialManager::sendRawSerial(ByteBuffer* packet_buffer){ - while( packet_buffer->getSize() > 0 ){ - byte b = packet_buffer->get(); - outgoing_buffer->put(b); - } - - return 0; -} - -void SerialManager::update(){ - - // If we have received stuff - if( _serial_port == 0 ){ - while( Serial.available() != 0 ) { - byte incoming = Serial.read(); - handleIncomingByte(incoming); - } - } - -#if defined(__AVR_ATmega1280__) - else if( _serial_port == 1 ){ - while( Serial1.available() != 0 ) { - byte incoming = Serial1.read(); - handleIncomingByte(incoming); - } - } - else if( _serial_port == 2 ){ - while( Serial2.available() != 0 ) { - byte incoming = Serial2.read(); - handleIncomingByte(incoming); - } - } - else if( _serial_port == 3 ){ - while( Serial3.available() != 0 ) { - byte incoming = Serial3.read(); - handleIncomingByte(incoming); - } - } -#endif - - - // If we should be sending stuff - if( outgoing_buffer->getSize() > 0 ){ - // If serial port not currently busy - if( _serial_port == 0 ) - if(((UCSRA) & (1 << UDRE)) ) Serial.write( outgoing_buffer->get() ); - -#if defined(__AVR_ATmega1280__) - else if( _serial_port == 1 ) - if(((UCSR1A) & (1 << UDRE1)) ) Serial1.write( outgoing_buffer->get() ); - else if( _serial_port == 2 ) - if(((UCSR2A) & (1 << UDRE2)) ) Serial2.write( outgoing_buffer->get() ); - else if( _serial_port == 3 ) - if(((UCSR3A) & (1 << UDRE3)) ) Serial3.write( outgoing_buffer->get() ); -#endif - } -} - -void SerialManager::setPacketHandler(void (*packetHandlerFunction)(ByteBuffer*)){ - handlePacketFunction = packetHandlerFunction; -} - - -void SerialManager::handleIncomingByte(byte incoming){ - - // If buffer overflows then reset (we could do something smarter here) - if( incoming_buffer->getSize() == incoming_buffer->getCapacity() ){ - incoming_buffer->clear(); - } - - incoming_buffer->put( incoming ); - serial_in_checksum += incoming; - - byte1 = byte2; - byte2 = byte3; - byte3 = byte4; - byte4 = incoming; - - // If we have a full packet ready - if( byte1==1 && byte2==2 && byte3==3 && byte4==4 ){ - // Remove header from buffer - incoming_buffer->getFromBack(); - incoming_buffer->getFromBack(); - incoming_buffer->getFromBack(); - incoming_buffer->getFromBack(); - - byte checksum_received = incoming_buffer->getFromBack(); - - // Remove the whole header from the calculated checksum - serial_in_checksum -= checksum_received + 10; - - // If checksums don't match, then do something () - if( checksum_received != serial_in_checksum ){ - ; // We could do something about this here - } - - // We have a successful packet - else{ - - if( handlePacketFunction != 0 ) - handlePacketFunction(incoming_buffer); - else - handlePacketDefault(incoming_buffer); - } - - // Clear variables - incoming_buffer->clear(); - serial_in_checksum = 0; - } - -} - -void SerialManager::handlePacketDefault(ByteBuffer* packet){ - // We could do something here like send the data to the host again for debug - // Or just do nothing - return; -} diff --git a/arduino_libs/SerialManager/SerialManager.h b/arduino_libs/SerialManager/SerialManager.h deleted file mode 100755 index f1474c5..0000000 --- a/arduino_libs/SerialManager/SerialManager.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - SerialManager.h - Library for doing packetized serial comm with Arduinos. - Created by Sigurdur Orn, May 23, 2010. - siggi@mit.edu - */ - -#ifndef SerialManager_h -#define SerialManager_h - -#include "ByteBuffer.h" -#include "WProgram.h" - -typedef void (*voidFuncPtr)(ByteBuffer*); - -#if defined(__AVR_ATmega8__) - #define UCSRA UCSRA - #define UDRE UDRE -#else - #define UCSRA UCSR0A - #define UDRE UDRE0 -#endif - -#if defined(__AVR_ATmega1280__) - #define UCSRA1 UCSR1A - #define UCSRA2 UCSR2A - #define UCSRA3 UCSR3A -#endif - - -class SerialManager -{ -public: - SerialManager(unsigned int in_buf_size, unsigned int out_buf_size); - void init(int serial_port, int baud_rate); - void setPacketHandler(void (*rx_func)(ByteBuffer*)); - - void update(); - bool isBusySending(); - - int sendSerialByte(byte b); - int sendSerialPacket(ByteBuffer* packet); - int sendRawSerial(ByteBuffer* packet); - -private: - void handleIncomingByte(byte incoming); - void handlePacketDefault(ByteBuffer* packet); - - voidFuncPtr handlePacketFunction; - - byte _serial_port; - ByteBuffer* incoming_buffer; - ByteBuffer* outgoing_buffer; - ByteBuffer* temp_buffer; - byte serial_in_checksum; - byte byte1; - byte byte2; - byte byte3; - byte byte4; -}; - -#endif - diff --git a/arduino_libs/core0022_2560.a b/arduino_libs/core0022_2560.a Binary files differdeleted file mode 100644 index 39936f0..0000000 --- a/arduino_libs/core0022_2560.a +++ /dev/null diff --git a/arduino_libs/core0022_328p.a b/arduino_libs/core0022_328p.a Binary files differdeleted file mode 100644 index 0141d8c..0000000 --- a/arduino_libs/core0022_328p.a +++ /dev/null |