Skip to content

Commit 7f64d94

Browse files
committed
cerebri: Rebase and apply latest changes
Signed-off-by: Luis Ubieda <luisf@croxel.com>
1 parent 1e13f9e commit 7f64d94

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

drivers/synapse/topic/include/synapse_topic_list.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ ZROS_TOPIC_DECLARE(topic_clock_offset_ethernet, synapse_pb_Time);
5555
ZROS_TOPIC_DECLARE(topic_cmd_vel, synapse_pb_Twist);
5656
ZROS_TOPIC_DECLARE(topic_cmd_vel_ethernet, synapse_pb_Twist);
5757
ZROS_TOPIC_DECLARE(topic_force_sp, synapse_pb_Vector3);
58-
ZROS_TOPIC_DECLARE(topic_imu, synapse_pb_Imu);
5958
ZROS_TOPIC_DECLARE(topic_imu0, synapse_pb_Imu);
6059
ZROS_TOPIC_DECLARE(topic_imu1, synapse_pb_Imu);
6160
ZROS_TOPIC_DECLARE(topic_imu_q31_array, synapse_pb_ImuQ31Array);
@@ -77,5 +76,10 @@ ZROS_TOPIC_DECLARE(topic_status, synapse_pb_Status);
7776
ZROS_TOPIC_DECLARE(topic_velocity_sp, synapse_pb_Vector3);
7877
ZROS_TOPIC_DECLARE(topic_wheel_odometry, synapse_pb_WheelOdometry);
7978

79+
/********************************************************************
80+
* alias
81+
********************************************************************/
82+
#define topic_imu topic_imu0
83+
8084
#endif // SYNAPSE_TOPIC_LIST_H_
8185
// vi: ts=4 sw=4 et

drivers/synapse/topic/src/synapse_topic_list.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ ZROS_TOPIC_DEFINE(clock_offset_ethernet, synapse_pb_ClockOffset);
190190
ZROS_TOPIC_DEFINE(cmd_vel, synapse_pb_Twist);
191191
ZROS_TOPIC_DEFINE(cmd_vel_ethernet, synapse_pb_Twist);
192192
ZROS_TOPIC_DEFINE(force_sp, synapse_pb_Vector3);
193-
ZROS_TOPIC_DEFINE(imu, synapse_pb_Imu);
194193
ZROS_TOPIC_DEFINE(imu0, synapse_pb_Imu);
195194
ZROS_TOPIC_DEFINE(imu1, synapse_pb_Imu);
196195
ZROS_TOPIC_DEFINE(imu_q31_array, synapse_pb_ImuQ31Array);

west.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ manifest:
1919
- name: zephyr
2020
remote: cognipilot
2121
west-commands: scripts/west-commands.yml
22-
revision: f5aaca82a6ff6952d82b012ed5d99ecc72f8e7ca # main-with-patches 12/02/25
22+
revision: 54b63152053707eb21810c2e54a09905b432257f # main-with-patches 12/16/25
2323
import:
2424
- name-allowlist:
2525
- nanopb
@@ -50,7 +50,7 @@ manifest:
5050
path: modules/hal/nxp
5151
- name: zros_drivers
5252
remote: cognipilot
53-
revision: 0e1c56dc7c0adca454a6627fd412c69992adffa0 # main 12/02/25
53+
revision: pull/26/head
5454
path: modules/lib/zros_drivers
5555
- name: zephyr_boards
5656
remote: cognipilot

0 commit comments

Comments
 (0)