Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-05 15:30:08 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

fix some more lisa test progs

Browse Source
This commit is contained in:
Felix Ruess
2012-02-10 22:05:15 +01:00
parent ec0dac9f08
commit 31ea8f14cd
26 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
+2 -2
View File
@@ -80,7 +80,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();
} }
main_event(); main_event();
@@ -92,7 +92,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);
overo_link_init(); overo_link_init();
uart1_init(); uart1_init();
sw/airborne/lisa/lisa_stm_passthrough_main.c
+2 -2
View File
@@ -95,7 +95,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();
main_event(); main_event();
} }
@@ -106,7 +106,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();
baro_init(); baro_init();
radio_control_init(); radio_control_init();
sw/airborne/lisa/stm_test_spi_link.c
+2 -2
View File
@@ -43,12 +43,12 @@ static inline void on_overo_link_lost(void);
int main(void) { int main(void) {
mcu_init(); mcu_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
overo_link_init(); overo_link_init();
DEBUG_SERVO1_INIT(); DEBUG_SERVO1_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();
} }
sw/airborne/lisa/test/hs_gyro.c
+2 -2
View File
@@ -51,7 +51,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();
} }
@@ -61,7 +61,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();
mcu_int_enable(); mcu_int_enable();
sw/airborne/lisa/test/lisa_test_actuators_mkk.c
+2 -2
View File
@@ -40,7 +40,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();
} }
@@ -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);
actuators_init(); actuators_init();
} }
sw/airborne/lisa/test/lisa_test_adxl345.c
+2 -2
View File
@@ -54,7 +54,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();
} }
@@ -64,7 +64,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);
main_init_hw(); main_init_hw();
} }
sw/airborne/lisa/test/lisa_test_adxl345_dma.c
+2 -2
View File
@@ -49,7 +49,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();
} }
@@ -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);
main_init_hw(); main_init_hw();
} }
sw/airborne/lisa/test/lisa_test_aspirin.c
+2 -2
View File
@@ -51,7 +51,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();
} }
@@ -61,7 +61,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);
main_init_hw(); main_init_hw();
gyro_ready_for_read = FALSE; gyro_ready_for_read = FALSE;
sw/airborne/lisa/test/lisa_test_hmc5843.c
+2 -2
View File
@@ -66,7 +66,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();
} }
@@ -76,7 +76,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);
main_init_hw(); main_init_hw();
} }
sw/airborne/lisa/test/lisa_test_itg3200.c
+2 -2
View File
@@ -64,7 +64,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();
} }
@@ -74,7 +74,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);
main_init_hw(); main_init_hw();
} }
sw/airborne/lisa/test/lisa_test_max1168.c
+2 -2
View File
@@ -44,7 +44,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();
} }
@@ -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);
max1168_init(); max1168_init();
main_spi2_init(); main_spi2_init();
} }
sw/airborne/lisa/test/lisa_test_ms2100.c
+2 -2
View File
@@ -44,7 +44,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();
} }
@@ -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);
ms2100_init(); ms2100_init();
main_spi2_init(); main_spi2_init();
} }
sw/airborne/lisa/test/lisa_test_sc18is600.c
+2 -2
View File
@@ -41,7 +41,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();
} }
@@ -52,7 +52,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);
sc18is600_init(); sc18is600_init();
main_spi2_init(); main_spi2_init();
} }
sw/airborne/lisa/test/lisa_tunnel.c
+2 -2
View File
@@ -36,7 +36,7 @@ static inline void main_event_task( 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();
} }
@@ -45,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);
} }
static inline void main_periodic_task( void ) { static inline void main_periodic_task( void ) {
sw/airborne/lisa/test/test_board.c
+2 -2
View File
@@ -89,7 +89,7 @@ enum TestType cur_test;
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();
} }
@@ -99,7 +99,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();
baro_init(); baro_init();
sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
+2 -2
View File
@@ -42,7 +42,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();
} }
@@ -52,7 +52,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);
} }
sw/airborne/lisa/test_adc.c
+2 -2
View File
@@ -47,7 +47,7 @@ extern uint8_t adc_new_data_trigger;
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);
adc_init(); adc_init();
adc_buf_channel(0, &adc0_buf, 8); adc_buf_channel(0, &adc0_buf, 8);
adc_buf_channel(1, &adc1_buf, 3); adc_buf_channel(1, &adc1_buf, 3);
@@ -59,7 +59,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();
sw/airborne/lisa/test_csc_servo.c
+2 -2
View File
@@ -52,7 +52,7 @@ int main(void) {
servos[3] = 4; servos[3] = 4;
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();
} }
@@ -62,7 +62,7 @@ int main(void) {
static inline void main_init( void ) { static inline void main_init( void ) {
hw_init(); hw_init();
sys_time_init(); sys_time_register_timer((1./PERIODIC_FREQUENCY), NULL);
cscp_init(); cscp_init();
cscp_register_callback(CSC_VANE_MSG_ID, main_on_vane_msg, (void *)&csc_vane_msg); cscp_register_callback(CSC_VANE_MSG_ID, main_on_vane_msg, (void *)&csc_vane_msg);
} }
sw/airborne/lisa/test_datalink.c
+2 -2
View File
@@ -39,7 +39,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();
main_event(); main_event();
} }
@@ -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);
} }
static inline void main_periodic( void ) { static inline void main_periodic( void ) {
sw/airborne/lisa/test_float.c
+2 -2
View File
@@ -36,7 +36,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;
@@ -44,7 +44,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);
} }
static inline void main_periodic( void ) { static inline void main_periodic( void ) {
sw/airborne/lisa/test_mc.c
+2 -2
View File
@@ -45,7 +45,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();
} }
@@ -56,7 +56,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);
main_i2c_init(); main_i2c_init();
test_gpios(); test_gpios();
} }
sw/airborne/lisa/test_periodic.c
+2 -2
View File
@@ -36,7 +36,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;
@@ -44,7 +44,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);
} }
static inline void main_periodic( void ) { static inline void main_periodic( void ) {
sw/airborne/lisa/test_servos.c
+2 -2
View File
@@ -34,7 +34,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;
@@ -42,7 +42,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();
} }
sw/airborne/lisa/test_spi_slave.c
+2 -2
View File
@@ -41,7 +41,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();
} }
@@ -52,7 +52,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);
main_spi_slave_init(); main_spi_slave_init();
} }
sw/airborne/lisa/test_spi_slave2.c
+2 -2
View File
@@ -49,7 +49,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();
} }
@@ -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);
main_spi_slave_init(); main_spi_slave_init();
} }
sw/airborne/lisa/test_uart.c
+2 -2
View File
@@ -40,7 +40,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;
@@ -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);
} }
static inline void main_periodic( void ) { static inline void main_periodic( void ) {