From a3b19bceec0987e16e5adc867c17ba27659bc40a Mon Sep 17 00:00:00 2001
From: DNOALEE <oliver.ljungberg@epfl.ch>
Date: Tue, 10 May 2022 17:09:18 +0200
Subject: [PATCH] Update main.c
---
main.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/main.c b/main.c
index af7bf20..ec5939e 100644
--- a/main.c
+++ b/main.c
@@ -43,9 +43,6 @@ int main(void)
/** Inits the Inter Process Communication bus. */
messagebus_init(&bus, &bus_lock, &bus_condvar);
-
-
-
// Start the imu
imu_start();
//inits the motors
@@ -55,12 +52,6 @@ int main(void)
//starts the USB communication
//usb_start();
-
-
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
messagebus_find_topic_blocking(&bus, "/imu");
// Wait callibration
@@ -72,14 +63,7 @@ int main(void)
/* Infinite loop. */
while (1) {
-<<<<<<< Updated upstream
- palTogglePad(GPIOD, GPIOD_LED_FRONT);
- chprintf((BaseSequentialStream *)&SD3, "Error = %f \n",get_acc_x());
- chprintf((BaseSequentialStream *)&SD3, "Case = %d \n",get_acc_case());
-
-=======
//test
->>>>>>> Stashed changes
chThdSleepMilliseconds(1000);
}
}
--
GitLab