[test_progs] update test_settings

This commit is contained in:
Felix Ruess
2015-02-14 23:57:07 +01:00
parent 2417345f73
commit 05bcf2c1c5
3 changed files with 12 additions and 15 deletions
+4 -4
View File
@@ -4,10 +4,10 @@
<dl_settings>
<dl_settings NAME="Group1">
<dl_setting var="setting_a" min="0" step="1" max="42" shortname ="a" module="test/subsystems/test_settings"/>
<dl_setting var="setting_b" min="0" step="1" max="42" shortname ="b" persistent="true"/>
<dl_setting var="setting_c" min="0" step="1" max="42" shortname ="c" persistent="true"/>
<dl_setting var="setting_d" min="0" step="1" max="42" shortname ="d" persistent="true" />
<dl_setting var="setting_f" min="0" step="0.1" max="42" shortname ="f" persistent="true" type="float" module="test/subsystems/test_settings"/>
<dl_setting var="setting_u8" min="0" step="1" max="42" shortname ="u8" persistent="true" type="uint8"/>
<dl_setting var="setting_d" min="-42" step="0.1" max="42" shortname ="d" persistent="true" type="double"/>
<dl_setting var="setting_i32" min="0" step="1" max="4242" shortname ="i32" persistent="true" type="int32"/>
<dl_setting var="settings_store_flag" min="0" step="1" max="1" shortname="store" handler="StoreSettings" module="subsystems/settings"/>
</dl_settings>
+4 -7
View File
@@ -38,10 +38,10 @@ static inline void main_periodic(void);
static inline void main_event(void);
float setting_a;
float setting_b;
float setting_c;
float setting_d;
float setting_f;
uint8_t setting_u8;
double setting_d;
int32_t setting_i32;
int main(void)
{
@@ -58,7 +58,6 @@ int main(void)
static inline void main_init(void)
{
mcu_init();
sys_time_register_timer((1. / PERIODIC_FREQUENCY), NULL);
settings_init();
@@ -69,7 +68,6 @@ static inline void main_init(void)
static inline void main_periodic(void)
{
RunOnceEvery(100, {
DOWNLINK_SEND_ALIVE(DefaultChannel, DefaultDevice, 16, MD5SUM);
PeriodicSendDlValue(&(DefaultChannel).trans_tx, &(DefaultDevice).device);
@@ -81,7 +79,6 @@ static inline void main_event(void)
{
DatalinkEvent();
}
void dl_parse_msg(void)
+4 -4
View File
@@ -3,9 +3,9 @@
#include "std.h"
extern float setting_a;
extern float setting_b;
extern float setting_c;
extern float setting_d;
extern float setting_f;
extern uint8_t setting_u8;
extern double setting_d;
extern int32_t setting_i32;
#endif