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
/
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 d3ae4690c41de2e85c9ea4b402fb35cc8e009d48..fbdab64a8766dbbc8a43d21a8e417da4d93691d1 100644
(file)
--- a/
src/megametrum-v0.1/ao_megametrum.c
+++ b/
src/megametrum-v0.1/ao_megametrum.c
@@
-24,13
+24,24
@@
#include <ao_packet.h>
#include <ao_companion.h>
#include <ao_profile.h>
#include <ao_packet.h>
#include <ao_companion.h>
#include <ao_profile.h>
+#if HAS_SAMPLE_PROFILE
+#include <ao_sample_profile.h>
+#endif
#include <ao_pyro.h>
#include <ao_pyro.h>
+#if HAS_STACK_GUARD
+#include <ao_mpu.h>
+#endif
int
main(void)
{
ao_clock_init();
int
main(void)
{
ao_clock_init();
+#if HAS_STACK_GUARD
+ ao_mpu_init();
+#endif
+
+ ao_task_init();
ao_serial_init();
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_GREEN);
ao_serial_init();
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_GREEN);
@@
-42,7
+53,9
@@
main(void)
ao_exti_init();
ao_adc_init();
ao_exti_init();
ao_adc_init();
+#if HAS_BEEP
ao_beep_init();
ao_beep_init();
+#endif
ao_cmd_init();
#if HAS_MS5607
ao_cmd_init();
#if HAS_MS5607
@@
-78,6
+91,9
@@
main(void)
#if AO_PROFILE
ao_profile_init();
#endif
#if AO_PROFILE
ao_profile_init();
#endif
+#if HAS_SAMPLE_PROFILE
+ ao_sample_profile_init();
+#endif
ao_start_scheduler();
return 0;
ao_start_scheduler();
return 0;