From c771902c61fdced09f739c8c825045584c029a1b Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Mon, 24 Feb 2014 23:13:35 +0100 Subject: [PATCH] [sim] enabled downlink via ivy by default and rename var --- sw/airborne/arch/sim/ivy_transport.c | 2 +- sw/airborne/arch/sim/ivy_transport.h | 4 ++-- sw/airborne/arch/sim/sim_ap.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/airborne/arch/sim/ivy_transport.c b/sw/airborne/arch/sim/ivy_transport.c index 3afcc4bc9c..4d8706dcd3 100644 --- a/sw/airborne/arch/sim/ivy_transport.c +++ b/sw/airborne/arch/sim/ivy_transport.c @@ -1,3 +1,3 @@ char ivy_buf[256]; char *ivy_p = ivy_buf; -int ivy_dl_status; +int ivy_dl_enabled = 1; diff --git a/sw/airborne/arch/sim/ivy_transport.h b/sw/airborne/arch/sim/ivy_transport.h index 295d237f0d..1c406b3811 100644 --- a/sw/airborne/arch/sim/ivy_transport.h +++ b/sw/airborne/arch/sim/ivy_transport.h @@ -3,7 +3,7 @@ extern char ivy_buf[]; extern char* ivy_p; -extern int ivy_dl_status; +extern int ivy_dl_enabled; #define IvyTransportCheckFreeSpace(_dev,_) TRUE @@ -11,7 +11,7 @@ extern int ivy_dl_status; #define IvyTransportHeader(_dev,len) ivy_p=ivy_buf; -#define IvyTransportTrailer(_dev) { *(--ivy_p) = '\0'; if (ivy_dl_status) { IvySendMsg("%s",ivy_buf); } } +#define IvyTransportTrailer(_dev) { *(--ivy_p) = '\0'; if (ivy_dl_enabled) { IvySendMsg("%s",ivy_buf); } } #define IvyTransportPutUint8(_dev,x) { ivy_p += sprintf(ivy_p, "%u ", x); } #define IvyTransportPutNamedUint8(_dev,_name, _x) { ivy_p += sprintf(ivy_p, "%s ", _name); } diff --git a/sw/airborne/arch/sim/sim_ap.c b/sw/airborne/arch/sim/sim_ap.c index 3924f4ee1d..20cb7ac5b4 100644 --- a/sw/airborne/arch/sim/sim_ap.c +++ b/sw/airborne/arch/sim/sim_ap.c @@ -109,8 +109,8 @@ value update_bat(value bat) { return Val_unit; } -value update_dl_status(value dl_status) { - ivy_dl_status = Int_val(dl_status); +value update_dl_status(value dl_enabled) { + ivy_dl_enabled = Int_val(dl_enabled); return Val_unit; }