typo

Author: joe-hung

GEMstack/onboard/interface/gem_hardware.py

@@ -183,15 +183,9 @@ def callback_with_gnss_reading(inspva_msg: Inspva):
                 else:
                     def callback_with_gnss_reading(msg: INSNavGeod):
                         pose = ObjectPose(ObjectFrameEnum.GLOBAL,
-<<<<<<< HEAD
-                                    t=time.time(),
-                                    x=msg.longitude,
-                                    y=msg.latitude,
-=======
                                     t=self.time(),
                                     x=math.degrees(msg.longitude),   #Septentrio GNSS uses radians rather than degrees
                                     y=math.degrees(msg.latitude),
->>>>>>> origin/s2025_teamB
                                     z=msg.height,
                                     yaw=math.radians(msg.heading),  #heading from north in degrees (TODO: maybe?? check this)
                                     roll=math.radians(msg.roll),