Skip to content

Fix: Add missing include "NANO_compat.h" #50

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

Merged
merged 2 commits into from
Sep 10, 2019
Merged

Fix: Add missing include "NANO_compat.h" #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c2fdd0
Bugfix - including 'NANO_Compat.h' within 'Arduino.h' if 'AVR_NANO_48…
aentinger Sep 10, 2019
ebc7933
Renaming 'NANO_Compat.h/cpp' to 'NANO_compat.h/cpp' for the naming sc…
aentinger Sep 10, 2019
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
3 changes: 3 additions & 0 deletions cores/arduino/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ bool isDoubleBondedActive(uint8_t pin);
#ifdef UNO_WIFI_REV2_328MODE
#include <UNO_compat.h>
#endif
#ifdef AVR_NANO_4809_328MODE
#include <NANO_compat.h>
#endif
#if defined(HAVE_HWSERIAL0) && defined(HAVE_CDCSERIAL)
#error "Targets with both UART0 and CDC serial not supported"
#endif
Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/NANO_Compat.cpp → cores/arduino/NANO_compat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include "NANO_Compat.h"
#include "NANO_compat.h"

#ifdef AVR_NANO_4809_328MODE

Expand Down
0 cores/arduino/NANO_Compat.h → cores/arduino/NANO_compat.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion cores/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set(TEST_TARGET testArduinoCore-megaavr)

set(TEST_SRCS
src/test_main.cpp
../arduino/NANO_Compat.cpp
../arduino/NANO_compat.cpp
)

##########################################################################
Expand Down
14 changes: 7 additions & 7 deletions cores/test/src/test_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
#define CATCH_CONFIG_MAIN
#include <catch2/catch.hpp>

#include "../../arduino/NANO_Compat.h"
#include "../../arduino/NANO_compat.h"

/*****************************************************************************/

SCENARIO("Testing Arduino Nano 4809 DDRB compatibility class", "NANO_Compat::DDRBClass") {
SCENARIO("Testing Arduino Nano 4809 DDRB compatibility class", "NANO_compat::DDRBClass") {
PORT_t portb, porte;

DDRBClass DDRB(&portb, &porte);
Expand Down Expand Up @@ -63,7 +63,7 @@ SCENARIO("Testing Arduino Nano 4809 DDRB compatibility class", "NANO_Compat::DDR

/*****************************************************************************/

SCENARIO("Testing Arduino Nano 4809 PORTB compatibility class", "NANO_Compat::PORTBClass") {
SCENARIO("Testing Arduino Nano 4809 PORTB compatibility class", "NANO_compat::PORTBClass") {
PORT_t portb, porte;

PORTBClass PORTB(&portb, &porte);
Expand Down Expand Up @@ -103,7 +103,7 @@ SCENARIO("Testing Arduino Nano 4809 PORTB compatibility class", "NANO_Compat::PO

/*****************************************************************************/

SCENARIO("Testing Arduino Nano 4809 DDRC compatibility class", "NANO_Compat::DDRCClass") {
SCENARIO("Testing Arduino Nano 4809 DDRC compatibility class", "NANO_compat::DDRCClass") {
PORT_t porta, portd;

DDRCClass DDRC(&porta, &portd);
Expand Down Expand Up @@ -149,7 +149,7 @@ SCENARIO("Testing Arduino Nano 4809 DDRC compatibility class", "NANO_Compat::DDR

/*****************************************************************************/

SCENARIO("Testing Arduino Nano 4809 PORTC compatibility class", "NANO_Compat::PORTCClass") {
SCENARIO("Testing Arduino Nano 4809 PORTC compatibility class", "NANO_compat::PORTCClass") {
PORT_t porta, portd;

PORTCClass PORTC(&porta, &portd);
Expand Down Expand Up @@ -195,7 +195,7 @@ SCENARIO("Testing Arduino Nano 4809 PORTC compatibility class", "NANO_Compat::PO

/*****************************************************************************/

SCENARIO("Testing Arduino Nano 4809 DDRD compatibility class", "NANO_Compat::DDRDClass") {
SCENARIO("Testing Arduino Nano 4809 DDRD compatibility class", "NANO_compat::DDRDClass") {
PORT_t porta, portb, portc, portf;

DDRDClass DDRD(&porta, &portb, &portc, &portf);
Expand Down Expand Up @@ -245,7 +245,7 @@ SCENARIO("Testing Arduino Nano 4809 DDRD compatibility class", "NANO_Compat::DDR

/*****************************************************************************/

SCENARIO("Testing Arduino Nano 4809 PORTD compatibility class", "NANO_Compat::PORTDClass") {
SCENARIO("Testing Arduino Nano 4809 PORTD compatibility class", "NANO_compat::PORTDClass") {
PORT_t porta, portb, portc, portf;

PORTDClass PORTD(&porta, &portb, &portc, &portf);
Expand Down