giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[assigner] some minor fix here and there

Browse Source 
plus deleted trailing spaces from lines
sorry Daniela, my editor trims them automagically
This commit is contained in:
giomba 2019-04-14 15:22:19 +02:00
parent 61e2f9f6d0
commit e453711712
3 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/Assigner/assigner.c
View File

@ -11,7 +11,6 @@
#include "os/dev/serial-line.h" #include "os/dev/serial-line.h"
#include "arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h" #include "arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h"
#include "../msg.h"
#include "assigner_fun.h" #include "assigner_fun.h"
#define LOG_MODULE "App" #define LOG_MODULE "App"

1
project/Assigner/assigner_fun.c
View File

@ -11,7 +11,6 @@
#include "os/dev/serial-line.h" #include "os/dev/serial-line.h"
#include "arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h" #include "arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h"
#include "../msg.h"
#include "assigner_fun.h" #include "assigner_fun.h"
#define LOG_MODULE "App" #define LOG_MODULE "App"

25
project/Assigner/assigner_fun.h
View File

@ -11,6 +11,8 @@
#include "os/dev/serial-line.h" #include "os/dev/serial-line.h"
#include "arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h" #include "arch/cpu/cc26x0-cc13x0/dev/cc26xx-uart.h"
#include "../common/supermarket_net.h"
typedef struct cart typedef struct cart
{ {
linkaddr_t* cart_address; linkaddr_t* cart_address;
@ -25,3 +27,26 @@ bool insert_cart(uint8_t new_req_battery, linkaddr_t* mac_cart_addr);
bool bat_upgrade(linkaddr_t* src_cart_addr, uint8_t battery_level); bool bat_upgrade(linkaddr_t* src_cart_addr, uint8_t battery_level);
//static void input_callback(const void* data, uint16_t len, const linkaddr_t* source_address, const linkaddr_t* destination_address); //static void input_callback(const void* data, uint16_t len, const linkaddr_t* source_address, const linkaddr_t* destination_address);
//void check(void *ptr); //void check(void *ptr);
//-----------------------Definition of the type of messages exchanged between the modules, with their useful informations. The significant fields are discriminated by the msg_type ---------
typedef struct assigner_msg //Message for communications between assigner and carts
{
enum message_type msg_type;
//assoc_req_msg request;
//assoc_reply_msg reply;
uint8_t battery_percentage;
uint32_t customer_id;
}a_msg;
/*
typedef struct cash_desk_msg
{
enum message_type msg_type;
cash_out_msg cash_out;
product_msg product;
basket_msg basket;
}cd_msg;
*/