projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
drivers
/
ao_lco_cmd.c
diff --git
a/src/drivers/ao_lco_cmd.c
b/src/drivers/ao_lco_cmd.c
index 0184363533390736f2e831f829285e8a83e6e676..391b4547560bc69a8950cf15dad8448c21548bf8 100644
(file)
--- a/
src/drivers/ao_lco_cmd.c
+++ b/
src/drivers/ao_lco_cmd.c
@@
-32,8
+32,8
@@
static uint8_t lco_channels;
static void
lco_args(void)
{
static void
lco_args(void)
{
- lco_box = ao_cmd_decimal();
- lco_channels = ao_cmd_hex();
+ lco_box =
(uint16_t)
ao_cmd_decimal();
+ lco_channels =
(uint8_t)
ao_cmd_hex();
}
static struct ao_pad_query ao_pad_query;
}
static struct ao_pad_query ao_pad_query;
@@
-126,7
+126,7
@@
lco_fire_cmd(void)
int8_t r;
lco_args();
int8_t r;
lco_args();
- secs = ao_cmd_decimal();
+ secs =
(uint8_t)
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
r = lco_query();
if (ao_cmd_status != ao_cmd_success)
return;
r = lco_query();
@@
-140,7
+140,7
@@
lco_fire_cmd(void)
lco_arm();
}
lco_arm();
}
- secs =
secs * 10 - 5
;
+ secs =
(uint8_t) (secs * 10 - 5)
;
if (secs > 100)
secs = 100;
for (i = 0; i < secs; i++) {
if (secs > 100)
secs = 100;
for (i = 0; i < secs; i++) {
@@
-159,7
+159,7
@@
lco_static_cmd(void)
int8_t r;
lco_args();
int8_t r;
lco_args();
- secs = ao_cmd_decimal();
+ secs =
(uint8_t)
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
r = lco_query();
if (ao_cmd_status != ao_cmd_success)
return;
r = lco_query();
@@
-173,7
+173,7
@@
lco_static_cmd(void)
lco_arm();
}
lco_arm();
}
- secs =
secs * 10 - 5
;
+ secs =
(uint8_t) (secs * 10 - 5)
;
if (secs > 100)
secs = 100;
for (i = 0; i < secs; i++) {
if (secs > 100)
secs = 100;
for (i = 0; i < secs; i++) {