diff --git a/.env b/.env index b7d628b..e73eeb0 100755 --- a/.env +++ b/.env @@ -1,14 +1,14 @@ # Base params -BASE_SUBNET=6.6.6 -XBEE_INDEX=2 +BASE_SUBNET=7.7.7 +XBEE_INDEX=1 # Default params -DEFAULT_GATEWAY=6.6.6.1 -DEFAULT_IPVLAN_IP=6.6.6.20 # Required only when running ipvlan net (look in docker compose) -DEFAULT_MACVLAN_IP=6.6.6.30 # Required only when running macvlan net (look in docker compose) +DEFAULT_GATEWAY=7.7.7.1 +DEFAULT_IPVLAN_IP=7.7.7.20 # Required only when running ipvlan net (look in docker compose) +DEFAULT_MACVLAN_IP=7.7.7.30 # Required only when running macvlan net (look in docker compose) # Configuration for xbnet -XBEE_PORT=/dev/ttyUSB1 +XBEE_PORT=/dev/ttyUSB0 XBEE_BAUDRATE=230400 -XBEE_NET_SRC_IP=6.6.6.202 # Set based on interface type -XBEE_NET_IFACE_NAME=xbnet_router_2 # Set based on interface type +XBEE_NET_SRC_IP=7.7.7.201 # Set based on interface type +XBEE_NET_IFACE_NAME=xbnet_router_1 # Set based on interface type diff --git a/docker-compose-run-single.yml b/docker-compose-run-single.yml index df352a2..0bf8e7b 100644 --- a/docker-compose-run-single.yml +++ b/docker-compose-run-single.yml @@ -68,14 +68,14 @@ services: container_name: xbnet_node privileged: true env_file: .env - # networks: - # xbee_net: - # ipv4_address: ${XBEE_NET_SRC_IP} # Ensure this IP belongs to the xbee_net subnet + networks: + xbee_net: + ipv4_address: ${XBEE_NET_SRC_IP} # Ensure this IP belongs to the xbee_net subnet -# networks: -# xbee_net: -# driver: bridge -# ipam: -# config: -# - subnet: ${BASE_SUBNET}.0/24 # Match the network's subnet -# gateway: ${DEFAULT_GATEWAY} # Gateway for central router \ No newline at end of file +networks: + xbee_net: + driver: bridge + ipam: + config: + - subnet: ${BASE_SUBNET}.0/24 # Match the network's subnet + gateway: ${DEFAULT_GATEWAY} # Gateway for central router \ No newline at end of file