diff --git a/.env.example b/.env.example index 7119a0b..f47951e 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,2 @@ PORT_ROSBRIDGE=9090 -PORT_CONTROL_PANEL=5000 +PORT_CONTROL_PANEL=4004 diff --git a/README.md b/README.md index a307de9..8c55675 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ python windows/Lucy.py # launch ### Opening the Control Panel -After **`Launch`**, enable **Core + Control Panel** in the launcher. Once it is running, the **Lucy Control Panel is accessible in your browser at [http://localhost:5000](http://localhost:5000)** (or **http://localhost:5001** if port 5000 is already taken — common on macOS due to AirPlay). The launcher also shows the exact URL next to the Control Panel entry once it's up. +After **`Launch`**, enable **Core + Control Panel** in the launcher. Once it is running, the **Lucy Control Panel is accessible in your browser at [http://localhost:4004](http://localhost:4004)** (or the next free port if 4004 is already taken). The launcher also shows the exact URL next to the Control Panel entry once it's up. ## Using the workspace @@ -154,10 +154,6 @@ the address it shows. Defaults: - On Apple Silicon, XQuartz can't give the container an OpenGL context, so the VNC desktop is used by default — no setup required. -- **Port 5000** is taken by the macOS AirPlay Receiver, and the control panel defaults to it. - The launcher auto-shifts to the next free port, but for a stable URL you can disable - **System Settings → General → AirDrop & Handoff → AirPlay Receiver**, or set - `PORT_CONTROL_PANEL=5001` in a root `.env`. ## More diff --git a/docs/developer_lucy_packages.md b/docs/developer_lucy_packages.md index 3b94239..d8db69b 100644 --- a/docs/developer_lucy_packages.md +++ b/docs/developer_lucy_packages.md @@ -118,7 +118,7 @@ Hardware mode runs the same **RELOAD** step after BUILD/FLASH once ros2_control |---------|---------|---------| | `DEV` | unset | `true` → use `url_ssh` in `repos.json` (install) and the interactive dev shell (launch) | | `PORT_CONTROL_PANEL` | matches container port | Host port the control panel is published on | -| `PORT_CONTROL_PANEL_CONTAINER` | `VITE_PORT` from `src/lucy_control_panel/.env`, else `5000` | Port the Vite dev server listens on inside the container | +| `PORT_CONTROL_PANEL_CONTAINER` | `VITE_PORT` from `src/lucy_control_panel/.env`, else `4004` | Port the Vite dev server listens on inside the container | | `DOCKER_GUI_DISPLAY` | host `$DISPLAY` | X display string passed to the container (use when the host `DISPLAY` doesn't reach Docker, e.g. Docker Desktop) | | `DOCKER_GUI_USE_HOST_NETWORK` | unset | Run with `--network=host` and `DISPLAY=:0` (alternative GUI path) | | `LUCY_DOCKER_PLATFORM` | content of `.lucy-docker-platform`, else host CPU | Docker `--platform` to build/run with (e.g. `linux/arm64`) | diff --git a/launch_lucy.sh b/launch_lucy.sh index 9d30a9b..660e7d8 100755 --- a/launch_lucy.sh +++ b/launch_lucy.sh @@ -12,7 +12,7 @@ # panel running in background; you launch the ROS stack yourself (handy commands are printed). # # Ports published on the host: rosbridge 9090, control panel PORT_CONTROL_PANEL (defaults to -# VITE_PORT from src/lucy_control_panel/.env, else 5000). Vite proxies /rosbridge to the bridge. +# VITE_PORT from src/lucy_control_panel/.env, else 4004). Vite proxies /rosbridge to the bridge. # # Docker platform follows the last ./install.sh run (.lucy-docker-platform; override with LUCY_DOCKER_PLATFORM). # GPU mode is auto-detected via docker/gpu_detect.sh (jetson / nvidia / dri / software). @@ -206,7 +206,7 @@ if [[ -z "${PORT_CONTROL_PANEL_CONTAINER:-}" ]]; then if v="$(vite_listen_port_from_envfile)"; then PORT_CONTROL_PANEL_CONTAINER="$v" else - PORT_CONTROL_PANEL_CONTAINER=5000 + PORT_CONTROL_PANEL_CONTAINER=4004 fi fi PORT_CONTROL_PANEL="$(resolve_host_port 'control panel' "${PORT_CONTROL_PANEL:-$PORT_CONTROL_PANEL_CONTAINER}")" diff --git a/windows/Lucy.py b/windows/Lucy.py index 9a7ace0..3962d31 100644 --- a/windows/Lucy.py +++ b/windows/Lucy.py @@ -31,7 +31,7 @@ WORKSPACE_DIR_HOST = PROJECT_ROOT WORKSPACE_DIR_CONTAINER = install_ops.WORKSPACE_CONTAINER -LCP_DEFAULT_PORT = 5000 +LCP_DEFAULT_PORT = 4004 _CLI_MODES = frozenset(('install', 'update', 'repair', 'build-only', 'check-prereqs')) diff --git a/windows/README.md b/windows/README.md index df95db4..179a41a 100644 --- a/windows/README.md +++ b/windows/README.md @@ -49,7 +49,7 @@ To **update** or **repair**, run **`Lucy-Setup.exe`** again and pick the matchin ### Control Panel -In the **Lucy Control Center**, enable **Core + Control Panel**. Once it is running, the **Lucy Control Panel is accessible in your browser at [http://localhost:5000](http://localhost:5000)** (or **http://localhost:5001** if port 5000 is already in use). The launcher also prints the exact URL next to the Control Panel entry once it is up. +In the **Lucy Control Center**, enable **Core + Control Panel**. Once it is running, the **Lucy Control Panel is accessible in your browser at [http://localhost:4004](http://localhost:4004)** (or the next free port if 4004 is already in use). The launcher also prints the exact URL next to the Control Panel entry once it is up. ## Manual install (developers)