Skip to content

Commit

Permalink
* fixed Header issue
Browse files Browse the repository at this point in the history
  • Loading branch information
innif committed May 1, 2019
1 parent 4ded56b commit d35ea6f
Show file tree
Hide file tree
Showing 22 changed files with 50 additions and 56 deletions.
2 changes: 1 addition & 1 deletion BallTouch.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "BallTouch.h"
#include "BallTouch.hpp"

BallTouch::BallTouch(int pinLed, int pinSensor){
_pinLed = pinLed;
Expand Down
6 changes: 3 additions & 3 deletions BallTouch.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef BallTouch_h
#define BallTouch_h
#ifndef BallTouch_hpp
#define BallTouch_hpp

#include "Config.h"
#include "Config.hpp"

#define LED_OFF false
#define LED_ON true
Expand Down
2 changes: 1 addition & 1 deletion Config.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Config.h"
#include "Config.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
23 changes: 12 additions & 11 deletions Config.hpp
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
#ifndef Config_h
#define Config_h
#ifndef Config_hpp
#define Config_hpp

#include "Arduino.h"
#include "Display.h"
#include "Led.h"
#include "Pilot.h"
#include "Player.h"
#include "Mate.h"
#include "Ultrasonic.h"
#include "Utility.h"
#include "pin.h"
#include "Display.hpp"
#include "Led.hpp"
#include "Pilot.hpp"
#include "Player.hpp"
#include "Mate.hpp"
#include "Ultrasonic.hpp"
#include "Utility.hpp"
#include "Input.hpp"
#include "BallTouch.h"
#include "BallTouch.hpp"

#include "EEPROM.h"
#include "Pin.h"

#include <SPI.h>
#include <HardWire.h>
Expand Down
2 changes: 1 addition & 1 deletion Display.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Display.h"
#include "Display.hpp"

// Implementierung: OBJEKTE
//extern Display d;
Expand Down
7 changes: 3 additions & 4 deletions Display.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#ifndef Display_h
#define Display_h
#ifndef Display_hpp
#define Display_hpp

#include "Config.h"
#include "pin.h"
#include "Config.hpp"

class Display
{
Expand Down
File renamed without changes.
11 changes: 4 additions & 7 deletions Input.hpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#include "Arduino.h"
#include "pin.h"
#include "Utility.h"

#include "Adafruit_MCP23017.h"
#include "HardWire.h"

#ifndef Input_hpp
#define Input_hpp

#include "Config.hpp"

#include <Adafruit_MCP23017.h>

//IO-Expander:
#define PIN_MCP_kick 8
#define PIN_MCP_compass 12
Expand Down
2 changes: 1 addition & 1 deletion Led.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Led.h"
#include "Led.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
7 changes: 3 additions & 4 deletions Led.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#ifndef Led_h
#define Led_h
#ifndef Led_hpp
#define Led_hpp

#include "Config.h"
#include "Input.hpp"
#include "Config.hpp"

#include <Adafruit_NeoPixel.h>

Expand Down
2 changes: 1 addition & 1 deletion Mate.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Mate.h"
#include "Mate.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
7 changes: 3 additions & 4 deletions Mate.hpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#ifndef Mate_h
#define Mate_h
#ifndef Mate_hpp
#define Mate_hpp

#include "Config.h"
#include "Input.hpp"
#include "Config.hpp"

#define CACHE_SIZE 10 // Länge des Input Byte Buffers

Expand Down
2 changes: 1 addition & 1 deletion Pilot.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Pilot.h"
#include "Pilot.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
6 changes: 3 additions & 3 deletions Pilot.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef Pilot_h
#define Pilot_h
#ifndef Pilot_hpp
#define Pilot_hpp

#include "Config.h"
#include "Config.hpp"

class Pilot
{
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Player.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Player.h"
#include "Player.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
6 changes: 3 additions & 3 deletions Player.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef Player_h
#define Player_h
#ifndef Player_hpp
#define Player_hpp

#include "Config.h"
#include "Config.hpp"

class Player
{
Expand Down
2 changes: 1 addition & 1 deletion UltraSonic.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Ultrasonic.h"
#include "Ultrasonic.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
6 changes: 3 additions & 3 deletions UltraSonic.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef Ultrasonic_h
#define Ultrasonic_h
#ifndef Ultrasonic_hpp
#define Ultrasonic_hpp

#include "Config.h"
#include "Config.hpp"

#define I2C_US_FRONT_LEFT 112
#define I2C_US_LEFT 113
Expand Down
2 changes: 1 addition & 1 deletion Utility.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "Utility.h"
#include "Utility.hpp"

// Implementierung: OBJEKTE
extern Display d;
Expand Down
6 changes: 3 additions & 3 deletions Utility.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef Utility_h
#define Utility_h
#ifndef Utility_hpp
#define Utility_hpp

#include "Config.h"
#include "Config.hpp"

void handleCompassCalibration();
void displayCalStatus(void);
Expand Down
3 changes: 1 addition & 2 deletions _iceberg.19.ino
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
// TODO: IR-Ortung

// Implementierung: DATEIEN
#include "Config.h"
#include "HardWire.h"
#include "Config.hpp"

// Globale Definition: FAHREN
bool start = false; // ist der funkstart aktiviert
Expand Down

0 comments on commit d35ea6f

Please sign in to comment.