Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

fix some more test progs, etc. for new systime

Browse Source
This commit is contained in:
Felix Ruess
2012-02-25 03:00:35 +01:00
parent fec3b1dc0d
commit 691d40fbf7
21 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/boards/booz/test_baro.c
+2 -2
View File
@@ -47,7 +47,7 @@ int main(void) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -57,7 +57,7 @@ int main(void) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
booz2_analog_init();
baro_init();
mcu_int_enable();
sw/airborne/boards/lisa_l/test_baro.c
+4 -2
View File
@@ -33,6 +33,8 @@
#include "mcu_periph/sys_time.h"
#include "mcu_periph/uart.h"
#include "led.h"
#include "subsystems/datalink/downlink.h"
#include "subsystems/sensors/baro.h"
@@ -50,7 +52,7 @@ int main(void) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -60,7 +62,7 @@ int main(void) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
baro_init();
// DEBUG_SERVO1_INIT();
sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
+2 -2
View File
@@ -51,7 +51,7 @@ static inline void main_event_task( void );
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -60,7 +60,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
mcu_int_enable();
}
sw/airborne/booz/test/booz2_test_crista.c
+2 -2
View File
@@ -45,7 +45,7 @@ static inline void on_imu_event(void);
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -54,7 +54,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
/* LED_ON(4); */
sw/airborne/booz/test/booz2_test_gps.c
+2 -2
View File
@@ -39,7 +39,7 @@ static void on_gps_sol(void);
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -48,7 +48,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
gps_init();
mcu_int_enable();
sw/airborne/booz/test/booz2_test_max1168.c
+2 -2
View File
@@ -48,7 +48,7 @@ static void SSP_ISR(void) __attribute__((naked));
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -57,7 +57,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
main_init_ssp();
max1168_init();
sw/airborne/booz/test/booz2_test_micromag.c
+2 -2
View File
@@ -50,7 +50,7 @@ static void SSP_ISR(void) __attribute__((naked));
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -59,7 +59,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
uart1_init_tx();
sw/airborne/booz/test/booz2_test_usb.c
+2 -2
View File
@@ -43,7 +43,7 @@ static inline void main_event_task( void );
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -52,7 +52,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
VCOM_init();
sw/airborne/csc/csc_ap_main.c
+2 -2
View File
@@ -142,7 +142,7 @@ static void on_gpspos_cmd( struct CscGPSPosMsg *msg )
static void csc_main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
Uart0Init();
@@ -213,7 +213,7 @@ static void csc_main_event( void )
int main( void ) {
csc_main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
csc_main_periodic();
csc_main_event();
}
sw/airborne/csc/csc_main.c
+2 -2
View File
@@ -67,7 +67,7 @@ struct NedCoor_i booz_ins_gps_speed_cm_s_ned;
static void csc_main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
#ifdef USE_UART0
@@ -219,7 +219,7 @@ static inline void on_motor_cmd(struct CscMotorMsg *msg)
int main( void ) {
csc_main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
csc_main_periodic();
csc_main_event();
}
sw/airborne/csc/mercury_csc_main.c
+2 -2
View File
@@ -81,7 +81,7 @@ static uint32_t can_msg_count = 0;
static void csc_main_init( void ) {
hw_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
actuators_init();
@@ -252,7 +252,7 @@ int main( void ) {
csc_main_init();
// Uart0PrintString("Hello");
while(1) {
if (sys_time_periodic()) {
if (sys_time_check_and_ack_timer(0)) {
csc_main_periodic();
}
csc_main_event();
sw/airborne/csc/mercury_main.c
+2 -2
View File
@@ -74,7 +74,7 @@ static inline void csc_main_event( void );
int main( void ) {
csc_main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
csc_main_periodic();
csc_main_event();
}
@@ -106,7 +106,7 @@ static void on_rc_cmd(struct CscRCMsg *msg)
static inline void csc_main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
Uart0Init();
sw/airborne/csc/ppm_bridge_main.c
+2 -2
View File
@@ -53,7 +53,7 @@ static uint16_t cpu_time = 0;
static void csc_main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
Uart0Init();
@@ -123,7 +123,7 @@ static void csc_main_event( void )
int main( void ) {
csc_main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
csc_main_periodic();
csc_main_event();
}
sw/airborne/firmwares/beth/main_beth.c
+2 -2
View File
@@ -17,7 +17,7 @@ static inline void main_on_bench_sensors( void );
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
}
return 0;
@@ -25,7 +25,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
mcu_int_enable();
}
sw/airborne/firmwares/beth/main_coders.c
+2 -2
View File
@@ -64,7 +64,7 @@ int main(void) {
servos[3] = 4;
while (1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic();
main_event();
}
@@ -74,7 +74,7 @@ int main(void) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
main_init_adc();
bench_sensors_init();
mcu_int_enable();
sw/airborne/firmwares/beth/main_stm32.c
+2 -2
View File
@@ -54,7 +54,7 @@ int main(void) {
main_init();
while (1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic();
main_event();
}
@@ -63,7 +63,7 @@ int main(void) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
actuators_init();
//radio_control_init();
imu_init();
sw/airborne/firmwares/setup/setup_actuators.c
+1 -1
View File
@@ -48,7 +48,7 @@ void dl_parse_msg( void ) {
void init_fbw( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
PprzUartInit();
sw/airborne/firmwares/wind_tunnel/main.c
+2 -2
View File
@@ -30,7 +30,7 @@ uint16_t datalink_time;
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task( );
}
@@ -39,7 +39,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
uart0_init();
sw/airborne/firmwares/wind_tunnel/main_mb.c
+2 -2
View File
@@ -29,7 +29,7 @@ uint16_t datalink_time;
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task( );
}
@@ -38,7 +38,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
uart0_init();
sw/airborne/fms/lpc_test_spi.c
+2 -2
View File
@@ -42,7 +42,7 @@ static void SPI0_ISR(void) __attribute__((naked));
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task();
}
@@ -51,7 +51,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
main_spi_init();
mcu_int_enable();
}
sw/airborne/sd_card/main.c
+2 -2
View File
@@ -26,7 +26,7 @@ uint16_t datalink_time;
int main( void ) {
main_init();
while(1) {
if (sys_time_periodic())
if (sys_time_check_and_ack_timer(0))
main_periodic_task();
main_event_task( );
}
@@ -35,7 +35,7 @@ int main( void ) {
static inline void main_init( void ) {
mcu_init();
sys_time_init();
sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
led_init();
Uart0Init();