projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove non-functional maintenance link check.
[pub/USBasp.git]
/
Projects
/
XPLAINBridge
/
Lib
/
SoftUART.c
diff --git
a/Projects/XPLAINBridge/Lib/SoftUART.c
b/Projects/XPLAINBridge/Lib/SoftUART.c
index
9df42c5
..
152c4e1
100644
(file)
--- a/
Projects/XPLAINBridge/Lib/SoftUART.c
+++ b/
Projects/XPLAINBridge/Lib/SoftUART.c
@@
-1,6
+1,6
@@
/*
LUFA Library
/*
LUFA Library
- Copyright (C) Dean Camera, 201
0
.
+ Copyright (C) Dean Camera, 201
2
.
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
dean [at] fourwalledcubicle [dot] com
www.lufa-lib.org
@@
-9,7
+9,7
@@
/*
Copyright 2010 David Prentice (david.prentice [at] farming [dot] uk)
Copyright 2010 Peter Danneger
/*
Copyright 2010 David Prentice (david.prentice [at] farming [dot] uk)
Copyright 2010 Peter Danneger
- Copyright 201
0
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-51,7
+51,8
@@
static uint8_t RX_BitsRemaining;
/** Temporary data variable to hold the byte being received as it is shifted in */
static uint8_t RX_Data;
/** Temporary data variable to hold the byte being received as it is shifted in */
static uint8_t RX_Data;
-/** Initialises the software UART, ready for data transmission and reception into the global ring buffers. */
+
+/** Initializes the software UART, ready for data transmission and reception into the global ring buffers. */
void SoftUART_Init(void)
{
/* Set TX pin to output high, enable RX pull-up */
void SoftUART_Init(void)
{
/* Set TX pin to output high, enable RX pull-up */
@@
-67,10
+68,10
@@
void SoftUART_Init(void)
SoftUART_SetBaud(9600);
/* Setup reception timer compare ISR */
SoftUART_SetBaud(9600);
/* Setup reception timer compare ISR */
- TIMSK1 = (1 << OC
1
E1A);
+ TIMSK1 = (1 << OC
I
E1A);
/* Setup transmission timer compare ISR and start the timer */
/* Setup transmission timer compare ISR and start the timer */
- TIMSK3 = (1 << OC
1
E3A);
+ TIMSK3 = (1 << OC
I
E3A);
TCCR3B = ((1 << CS30) | (1 << WGM32));
}
TCCR3B = ((1 << CS30) | (1 << WGM32));
}
@@
-80,8
+81,10
@@
ISR(INT0_vect, ISR_BLOCK)
/* Reset the number of reception bits remaining counter */
RX_BitsRemaining = 8;
/* Reset the number of reception bits remaining counter */
RX_BitsRemaining = 8;
- /* Reset the bit reception timer */
- TCNT1 = 0;
+ /* Reset the bit reception timer to -(1/2) of the total bit time, so that the first data bit is
+ * sampled mid way through the total bit time, making reception more robust.
+ */
+ TCNT1 = -(OCR1A >> 1);
/* Check to see that the pin is still low (prevents glitches from starting a frame reception) */
if (!(SRXPIN & (1 << SRX)))
/* Check to see that the pin is still low (prevents glitches from starting a frame reception) */
if (!(SRXPIN & (1 << SRX)))