Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,14 @@ extra_scripts =
post:./scripts/package.py

; Custom options (https://docs.platformio.org/en/latest/scripting/examples/platformio_ini_custom_options.html)
webots_ip_address = 127.0.0.1 ; IP address of the Webots simulation, which is used for TCP communication
webots_protocol = ipc ; [ipc|tcp] - ipc is faster but only works on the same machine, tcp works also over network
webots_robot_name = Zumo
webots_supervisor_serial_rx_channel = 1
webots_supervisor_serial_tx_channel = 2
webots_robot_serial_rx_channel = 3
webots_robot_serial_tx_channel = 4
settings_path = ./settings/settings.json
custom_webots_ip_address = 127.0.0.1 ; IP address of the Webots simulation, which is used for TCP communication
custom_webots_protocol = ipc ; [ipc|tcp] - ipc is faster but only works on the same machine, tcp works also over network
custom_webots_robot_name = Zumo
custom_webots_supervisor_serial_rx_channel = 1
custom_webots_supervisor_serial_tx_channel = 2
custom_webots_robot_serial_rx_channel = 3
custom_webots_robot_serial_tx_channel = 4
custom_settings_path = ./settings/settings.json

; *****************************************************************************
; PC target environment for tests
Expand Down
16 changes: 8 additions & 8 deletions platformio_override.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ test_port = com9
; Webots directory, e.g. WEBOTS_HOME=C:\Users\<user>\AppData\Local\Programs\Webots
; *****************************************************************************
[hal:Sim]
webots_ip_address = 127.0.0.1 ; IP address of the Webots simulation, which is used for TCP communication
webots_protocol = ipc ; [ipc|tcp] - ipc is faster but only works on the same machine, tcp works also over network
webots_robot_name = Zumo
webots_supervisor_serial_rx_channel = 1
webots_supervisor_serial_tx_channel = 2
webots_robot_serial_rx_channel = 3
webots_robot_serial_tx_channel = 4
settings_path = ./settings/settings.json
custom_webots_ip_address = 127.0.0.1 ; IP address of the Webots simulation, which is used for TCP communication
custom_webots_protocol = ipc ; [ipc|tcp] - ipc is faster but only works on the same machine, tcp works also over network
custom_webots_robot_name = Zumo
custom_webots_supervisor_serial_rx_channel = 1
custom_webots_supervisor_serial_tx_channel = 2
custom_webots_robot_serial_rx_channel = 3
custom_webots_robot_serial_tx_channel = 4
custom_settings_path = ./settings/settings.json
16 changes: 8 additions & 8 deletions scripts/webots_launcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@
OS_PLATFORM_TYPE_MACOS = "Darwin"
OS_PLATFORM_TYPE = platform.system()

WEBOTS_IP_ADDRESS = env.GetProjectOption("webots_ip_address") # pylint: disable=undefined-variable
WEBOTS_PROTOCOL = env.GetProjectOption("webots_protocol") # pylint: disable=undefined-variable
WEBOTS_IP_ADDRESS = env.GetProjectOption("custom_webots_ip_address") # pylint: disable=undefined-variable
WEBOTS_PROTOCOL = env.GetProjectOption("custom_webots_protocol") # pylint: disable=undefined-variable

ROBOT_NAME = env.GetProjectOption("webots_robot_name") # pylint: disable=undefined-variable
ROBOT_NAME = env.GetProjectOption("custom_webots_robot_name") # pylint: disable=undefined-variable

SUPERVISOR_SERIAL_RX_CHANNEL = env.GetProjectOption("webots_supervisor_serial_rx_channel") # pylint: disable=undefined-variable
SUPERVISOR_SERIAL_TX_CHANNEL = env.GetProjectOption("webots_supervisor_serial_tx_channel") # pylint: disable=undefined-variable
SUPERVISOR_SERIAL_RX_CHANNEL = env.GetProjectOption("custom_webots_supervisor_serial_rx_channel") # pylint: disable=undefined-variable
SUPERVISOR_SERIAL_TX_CHANNEL = env.GetProjectOption("custom_webots_supervisor_serial_tx_channel") # pylint: disable=undefined-variable

ROBOT_SERIAL_RX_CHANNEL = env.GetProjectOption("webots_robot_serial_rx_channel") # pylint: disable=undefined-variable
ROBOT_SERIAL_TX_CHANNEL = env.GetProjectOption("webots_robot_serial_tx_channel") # pylint: disable=undefined-variable
ROBOT_SERIAL_RX_CHANNEL = env.GetProjectOption("custom_webots_robot_serial_rx_channel") # pylint: disable=undefined-variable
ROBOT_SERIAL_TX_CHANNEL = env.GetProjectOption("custom_webots_robot_serial_tx_channel") # pylint: disable=undefined-variable

SETTINGS_PATH = env.GetProjectOption("settings_path") # pylint: disable=undefined-variable
SETTINGS_PATH = env.GetProjectOption("custom_settings_path") # pylint: disable=undefined-variable

PROJECT_PATH = env["PROJECT_DIR"] # pylint: disable=undefined-variable
ABS_SETTINGS_PATH = os.path.join(PROJECT_PATH, SETTINGS_PATH)
Expand Down