fixed object id merge conflicts

2021-06-25 12:15:59 +02:00
parent a5820cb285 d976697c2a
commit a53ff3c4d6
23 changed files with 383 additions and 249 deletions
--- a/linux/fsfwconfig/devices/addresses.h
+++ b/linux/fsfwconfig/devices/addresses.h
@ -17,7 +17,8 @@ namespace addresses {

 		GYRO_0_ADIS = objects::GYRO_0_ADIS_HANDLER,
 		GYRO_1_L3G = objects::GYRO_1_L3G_HANDLER,
-		GYRO_2_L3G = objects::GYRO_2_L3G_HANDLER,
+		GYRO_2_ADIS = objects::GYRO_2_ADIS_HANDLER,
+		GYRO_3_L3G = objects::GYRO_3_L3G_HANDLER,

 		RAD_SENSOR = objects::RAD_SENSOR,