Merge branch 'master' of git.giomba.it:giomba/nes-proj

project/.gitignore

@@ -0,0 +1 @@
+*.swp

project/Giomba/cart.c

@@ -21,9 +21,8 @@ PROCESS_THREAD(cart_main_process, ev, data) {
     //	SENSORS_ACTIVATE(batmon_sensor);
 
     /*** Variables initialization ***/
-
     status = NOT_ASSOCIATED;
-    etimer_set(&broadcast_timer, 10 * CLOCK_SECOND);
+    etimer_set(&broadcast_timer, 5 * CLOCK_SECOND);
 
     /*** Subsystem initialization ***/
     net_init();
@@ -39,7 +38,9 @@ PROCESS_THREAD(cart_main_process, ev, data) {
                 s_not_associated(ev, data);
                 break;
             break;
-			case ASSOCIATED: break;
+			case ASSOCIATED:
+                s_associated(ev, data);
+            break;
 			case SHOPPING: break;
 			case CASHOUT: break;
 			default: status = NOT_ASSOCIATED; break;

project/Giomba/event.h

@@ -2,7 +2,8 @@
 #define EVENT_H
 
 enum CartEvent {
-    CART_EVENT_ASSOCIATED
+    CART_EVENT_ASSOCIATED,
+    CART_EVENT_ASSIGNED
 } event;
 
 #endif

project/Giomba/sendrecv.c

@@ -24,11 +24,15 @@ void net_recv(const void* data, uint16_t len, const linkaddr_t* src, const linka
 
     LOG_INFO("Received %d bytes from ", len); LOG_INFO_LLADDR(src);	LOG_INFO("\n");
 
-    switch ( ((struct Msg*)data)->type ) {
+    switch ( ((msg*)data)->msg_type ) {
         case ASSOCIATION_REPLY_MSG:
             event = CART_EVENT_ASSOCIATED;
             process_post(&cart_main_process, PROCESS_EVENT_MSG, NULL);
         break;
+        case ASSIGNMENT_MSG:
+            event = CART_EVENT_ASSIGNED;
+            process_post(&cart_main_process, PROCESS_EVENT_MSG, NULL);
+        break;
         default:
             LOG_INFO("[W] message type unknown\n");
             break;

project/Giomba/status.c

@@ -3,15 +3,16 @@
 enum CartStatus status;
 struct etimer broadcast_timer;
 linkaddr_t assigner_address;
+uint32_t customer_id;
 
 void s_not_associated(process_event_t ev, process_data_t data) {
     if (ev == PROCESS_EVENT_TIMER) {
         /* at time expiration, send broadcast message to request association with assigner */
         if (etimer_expired(&broadcast_timer)) {
             printf("[I] Sending association request msg\n");
-            struct Msg msg;
+            msg m;
-            msg.type = ASSOCIATION_REQUEST_MSG;
+            m.msg_type = ASSOCIATION_REQUEST_MSG;
-            net_send(&msg, sizeof(msg), NULL);
+            net_send(&m, sizeof(m), NULL);
             etimer_reset(&broadcast_timer);
         }
     }
@@ -23,4 +24,23 @@ void s_not_associated(process_event_t ev, process_data_t data) {
     }
 }
 
+void s_associated(process_event_t ev, process_data_t data) {
+    if (ev == PROCESS_EVENT_TIMER) {
+        /* now send battery level */
+        printf("[I] Sending battery level\n");
+        struct battery_msg m;
+        m.msg_type = BATTERY_STATUS_MSG;
+        m.battery_percentage = 77;
+        net_send(&m, sizeof(m), &assigner_address);
+        etimer_reset(&broadcast_timer);
+    }
+    if (ev == PROCESS_EVENT_MSG && *((enum CartEvent*)data) == CART_EVENT_ASSIGNED) {
+        /* cart has been assigned to a new customer */
+        printf("[I] Assigned to customer\n");
+        customer_id = ((assign_msg*)pkt.data)->customer_id;
+        status = SHOPPING;
+    }
+
+}
+
 

project/Giomba/status.h

@@ -20,5 +20,6 @@ extern enum CartStatus status;
 extern struct etimer broadcast_timer;
 
 void s_not_associated(process_event_t ev, process_data_t data);
+void s_associated(process_event_t ev, process_data_t data);
 
 #endif

project/common/supermarket_net.h

@@ -7,18 +7,17 @@ enum message_type {
     BATTERY_STATUS_MSG,
     ASSIGNMENT_MSG,
     CASH_OUT_MSG,
-    PRODUCT_MSG,   
+    PRODUCT_MSG,
     ITEM_ELEM_MSG,
     BASKET_MSG,
-    START_OF_LIST_PRODUCTS_MSG	
+    START_OF_LIST_PRODUCTS_MSG
 };
 
-
 typedef struct msg {
     enum message_type msg_type;
 }msg;
 
-typedef struct assoc_req_msg	
+typedef struct assoc_req_msg
 {
 	enum message_type msg_type;
 	uint8_t battery_percentage;
@@ -47,11 +46,10 @@ typedef struct assign_msg
 
 
 typedef struct basket_msg
-{	
+{
 	enum message_type msg_type;
 	uint8_t n_products;
 	uint8_t customer_id;
-	
 }basket_msg;
 
 
@@ -64,7 +62,7 @@ typedef struct cash_out_msg
 
 typedef struct product_msg
 {
-	enum message_type msg_type;	
+	enum message_type msg_type;
 	uint8_t customer_id;
 	uint8_t product_id;
 	float prize;
@@ -76,10 +74,9 @@ typedef struct user_invoice
 	uint8_t n_prods;
 	float total_sum;
 	uint8_t customer_id;
-	linkaddr_t* address_basket;
 	uint8_t empty;
-	
+
-	
+
 }user_invoice;
 
 #endif

project/product/Makefile

@@ -0,0 +1,12 @@
+CONTIKI_PROJECT = product
+PLATFORMS_ONLY = cc26x0-cc13x0
+all: $(CONTIKI_PROJECT)
+
+CONTIKI = ../..
+
+PLATFORMS_EXCLUDE = nrf52dk
+
+#use this to enable TSCH: MAKE_MAC = MAKE_MAC_TSCH
+MAKE_MAC ?= MAKE_MAC_CSMA
+MAKE_NET = MAKE_NET_NULLNET
+include $(CONTIKI)/Makefile.include

project/product/product.c

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2017, RISE SICS.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+#include "net/netstack.h"
+#include "net/nullnet/nullnet.h"
+#include "os/net/linkaddr.h"
+#include "os/dev/button-hal.h"
+#include "os/dev/leds.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "sys/log.h"
+#include "sys/clock.h"
+#include "contiki.h"
+
+#define LOG_MODULE "App"
+#define LOG_LEVEL LOG_LEVEL_INFO
+
+// !! TO INIT WITH CART MAC ADDRESS !! //
+static linkaddr_t dest_addr = {{0x00, 0x12, 0x4b, 0x00, 0x0f, 0x82, 0x18, 0x04}};
+
+
+struct Product {
+	char name[20];
+	char expiration_date[8]; // gg/mm/yy
+	double price;
+};
+
+struct Product product_list[] = {
+	{ "latte"     , "21/12/19", 1.05 },
+	{ "pane"      , "12/05/19", 3.25 },
+	{ "cioccolato", "05/05/21", 2.50 }
+};
+
+
+PROCESS(product_proc, "product random generator");
+AUTOSTART_PROCESSES(&product_proc);
+
+void scan_product(struct Product *p){
+	nullnet_buf = (uint8_t *)p;
+	nullnet_len = sizeof(*p);
+	NETSTACK_NETWORK.output(&dest_addr);
+	LOG_INFO("Product %s scanned from ", p->name);
+	LOG_INFO_LLADDR(&dest_addr);
+	LOG_INFO_("\n");
+}
+
+PROCESS_THREAD(product_proc, ev, data){
+	PROCESS_BEGIN();
+	// init random number generator
+	unsigned int magic_seed = 12; // oooh :o
+	srand(magic_seed);
+
+	while(1) {
+		PROCESS_YIELD();
+		if (ev == button_hal_press_event){
+			// product generation
+			unsigned int index = rand() % 3;
+			scan_product(&product_list[index]);
+		}
+	}
+	PROCESS_END();
+}

project/product/project-conf.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, Texas Instruments Incorporated - http://www.ti.com/
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holder nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*---------------------------------------------------------------------------*/
+#ifndef PROJECT_CONF_H_
+#define PROJECT_CONF_H_
+/*---------------------------------------------------------------------------*/
+/* Enable the ROM bootloader */
+#define CCXXWARE_CONF_ROM_BOOTLOADER_ENABLE   1
+/*---------------------------------------------------------------------------*/
+/* Change to match your configuration */
+#define IEEE802154_CONF_PANID            0xABCD
+#define IEEE802154_CONF_DEFAULT_CHANNEL      25
+#define RF_BLE_CONF_ENABLED                   1
+/*---------------------------------------------------------------------------*/
+/* log */
+#define LOG_CONF_LEVEL_NULLNET LOG_LEVEL_DBG
+/*---------------------------------------------------------------------------*/
+#endif /* PROJECT_CONF_H_ */
+/*---------------------------------------------------------------------------*/