aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/USBtoSerial
diff options
context:
space:
mode:
Diffstat (limited to 'Demos/Device/USBtoSerial')
-rw-r--r--Demos/Device/USBtoSerial/Descriptors.c2
-rw-r--r--Demos/Device/USBtoSerial/RingBuff.h10
-rw-r--r--Demos/Device/USBtoSerial/USBtoSerial.c2
-rw-r--r--Demos/Device/USBtoSerial/USBtoSerial.h10
4 files changed, 12 insertions, 12 deletions
diff --git a/Demos/Device/USBtoSerial/Descriptors.c b/Demos/Device/USBtoSerial/Descriptors.c
index 03d4ed9e4..67fb4e910 100644
--- a/Demos/Device/USBtoSerial/Descriptors.c
+++ b/Demos/Device/USBtoSerial/Descriptors.c
@@ -216,7 +216,7 @@ USB_Descriptor_String_t PROGMEM ProductString =
/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h
* documentation) by the application code so that the address and size of a requested descriptor can be given
- * to the USB library. When the device recieves a Get Descriptor request on the control endpoint, this function
+ * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
* is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
* USB host.
*/
diff --git a/Demos/Device/USBtoSerial/RingBuff.h b/Demos/Device/USBtoSerial/RingBuff.h
index 4b6bfde66..23288d87a 100644
--- a/Demos/Device/USBtoSerial/RingBuff.h
+++ b/Demos/Device/USBtoSerial/RingBuff.h
@@ -29,8 +29,8 @@
*/
/* Buffer Configuration: */
- /* Buffer length - select static size of created ringbuffers: */
- #define BUFF_STATICSIZE 128 // Set to the static ringbuffer size for all ringbuffers (place size after define)
+ /* Buffer length - select static size of created ring buffers: */
+ #define BUFF_STATICSIZE 128 // Set to the static ring buffer size for all ring buffers (place size after define)
/* Volatile mode - uncomment to make buffers volatile, for use in ISRs, etc: */
#define BUFF_VOLATILE // Uncomment to cause all ring buffers to become volatile (and atomic if multi-byte) in access
@@ -40,9 +40,9 @@
// #define BUFF_DROPNEW // Uncomment to cause full ring buffers to drop the new character when full
// #define BUFF_NODROPCHECK // Uncomment to ignore full ring buffer checks - checking left to user!
- /* Underflow behaviour - select behaviour when Buffer_GetElement is called with an empty ringbuffer: */
- //#define BUFF_EMPTYRETURNSZERO // Uncomment to return 0 when an empty ringbuffer is read
- #define BUFF_NOEMPTYCHECK // Uncomment to disable checking of empty ringbuffers - checking left to user!
+ /* Underflow behaviour - select behaviour when Buffer_GetElement is called with an empty ring buffer: */
+ //#define BUFF_EMPTYRETURNSZERO // Uncomment to return 0 when an empty ring buffer is read
+ #define BUFF_NOEMPTYCHECK // Uncomment to disable checking of empty ring buffers - checking left to user!
/* Buffer storage type - set the datatype for the stored data */
#define BUFF_DATATYPE uint8_t // Change to the data type that is going to be stored into the buffer
diff --git a/Demos/Device/USBtoSerial/USBtoSerial.c b/Demos/Device/USBtoSerial/USBtoSerial.c
index c7c9e4b04..a9f0434cb 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/USBtoSerial/USBtoSerial.c
@@ -79,7 +79,7 @@ int main(void)
LEDs_Init();
ReconfigureUSART();
- /* Ringbuffer Initialization */
+ /* Ring buffer Initialization */
Buffer_Initialize(&Rx_Buffer);
Buffer_Initialize(&Tx_Buffer);
diff --git a/Demos/Device/USBtoSerial/USBtoSerial.h b/Demos/Device/USBtoSerial/USBtoSerial.h
index 3fb6d7d9f..092660069 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/USBtoSerial/USBtoSerial.h
@@ -39,7 +39,7 @@
/* Includes: */
#include <avr/io.h>
#include <avr/wdt.h>
- #include <avr/interrupt.h>
+ #include <avr/interrupt.h>
#include <avr/power.h>
#include "Descriptors.h"
@@ -99,17 +99,17 @@
#define CONTROL_LINE_IN_RING (1 << 3)
/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
- * to indicate that a framing error has ocurred on the virtual serial port.
+ * to indicate that a framing error has occurred on the virtual serial port.
*/
#define CONTROL_LINE_IN_FRAMEERROR (1 << 4)
/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
- * to indicate that a parity error has ocurred on the virtual serial port.
+ * to indicate that a parity error has occurred on the virtual serial port.
*/
#define CONTROL_LINE_IN_PARITYERROR (1 << 5)
/** Mask for use with the a NOTIF_SerialState class specific notification from the device to the host,
- * to indicate that a data overrun error has ocurred on the virtual serial port.
+ * to indicate that a data overrun error has occurred on the virtual serial port.
*/
#define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)
@@ -139,7 +139,7 @@
uint8_t ParityType; /**< Parity setting of the virtual serial port, a value from the
* CDCDevice_LineCodingParity_t enum
*/
- uint8_t DataBits; /**< Bits of data per charater of the virtual serial port */
+ uint8_t DataBits; /**< Bits of data per character of the virtual serial port */
} CDC_Line_Coding_t;
/** Type define for a CDC notification, sent to the host via the CDC notification endpoint to indicate a