Browse Source
Add serial checkRx in stepper ISR. Copied HardwareSerial to MarlinSerial (Needed for checkRx).pull/1/head
Erik van der Zalm
13 years ago
16 changed files with 1007 additions and 754 deletions
@ -0,0 +1,213 @@ |
|||||
|
/*
|
||||
|
HardwareSerial.cpp - Hardware serial library for Wiring |
||||
|
Copyright (c) 2006 Nicholas Zambetti. 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 |
||||
|
|
||||
|
Modified 23 November 2006 by David A. Mellis |
||||
|
Modified 28 September 2010 by Mark Sproul |
||||
|
*/ |
||||
|
|
||||
|
#include <stdlib.h> |
||||
|
#include <stdio.h> |
||||
|
#include <string.h> |
||||
|
#include <inttypes.h> |
||||
|
#include "wiring.h" |
||||
|
#include "wiring_private.h" |
||||
|
|
||||
|
// this next line disables the entire HardwareSerial.cpp,
|
||||
|
// this is so I can support Attiny series and any other chip without a uart
|
||||
|
#if defined(UBRRH) || defined(UBRR0H) || defined(UBRR1H) || defined(UBRR2H) || defined(UBRR3H) |
||||
|
|
||||
|
#include "MarlinSerial.h" |
||||
|
|
||||
|
// Define constants and variables for buffering incoming serial data. We're
|
||||
|
// using a ring buffer (I think), in which rx_buffer_head is the index of the
|
||||
|
// location to which to write the next incoming character and rx_buffer_tail
|
||||
|
// is the index of the location from which to read.
|
||||
|
#define RX_BUFFER_SIZE 128 |
||||
|
|
||||
|
struct ring_buffer |
||||
|
{ |
||||
|
unsigned char buffer[RX_BUFFER_SIZE]; |
||||
|
int head; |
||||
|
int tail; |
||||
|
}; |
||||
|
|
||||
|
#if defined(UBRRH) || defined(UBRR0H) |
||||
|
ring_buffer rx_buffer = { { 0 }, 0, 0 }; |
||||
|
#endif |
||||
|
|
||||
|
|
||||
|
inline void store_char(unsigned char c, ring_buffer *rx_buffer) |
||||
|
{ |
||||
|
int i = (unsigned int)(rx_buffer->head + 1) % RX_BUFFER_SIZE; |
||||
|
|
||||
|
// if we should be storing the received character into the location
|
||||
|
// just before the tail (meaning that the head would advance to the
|
||||
|
// current location of the tail), we're about to overflow the buffer
|
||||
|
// and so we don't write the character or advance the head.
|
||||
|
if (i != rx_buffer->tail) { |
||||
|
rx_buffer->buffer[rx_buffer->head] = c; |
||||
|
rx_buffer->head = i; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
|
||||
|
//#elif defined(SIG_USART_RECV)
|
||||
|
#if defined(USART0_RX_vect) |
||||
|
// fixed by Mark Sproul this is on the 644/644p
|
||||
|
//SIGNAL(SIG_USART_RECV)
|
||||
|
SIGNAL(USART0_RX_vect) |
||||
|
{ |
||||
|
#if defined(UDR0) |
||||
|
unsigned char c = UDR0; |
||||
|
#elif defined(UDR) |
||||
|
unsigned char c = UDR; // atmega8, atmega32
|
||||
|
#else |
||||
|
#error UDR not defined |
||||
|
#endif |
||||
|
store_char(c, &rx_buffer); |
||||
|
} |
||||
|
#endif |
||||
|
|
||||
|
// Constructors ////////////////////////////////////////////////////////////////
|
||||
|
|
||||
|
MarlinSerial::MarlinSerial(ring_buffer *rx_buffer, |
||||
|
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl, |
||||
|
volatile uint8_t *ucsra, volatile uint8_t *ucsrb, |
||||
|
volatile uint8_t *udr, |
||||
|
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udre, uint8_t u2x) |
||||
|
{ |
||||
|
_rx_buffer = rx_buffer; |
||||
|
_ubrrh = ubrrh; |
||||
|
_ubrrl = ubrrl; |
||||
|
_ucsra = ucsra; |
||||
|
_ucsrb = ucsrb; |
||||
|
_udr = udr; |
||||
|
_rxen = rxen; |
||||
|
_txen = txen; |
||||
|
_rxcie = rxcie; |
||||
|
_udre = udre; |
||||
|
_u2x = u2x; |
||||
|
} |
||||
|
|
||||
|
// Public Methods //////////////////////////////////////////////////////////////
|
||||
|
|
||||
|
void MarlinSerial::begin(long baud) |
||||
|
{ |
||||
|
uint16_t baud_setting; |
||||
|
bool use_u2x = true; |
||||
|
|
||||
|
#if F_CPU == 16000000UL |
||||
|
// hardcoded exception for compatibility with the bootloader shipped
|
||||
|
// with the Duemilanove and previous boards and the firmware on the 8U2
|
||||
|
// on the Uno and Mega 2560.
|
||||
|
if (baud == 57600) { |
||||
|
use_u2x = false; |
||||
|
} |
||||
|
#endif |
||||
|
|
||||
|
if (use_u2x) { |
||||
|
*_ucsra = 1 << _u2x; |
||||
|
baud_setting = (F_CPU / 4 / baud - 1) / 2; |
||||
|
} else { |
||||
|
*_ucsra = 0; |
||||
|
baud_setting = (F_CPU / 8 / baud - 1) / 2; |
||||
|
} |
||||
|
|
||||
|
// assign the baud_setting, a.k.a. ubbr (USART Baud Rate Register)
|
||||
|
*_ubrrh = baud_setting >> 8; |
||||
|
*_ubrrl = baud_setting; |
||||
|
|
||||
|
sbi(*_ucsrb, _rxen); |
||||
|
sbi(*_ucsrb, _txen); |
||||
|
sbi(*_ucsrb, _rxcie); |
||||
|
} |
||||
|
|
||||
|
void MarlinSerial::end() |
||||
|
{ |
||||
|
cbi(*_ucsrb, _rxen); |
||||
|
cbi(*_ucsrb, _txen); |
||||
|
cbi(*_ucsrb, _rxcie); |
||||
|
} |
||||
|
|
||||
|
int MarlinSerial::available(void) |
||||
|
{ |
||||
|
return (unsigned int)(RX_BUFFER_SIZE + _rx_buffer->head - _rx_buffer->tail) % RX_BUFFER_SIZE; |
||||
|
} |
||||
|
|
||||
|
int MarlinSerial::peek(void) |
||||
|
{ |
||||
|
if (_rx_buffer->head == _rx_buffer->tail) { |
||||
|
return -1; |
||||
|
} else { |
||||
|
return _rx_buffer->buffer[_rx_buffer->tail]; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
int MarlinSerial::read(void) |
||||
|
{ |
||||
|
// if the head isn't ahead of the tail, we don't have any characters
|
||||
|
if (_rx_buffer->head == _rx_buffer->tail) { |
||||
|
return -1; |
||||
|
} else { |
||||
|
unsigned char c = _rx_buffer->buffer[_rx_buffer->tail]; |
||||
|
_rx_buffer->tail = (unsigned int)(_rx_buffer->tail + 1) % RX_BUFFER_SIZE; |
||||
|
return c; |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
void MarlinSerial::flush() |
||||
|
{ |
||||
|
// don't reverse this or there may be problems if the RX interrupt
|
||||
|
// occurs after reading the value of rx_buffer_head but before writing
|
||||
|
// the value to rx_buffer_tail; the previous value of rx_buffer_head
|
||||
|
// may be written to rx_buffer_tail, making it appear as if the buffer
|
||||
|
// don't reverse this or there may be problems if the RX interrupt
|
||||
|
// occurs after reading the value of rx_buffer_head but before writing
|
||||
|
// the value to rx_buffer_tail; the previous value of rx_buffer_head
|
||||
|
// may be written to rx_buffer_tail, making it appear as if the buffer
|
||||
|
// were full, not empty.
|
||||
|
_rx_buffer->head = _rx_buffer->tail; |
||||
|
} |
||||
|
|
||||
|
void MarlinSerial::write(uint8_t c) |
||||
|
{ |
||||
|
while (!((*_ucsra) & (1 << _udre))) |
||||
|
; |
||||
|
|
||||
|
*_udr = c; |
||||
|
} |
||||
|
|
||||
|
void MarlinSerial::checkRx() |
||||
|
{ |
||||
|
if((UCSR0A & (1<<RXC0)) != 0) { |
||||
|
unsigned char c = UDR0; |
||||
|
store_char(c, &rx_buffer); |
||||
|
} |
||||
|
} |
||||
|
|
||||
|
// Preinstantiate Objects //////////////////////////////////////////////////////
|
||||
|
|
||||
|
#if defined(UBRR0H) && defined(UBRR0L) |
||||
|
MarlinSerial MSerial(&rx_buffer, &UBRR0H, &UBRR0L, &UCSR0A, &UCSR0B, &UDR0, RXEN0, TXEN0, RXCIE0, UDRE0, U2X0); |
||||
|
#else |
||||
|
#error no serial port defined (port 0) |
||||
|
#endif |
||||
|
|
||||
|
|
||||
|
#endif // whole file
|
||||
|
|
||||
@ -0,0 +1,66 @@ |
|||||
|
/*
|
||||
|
HardwareSerial.h - Hardware serial library for Wiring |
||||
|
Copyright (c) 2006 Nicholas Zambetti. 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 |
||||
|
|
||||
|
Modified 28 September 2010 by Mark Sproul |
||||
|
*/ |
||||
|
|
||||
|
#ifndef MarlinSerial_h |
||||
|
#define MarlinSerial_h |
||||
|
|
||||
|
#include <inttypes.h> |
||||
|
|
||||
|
#include "Stream.h" |
||||
|
|
||||
|
struct ring_buffer; |
||||
|
|
||||
|
class MarlinSerial : public Stream |
||||
|
{ |
||||
|
private: |
||||
|
ring_buffer *_rx_buffer; |
||||
|
volatile uint8_t *_ubrrh; |
||||
|
volatile uint8_t *_ubrrl; |
||||
|
volatile uint8_t *_ucsra; |
||||
|
volatile uint8_t *_ucsrb; |
||||
|
volatile uint8_t *_udr; |
||||
|
uint8_t _rxen; |
||||
|
uint8_t _txen; |
||||
|
uint8_t _rxcie; |
||||
|
uint8_t _udre; |
||||
|
uint8_t _u2x; |
||||
|
public: |
||||
|
MarlinSerial(ring_buffer *rx_buffer, |
||||
|
volatile uint8_t *ubrrh, volatile uint8_t *ubrrl, |
||||
|
volatile uint8_t *ucsra, volatile uint8_t *ucsrb, |
||||
|
volatile uint8_t *udr, |
||||
|
uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udre, uint8_t u2x); |
||||
|
void begin(long); |
||||
|
void end(); |
||||
|
virtual int available(void); |
||||
|
virtual int peek(void); |
||||
|
virtual int read(void); |
||||
|
virtual void flush(void); |
||||
|
virtual void write(uint8_t); |
||||
|
virtual void checkRx(void); |
||||
|
using Print::write; // pull in write(str) and write(buf, size) from Print
|
||||
|
}; |
||||
|
|
||||
|
#if defined(UBRRH) || defined(UBRR0H) |
||||
|
extern MarlinSerial MSerial; |
||||
|
#endif |
||||
|
|
||||
|
#endif |
||||
File diff suppressed because it is too large
@ -1,46 +1,48 @@ |
|||||
/* Arduino SdFat Library
|
/* Arduino SdFat Library
|
||||
* Copyright (C) 2008 by William Greiman |
* Copyright (C) 2008 by William Greiman |
||||
* |
* |
||||
* This file is part of the Arduino SdFat Library |
* This file is part of the Arduino SdFat Library |
||||
* |
* |
||||
* This Library is free software: you can redistribute it and/or modify |
* This Library is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU General Public License as published by |
* it under the terms of the GNU General Public License as published by |
||||
* the Free Software Foundation, either version 3 of the License, or |
* the Free Software Foundation, either version 3 of the License, or |
||||
* (at your option) any later version. |
* (at your option) any later version. |
||||
* |
* |
||||
* This Library is distributed in the hope that it will be useful, |
* This Library is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU General Public License for more details. |
* GNU General Public License for more details. |
||||
|
|
||||
* You should have received a copy of the GNU General Public License |
* You should have received a copy of the GNU General Public License |
||||
* along with the Arduino SdFat Library. If not, see |
* along with the Arduino SdFat Library. If not, see |
||||
* <http://www.gnu.org/licenses/>.
|
* <http://www.gnu.org/licenses/>.
|
||||
*/ |
*/ |
||||
#ifndef SdFatUtil_h |
#ifndef SdFatUtil_h |
||||
#define SdFatUtil_h |
#define SdFatUtil_h |
||||
/**
|
/**
|
||||
* \file |
* \file |
||||
* \brief Useful utility functions. |
* \brief Useful utility functions. |
||||
*/ |
*/ |
||||
#include <avr/pgmspace.h> |
#include <avr/pgmspace.h> |
||||
#if ARDUINO < 100 |
#if ARDUINO < 100 |
||||
#include <WProgram.h> |
#define HardwareSerial_h // trick to disable the standard HWserial
|
||||
#else // ARDUINO
|
#include <WProgram.h> |
||||
#include <Arduino.h> |
#include "MarlinSerial.h" |
||||
#endif // ARDUINO
|
#else // ARDUINO
|
||||
/** Store and print a string in flash memory.*/ |
#include <Arduino.h> |
||||
#define PgmPrint(x) SerialPrint_P(PSTR(x)) |
#endif // ARDUINO
|
||||
/** Store and print a string in flash memory followed by a CR/LF.*/ |
/** Store and print a string in flash memory.*/ |
||||
#define PgmPrintln(x) SerialPrintln_P(PSTR(x)) |
#define PgmPrint(x) SerialPrint_P(PSTR(x)) |
||||
|
/** Store and print a string in flash memory followed by a CR/LF.*/ |
||||
namespace SdFatUtil { |
#define PgmPrintln(x) SerialPrintln_P(PSTR(x)) |
||||
int FreeRam(); |
|
||||
void print_P(Print* pr, PGM_P str); |
namespace SdFatUtil { |
||||
void println_P(Print* pr, PGM_P str); |
int FreeRam(); |
||||
void SerialPrint_P(PGM_P str); |
void print_P(Print* pr, PGM_P str); |
||||
void SerialPrintln_P(PGM_P str); |
void println_P(Print* pr, PGM_P str); |
||||
} |
void SerialPrint_P(PGM_P str); |
||||
|
void SerialPrintln_P(PGM_P str); |
||||
using namespace SdFatUtil; // NOLINT
|
} |
||||
|
|
||||
|
using namespace SdFatUtil; // NOLINT
|
||||
#endif // #define SdFatUtil_h
|
#endif // #define SdFatUtil_h
|
||||
|
|||||
Loading…
Reference in new issue