replaced lisa_l_test_progs and lisa_m_test_progs by one common lisa_test_progs and cleaned/fixed a little

This commit is contained in:
Felix Ruess
2012-02-11 18:47:06 +01:00
parent 316952ccf5
commit 267e62d680
10 changed files with 612 additions and 1613 deletions
+21 -19
View File
@@ -31,25 +31,27 @@
<target name="tunnel" board="lisa_m_1.0"/>
</firmware>
<firmware name="lisa_m_test_progs">
<target name="test_sys_time" board="lisa_m_1.0"/>
<target name="test_led" board="lisa_m_1.0"/>
<target name="test_uart_lisam" board="lisa_m_1.0"/>
<target name="test_servos" board="lisa_m_1.0"/>
<target name="test_telemetry" board="lisa_m_1.0"/>
<target name="test_imu_aspirin" board="lisa_m_1.0"/>
<target name="test_rc_spektrum" board="lisa_m_1.0"/>
<target name="test_baro" board="lisa_m_1.0"/>
<!--<target name="test_imu" board="lisa_m_1.0"/>
<target name="test_rc_ppm" board="lisa_m_1.0"/>
<target name="test_adc" board="lisa_m_1.0"/>
<target name="test_hmc5843" board="lisa_m_1.0"/>
<target name="test_itg3200" board="lisa_m_1.0"/>
<target name="test_adxl345" board="lisa_m_1.0"/>
<target name="test_esc_mkk_simple" board="lisa_m_1.0"/>
<target name="test_esc_asctecv1_simple" board="lisa_m_1.0"/>
<target name="test_actuators_mkk" board="lisa_m_1.0"/>
<target name="test_actuators_asctecv1" board="lisa_m_1.0"/-->
<firmware name="lisa_test_progs">
<target name="test_led" board="lisa_m_1.0"/>
<target name="test_sys_time" board="lisa_m_1.0"/>
<target name="test_uart" board="lisa_m_1.0"/>
<target name="test_servos" board="lisa_m_1.0"/>
<target name="test_telemetry" board="lisa_m_1.0"/>
<target name="test_baro" board="lisa_m_1.0"/>
<target name="test_rc_spektrum" board="lisa_m_1.0"/>
<target name="test_rc_ppm" board="lisa_m_1.0"/>
<target name="test_adc" board="lisa_m_1.0"/>
<target name="test_imu_b2" board="lisa_m_1.0"/>
<target name="test_imu_b2_2" board="lisa_m_1.0"/>
<target name="test_imu_aspirin" board="lisa_m_1.0"/>
<target name="test_ahrs" board="lisa_m_1.0"/>
<target name="test_hmc5843" board="lisa_m_1.0"/>
<target name="test_itg3200" board="lisa_m_1.0"/>
<target name="test_adxl345" board="lisa_m_1.0"/>
<target name="test_esc_mkk_simple" board="lisa_m_1.0"/>
<target name="test_esc_asctecv1_simple" board="lisa_m_1.0"/>
<target name="test_actuators_mkk" board="lisa_m_1.0"/>
<target name="test_actuators_asctecv1" board="lisa_m_1.0"/>
</firmware>
<modules main_freq="512">
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
-25
View File
@@ -1,25 +0,0 @@
<firmware name="lisa_m_test_progs" boards="lisa_m_1.0"
description="test programs for lisa_m boards">
<!--target name="test telemetry" description="Sends ALIVE telemetry messages">
<param name="MODEM_PORT" values="UART1,UART2,UART3" default="UART2"/>
<param name="MODEM_BAUD" values="B9600,B57600,B115200" default="B57600"/>
</target>
<target name="test baro" description="reads barometers and sends values over telemetry">
<param name="MODEM_PORT" values="UART1,UART2,UART3" default="UART2"/>
<param name="MODEM_BAUD" values="B9600,B57600,B115200" default="B57600"/>
</target>
<target name="test imu b2" description="reads imu values over telemetry">
<param name="MODEM_PORT" values="UART1,UART2,UART3" default="UART2"/>
<param name="MODEM_BAUD" values="B9600,B57600,B115200" default="B57600"/>
</target>
<target name="test spektrum" description="sends RADIO_CONTROL messages on telemetry">
<param name="MODEM_PORT" values="UART1,UART2,UART3" default="UART2"/>
<param name="MODEM_BAUD" values="B9600,B57600,B115200" default="B57600"/>
<param name="RADIO_CONTROL_LINK" values="UART1,UART2,UART3|UART5" default="UART3"/>
</target-->
</firmware>
File diff suppressed because it is too large Load Diff
@@ -1,5 +1,5 @@
<firmware name="lisa_l_test_progs" boards="lisa_l_1.0,lisa_l_1.1"
description="test programs for lisa_l boards">
<firmware name="lisa_test_progs" boards="lisa_m_1.0, lisa_l_1.0,lisa_l_1.1"
description="test programs for lisa_m and lisa_l boards">
<target name="test telemetry" description="Sends ALIVE telemetry messages">
<param name="MODEM_PORT" values="UART1,UART2,UART3" default="UART2"/>
@@ -22,4 +22,6 @@
<param name="RADIO_CONTROL_LINK" values="UART1,UART2,UART3|UART5" default="UART3"/>
</target>
<!-- FIXME! add descriptions for all targets -->
</firmware>
+3 -2
View File
@@ -32,6 +32,7 @@
#include "mcu.h"
#include "mcu_periph/sys_time.h"
#include "mcu_periph/uart.h"
#include "led.h"
#include "subsystems/datalink/downlink.h"
@@ -50,7 +51,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 +61,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();
@@ -31,6 +31,7 @@
#include BOARD_CONFIG
#include "mcu.h"
#include "mcu_periph/sys_time.h"
#include "mcu_periph/uart.h"
#include "subsystems/datalink/downlink.h"
#include "peripherals/adxl345.h"
@@ -79,7 +79,7 @@ static inline void main_periodic_task( void ) {
&radio_control.status);});
#ifdef RADIO_CONTROL_TYPE_PPM
RunOnceEvery(10,
{uint8_t blaa = 0; DOWNLINK_SEND_PPM(DefaultChannel, DefaultDevice,&blaa, 8, booz_radio_control_ppm_pulses);});
{uint8_t blaa = 0; DOWNLINK_SEND_PPM(DefaultChannel, DefaultDevice,&blaa, 8, ppm_pulses);});
#endif
LED_PERIODIC();