Skip to content

Commit

Permalink
Rename sources to prevent conflicts with other Arduino libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
Erriez committed Aug 4, 2018
1 parent c7bf1ab commit 5ed9cb7
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ include_directories(${LIB_SRC_DIR})
generate_arduino_library(
${PROJECT_NAME}Lib
SRCS
${LIB_SRC_DIR}/SerialTerminal.cpp
${LIB_SRC_DIR}/ErriezSerialTerminal.cpp
HDRS
${LIB_SRC_DIR}/SerialTerminal.h
${LIB_SRC_DIR}/ErriezSerialTerminal.h
)

# Configure project
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Default newline character: ```'\n'```
Default delimiter character: ```Space```

```c++
#include <SerialTerminal.h>
#include <ErriezSerialTerminal.h>

// Newline character '\r' or '\n'
char newlineChar = '\n';
Expand Down
2 changes: 1 addition & 1 deletion examples/SerialTerminal/SerialTerminal.ino
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* Documentation: https://erriez.github.io/ErriezSerialTerminal
*/

#include <SerialTerminal.h>
#include <ErriezSerialTerminal.h>

// LED pin
#define LED_PIN LED_BUILTIN
Expand Down
2 changes: 1 addition & 1 deletion platformio/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* Documentation: https://erriez.github.io/ErriezSerialTerminal
*/

#include <SerialTerminal.h>
#include <ErriezSerialTerminal.h>

// LED pin
#define LED_PIN LED_BUILTIN
Expand Down
4 changes: 2 additions & 2 deletions src/SerialTerminal.cpp → src/ErriezSerialTerminal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
*/

/*!
* \file ErriezSerialTerminal.cpp
* \brief Serial terminal library for Arduino.
* \file SerialTerminal.cpp
* \details
* Source: https://github.com/Erriez/ErriezSerialTerminal
* Documentation: https://erriez.github.io/ErriezSerialTerminal
*/

#include "SerialTerminal.h"
#include "ErriezSerialTerminal.h"

/*!
* \brief SerialTerminal constructor.
Expand Down
8 changes: 4 additions & 4 deletions src/SerialTerminal.h → src/ErriezSerialTerminal.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
*/

/*!
* \file ErriezSerialTerminal.h
* \brief Serial terminal library for Arduino
* \file SerialTerminal.h
* \details
* Source: https://github.com/Erriez/ErriezSerialTerminal
* Documentation: https://erriez.github.io/ErriezSerialTerminal
*/

#ifndef SERIAL_TERMINAL_H_
#define SERIAL_TERMINAL_H_
#ifndef ERRIEZ_SERIAL_TERMINAL_H_
#define ERRIEZ_SERIAL_TERMINAL_H_

#include <Arduino.h>
#include <string.h>
Expand Down Expand Up @@ -80,4 +80,4 @@ class SerialTerminal
void (*_defaultHandler)(const char *);
};

#endif // SERIAL_TERMINAL_H_
#endif // ERRIEZ_SERIAL_TERMINAL_H_

0 comments on commit 5ed9cb7

Please sign in to comment.