fixed conflicts

generators/bsp_q7s_objects.csv

@@ -4,19 +4,18 @@
 0x43400001;THERMAL_CONTROLLER
 0x44120006;MGM_0_LIS3_HANDLER
 0x44120010;GYRO_0_ADIS_HANDLER
-0x44120032;SUS_1
-0x44120033;SUS_2
-0x44120034;SUS_3
-0x44120035;SUS_4
-0x44120036;SUS_5
-0x44120037;SUS_6
-0x44120038;SUS_7
-0x44120039;SUS_8
-0x44120040;SUS_9
-0x44120041;SUS_10
-0x44120042;SUS_11
-0x44120043;SUS_12
-0x44120044;SUS_13
+0x44120032;SUS_0
+0x44120033;SUS_1
+0x44120034;SUS_2
+0x44120035;SUS_3
+0x44120036;SUS_4
+0x44120037;SUS_5
+0x44120038;SUS_6
+0x44120039;SUS_7
+0x44120040;SUS_8
+0x44120041;SUS_9
+0x44120042;SUS_10
+0x44120043;SUS_11
 0x44120047;RW1
 0x44120107;MGM_1_RM3100_HANDLER
 0x44120111;GYRO_1_L3G_HANDLER
@@ -28,14 +27,15 @@
 0x44120313;GYRO_3_L3G_HANDLER
 0x44120350;RW4
 0x44130001;STAR_TRACKER
-0x44130045;GPS0_HANDLER
-0x44130146;GPS1_HANDLER
+0x44130045;GPS_CONTROLLER
 0x44140014;IMTQ_HANDLER
 0x442000A1;PCDU_HANDLER
 0x44250000;P60DOCK_HANDLER
 0x44250001;PDU1_HANDLER
 0x44250002;PDU2_HANDLER
 0x44250003;ACU_HANDLER
+0x44260000;BPX_BATT_HANDLER
+0x44300000;PLPCDU_HANDLER
 0x443200A5;RAD_SENSOR
 0x44330000;PLOC_UPDATER
 0x44330001;PLOC_MEMORY_DUMPER
@@ -75,12 +75,9 @@
 0x50000300;TMTC_BRIDGE
 0x50000400;TMTC_POLLING_TASK
 0x50000500;FILE_SYSTEM_HANDLER
+0x50000550;SDC_MANAGER
 0x50000600;PTME
-0x50000700;PAPB_VC0
-0x50000701;PAPB_VC1
-0x50000702;PAPB_VC2
-0x50000703;PAPB_VC3
-0x50000704;PDEC_HANDLER
+0x50000700;PDEC_HANDLER
 0x50000800;CCSDS_HANDLER
 0x51000500;PUS_SERVICE_6
 0x53000000;FSFW_OBJECTS_START
@@ -94,6 +91,7 @@
 0x53000020;PUS_SERVICE_20_PARAMETERS
 0x53000200;PUS_SERVICE_200_MODE_MGMT
 0x53000201;PUS_SERVICE_201_HEALTH
+0x53001000;CFDP_PACKET_DISTRIBUTOR
 0x53010000;HEALTH_TABLE
 0x53010100;MODE_STORE
 0x53030000;EVENT_MANAGER
@@ -105,6 +103,7 @@
 0x53ffffff;FSFW_OBJECTS_END
 0x54000010;SPI_TEST
 0x54000020;UART_TEST
+0x54000030;I2C_TEST
 0x5400AFFE;DUMMY_HANDLER
 0x5400CAFE;DUMMY_INTERFACE
 0x54123456;LIBGPIOD_TEST