Skip to content

Commit

Permalink
Config updates and a small fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
@andybarry
andybarry committed Aug 29, 2015
1 parent fc82ba9 commit 24545a7
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 42 deletions.
96 changes: 54 additions & 42 deletions config/bot-procman-flight.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ group "4-Controllers" {
}

group "8-Old" {
cmd "Octomap control" {
exec = "/home/$USER/realtime/controllers/cpp_stereo_obstacles/stereo-imu-obstacles -c /home/$USER/realtime/sensors/stereo/deltawing-stereo.conf";
host = "gps-deputy";
}
cmd "constant control" {
exec = "/home/$USER/realtime/controllers/constant-control/constant-control -p servo_out";
host = "gps-deputy";
}
cmd "Octomap control" {
exec = "/home/$USER/realtime/controllers/cpp_stereo_obstacles/stereo-imu-obstacles -c /home/$USER/realtime/sensors/stereo/deltawing-stereo.conf";
host = "gps-deputy";
}
}

group "7.2-Views Cam" {
Expand Down Expand Up @@ -45,6 +45,10 @@ group "5-Logging" {
}

group "9-FPGA" {
cmd "FPGA serial bridge" {
exec = "/home/$USER/realtime/scripts/runMavconnBridgeFPGA";
host = "gps-deputy";
}
cmd "FPGA mavlink bridge" {
exec = "/home/$USER/realtime/drivers/fpga_mavlink_bridge/fpga-mavlink-bridge stereo-control MAVLINK servo_out";
host = "gps-deputy";
Expand All @@ -53,36 +57,32 @@ group "9-FPGA" {
exec = "/home/$USER/realtime/drivers/fpga_reset/fpga-camera-reset";
host = "gps-deputy";
}
cmd "FPGA serial bridge" {
exec = "/home/$USER/realtime/scripts/runMavconnBridgeFPGA";
host = "gps-deputy";
}
}

group "7.1-Views GPS" {
cmd "pronto-viewer" {
exec = "/home/$USER/pronto-distro/build/bin/pronto-viewer -p";
host = "gps-deputy";
}
cmd "lcm-spy" {
exec = "/home/$USER/realtime/scripts/runlcmspy";
host = "gps-deputy";
}
cmd "HUD" {
exec = "/home/$USER/realtime/ui/hud/hud-main -c /home/$USER/realtime/sensors/stereo/deltawing-stereo-odroid-cam1.conf";
host = "gps-deputy";
}
cmd "lcm-spy" {
exec = "/home/$USER/realtime/scripts/runlcmspy";
host = "gps-deputy";
}
}

group "0-Local Startup" {
cmd "LCM tunnel2" {
exec = "bot-lcm-tunnel odroid-gps2 -R (MAVLINK|STATE_ESTIMATOR_STATE|attitude|baro-airspeed|servo_out|cpu-info-AAAZZZA|log-info-AAAZZZA|stereo|stereo-mono) -u";
host = "localhost";
}
cmd "LCM tunnel1" {
exec = "bot-lcm-tunnel odroid-gps1 -R (MAVLINK|STATE_ESTIMATOR_STATE|attitude|baro-airspeed|servo_out|cpu-info-AAAZZZA|log-info-AAAZZZA|stereo|stereo-mono) -u";
host = "localhost";
}
cmd "LCM tunnel2" {
exec = "bot-lcm-tunnel odroid-gps2 -R (MAVLINK|STATE_ESTIMATOR_STATE|attitude|baro-airspeed|servo_out|cpu-info-AAAZZZA|log-info-AAAZZZA|stereo|stereo-mono) -u";
host = "localhost";
}
}

group "6-Vision" {
Expand All @@ -109,10 +109,6 @@ group "XX-Shutdown" {
}

group "7.0-Views Local" {
cmd "HUD" {
exec = "/home/$USER/realtime/ui/hud/hud-main -c /home/$USER/realtime/sensors/stereo/deltawing-stereo-AAAZZZA.conf";
host = "localhost";
}
cmd "pronto-viewer" {
exec = "/home/$USER/pronto-distro/build/bin/pronto-viewer -p";
host = "localhost";
Expand All @@ -121,6 +117,10 @@ group "7.0-Views Local" {
exec = "/home/$USER/realtime/scripts/runlcmspy";
host = "localhost";
}
cmd "HUD" {
exec = "/home/$USER/realtime/ui/hud/hud-main -c /home/$USER/realtime/sensors/stereo/deltawing-stereo-AAAZZZA.conf";
host = "localhost";
}
}

group "2-Drivers" {
Expand All @@ -132,35 +132,39 @@ group "2-Drivers" {
exec = "/home/$USER/realtime/sensors/airspeed-check/airspeed-check -t";
host = "gps-deputy";
}
cmd "Mavlink LCM bridge" {
exec = "/home/$USER/realtime/drivers/cpp_ardupilot_mavlink_bridge/ardupilot-mavlink-bridge";
host = "gps-deputy";
}
cmd "Mavlink Serial Bridge" {
exec = "/home/$USER/realtime/scripts/runMavconnBridge";
host = "gps-deputy";
}
cmd "Mavlink LCM bridge" {
exec = "/home/$USER/realtime/drivers/cpp_ardupilot_mavlink_bridge/ardupilot-mavlink-bridge";
host = "gps-deputy";
}
}

group "1-Startup" {
cmd "cam: log monitor" {
exec = "/home/$USER/realtime/ui/log-monitor/log-monitor -d /home/$USER";
cmd "cam: CPU Monitor" {
exec = "/home/$USER/realtime/drivers/cpu-monitor/cpu-monitor";
host = "cam-deputy";
}
cmd "cam: stereo-monitor" {
exec = "/home/$USER/realtime/ui/stereo-monitor/stereo-monitor";
host = "cam-deputy";
}
cmd "cam: CPU Monitor" {
exec = "/home/$USER/realtime/drivers/cpu-monitor/cpu-monitor";
host = "cam-deputy";
}
cmd "cam: mono-monitor" {
exec = "/home/$USER/realtime/ui/stereo-monitor/stereo-monitor -s stereo-mono -n 30";
host = "cam-deputy";
}
cmd "gps: CPU Monitor" {
exec = "/home/$USER/realtime/drivers/cpu-monitor/cpu-monitor";
cmd "cam: log monitor" {
exec = "/home/$USER/realtime/ui/log-monitor/log-monitor -d /home/$USER";
host = "cam-deputy";
}
cmd "cam: git monitor" {
exec = "/home/$USER/realtime/ui/git-monitor/git-monitor";
host = "cam-deputy";
}
cmd "gps: git monitor" {
exec = "/home/$USER/realtime/ui/git-monitor/git-monitor";
host = "gps-deputy";
}
cmd "param server" {
Expand All @@ -171,6 +175,10 @@ group "1-Startup" {
exec = "/home/$USER/realtime/ui/log-monitor/log-monitor -d /home/$USER";
host = "gps-deputy";
}
cmd "gps: CPU Monitor" {
exec = "/home/$USER/realtime/drivers/cpu-monitor/cpu-monitor";
host = "gps-deputy";
}
cmd "GoForFlight" {
exec = "/home/$USER/realtime/ui/GoForFlight/bin/Debug/GoForFlight";
host = "localhost";
Expand All @@ -179,21 +187,17 @@ group "1-Startup" {
exec = "/home/$USER/realtime/drivers/cpu-monitor/cpu-monitor -n";
host = "localhost";
}
cmd "local: git monitor" {
exec = "/home/$USER/realtime/ui/git-monitor/git-monitor";
host = "localhost";
}
cmd "local: log monitor" {
exec = "/home/$USER/realtime/ui/log-monitor/log-monitor -d /home/$USER";
host = "localhost";
}
}

group "8-Debug" {
cmd "MIDI Airspeed" {
exec = "/home/$USER/realtime/ui/midi-airspeed/midi-airspeed";
host = "gps-deputy";
}
cmd "Send airspeed 15" {
exec = "python /home/$USER/realtime/LCM/lcm-tester/send_airspeed_midi.py";
host = "gps-deputy";
}
cmd "Mavlink LCM no airspeed" {
exec = "/home/$USER/realtime/drivers/cpp_ardupilot_mavlink_bridge/ardupilot-mavlink-bridge --airspeed-channel airspeed-real";
host = "gps-deputy";
Expand All @@ -202,14 +206,22 @@ group "8-Debug" {
exec = "/home/$USER/realtime/drivers/midi/midi-lcm hw:1,0,0 midi-out";
host = "gps-deputy";
}
cmd "MIDI Control" {
exec = "/home/$USER/realtime/ui/midi-control/midi-control";
cmd "Send airspeed 15" {
exec = "python /home/$USER/realtime/LCM/lcm-tester/send_airspeed_midi.py";
host = "gps-deputy";
}
cmd "Airspeed Check FORCE" {
exec = "/home/$USER/realtime/sensors/airspeed-check/airspeed-check -f";
host = "gps-deputy";
}
cmd "MIDI Control" {
exec = "/home/$USER/realtime/ui/midi-control/midi-control";
host = "gps-deputy";
}
cmd "MIDI Airspeed" {
exec = "/home/$USER/realtime/ui/midi-airspeed/midi-airspeed";
host = "gps-deputy";
}
}

group "3-Estimators" {
Expand Down
5 changes: 5 additions & 0 deletions ui/git-monitor/git_monitor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ int main(int argc,char** argv) {

GitMonitor monitor(&lcm, git_status_channel);

// wait for 1 second on start to let Go For Flight start up
// if they were both started at once to give a little better
// responsiveness
sleep(1);

while (true) {

monitor.PublishMessage();
Expand Down

0 comments on commit 24545a7

Please sign in to comment.