summaryrefslogtreecommitdiffhomepage
path: root/digital/ai
diff options
context:
space:
mode:
authorNicolas Schodet2012-05-17 00:42:31 +0200
committerNicolas Schodet2012-05-17 01:19:24 +0200
commit04816a2763a12e4cb90f5c2de4b8f5b9e37a3f22 (patch)
treea4a8a374a6e3797fb7ebce3464c4b63015ea473b /digital/ai
parent1fa0c895044e3219d0494b850896e263ac0d8ad1 (diff)
digital/{ai,io-hub,mimot}: add parameter for brake
Diffstat (limited to 'digital/ai')
-rw-r--r--digital/ai/src/twi_master/mimot.c16
-rw-r--r--digital/ai/src/twi_master/mimot.h8
2 files changed, 6 insertions, 18 deletions
diff --git a/digital/ai/src/twi_master/mimot.c b/digital/ai/src/twi_master/mimot.c
index 6663f81f..ff73fdb7 100644
--- a/digital/ai/src/twi_master/mimot.c
+++ b/digital/ai/src/twi_master/mimot.c
@@ -240,21 +240,13 @@ mimot_motor1_clamp (int16_t speed, int16_t pwm)
}
void
-mimot_motor0_free (void)
+mimot_motor_free (uint8_t motor, uint8_t brake)
{
uint8_t *buffer = twi_master_get_buffer (TWI_MASTER_ID_MIMOT);
buffer[0] = 'w';
- buffer[1] = 0;
- twi_master_send_buffer (2);
-}
-
-void
-mimot_motor1_free (void)
-{
- uint8_t *buffer = twi_master_get_buffer (TWI_MASTER_ID_MIMOT);
- buffer[0] = 'w';
- buffer[1] = 1;
- twi_master_send_buffer (2);
+ buffer[1] = motor;
+ buffer[2] = brake;
+ twi_master_send_buffer (3);
}
void
diff --git a/digital/ai/src/twi_master/mimot.h b/digital/ai/src/twi_master/mimot.h
index 78806154..78f0a8c9 100644
--- a/digital/ai/src/twi_master/mimot.h
+++ b/digital/ai/src/twi_master/mimot.h
@@ -111,13 +111,9 @@ mimot_motor0_clamp (int16_t speed, int16_t pwm);
void
mimot_motor1_clamp (int16_t speed, int16_t pwm);
-/** Free motor0. */
+/** Free motor. */
void
-mimot_motor0_free (void);
-
-/** Free motor1. */
-void
-mimot_motor1_free (void);
+mimot_motor_free (uint8_t motor, uint8_t brake);
/** Set raw output for motor. */
void