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

Tests #104

Open
wants to merge 1 commit into
base: junior_testing
Choose a base branch
from
Open

Tests #104

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
Binary file added .vscode/.BROWSE.VC.DB-shm
Binary file not shown.
Binary file added .vscode/.BROWSE.VC.DB-wal
Binary file not shown.
2 changes: 1 addition & 1 deletion micromouse/Controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <vector>
#include "Timer.h"
#include "ButtonFlag.h"

#include "TeensyFunctions.h"
#ifdef __MK20DX256__ // Teensy Compile
#include "WProgram.h"
#else // pc compile
Expand Down
2 changes: 1 addition & 1 deletion micromouse/IRSensor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Logger.h"
#include "RobotIO.h"
#include <assert.h>

#include "TeensyFunctions.h"
#ifdef __MK20DX256__ // Teensy Compile
#include "WProgram.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion micromouse/Memory.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "Memory.h"
#include <assert.h>

#include "TeensyFunctions.h"
namespace Micromouse {

int Memory::read(int address)
Expand Down
62 changes: 59 additions & 3 deletions micromouse/TeensyFunctions.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,65 @@
#ifdef #ifdef __MK20DX256__ // Teensy Compile
#ifndef TEENSYFUNCTIONS_H
#define TEENSYFUNCTIONS_H

#include "ButtonFlag.h"
//Teensy PC safe versions
//Controller.cpp

extern volatile bool buttonFlag;

#ifdef __MK20DX256__ // Teensy Compile
#else //on windows
void delay(int milliseconds){};
void delay(unsigned long milliseconds){};
Copy link
Member

@blhough blhough Aug 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the functions actually need to be static as well, my bad. This is to prevent any linker problems during compiling

static void delay(unsigned long milliseconds){};

all of them need to be static

#endif

#ifdef #ifdef __MK20DX256__ // Teensy Compile
#ifdef __MK20DX256__ // Teensy Compile
#else //on windows
void digitalWrite(int pin, bool high){};
#endif

//The above definitions already complete
//Line 237
//Line 263
//Line 273
//Line 287

//Line 301
#ifdef __MK20DX256__ // Teensy Compile
#else
void cli(){};

if (!buttonFlag)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can't have an if statement that is not part of a function

{
buttonFlag = true;
}

void sei(){};
#endif

//Line 316
#ifdef __MK20DX256__ // Teensy Compile
#else
void pinMode(int pin, bool mode){};
void attachInterrupt(int pin, bool mode){};
#endif

//IRSensor.cpp
//Line 6
#ifdef __MK20DX256__ // Teensy Compile
#else
#include <iostream>
#endif

//Line 48 already done
//Line 151 as well
//Line 201 -- pinMode (here on line 41) may fix it

//Logger.h
//Line 3 already done
//Line 57 as well
//Line 113 as well
//Line 123 as well
//Line 138 --
//Line 151 done
//Line 177 done
#endif