fix some more test progs for new sys_time

This commit is contained in:
Felix Ruess
2012-02-10 21:48:56 +01:00
parent 2efab36e83
commit ec0dac9f08
10 changed files with 22 additions and 20 deletions
+2 -2
View File
@@ -17,7 +17,7 @@ static inline void main_event( void );
int main( void ) { int main( void ) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic(); main_periodic();
main_event(); main_event();
} }
@@ -27,7 +27,7 @@ int main( void ) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init(); led_init();
+2 -2
View File
@@ -46,7 +46,7 @@ static inline void on_mag(void);
int main( void ) { int main( void ) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic_task(); main_periodic_task();
main_event_task(); main_event_task();
} }
@@ -55,7 +55,7 @@ int main( void ) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
LED_ON(4); LED_ON(4);
ami601_init(); ami601_init();
+2 -2
View File
@@ -49,7 +49,7 @@ static inline void on_mag_event(void);
int main( void ) { int main( void ) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic_task(); main_periodic_task();
main_event_task(); main_event_task();
} }
@@ -59,7 +59,7 @@ int main( void ) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
imu_init(); imu_init();
ahrs_aligner_init(); ahrs_aligner_init();
ahrs_init(); ahrs_init();
@@ -41,7 +41,7 @@ static void main_on_radio_control_frame( void );
int main( void ) { int main( void ) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic_task(); main_periodic_task();
main_event_task(); main_event_task();
} }
@@ -50,7 +50,7 @@ int main( void ) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
radio_control_init(); radio_control_init();
mcu_int_enable(); mcu_int_enable();
} }
+2 -2
View File
@@ -49,7 +49,7 @@ float setting_d;
int main( void ) { int main( void ) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic(); main_periodic();
main_event(); main_event();
} }
@@ -60,7 +60,7 @@ int main( void ) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
settings_init(); settings_init();
// DEBUG_SERVO2_INIT(); // DEBUG_SERVO2_INIT();
// LED_ON(1); // LED_ON(1);
+2 -2
View File
@@ -38,7 +38,7 @@ int main(void) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic_task(); main_periodic_task();
main_event_task(); main_event_task();
} }
@@ -48,7 +48,7 @@ int main(void) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
actuators_init(); actuators_init();
} }
+2 -2
View File
@@ -20,7 +20,7 @@ static struct adc_buf buf_adc[NB_ADC];
int main (int argc, char** argv) { int main (int argc, char** argv) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init(); led_init();
adc_init(); adc_init();
@@ -51,7 +51,7 @@ int main (int argc, char** argv) {
mcu_int_enable(); mcu_int_enable();
while(1) { while(1) {
if (sys_time_periodic()) { if (sys_time_check_and_ack_timer(0)) {
LED_TOGGLE(1); LED_TOGGLE(1);
uint16_t values[NB_ADC]; uint16_t values[NB_ADC];
uint8_t i; uint8_t i;
+2 -2
View File
@@ -38,7 +38,7 @@ int main(void) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic_task(); main_periodic_task();
main_event_task(); main_event_task();
} }
@@ -48,7 +48,7 @@ int main(void) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
} }
+2 -2
View File
@@ -38,7 +38,7 @@ int main(void) {
main_init(); main_init();
while(1) { while(1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic_task(); main_periodic_task();
main_event_task(); main_event_task();
} }
@@ -48,7 +48,7 @@ int main(void) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
} }
+4 -2
View File
@@ -27,6 +27,8 @@
#include "interrupt_hw.h" #include "interrupt_hw.h"
#include "mcu_periph/sys_time.h" #include "mcu_periph/sys_time.h"
#include "subsystems/datalink/downlink.h" #include "subsystems/datalink/downlink.h"
#include "led.h"
static inline void main_init( void ); static inline void main_init( void );
static inline void main_periodic( void ); static inline void main_periodic( void );
@@ -35,7 +37,7 @@ int main(void) {
main_init(); main_init();
while (1) { while (1) {
if (sys_time_periodic()) if (sys_time_check_and_ack_timer(0))
main_periodic(); main_periodic();
} }
return 0; return 0;
@@ -43,7 +45,7 @@ int main(void) {
static inline void main_init( void ) { static inline void main_init( void ) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
mcu_int_enable(); mcu_int_enable();
} }