projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Start making cc1120 radio work
[fw/altos]
/
src
/
megametrum-v0.1
/
ao_megametrum.c
diff --git
a/src/megametrum-v0.1/ao_megametrum.c
b/src/megametrum-v0.1/ao_megametrum.c
index d93480f2b87379a9c18527c30ea2a6b05b2b018c..628c55387120ead3c659a1c23287cd9660cf8d8a 100644
(file)
--- a/
src/megametrum-v0.1/ao_megametrum.c
+++ b/
src/megametrum-v0.1/ao_megametrum.c
@@
-16,23
+16,11
@@
*/
#include <ao.h>
*/
#include <ao.h>
+#include <ao_hmc5883.h>
+#include <ao_mpu6000.h>
+#include <ao_log.h>
#include <ao_exti.h>
#include <ao_exti.h>
-void
-beep(void)
-{
- ao_beep(AO_BEEP_MID);
- printf ("Hit a character to stop..."); flush();
- getchar();
- putchar('\n');
- ao_beep(0);
-}
-
-const struct ao_cmds ao_mm_cmds[] = {
- { beep, "b\0Beep" },
- { 0, NULL },
-};
-
int
main(void)
{
int
main(void)
{
@@
-44,7
+32,6
@@
main(void)
ao_timer_init();
ao_cmd_init();
ao_gps_init();
ao_timer_init();
ao_cmd_init();
ao_gps_init();
- ao_config_init();
ao_dma_init();
ao_spi_init();
ao_ms5607_init();
ao_dma_init();
ao_spi_init();
ao_ms5607_init();
@@
-54,8
+41,14
@@
main(void)
ao_usb_init();
ao_exti_init();
ao_radio_init();
ao_usb_init();
ao_exti_init();
ao_radio_init();
+ ao_i2c_init();
+ ao_hmc5883_init();
+ ao_mpu6000_init();
+ ao_flight_init();
+ ao_log_init();
+ ao_report_init();
+ ao_config_init();
- ao_cmd_register(&ao_mm_cmds[0]);
ao_start_scheduler();
return 0;
}
ao_start_scheduler();
return 0;
}