fixed merge conflicts

2021-06-24 18:01:09 +02:00
parent b5fdeb93bb 1eae885aa4
commit b7ca1606f7
12 changed files with 504 additions and 360 deletions
--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -48,6 +48,9 @@ enum commonObjects: uint32_t {
    SUS_11 = 0x44000021,
    SUS_12 = 0x44000022,
    SUS_13 = 0x44000023,
+
+    GPS0_HANDLER = 0x44001000,
+    GPS1_HANDLER = 0x44002000
 };
 }