diff --git a/README.md b/README.md new file mode 100644 index 0000000..8b0b9c7 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# SFHS_mmSim +Micro-mouse sim software for SFHS robotics team. +See https://github.com/Saint-Francis-Robotics-Team2367/SFHS_mmSim instead. diff --git a/microMouseServer/microMouseServer/microMouseServer.pro b/microMouseServer/microMouseServer/microMouseServer.pro index 3813bed..93c2895 100644 --- a/microMouseServer/microMouseServer/microMouseServer.pro +++ b/microMouseServer/microMouseServer/microMouseServer.pro @@ -15,12 +15,14 @@ TEMPLATE = app SOURCES += mazegui.cpp\ main.cpp \ micromouseserver.cpp \ - mazeBase.cpp + mazeBase.cpp \ + studentAi.cpp -HEADERS += micromouseserver.h \ +HEADERS += \ mazeConst.h \ mazeBase.h \ - mazegui.h + mazegui.h \ + micromouseserver.h FORMS += micromouseserver.ui diff --git a/microMouseServer/microMouseServer/micromouseserver.cpp b/microMouseServer/microMouseServer/micromouseserver.cpp index bdcfa69..008274c 100644 --- a/microMouseServer/microMouseServer/micromouseserver.cpp +++ b/microMouseServer/microMouseServer/micromouseserver.cpp @@ -501,26 +501,3 @@ void microMouseServer::turnRight() break; } } - -void microMouseServer::studentAI() -{ -/* - * The following are the eight functions that you can call. Feel free to create your own fuctions as well. - * Remember that any solution that calls moveForward more than once per call of studentAI() will have points deducted. - * - *The following functions return if there is a wall in their respective directions - *bool isWallLeft(); - *bool isWallRight(); - *bool isWallForward(); - * - *The following functions move the mouse. Move forward returns if the mouse was able to move forward and can be used for error checking - *bool moveForward(); - *void turnLeft(); - *void turnRight(); - * - * The following functions are called when you need to output something to the UI or when you have finished the maze - * void foundFinish(); - * void printUI(const char *mesg); -*/ - -} diff --git a/microMouseServer/microMouseServer/micromouseserver.h b/microMouseServer/microMouseServer/micromouseserver.h index 096e3d2..8f14738 100644 --- a/microMouseServer/microMouseServer/micromouseserver.h +++ b/microMouseServer/microMouseServer/micromouseserver.h @@ -1,5 +1,5 @@ #ifndef MICROMOUSESERVER_H -#define MICROMOUSESERVER_H +#define MICROMOUSESERVER_HPP #include "mazeConst.h" #include "mazeBase.h" #include "mazegui.h" @@ -15,7 +15,7 @@ namespace Ui { -class microMouseServer; + class microMouseServer; } class microMouseServer : public QMainWindow diff --git a/microMouseServer/microMouseServer/studentAi.cpp b/microMouseServer/microMouseServer/studentAi.cpp new file mode 100644 index 0000000..091f96d --- /dev/null +++ b/microMouseServer/microMouseServer/studentAi.cpp @@ -0,0 +1,30 @@ +#ifndef STUDENT_AI_CPP +#define STUDENT_AI_CPP + +#include "micromouseserver.h" +#include "ui_micromouseserver.h" + +void microMouseServer::studentAI() +{ +/* + * The following are the eight functions that you can call. Feel free to create your own fuctions as well. + * Remember that any solution that calls moveForward more than once per call of studentAI() will have points deducted. + * + *The following functions return if there is a wall in their respective directions + *bool isWallLeft(); + *bool isWallRight(); + *bool isWallForward(); + * + *The following functions move the mouse. Move forward returns if the mouse was able to move forward and can be used for error checking + *bool moveForward(); + *void turnLeft(); + *void turnRight(); + * + * The following functions are called when you need to output something to the UI or when you have finished the maze + * void foundFinish(); + * void printUI(const char *mesg); +*/ + + +} +#endif