Skip to content

added defines so it is possible to change settings by compiler -D flags #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DEvil0000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added defines so it is possible to change settings by compiler -D flags #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 60 additions & 5 deletions AltSoftSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,31 @@
static uint16_t ticks_per_bit=0;
bool AltSoftSerial::timing_error=false;

#ifndef TX_ONLY
static uint8_t rx_state;
static uint8_t rx_byte;
static uint8_t rx_bit = 0;
static uint16_t rx_target;
static uint16_t rx_stop_ticks=0;
static volatile uint8_t rx_buffer_head;
static volatile uint8_t rx_buffer_tail;
#ifndef RX_BUFFER_SIZE
#define RX_BUFFER_SIZE 80
#endif
static volatile uint8_t rx_buffer[RX_BUFFER_SIZE];
#endif

#ifndef RX_ONLY
static volatile uint8_t tx_state=0;
static uint8_t tx_byte;
static uint8_t tx_bit;
static volatile uint8_t tx_buffer_head;
static volatile uint8_t tx_buffer_tail;
#ifndef TX_BUFFER_SIZE
#define TX_BUFFER_SIZE 68
#endif
static volatile uint8_t tx_buffer[TX_BUFFER_SIZE];
#endif


#ifndef INPUT_PULLUP
Expand Down Expand Up @@ -100,26 +108,44 @@ void AltSoftSerial::init(uint32_t cycles_per_bit)
}
}
ticks_per_bit = cycles_per_bit;
rx_stop_ticks = cycles_per_bit * 37 / 4;
#ifndef TX_ONLY
pinMode(INPUT_CAPTURE_PIN, INPUT_PULLUP);
#endif
#ifndef RX_ONLY
digitalWrite(OUTPUT_COMPARE_A_PIN, HIGH);
pinMode(OUTPUT_COMPARE_A_PIN, OUTPUT);
#endif
#ifndef TX_ONLY
rx_stop_ticks = cycles_per_bit * 37 / 4;
rx_state = 0;
rx_buffer_head = 0;
rx_buffer_tail = 0;
#endif
#ifndef RX_ONLY
tx_state = 0;
tx_buffer_head = 0;
tx_buffer_tail = 0;
#endif
#ifndef TX_ONLY
ENABLE_INT_INPUT_CAPTURE();
#endif
}

void AltSoftSerial::end(void)
{
#ifndef RX_ONLY
DISABLE_INT_COMPARE_B();
#endif
#ifndef TX_ONLY
DISABLE_INT_INPUT_CAPTURE();
flushInput();
#endif
#ifndef RX_ONLY
flushOutput();
#endif
#ifndef TX_ONLY
DISABLE_INT_COMPARE_A();
#endif
// TODO: restore timer to original settings?
}

Expand All @@ -130,6 +156,7 @@ void AltSoftSerial::end(void)

void AltSoftSerial::writeByte(uint8_t b)
{
#ifndef RX_ONLY
uint8_t intr_state, head;

head = tx_buffer_head + 1;
Expand All @@ -149,9 +176,12 @@ void AltSoftSerial::writeByte(uint8_t b)
SET_COMPARE_A(GET_TIMER_COUNT() + 16);
}
SREG = intr_state;
#else
return;
#endif
}


#ifndef RX_ONLY
ISR(COMPARE_A_INTERRUPT)
{
uint8_t state, byte, bit, head, tail;
Expand Down Expand Up @@ -208,17 +238,21 @@ ISR(COMPARE_A_INTERRUPT)
// TODO: how to detect timing_error?
}
}
#endif

void AltSoftSerial::flushOutput(void)
{
#ifndef RX_ONLY
while (tx_state) /* wait */ ;
#endif
}


/****************************************/
/** Reception **/
/****************************************/

#ifndef TX_ONLY
ISR(CAPTURE_INTERRUPT)
{
uint8_t state, bit, head;
Expand Down Expand Up @@ -271,7 +305,9 @@ ISR(CAPTURE_INTERRUPT)
}
//if (GET_TIMER_COUNT() - capture > ticks_per_bit) AltSoftSerial::timing_error = true;
}
#endif

#ifndef TX_ONLY
ISR(COMPARE_B_INTERRUPT)
{
uint8_t head, state, bit;
Expand All @@ -294,11 +330,12 @@ ISR(COMPARE_B_INTERRUPT)
CONFIG_CAPTURE_FALLING_EDGE();
rx_bit = 0;
}

#endif


int AltSoftSerial::read(void)
{
#ifndef TX_ONLY
uint8_t head, tail, out;

head = rx_buffer_head;
Expand All @@ -308,42 +345,61 @@ int AltSoftSerial::read(void)
out = rx_buffer[tail];
rx_buffer_tail = tail;
return out;
#else
return 0;
#endif
}

int AltSoftSerial::peek(void)
{
#ifndef TX_ONLY
uint8_t head, tail;

head = rx_buffer_head;
tail = rx_buffer_tail;
if (head == tail) return -1;
if (++tail >= RX_BUFFER_SIZE) tail = 0;
return rx_buffer[tail];
#else
return 0;
#endif
}

int AltSoftSerial::available(void)
{
#ifndef TX_ONLY
uint8_t head, tail;

head = rx_buffer_head;
tail = rx_buffer_tail;
if (head >= tail) return head - tail;
return RX_BUFFER_SIZE + head - tail;
#else
return 0;
#endif
}

int AltSoftSerial::availableForWrite(void)
{
{
#ifndef RX_ONLY
uint8_t head, tail;
head = tx_buffer_head;
tail = tx_buffer_tail;

if (tail > head) return tail - head;
return TX_BUFFER_SIZE + tail - head;
#else
return 0;
#endif
};

void AltSoftSerial::flushInput(void)
{
#ifndef TX_ONLY
rx_buffer_head = rx_buffer_tail;
#else
return;
#endif
}


Expand All @@ -357,4 +413,3 @@ void ftm0_isr(void)
if (flags & (1<<6) && (FTM0_C6SC & 0x40)) altss_compare_a_interrupt();
}
#endif