Commit Graph

14825 Commits

Author SHA1 Message Date
e453711712 [assigner] some minor fix here and there
plus deleted trailing spaces from lines
sorry Daniela, my editor trims them automagically
2019-04-14 15:22:19 +02:00
61e2f9f6d0 [product] written rfid product encapsulation 2019-04-13 09:29:41 +02:00
26182c778e [common] updated common files 2019-04-13 09:29:17 +02:00
0343edb42c [cash] minor fix due to a copypasta error 2019-04-13 09:28:54 +02:00
2fb95798df [cart] futher adjustments for new type names 2019-04-13 09:28:16 +02:00
aa708cfea8 Merge branch 'master' of git.giomba.it:giomba/nes-proj 2019-04-12 22:24:21 +02:00
5af2caaf8a [net] product vs item explanation 2019-04-12 19:05:44 +02:00
francesco.barbarulo
9d0913aef9 Merge branch 'master' of git.giomba.it:giomba/nes-proj 2019-04-12 17:53:17 +02:00
francesco.barbarulo
dda6aa48ad Updated .gitignore for presentation file 2019-04-12 17:53:11 +02:00
francescobarbarulo
268e8b624f Merge branch 'master' of git.giomba.it:giomba/nes-proj 2019-04-12 17:51:12 +02:00
francescobarbarulo
e7bf80de71 Added some comments 2019-04-12 17:50:48 +02:00
b2087edbde [merge] fixd merge conflict for typo 2019-04-12 16:50:44 +02:00
Daniela
a97bb9aa71 Merge branch 'master' of git.giomba.it:giomba/nes-proj 2019-04-12 16:47:58 +02:00
Daniela
1d0f6521ea Fixed struct name 2019-04-12 16:47:44 +02:00
francescobarbarulo
f8fe30f0ef Merge branch 'master' of git.giomba.it:giomba/nes-proj 2019-04-12 16:44:28 +02:00
35555fad78 [cart] update with new struct names 2019-04-12 16:44:25 +02:00
francescobarbarulo
abadc65caf First version of product 2019-04-12 16:44:20 +02:00
natalija.zlatkova@gmail.com
90ea7bb4c1 deleted adress field in basket structure 2019-04-12 16:41:39 +02:00
b38dccc325 [cart] not working 2019-04-12 16:30:05 +02:00
Daniela
aafd37dd59 Cassa and Supermarket updated 2019-04-12 16:30:01 +02:00
natalija.zlatkova@gmail.com
3393ab5877 modified version that saves up memory 2019-04-12 16:20:00 +02:00
b3eaad66d0 [repo] added a gitignore 2019-04-12 16:10:52 +02:00
Daniela
e62c4d5501 first version of Assigner 2019-04-12 15:14:52 +02:00
477963987f [cart] Now cart should associate 2019-04-12 14:56:37 +02:00
ef9cde532f [cart] first unuseful version for cart 2019-04-11 17:46:54 +02:00
natalija.zlatkova@gmail.com
55f248f517 first version cassa 2019-04-06 17:34:46 +02:00
francesco.barbarulo
0ec72832d1 First project commit 2019-04-04 10:36:10 +02:00
bfa635078e Latest tests before project 2019-04-04 08:59:43 +02:00
647b6437d0 Battery monitor sensors 2019-03-29 12:03:35 +01:00
2f06326b6d Hardware interaction 2019-03-22 13:19:50 +01:00
b79c7e09c8 First working event driven software 2019-03-19 13:33:03 +01:00
5ffda9d0b4 First class 2019-03-19 13:01:50 +01:00
f83deb08a3 First commit as given by Francesca Righetti 2019-03-19 13:01:02 +01:00
George Oikonomou
8974aa19d5
Merge pull request #846 from simonduq/pr/rtimer-busywait-no-watchdog
Do not refresh watchdog in rtimer busy-wait macros
2019-03-04 10:55:18 +00:00
Simon Duquennoy
11346c5bda RTIMER_BUSYWAIT_UNTIL_ABS: move cooja-specific implem to cooja platform directory 2019-03-04 09:17:17 +01:00
Simon Duquennoy
68e8846139 Do not refresh watchdog in rtimer busy-wait macros 2019-03-04 09:17:17 +01:00
Simon Duquennoy
abab7f1645
Merge pull request #858 from simonduq/contrib/tsch-discard-frames-from-ourselves
TSCH: filter out frames from ourselves
2019-03-04 09:11:27 +01:00
George Oikonomou
07c646484b
Merge branch 'develop' into contrib/tsch-discard-frames-from-ourselves 2019-03-03 23:40:12 +00:00
George Oikonomou
2ccd48f42f
Merge pull request #857 from simonduq/contrib/tsch-timeslot-elements
Document and clean up TSCH timeslot timing elements
2019-03-03 23:39:34 +00:00
George Oikonomou
8dd8d10f19
Merge branch 'develop' into contrib/tsch-timeslot-elements 2019-03-03 22:41:03 +00:00
George Oikonomou
80631f817b
Merge pull request #853 from firmwaremodules/bugfix/mqtt
Fix a few minor MQTT issues
2019-03-03 22:40:49 +00:00
George Oikonomou
c28b6715fa
Merge branch 'develop' into bugfix/mqtt 2019-03-03 21:51:02 +00:00
Simon Duquennoy
88ea8e2e2b
Merge branch 'develop' into contrib/tsch-discard-frames-from-ourselves 2019-02-26 17:00:32 +01:00
Simon Duquennoy
e756b24d0f
Merge pull request #845 from simonduq/pr/netstack-h-typos
Fix typos in comments
2019-02-26 09:41:21 +01:00
Simon Duquennoy
a2387cd881
Merge branch 'develop' into pr/netstack-h-typos 2019-02-26 08:47:42 +01:00
Simon Duquennoy
7ca4b088f4
Merge pull request #847 from simonduq/contrib/nbr-table-sanity-check
Check that table is non-NULL in nbr_table_add_lladdr
2019-02-26 08:47:23 +01:00
Simon Duquennoy
0bfbb47f4a
Merge branch 'develop' into contrib/nbr-table-sanity-check 2019-02-25 22:09:55 +01:00
Simon Duquennoy
a0d94b62a8
Merge pull request #692 from simonduq/contrib/rpl-schedule-dao
RPL-Lite: rework DAO sending/resending/refreshing logic
2019-02-25 22:04:43 +01:00
Simon Duquennoy
fbbf60248e
Merge branch 'develop' into contrib/rpl-schedule-dao 2019-02-25 21:35:57 +01:00
Simon Duquennoy
4cc64ea942 TSCH: filter out frames from ourselves 2019-02-24 16:30:57 +01:00