Skip to content
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.

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

Fix Arduino header file inclusion #207

Merged
merged 2 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 19 additions & 6 deletions andino_firmware/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,36 @@
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html

[platformio]
default_envs = uno, nanoatmega328

; Base configuration for build tools.
[base_build]
build_flags =
-Wall -Wextra

; Base configuration for Atmel AVR based Arduino boards.
[base_atmelavr]
platform = atmelavr
framework = arduino
monitor_speed = 57600
test_ignore = test_desktop

; Base configuration for build tools.
[base_build]
build_flags =
-Wall -Wextra
; Base configuration for desktop platforms (for unit testing).
[base_desktop]
platform = native
test_framework = googletest

; Environment for Arduino Uno.
[env:uno]
extends = base_atmelavr, base_build
extends = base_build, base_atmelavr
board = uno

; Environment for Arduino Nano.
[env:nanoatmega328]
extends = base_atmelavr, base_build
extends = base_build, base_atmelavr
board = nanoatmega328

; Environment for desktop platforms (Windows, macOS, Linux, etc).
[env:desktop]
extends = base_build, base_desktop
3 changes: 2 additions & 1 deletion andino_firmware/src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "app.h"

#include "Arduino.h"
#include <Arduino.h>

#include "commands.h"
#include "constants.h"
#include "encoder.h"
Expand Down
3 changes: 2 additions & 1 deletion andino_firmware/src/encoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@

#include <stdint.h>

#include "Arduino.h"
#include <Arduino.h>

#include "pcint.h"

namespace andino {
Expand Down
2 changes: 1 addition & 1 deletion andino_firmware/src/motor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "motor.h"

#include "Arduino.h"
#include <Arduino.h>

namespace andino {

Expand Down
2 changes: 1 addition & 1 deletion andino_firmware/src/pcint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pcint.h"

#include "Arduino.h"
#include <Arduino.h>

static andino::PCInt::InterruptCallback g_callbacks[3] = {nullptr};

Expand Down
2 changes: 1 addition & 1 deletion andino_firmware/src/pcint.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <stdint.h>

#include "Arduino.h"
#include <Arduino.h>

namespace andino {

Expand Down
47 changes: 47 additions & 0 deletions andino_firmware/test/test_desktop/pid_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// BSD 3-Clause License
//
// Copyright (c) 2023, Ekumen Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// 3. Neither the name of the copyright holder nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pid.h"

#include <gtest/gtest.h>

// TODO(jballoffet): Add unit tests.
TEST(PidTest, ConstructOk) {
andino::PID pid_controller(0, 0, 0, 0, 0, 0);
EXPECT_EQ(1, 1);
}

int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
if (RUN_ALL_TESTS()) {
}

// Always return zero-code and allow PlatformIO to parse results.
return 0;
}