kdee/miSim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed potentially faulty environment detection in favor of explicit setting

Browse Source
This commit is contained in:
Kevin Dee
2026-02-01 11:34:35 -08:00
parent 79b03345ba
commit f6e1f13bb5
19 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
aerpaw/client/uav_runner.py
View File

@@ -41,22 +41,19 @@ def load_config():
return yaml.safe_load(f) return yaml.safe_load(f)
def detect_environment(): def get_environment():
"""Detect whether we're on the AERPAW testbed or running locally.""" """Get environment from AERPAW_ENV variable. Fails if not set."""
# Check for AERPAW_ENV environment variable first
env = os.environ.get('AERPAW_ENV') env = os.environ.get('AERPAW_ENV')
if env in ('local', 'testbed'): if env is None:
return env raise RuntimeError(
"AERPAW_ENV environment variable not set. "
# Auto-detect based on network (testbed uses 192.168.122.x) "Set to 'local' or 'testbed', or use: ./run_uav.sh [local|testbed]"
import subprocess )
try: if env not in ('local', 'testbed'):
result = subprocess.run(['ip', 'addr'], capture_output=True, text=True, timeout=5) raise RuntimeError(
if '192.168.122' in result.stdout: f"Invalid AERPAW_ENV '{env}'. Must be 'local' or 'testbed'."
return 'testbed' )
except Exception: return env
pass
return 'local'
def parse_target(message: str): def parse_target(message: str):
@@ -74,7 +71,7 @@ class UAVRunner(BasicRunner):
def initialize_args(self, extra_args): def initialize_args(self, extra_args):
"""Load configuration from YAML config file.""" """Load configuration from YAML config file."""
config = load_config() config = load_config()
env = detect_environment() env = get_environment()
print(f"[UAV] Environment: {env}") print(f"[UAV] Environment: {env}")
# Load origin # Load origin

35
aerpaw/run_uav.sh
View File

@@ -1,11 +1,10 @@
#!/bin/bash #!/bin/bash
# run_uav.sh - Auto-detecting wrapper for UAV runner # run_uav.sh - Wrapper for UAV runner
# Detects testbed vs local environment and launches with appropriate connection # Launches UAV client with environment-specific configuration
# #
# Usage: # Usage:
# ./run_uav.sh # Auto-detect and run # ./run_uav.sh local # Use local/simulation configuration
# ./run_uav.sh testbed # Force testbed mode # ./run_uav.sh testbed # Use AERPAW testbed configuration
# ./run_uav.sh local # Force local mode
set -e set -e
@@ -17,30 +16,22 @@ if [ -d "venv" ]; then
source venv/bin/activate source venv/bin/activate
fi fi
# Function to check if we're in testbed environment # Determine environment from argument (required)
check_testbed() {
ip addr | grep -q "192.168.122"
return $?
}
# Determine environment based on argument or auto-detection
if [ "$1" = "testbed" ]; then if [ "$1" = "testbed" ]; then
ENV="testbed" ENV="testbed"
echo "[run_uav] Forced testbed mode"
elif [ "$1" = "local" ]; then elif [ "$1" = "local" ]; then
ENV="local" ENV="local"
echo "[run_uav] Forced local mode"
else else
echo "[run_uav] Auto-detecting environment..." echo "Error: Environment not specified."
if check_testbed; then echo "Usage: $0 [local|testbed]"
ENV="testbed" echo ""
echo "[run_uav] Testbed detected" echo " local - Use local/simulation configuration"
else echo " testbed - Use AERPAW testbed configuration"
ENV="local" exit 1
echo "[run_uav] Local mode"
fi
fi fi
echo "[run_uav] Environment: $ENV"
# Export environment for Python to use # Export environment for Python to use
export AERPAW_ENV="$ENV" export AERPAW_ENV="$ENV"

6
resources/project/4sXto5Q6PQxNCRaZ_E3lobFdDW0/gsyStyyOVyV_ZZ2qqV11kkPreoEd.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design"/>
</Category>
</Info>

2
resources/project/4sXto5Q6PQxNCRaZ_E3lobFdDW0/gsyStyyOVyV_ZZ2qqV11kkPreoEp.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="tmwtypes.h" type="File"/>

6
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/0R7brX1PJM2uI2ZQ6vdPPfKixB0d.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info>
<Category UUID="FileClassCategory">
<Label UUID="design"/>
</Category>
</Info>

2
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/0R7brX1PJM2uI2ZQ6vdPPfKixB0p.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="loadTargetsFromYaml.m" type="File"/>

0
resources/project/vmVRNnXTZxyEiUtNp09z8POG4ww/LK7oJyAsjG7L54MEiqw4vyI1c5cd.xml → resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/8r7PXt-CEJX2YvR04X9eMkzrlZQd.xml
View File

2
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/8r7PXt-CEJX2YvR04X9eMkzrlZQp.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="controller.coderprj" type="File"/>

2
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/GtnTj1ssSNR3QhZ3AllzXf2GUE0d.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info/>

2
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/GtnTj1ssSNR3QhZ3AllzXf2GUE0p.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="compile.sh" type="File"/>

2
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/o6FVDwp3EHYMTXmqklIOCJkGp0kd.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info/>

2
resources/project/Gnz6T47dAsmf4YcBHB3EkpeZeYA/o6FVDwp3EHYMTXmqklIOCJkGp0kp.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="run_uav.sh" type="File"/>

2
resources/project/_OVq48gDE3e3rOLnb5h-BM7EFlo/OQ0CFX4UZF9ARPKtDq_te57QCLMd.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info/>

2
resources/project/_OVq48gDE3e3rOLnb5h-BM7EFlo/OQ0CFX4UZF9ARPKtDq_te57QCLMp.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="uav_runner.py" type="File"/>

2
resources/project/qaw0eS1zuuY1ar9TdPn1GMfrjbQ/NTqKTk5GXJ50iyVRWNQZdIM_krkd.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info/>

2
resources/project/qaw0eS1zuuY1ar9TdPn1GMfrjbQ/NTqKTk5GXJ50iyVRWNQZdIM_krkp.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location=".gitmodules" type="File"/>

2
resources/project/vmVRNnXTZxyEiUtNp09z8POG4ww/LK7oJyAsjG7L54MEiqw4vyI1c5cp.xml
View File

@@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="targets.txt" type="File"/>

2
resources/project/vmVRNnXTZxyEiUtNp09z8POG4ww/cI5_6UThNoj4X6TsI4A5hBM9jVod.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info/>

2
resources/project/vmVRNnXTZxyEiUtNp09z8POG4ww/cI5_6UThNoj4X6TsI4A5hBM9jVop.xml Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Info location="config.yaml" type="File"/>