From 9993027021bfa25af091bda0b1779e124cfdaee6 Mon Sep 17 00:00:00 2001 From: nickg <132455a@gmail.com> Date: Sun, 2 Feb 2020 20:48:50 +0100 Subject: [PATCH] Added missing commands for measurements. --- Code/miniRobotRC/JoystickSteuerung.ino | 6 ++++++ Code/miniRobotRC/_main.ino | 2 -- Code/miniRobotRC/miniRobotRC.ino | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Code/miniRobotRC/JoystickSteuerung.ino b/Code/miniRobotRC/JoystickSteuerung.ino index 42b7304..6c03c41 100644 --- a/Code/miniRobotRC/JoystickSteuerung.ino +++ b/Code/miniRobotRC/JoystickSteuerung.ino @@ -64,5 +64,11 @@ void joystickInit() { commands[7] = highByte(driveTimeout); commands[8] = lowByte(driveTimeout); commands[9] = goDrive; + commands[10] = getTemp; + commands[11] = highByte(temperature); + commands[12] = lowByte(temperature); + commands[13] = getTemp; + commands[14] = highByte(distance); + commands[15] = lowByte(distance); radio.write(&commands, sizeof(commands)); } diff --git a/Code/miniRobotRC/_main.ino b/Code/miniRobotRC/_main.ino index a2cfe13..e851f94 100644 --- a/Code/miniRobotRC/_main.ino +++ b/Code/miniRobotRC/_main.ino @@ -3,8 +3,6 @@ #include long timer; -int distance; -int temperature; void inline clearCommands() { for(uint8_t i=0; i<32; i++) { diff --git a/Code/miniRobotRC/miniRobotRC.ino b/Code/miniRobotRC/miniRobotRC.ino index 9ec4e9b..5416084 100644 --- a/Code/miniRobotRC/miniRobotRC.ino +++ b/Code/miniRobotRC/miniRobotRC.ino @@ -34,6 +34,10 @@ bool forwardA = true; bool forwardB = true; bool driveOn = false; uint16_t driveTimeout = 0; + +int distance; +int temperature; + //Funk #include #include