boards: change default IP from 192.168.0.3 to 10.41.10.2

192.168.0.x is often used by routers for WIFI/ethernet networks, and thus can create conflicts. This can happen for example if a companion is connected to the FMU via ethernet and at the same time connects to a WIFI network as DHCP client.
boards/px4/fmu-v{5,6}x: enable uxrce_dds_client on ethernet by default
2023-12-08 15:23:36 +01:00 · 2023-12-08 15:23:36 +01:00 · 2023-12-08 14:24:37 +01:00
12 changed files with 43 additions and 39 deletions
--- a/boards/ark/fmu-v6x/nuttx-config/nsh/defconfig
+++ b/boards/ark/fmu-v6x/nuttx-config/nsh/defconfig
@ -147,8 +147,8 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
--- a/boards/av/x-v1/nuttx-config/nsh/defconfig
+++ b/boards/av/x-v1/nuttx-config/nsh/defconfig
@ -139,8 +139,8 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
 CONFIG_NETUTILS_TELNETD=y
--- a/boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig
+++ b/boards/nxp/mr-canhubk3/nuttx-config/nsh/defconfig
@ -158,8 +158,8 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
--- a/boards/nxp/mr-canhubk3/nuttx-config/sysview/defconfig
+++ b/boards/nxp/mr-canhubk3/nuttx-config/sysview/defconfig
@ -158,8 +158,8 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
--- a/boards/px4/fmu-v5x/init/rc.board_defaults
+++ b/boards/px4/fmu-v5x/init/rc.board_defaults
@ -3,23 +3,25 @@
 # board specific defaults
 #------------------------------------------------------------------------------

-# Mavlink ethernet (CFG 1000)
-param set-default MAV_2_CONFIG 1000
-param set-default MAV_2_BROADCAST 1
-param set-default MAV_2_MODE 0
-param set-default MAV_2_RADIO_CTL 0
-param set-default MAV_2_RATE 100000
-param set-default MAV_2_REMOTE_PRT 14550
-param set-default MAV_2_UDP_PRT 14550
-
 param set-default SENS_EN_INA238 0
 param set-default SENS_EN_INA228 0
 param set-default SENS_EN_INA226 1

 if ver hwtypecmp V5X009000 V5X009001 V5X00a000 V5X00a001 V5X008000 V5X008001 V5X010001
 then
-	# Skynode: use the "custom participant" config for uxrce_dds_client
+	# Skynode: use the "custom participant", IP=10.41.10.1 config for uxrce_dds_client
 	param set-default UXRCE_DDS_PTCFG 2
+	param set-default UXRCE_DDS_AG_IP 170461697
+	param set-default UXRCE_DDS_CFG 1000
+else
+	# Mavlink ethernet (CFG 1000)
+	param set-default MAV_2_CONFIG 1000
+	param set-default MAV_2_BROADCAST 1
+	param set-default MAV_2_MODE 0
+	param set-default MAV_2_RADIO_CTL 0
+	param set-default MAV_2_RATE 100000
+	param set-default MAV_2_REMOTE_PRT 14550
+	param set-default MAV_2_UDP_PRT 14550
 fi

 safety_button start
--- a/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v5x/nuttx-config/nsh/defconfig
@ -143,8 +143,8 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
--- a/boards/px4/fmu-v5x/nuttx-config/test/defconfig
+++ b/boards/px4/fmu-v5x/nuttx-config/test/defconfig
@ -143,8 +143,8 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
 CONFIG_NETUTILS_TELNETD=y
--- a/boards/px4/fmu-v6x/init/rc.board_defaults
+++ b/boards/px4/fmu-v6x/init/rc.board_defaults
@ -3,15 +3,6 @@
 # board specific defaults
 #------------------------------------------------------------------------------

-# Mavlink ethernet (CFG 1000)
-param set-default MAV_2_CONFIG 1000
-param set-default MAV_2_BROADCAST 1
-param set-default MAV_2_MODE 0
-param set-default MAV_2_RADIO_CTL 0
-param set-default MAV_2_RATE 100000
-param set-default MAV_2_REMOTE_PRT 14550
-param set-default MAV_2_UDP_PRT 14550
-
 # By disabling all 3 INA modules, we use the
 # i2c_launcher instead.
 param set-default SENS_EN_INA238 0
@ -20,8 +11,19 @@ param set-default SENS_EN_INA226 0

 if ver hwtypecmp V6X009010 V6X010010
 then
-	# Skynode: use the "custom participant" config for uxrce_dds_client
+	# Skynode: use the "custom participant", IP=10.41.10.1 config for uxrce_dds_client
 	param set-default UXRCE_DDS_PTCFG 2
+	param set-default UXRCE_DDS_AG_IP 170461697
+	param set-default UXRCE_DDS_CFG 1000
+else
+	# Mavlink ethernet (CFG 1000)
+	param set-default MAV_2_CONFIG 1000
+	param set-default MAV_2_BROADCAST 1
+	param set-default MAV_2_MODE 0
+	param set-default MAV_2_RADIO_CTL 0
+	param set-default MAV_2_RATE 100000
+	param set-default MAV_2_REMOTE_PRT 14550
+	param set-default MAV_2_UDP_PRT 14550
 fi

 safety_button start
--- a/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v6x/nuttx-config/nsh/defconfig
@ -147,8 +147,8 @@ CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
--- a/boards/px4/fmu-v6xrt/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v6xrt/nuttx-config/nsh/defconfig
@ -198,8 +198,8 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DHCPC=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_MONITOR=y
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
--- a/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig
+++ b/boards/sky-drones/smartap-airlink/nuttx-config/nsh/defconfig
@ -141,8 +141,8 @@ CONFIG_NETDB_DNSCLIENT_ENTRIES=8
 CONFIG_NETDB_DNSSERVER_NOADDR=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NETINIT_DNS=y
-CONFIG_NETINIT_DNSIPADDR=0XC0A800FE
-CONFIG_NETINIT_DRIPADDR=0XC0A800FE
+CONFIG_NETINIT_DNSIPADDR=0xA290AFE
+CONFIG_NETINIT_DRIPADDR=0xA290AFE
 CONFIG_NETINIT_THREAD=y
 CONFIG_NETINIT_THREAD_PRIORITY=49
 CONFIG_NETUTILS_TELNETD=y
--- a/src/systemcmds/netman/netman.cpp
+++ b/src/systemcmds/netman/netman.cpp
@ -54,7 +54,7 @@
 constexpr char DEFAULT_NETMAN_CONFIG[] = "/fs/microsd/net.cfg";
 #if defined(CONFIG_NETINIT_DHCPC)
 #  define DEFAULT_PROTO    IPv4PROTO_FALLBACK
-#  define DEFAULT_IP      0XC0A80003  // 192.168.0.3
+#  define DEFAULT_IP      0xA290A02  // 10.41.10.2
 #else
 #  define DEFAULT_PROTO   IPv4PROTO_STATIC
 #  define DEFAULT_IP      CONFIG_NETINIT_IPADDR
Author	SHA1	Message	Date
Beat Küng	412c8cbb3c	boards: change default IP from 192.168.0.3 to 10.41.10.2 192.168.0.x is often used by routers for WIFI/ethernet networks, and thus can create conflicts. This can happen for example if a companion is connected to the FMU via ethernet and at the same time connects to a WIFI network as DHCP client.	2023-12-08 15:23:36 +01:00
Beat Küng	f8951ad1dd	boards/px4/fmu-v{5,6}x: enable uxrce_dds_client on ethernet by default	2023-12-08 15:23:36 +01:00
Beat Küng	5005ea9ff0	boards/px4/fmu-v{5,6}x: do not enable mavlink on ethernet for skynode	2023-12-08 14:24:37 +01:00