renamed RobotControl to Movement

main
Jonas Arnold 4 years ago
parent e2ef6b4c2b
commit 84c3d79859
  1. 10
      ADIS_Csharp/RobotConsoleClient/Program.cs
  2. 8
      ADIS_Csharp/RobotLib/Movement/DevMovement.cs
  3. 6
      ADIS_Csharp/RobotLib/Robot.cs

@ -19,11 +19,11 @@ namespace RobotConsoleClient
robotStationary.SplitFlap.InitializeAllSplitflaps(); robotStationary.SplitFlap.InitializeAllSplitflaps();
Thread.Sleep(1000); Thread.Sleep(1000);
robotMobile.RobotControl.SetSpeed(1000); robotMobile.Movement.SetSpeed(1000);
robotMobile.RobotControl.Turn(-10); robotMobile.Movement.Turn(-10);
robotMobile.RobotControl.SetSpeed(-500); robotMobile.Movement.SetSpeed(-500);
robotMobile.RobotControl.StopMovement(); robotMobile.Movement.Stop();
robotMobile.RobotControl.SetMobilityMode(automatic: true); robotMobile.Movement.SetMobilityMode(automatic: true);
} }

@ -2,16 +2,16 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.Json; using System.Text.Json;
namespace RobotLib.RobotControl namespace RobotLib.Movement
{ {
public class DevRobot : DevBase public class DevMovement : DevBase
{ {
private const string TOPIC_MOBILE_MODE = "/mobile/cmd/mode/"; private const string TOPIC_MOBILE_MODE = "/mobile/cmd/mode/";
private const string TOPIC_MOBILE_NAV_TURN = "/mobile/cmd/nav/turn/"; private const string TOPIC_MOBILE_NAV_TURN = "/mobile/cmd/nav/turn/";
private const string TOPIC_MOBILE_NAV_MOVE = "/mobile/cmd/nav/move/"; private const string TOPIC_MOBILE_NAV_MOVE = "/mobile/cmd/nav/move/";
private const string TOPIC_MOBILE_NAV_STOP = "/mobile/cmd/nav/stop/"; private const string TOPIC_MOBILE_NAV_STOP = "/mobile/cmd/nav/stop/";
public DevRobot(IPublisherSubscriber com) : base(com, new List<string>() { }) { } public DevMovement(IPublisherSubscriber com) : base(com, new List<string>() { }) { }
public void SetMobilityMode(bool automatic) public void SetMobilityMode(bool automatic)
{ {
@ -29,7 +29,7 @@ namespace RobotLib.RobotControl
base.SendMessage(TOPIC_MOBILE_NAV_MOVE, speed.ToString()); base.SendMessage(TOPIC_MOBILE_NAV_MOVE, speed.ToString());
} }
public void StopMovement() public void Stop()
{ {
base.SendMessage(TOPIC_MOBILE_NAV_STOP, true.ToString()); base.SendMessage(TOPIC_MOBILE_NAV_STOP, true.ToString());
} }

@ -1,6 +1,6 @@
using RobotLib.Communication; using RobotLib.Communication;
using RobotLib.RobotControl;
using RobotLib.SplitFlap; using RobotLib.SplitFlap;
using RobotLib.Movement;
using System.Threading; using System.Threading;
namespace RobotLib namespace RobotLib
@ -13,7 +13,7 @@ namespace RobotLib
//Buzzer = new DevBuzzer(Com); //Buzzer = new DevBuzzer(Com);
//Battery = new DevBattery(Com); //Battery = new DevBattery(Com);
SplitFlap = new DevSplitFlap(com); SplitFlap = new DevSplitFlap(com);
RobotControl = new DevRobot(com); Movement = new DevMovement(com);
Timer timer = new Timer(TimerCallback); Timer timer = new Timer(TimerCallback);
timer.Change(2000, 10000); timer.Change(2000, 10000);
@ -24,7 +24,7 @@ namespace RobotLib
//public DevBuzzer Buzzer { get; } //public DevBuzzer Buzzer { get; }
//public DevBattery Battery { get; } //public DevBattery Battery { get; }
public DevSplitFlap SplitFlap { get; } public DevSplitFlap SplitFlap { get; }
public DevRobot RobotControl { get; } public DevMovement Movement { get; }
public void Connect(string host, int port) public void Connect(string host, int port)
{ {

Loading…
Cancel
Save