From 90ea7bb4c138c6ac314efcb1e3c6974e911d2676 Mon Sep 17 00:00:00 2001 From: "natalija.zlatkova@gmail.com" Date: Fri, 12 Apr 2019 16:41:39 +0200 Subject: [PATCH 1/2] deleted adress field in basket structure --- project/Natalia/cassa.c | 2 +- project/common/supermarket_net.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Natalia/cassa.c b/project/Natalia/cassa.c index 5c21a54b9..8c29b2915 100644 --- a/project/Natalia/cassa.c +++ b/project/Natalia/cassa.c @@ -68,7 +68,7 @@ static void input_callback(const void* data, uint16_t len, const linkaddr_t* sou invoices[index].n_prods = basket->n_products; invoices[index].total_sum = 0; invoices[index].customer_id = basket->customer_id; - invoices[index].address_basket = basket->address; + invoices[index].address_basket = source_address; msg start_sending_list; start_sending_list.msg_type = START_OF_LIST_PRODUCTS_MSG; diff --git a/project/common/supermarket_net.h b/project/common/supermarket_net.h index 66606fd25..fa7af55ee 100644 --- a/project/common/supermarket_net.h +++ b/project/common/supermarket_net.h @@ -51,7 +51,7 @@ typedef struct basket_msg enum message_type msg_type; uint8_t n_products; uint8_t customer_id; - linkaddr_t* address; + }basket_msg; From 1d0f6521ea7224cb2e2e66134613a44f59c3122c Mon Sep 17 00:00:00 2001 From: Daniela Date: Fri, 12 Apr 2019 16:47:44 +0200 Subject: [PATCH 2/2] Fixed struct name --- project/common/supermarket_net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/common/supermarket_net.h b/project/common/supermarket_net.h index 66606fd25..3ec419d6c 100644 --- a/project/common/supermarket_net.h +++ b/project/common/supermarket_net.h @@ -43,7 +43,7 @@ typedef struct assign_msg { enum message_type msg_type; uint32_t customer_id; -}assing_msg; +}assign_msg; typedef struct basket_msg