Commit 7aba5d17 authored by Simon Krissel's avatar Simon Krissel
Browse files

Merge branch 'master' of gitlab.cs.hs-rm.de:CaroloCup/carolocupFirmware

parents 27a4c119 aed12eaa
Subproject commit 6b3b6541a5115e81cd62205fd659b603d890e7e0
Subproject commit af19f25252ad9476a4fd6e3ab7105ad3a5c40998
Subproject commit 402401990c58992ad8dd76d01d94d5019ef38739
Subproject commit 7aeafca1aa7370e4d521ca76a2cd8f71f70fa51e
Subproject commit 4ce005fd4430cccf60dd27193ae8ec62fa7be9bf
Subproject commit 5d462820e3be69c3da210492eb8adc2d000c09d6
Subproject commit fb4a367608e47c3f90afd4e87c0c646f0ae100f9
Subproject commit ba01c5ce598b573b4a6681c1a564639763eec676
......@@ -254,11 +254,11 @@ struct hardware *hartwareInit(void) {
mpu = mpu9250_init(MPU9250_ID(0), spi, 0, SPI_OPT_GPIO_DIS, 0);
CONFIG_ASSERT(mpu);
# ifdef CONFIG_GYRO
hw.gyro = gyro_init(0);
hw.gyro = gyro_init(MPU9250_GYRO_ID(0));
CONFIG_ASSERT(hw.gyro);
# endif
# ifdef CONFIG_ACCEL
hw.accel = accel_init(0);
hw.accel = accel_init(MPU9250_ACCEL_ID(0));
CONFIG_ASSERT(hw.accel);
# endif
}
......
......@@ -327,11 +327,11 @@ struct hardware *hartwareInit(void) {
mpu = mpu9250_init(MPU9250_ID(0), spi, 0, SPI_OPT_GPIO_DIS, 0);
CONFIG_ASSERT(mpu);
# ifdef CONFIG_GYRO
hw.gyro = gyro_init(0);
hw.gyro = gyro_init(MPU9250_GYRO_ID(0));
CONFIG_ASSERT(hw.gyro);
# endif
# ifdef CONFIG_ACCEL
hw.accel = accel_init(0);
hw.accel = accel_init(MPU9250_ACCEL_ID(0));
CONFIG_ASSERT(hw.accel);
# endif
}
......@@ -372,7 +372,7 @@ struct hardware *hartwareInit(void) {
timer = timer_init(TIMER1_ID, 1, 10, 0);
CONFIG_ASSERT(timer);
hw.servo = motor_init(MOTOR_PWM_ID(0));
hw.motor = motor_init(MOTOR_PWM_ID(0));
CONFIG_ASSERT(hw.motor);
pwm = pwm_init(PWM1_ID);
CONFIG_ASSERT(pwm);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment