Skip to content

Commit 7641695

Browse files
jgoppertbperseghetti
authored andcommitted
Move zros into module.
Signed-off-by: James Goppert <james.goppert@gmail.com>
1 parent a2ad80b commit 7641695

38 files changed

+21
-918
lines changed

app/b3rb/prj.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_CEREBRI_SYNAPSE_ETHERNET=n
3535
CONFIG_CEREBRI_SYNAPSE_TOPIC=y
3636
CONFIG_CEREBRI_CORE_COMMON=y
3737
CONFIG_CEREBRI_CORE_COMMON_BOOT_BANNER=y
38-
CONFIG_CEREBRI_SYNAPSE_ZROS=y
38+
CONFIG_ZROS=y
3939

4040
CONFIG_SHELL_STACK_SIZE=10240
4141
CONFIG_INIT_STACKS=y

app/elm4/prj.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CONFIG_CEREBRI_SENSE_IMU=y
66
CONFIG_CEREBRI_SENSE_MAG=y
77
CONFIG_CEREBRI_SYNAPSE_TOPIC=y
88
CONFIG_CEREBRI_SYNAPSE_ETHERNET=y
9-
CONFIG_CEREBRI_SYNAPSE_ZROS=y
9+
CONFIG_ZROS=y
1010

1111
CONFIG_LOG=y
1212
CONFIG_ASSERT=n

app/rdd2/prj.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONFIG_CEREBRI_SYNAPSE_ETHERNET=n
3535
CONFIG_CEREBRI_SYNAPSE_TOPIC=y
3636
CONFIG_CEREBRI_CORE_COMMON=y
3737
CONFIG_CEREBRI_CORE_COMMON_BOOT_BANNER=n
38-
CONFIG_CEREBRI_SYNAPSE_ZROS=y
38+
CONFIG_ZROS=y
3939

4040
CONFIG_SHELL_STACK_SIZE=10240
4141
CONFIG_INIT_STACKS=y

lib/actuate/pwm/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
menuconfig CEREBRI_ACTUATE_PWM
55
bool "PWM"
66
depends on PWM
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
help
99
This option enables pwm actuators
1010

lib/actuate/pwm/gen_kconfig.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
menuconfig CEREBRI_ACTUATE_PWM
77
bool "PWM"
88
depends on PWM
9-
depends on CEREBRI_SYNAPSE_ZROS
9+
depends on ZROS
1010
help
1111
This option enables pwm actuators
1212

lib/dream/sil/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
menuconfig CEREBRI_DREAM_SIL
55
bool "SIL"
6-
depends on CEREBRI_SYNAPSE_ZROS
6+
depends on ZROS
77
help
88
This option enables the cerebri sil sim
99

lib/sense/imu/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ menuconfig CEREBRI_SENSE_IMU
44
bool "IMU"
55
default y
66
depends on CEREBRI_CORE_COMMON
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
help
99
This option enables the IMU driver interface
1010

lib/sense/mag/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ menuconfig CEREBRI_SENSE_MAG
44
bool "MAG"
55
default y
66
depends on CEREBRI_CORE_COMMON
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
help
99
This option enables the MAG driver interface
1010

lib/sense/power/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
menuconfig CEREBRI_SENSE_POWER
55
bool "Power"
6-
depends on CEREBRI_SYNAPSE_ZROS
6+
depends on ZROS
77
help
88
This option enables power sensor.
99

lib/sense/safety/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
menuconfig CEREBRI_SENSE_SAFETY
44
bool "Safety"
55
default y
6-
depends on CEREBRI_SYNAPSE_ZROS
6+
depends on ZROS
77
depends on CEREBRI_CORE_WORKQUEUES
88
help
99
This option enables the safety interface

lib/sense/ubx_gnss/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
config CEREBRI_SENSE_UBX_GNSS
55
bool "U-blox GNSS Interface"
6-
depends on CEREBRI_SYNAPSE_ZROS
6+
depends on ZROS
77
depends on UBXLIB
88
help
99
This option enables U-blox GNSS driver.

lib/sense/wheel_odometry/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33
menuconfig CEREBRI_SENSE_WHEEL_ODOMETRY
44
bool "Wheel Odometry"
5-
depends on CEREBRI_SYNAPSE_ZROS
5+
depends on ZROS
66
depends on CEREBRI_CORE_COMMON
77
depends on SYNAPSE_PROTOBUF
88
help

lib/synapse/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ add_subdirectory_ifdef(CONFIG_CEREBRI_SYNAPSE_ETH_RX eth_rx)
55
add_subdirectory_ifdef(CONFIG_CEREBRI_SYNAPSE_TOPIC topic)
66
add_subdirectory_ifdef(CONFIG_CEREBRI_SYNAPSE_UDP udp)
77
add_subdirectory_ifdef(CONFIG_CEREBRI_SYNAPSE_VESC_CAN vesc_can)
8-
add_subdirectory_ifdef(CONFIG_CEREBRI_SYNAPSE_ZROS zros)

lib/synapse/Kconfig

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
menu "Synapse"
55

6-
rsource "zros/Kconfig"
76
rsource "eth_tx/Kconfig"
87
rsource "eth_rx/Kconfig"
98
rsource "ethernet/Kconfig"

lib/synapse/eth_rx/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config CEREBRI_SYNAPSE_ETH_RX
55
bool "ethernet receive"
66
default y
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
help
99
This option enables the synapse udp interface
1010

lib/synapse/eth_tx/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config CEREBRI_SYNAPSE_ETH_TX
55
bool "ethernet tx"
66
default y
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
help
99
This option enables the synapse udp interface
1010

lib/synapse/ethernet/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config CEREBRI_SYNAPSE_ETHERNET
55
bool "Ethernet"
66
default y
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
help
99
This option enables the synapse ethernet interface
1010

lib/synapse/topic/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
config CEREBRI_SYNAPSE_TOPIC
55
bool "Enable synapse topic shell"
66
default y
7-
depends on CEREBRI_SYNAPSE_ZROS
7+
depends on ZROS
88
depends on SHELL
99
help
1010
This option enables the synapse topic shell

lib/synapse/zros/CMakeLists.txt

-18
This file was deleted.

lib/synapse/zros/Kconfig

-15
This file was deleted.

lib/synapse/zros/include/zros/private/zros_broker_struct.h

-22
This file was deleted.

lib/synapse/zros/include/zros/private/zros_node_struct.h

-22
This file was deleted.

lib/synapse/zros/include/zros/private/zros_pub_struct.h

-22
This file was deleted.

lib/synapse/zros/include/zros/private/zros_sub_struct.h

-29
This file was deleted.

lib/synapse/zros/include/zros/private/zros_topic_struct.h

-25
This file was deleted.

lib/synapse/zros/include/zros/zros_broker.h

-31
This file was deleted.

lib/synapse/zros/include/zros/zros_common.h

-19
This file was deleted.

lib/synapse/zros/include/zros/zros_node.h

-28
This file was deleted.

0 commit comments

Comments
 (0)