having troubles testing

pull/1/head
Siria 2019-12-02 17:25:22 +01:00
parent 2eb40084c7
commit c346312bc9
7 changed files with 57 additions and 10 deletions

View File

@ -1,3 +1,4 @@
#pragma once
#include "data_source.h" #include "data_source.h"
#include "vars.h" #include "vars.h"
#include <Arduino.h> #include <Arduino.h>

18
include/game.h Normal file
View File

@ -0,0 +1,18 @@
#pragma once
#include "data_source.h"
#include "data_source_ball.h"
#include "motor.h"
#include "drivecontroller.h"
#include "sensors.h"
#include "vars.h"
#include "data_source_bno055.h"
class Game{
public:
Game();
void keeper();
void goalie();
bool role, attackGoal; //1->goalie 0->keeper, 1->yellow 0->blue
//~Game();
};

View File

@ -6,19 +6,22 @@
#include "motor.h" #include "motor.h"
#include "data_source_controller.h" #include "data_source_controller.h"
#include "drivecontroller.h" #include "drivecontroller.h"
#pragma once
#include "game.h"
#ifdef SENSORS_CPP #ifdef SENSORS_CPP
#define extr #define extr
#else #else
#define extr extern #define extr extern
#endif #endif
class Game;
void initSensors(); void initSensors();
void updateSensors(); void updateSensors();
extr DataSource* compass; extr DataSourceBNO055* compass;
extr DataSource* ball; extr DataSourceBall* ball;
extr DataSource* camera; extr DataSourceCamera* camera;
//extr DataSource* us; //extr DataSource* us;
extr DataSourceController* usCtrl; extr DataSourceController* usCtrl;
extr DriveController* drive; extr DriveController* drive;
extr Game* game;

21
src/game.cpp Normal file
View File

@ -0,0 +1,21 @@
#include "game.h"
Game::Game(){
}
void Game::goalie(){
digitalWrite(LED_G, HIGH);
//if(ball->ballSeen){
//if(ball->angle >= 0) {
drive->prepareDrive(0, 150, 0);
drive->drive(0, 150, 0);
//}
//} else drive->prepareDrive(0, 0, 0);
}
void Game::keeper(){
digitalWrite(LED_Y, HIGH);
}

View File

@ -1,8 +1,6 @@
#include <Arduino.h> #include <Arduino.h>
#include "vars.h"
#include "data_source_bno055.h" #include "game.h"
#include "drivecontroller.h"
#include "sensors.h"
void setup() { void setup() {
@ -17,6 +15,10 @@ void loop() {
updateSensors(); updateSensors();
/*if(millis() % 100 == 0) /*if(millis() % 100 == 0)
DEBUG_PRINT.println(us->getValue());*/ DEBUG_PRINT.println(us->getValue());*/
usCtrl->test(); if(game->role) game->goalie();
else game->keeper();
game->role = digitalRead(SWITCH_DX);
game->attackGoal = digitalRead(SWITCH_SX);
//usCtrl->test();
delay(200); delay(200);
} }

View File

@ -12,6 +12,8 @@ void initSensors(){
ball = new DataSourceBall(&Serial4, 57600); ball = new DataSourceBall(&Serial4, 57600);
camera = new DataSourceCamera(&Serial2, 19200); camera = new DataSourceCamera(&Serial2, 19200);
usCtrl = new DataSourceController(dUs); usCtrl = new DataSourceController(dUs);
game = new Game();
} }
void updateSensors(){ void updateSensors(){