From a1d92b0aa3c343a5cd310994c739f14ad836a127 Mon Sep 17 00:00:00 2001
From: Jake <jake.read@cba.mit.edu>
Date: Thu, 7 Dec 2017 15:03:19 -0500
Subject: [PATCH] combined build
---
.../.vs/atsams70-tinyrouter/v14/.atsuo | Bin 79360 -> 79360 bytes
.../atsams70-tinyrouter/Debug/Makefile | 27 +++++++++------
.../Debug/atsams70-tinyrouter.bin | Bin 8772 -> 8592 bytes
.../atsams70-tinyrouter/Debug/makedep.mk | 2 ++
.../atsams70-tinyrouter.cproj | 9 +++++
.../atsams70-tinyrouter/src/main.c | 13 +++++---
.../atsams70-tinyrouter/src/node.h | 4 +--
.../atsams70-tinyrouter/src/packet_handling.c | 31 ++++++++++--------
.../atsams70-tinyrouter/src/packet_handling.h | 28 ++++++++++++++++
.../atsams70-tinyrouter/src/tinyport.c | 2 +-
.../atsams70-tinyrouter/src/tinyport.h | 2 +-
11 files changed, 87 insertions(+), 31 deletions(-)
create mode 100644 embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.h
diff --git a/embedded/atsams70-tinyrouter/.vs/atsams70-tinyrouter/v14/.atsuo b/embedded/atsams70-tinyrouter/.vs/atsams70-tinyrouter/v14/.atsuo
index 49d311941691e1062bf65383cb2dd5b6e74b1d11..b7969d22e345530db6e335273301e2d407f90dc7 100644
GIT binary patch
delta 726
zcmZp8!_x4EWkLX>+QvX>CN_mN4}B-)PcC9=V*I@ME0Zy!pd14O0~-Sa!+$7{oNURW
zoGQV<z@W*%z#zoHz#z@Qz@P|Kq0PX+z{kMAV8Fn@AkV<SAj`nOAj-hNpbnMiVqjqS
z`~UxcK`38~fq_Affq_AXfq}uAfq_ARfq_Alfq_Asfq_A3@<9&u%`aG57}+iy+@?4w
ze{&I2ALAqr6&oG~1_liV1_o9J1_pix1_qF8I2jli{{8>|UxtB!K^SVf7}Pe9ILKs>
z7bYjLSg?W^|0mC75oZChHt%5ZVBEyT!OC)rfq`K%5AOlSe-jg>H^1PwVA-tTx0rGA
zVJ1Vi-3$y2pBOg(5@lmqq{g&JhHbhcFQfGIdm4<!ll=^e7|%>TsB(C6i;CXF0=~%y
z3>_w^wrp-u*$>gYpMilvjd607nkOfNF#`jG8OS0BZH>ua)ciRaL5?toifk@X?_rvl
zC^K0mz=Kg>W8iGY$%zHCCg1zvwE2$C5=H@=ZtaOzmj$n`FO!}5U)!E%^8~#D#!WJZ
z895nE85kHq0Xi9Mu#C=T1tS$^4p3Bp0tqZyVj99?0=0=7;v)tSm|Xa$c5{tc3;QN1
zXGTs2P{46Rl}#=Q?wMTlr)Bbozg(O99E#W{85}_IEMvoDMlJhAUMv$sAg)%1y1Hlb
zzds@h84Rfmi3}+WsSHI7@eFAUnG87$sSL#oF$|du`3!mtn-5qyFm4KJ;1bSY&~Lbq
zHoN*>XI66fGpAtgJcfyZ!jlCxq&6RjabTU~bpXTnlO6l@rW*(|N>4v;%(!gwe(%K1
J3MmgR0svfS>ze=o
delta 615
zcmZp8!_x4EWkLX>`o=(MCN_cnTeLm%HW#t=F-~I95Y%8`U|?flVEF(4|9=Sv1_rgs
zmMqFFG7Jn1lM^^BScMoE82(P4%OTF9z`($;c?X9F<0PgWwhhS}A%+Apax$tgFffRN
zG&n?RO#Z@dP_GO%4`e1E0|NudTuBB7hJXM6|2JS@U=U_tVBlw9U=U+qV6cLUgNz5+
zD!{<N0J2n?fq_Ahfq_Agfq_AUfq{XQfq?;JkvszfgDe9BgD3+70}lfOgA$Tme?b=h
z|35KZl#`Qzfq|ESfkAKbK^AouYmnRDaLBMt=HUIYNkD;Rvx1KXBa1rB(Ivh;i^Nzq
z1s!4J02u*t<79_O4c4s;3=A%te@e5nZ3;Qe$O(2B$TJ{GZjcK&7{Fk1;h)ycEh_sN
zH#<x1Wn84ev?zjUa?zij$rpYEY`&wjgi*l%e{I<0pWJTqCYUz|#f3C)o}gF2ILYI{
z<O5chgp(O2FJCo3FCbn?(8i&CJx{eX!^A-8$p@4jHW|4vPj*S)!u|tn55wfbKed}{
z%v#tNNq{V9nf&1|*XBNlBKApQ&YTROa94x+X>*B~KjY-X_J-VX3=9lkAlf(o_he+*
zByyN>^5Jw-R<M~91LY^nXn8P-Zw#ExxGAWC3%gSn#j#8ZbLM0O1rI1HK_M`?B+P&E
OVHw*+;f#w?E&%}4sJg5G
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/Makefile b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/Makefile
index 1dd8497..23033bf 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/Makefile
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/Makefile
@@ -80,6 +80,7 @@ SUBDIRS := \
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
../src/packet.c \
+../src/packet_handling.c \
../src/pin.c \
../src/ringbuffer.c \
../src/tinyport.c \
@@ -103,6 +104,7 @@ ASM_SRCS +=
OBJS += \
src/packet.o \
+src/packet_handling.o \
src/pin.o \
src/ringbuffer.o \
src/tinyport.o \
@@ -119,6 +121,7 @@ src/main.o
OBJS_AS_ARGS += \
src/packet.o \
+src/packet_handling.o \
src/pin.o \
src/ringbuffer.o \
src/tinyport.o \
@@ -135,6 +138,7 @@ src/main.o
C_DEPS += \
src/packet.d \
+src/packet_handling.d \
src/pin.d \
src/ringbuffer.d \
src/tinyport.d \
@@ -151,6 +155,7 @@ src/main.d
C_DEPS_AS_ARGS += \
src/packet.d \
+src/packet_handling.d \
src/pin.d \
src/ringbuffer.d \
src/tinyport.d \
@@ -206,68 +211,70 @@ LINKER_SCRIPT_DEP+= \
+
+
src/%.o: ../src/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/common/services/delay/sam/%.o: ../src/ASF/common/services/delay/sam/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/common/services/clock/sams70/%.o: ../src/ASF/common/services/clock/sams70/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/sam/drivers/pmc/%.o: ../src/ASF/sam/drivers/pmc/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/common/boards/user_board/%.o: ../src/ASF/common/boards/user_board/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/common/utils/interrupt/%.o: ../src/ASF/common/utils/interrupt/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/sam/utils/cmsis/sams70/source/templates/gcc/%.o: ../src/ASF/sam/utils/cmsis/sams70/source/templates/gcc/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/sam/utils/cmsis/sams70/source/templates/%.o: ../src/ASF/sam/utils/cmsis/sams70/source/templates/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
src/ASF/sam/utils/syscalls/gcc/%.o: ../src/ASF/sam/utils/syscalls/gcc/%.c
@echo Building file: $<
- @echo Invoking: ARM/GNU C Compiler : 6.3.1
+ @echo Invoking: ARM/GNU C Compiler : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -x c -mthumb -D__SAMS70N20__ -DDEBUG -Dscanf=iscanf -DBOARD=USER_BOARD -DARM_MATH_CM7=true -Dprintf=iprintf -I"../src/ASF/common/boards" -I"../src/ASF/sam/utils" -I"../src/ASF/sam/utils/header_files" -I"../src/ASF/sam/utils/preprocessor" -I"../src/ASF/thirdparty/CMSIS/Include" -I"../src/ASF/thirdparty/CMSIS/Lib/GCC" -I"../src/ASF/sam/utils/fpu" -I"../src/ASF/common/utils" -I"../src/ASF/sam/utils/cmsis/sams70/source/templates" -I"../src/ASF/sam/utils/cmsis/sams70/include" -I"../src/ASF/common/boards/user_board" -I"../src" -I"../src/config" -I"../src/ASF/sam/drivers/pmc" -I"../src/ASF/common/services/clock" -I"../src/ASF/common/services/delay" -O1 -fdata-sections -ffunction-sections -mlong-calls -g3 -Wall -mcpu=cortex-m7 -c -pipe -fno-strict-aliasing -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -std=gnu99 -ffunction-sections -fdata-sections -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int -Wmain -Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef -Wshadow -Wbad-function-cast -Wwrite-strings -Wsign-compare -Waggregate-return -Wmissing-declarations -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wnested-externs -Wlong-long -Wunreachable-code -Wcast-align --param max-inline-insns-single=500 -mfloat-abi=softfp -mfpu=fpv5-sp-d16 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<
@@ -296,7 +303,7 @@ all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES)
$(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP)
@echo Building target: $@
- @echo Invoking: ARM/GNU Linker : 6.3.1
+ @echo Invoking: ARM/GNU Linker : 6.2.1
$(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -mthumb -Wl,-Map="atsams70-tinyrouter.map" -Wl,--start-group -larm_cortexM7lfsp_math_softfp -lm -Wl,--end-group -L"../src/ASF/thirdparty/CMSIS/Lib/GCC" -Wl,--gc-sections -mcpu=cortex-m7 -Wl,--entry=Reset_Handler -Wl,--cref -mthumb -T../src/ASF/sam/utils/linker_scripts/sams70/sams70n20/gcc/flash.ld
@echo Finished building target: $@
"C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\arm\arm-gnu-toolchain\bin\arm-none-eabi-objcopy.exe" -O binary "atsams70-tinyrouter.elf" "atsams70-tinyrouter.bin"
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/atsams70-tinyrouter.bin b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/atsams70-tinyrouter.bin
index 38332778cd43592e78eb58900ce904e14aa06616..2ed84e36c9185051d7b2b2f99cd24f64f6034d26 100644
GIT binary patch
delta 1709
zcmX@&GQqjNLC-<qBdY_$dn}j%4ZzfZgkfxav?iYegD;;0NIBem5C=(*4_E?C5G;nI
z2+Rkmfnkswhz+8V@MJ|P(KsYNSRX4N#B+sEhk*2fFtR!jABK^|VQhrlWIIMF&HxSv
z1(1-#<U~emP6tT`h7b-11&7H?8M~RD@=Z2ks+!EgJcluK@<L|O&BvJC7*!kD9T+lM
z9T@hqIxw7Nbzoq$mr!6}<8!zR;<Gp~u(CQZlx{X;?Pin(83(eUfzLq!L^Hf)c)-Bm
zz%Z51fgy79O}68VoH-m03V;5)Dl}|f$q~)udxytCfq{?D;XI=Q!&OEHhVP6H3|l~A
zB76=m+ztvdybcOF+ztvh+ztvR+ztvnybcN?ybcO~cpMa1cpVh>@Hi-la62e`;c-wn
zGC7djx*nwCIimvu(YkmX6m(yH@L&7MrMBFAhC2-Ve_?Pc^Nva=^Pb^;|3|^3`#%ac
zm3XsFF7alaT;k0#xx|}!a)~$7Wd9Eh$&8czKQI(COlDS&s&^~!<XCb4hsUA|?*3oq
zlxn$gtn_fp@mb)W<Dcu7>&-Sf*PC^6t~bl%TyN&dxgZ0+fDQNpGJsLp$Su>8W5oq`
zkUk5y1@8BMur#H4vrSI(W}Teo%`!R7n|X4YH`8PRWyZ-0${;I^+>+rs9NerIxF`4}
zdb3SV^k$u$=*==Y(VKa4BG?)RWyZ<=UmC!gqTFKPnhe|)xO=$W|FK~5Q66J+AMY9N
zVC>=RJ;U7>OnSKa`YdpFa9iLGauP`W{U06+@Bfh5sQ-ZD>zs;%t{Ri|c|{$Sy=S=3
z_+c2x@ll7t)_aCKgL20Y4TBp$WEgI^Gw43N!22m&g!k)<WLcM`pI(NV`HTEuls9nO
z;l9-A=fz9U85N8sPvn)aKk}Sm|65iEhFBH{23HOTh5!jZ2Ubo822dIR#VRO<Ww;#_
ze7GGH7^L_dLPZ=HmVlBqAD;s#ZGh4UD6PbBJ19H>r6mqN2T(czr58}TQQ>t^SOOB~
z;&aI1c2GFN14%!ibaaNt!A-%0*Fk|nj?ZB$hXcb~E=Ym|B`Hv1eb4B?z{ujju$9q)
z!I#;Afsw&M;SQ&R0)q&j!&)W>1{Yojg_}$c426>q^2u;W@i~AbW5FB_J_nF9K^%Ej
zkU9`chC>eGirC4V{OXK`lMVT$c{L;*7(mznL~oAd4`*atIeDXiGh_SYuL9PLnUf6#
zB^hHTdkgw9nopi77|F;r`Lkdx<H^Z|LXwPoCU*;I@-E<TP$=MVP?*8tpfG3hL7`H{
zw8`ee&WtXbtA!aE83QNRig+^?Y(6Ps&gfm>&afYZEw-}zFetOSakwcb{QqwD(^-b$
zg2i6t3<mAr7qk;B_SWz@C@^^oZ)Ead_`tfOz#UYMTorX-U{GdslX8=AWB3p-Ia*9p
zeCAGu{h*@2M$&=d$5s`89yd0(|KE2_o-Jn1xM1>SF?GhC$-l*P#X;`#07aap%LUz+
z9~^nz8r=SW&zNj4UdyOGd9S!5BiH2r;y>#_e$jpT!CloyHRI|J4@Wk)4!22eGu@7C
zPRNkg5WnLrQ?`-ibptD-($OCs3$Fa=5NvV~bY{{!@}ooW=nsyGau=8kk`r8hC^RrA
z?0xZ}UBsJtv;UV91^>VE{AO{xu<_~-4?_m^h8G<SM}K%YTDUPPANkQyc;rV<A%ot-
z3m2`QU-{7^$mM+GM~~vI=d53sm4K8TeD43@zX8ZNhW!$f4h&EE92g`R929<RW!V2?
T567N)ZUydJMK|A)Oyd9mb6y1J
delta 1908
zcmbQ>e8i=Gg`R^#B%1?6I2O!+24HGH!Z0>IdLf?!!%;p5kaD>BAP$lqAFu?PAXp4Z
z5tt8B1H&LW5F11z;mL)PqH#!ku)bP8i058H9Rkt^!pQ1Cd>BR+hp`cIlkFI#I72ub
z6hJ~BCMPmlbAFI?V2I#wQ1~!;DPuQNEdOL9rm6_%3`XOF8JmB9{KWWM$haY+*-2zS
zg94*Mfja|(?#mDEtZrRy6Wkb7IQ{Sc(3qg%w!=M5=J6(HSN2N=JD+Tl`oSWg;da8^
z#O>qry)QnrGwff><iKFb<iId_4bvRuvmy=*Oc}wM!XKFUe_yzm2r`sot3wu}_Y8NA
zy$t(LGC6FHX7*%MeaY^?aFNx4L6yyc!IaH`fze(<fq{+B!4<@3bzsP4bzr!=`6Np>
zqb$f5Ab+jkb5H=$3~w18FfceU@bWt_9Nb*UcASy3fWtxI&wp2i6`LJ7qM3Xj@Hi+i
z@bNjEXLMk=%ILuGoza0|2S`kW&%uM+K|z7nLBW9ALBWCBLBWFCK|z4mK|zAoL4kqS
zL4kwULE!+8gMtLNgTfCU2Za-pUvgRJf^<A*bYLJ_7mtI2?#mDUYd^WvR(a2GhhhIO
z3{I8aQ3;jaGu-e0Xqa^WN5iIaZ??(h-mH_$y;&xgdoxcipFELUShv`dW5xX+5sNOk
z`+u2Js^!M9(!(v^XMuaZe}P|tH{0X_Z`R2L-Yk;~yqPB#Ouoo1T%Y5~vEqU|NTr3_
z0{8nrM4B?a*(PUtvrf+RW|^Gn%{)2Nn`yFuGUH?gWroSj%0_N!a2*bA3*3|aQoPwF
zr+BkYPVr`$oZ`(qImMf4vi}zbWyZ<=UmC!AqTCYTdJNnaxO=$W|FL1=1$PU#3zL(1
zbnE@SXSjp0M}YSX_W&^I;TGVtz#U`*$Xy^^_kTnzy#GUEqv->VuX8F+xawVSbDQx)
z!+=5i+XeqGEkzt3br{1|sDaYVM;!)7?-}k4${jy63~v08VYuNw_eZQ!(nj7-;i3#G
z*8ZYD808JzcDOT|%>5B7rL@TD+nunL25x2`O&aGf7G&OVKl7YX!FaMPuYCQ!=M4Kp
z*&G;-vN$lT<#1pKkl=I3<#b>GB?M5^f}&Z0+d(0K+d+Xriq8R*oL7Ld6d#`hD1m?y
z3Mj!Oa62fx03|36J_k@@0VNtx;?dxBP*?#H=i+lH;C4_r!2?M|pu}{6$H7a%0+h<+
z_#9+89T-BnA*m9Su0SdFJ);9dCW`~ZRz?SgrOXZtTbUgg7#SQC9&kD+Fo^IuurfO^
zc<?$X7&1FB+?>qFC(jC!IXan<Plkho&jI942#1T$0i+JXk%PG8=;Vof>WsdVck)T|
z-jH-)0O1E9dh<iRa7M<plPv|D8M`Of3Rp|${^BrEaAV%E_r-^PWfu*%s0^nMj7(7p
z3?C9EUl#CXw4baf7|AF!xmvJR`s_~z6^G}GB%MDnGP`|XWJ^oXaNCs-oWStmz+_<|
zP2MFO4hkh44hnNP926Ez_7o~*%$mGk$eGb&GqW%wBV*)bRuON;lFfl4=8Tq%9t<C<
zcQWjsz~`U<VwXeN7F*eU7?fGvINX#I{(o2d=`6!=!D6p+27~tR3)%@5dzVb!C@Rb!
zE9St!pv>qd<tE|A@F8UKWl>G>wL2O1gG!G#k`4?%wyOB^xUsqY|GsImu$VdHoXOr|
z>Wm$ei^X&qOC~QA6J<=8yj`r8QGK$hxFaLm<Z|(!^&r<5xHIerVcnNMoOOKJ+%z&~
zxbeG9bo>AP(|=8GnT#txJPaAM?Jh)R$ZN^mVfx6(SGJM)brU0_%E2EU6E6SgV4UKh
z;LN0V_(uoh!5<ur$`_c74*y_zppoJHL#g2Z_ly4-6!yOO(Jb!Gz1jcEiGu&%zx`r%
zyRq@g507L;rUV8>#{@37BR@PC{Xa1B9r)29c;H8mAcNkW3um5R{?Q}I<9zr>kK@(n
zEMJ!uANk>7xcj+A#{cij|NDRVZvZluVSfOJgTe_(2ZmUF2L=fS2ZbM78TS9!!?9<c
TTY<Z+*k&!sG!B*qJ_iK=w`n}&
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/makedep.mk b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/makedep.mk
index 19558e0..af67d53 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/makedep.mk
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/Debug/makedep.mk
@@ -4,6 +4,8 @@
src\packet.c
+src\packet_handling.c
+
src\pin.c
src\ringbuffer.c
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/atsams70-tinyrouter.cproj b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/atsams70-tinyrouter.cproj
index 8e77277..817f1d0 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/atsams70-tinyrouter.cproj
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/atsams70-tinyrouter.cproj
@@ -472,12 +472,21 @@
<Folder Include="src\config\" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="src\node.h">
+ <SubType>compile</SubType>
+ </Compile>
<Compile Include="src\packet.c">
<SubType>compile</SubType>
</Compile>
<Compile Include="src\packet.h">
<SubType>compile</SubType>
</Compile>
+ <Compile Include="src\packet_handling.c">
+ <SubType>compile</SubType>
+ </Compile>
+ <Compile Include="src\packet_handling.h">
+ <SubType>compile</SubType>
+ </Compile>
<Compile Include="src\pin.c">
<SubType>compile</SubType>
</Compile>
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/main.c b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/main.c
index 5aa8fc3..216b139 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/main.c
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/main.c
@@ -31,6 +31,7 @@
#include <asf.h>
#include "pin.h"
#include "tinyport.h"
+#include "packet_handler.h"
pin_t stlb;
pin_t stlr;
@@ -64,8 +65,6 @@ pin_t p4lr;
pin_t p4lg;
pin_t p4lb;
-
-
void setupperipherals(void){
PMC->PMC_PCER0 = 1 << ID_PIOA; // Pins
@@ -247,10 +246,11 @@ int main (void)
for(int i = 0; i < 4; i++){ // loop over ports and check for packets, add packets to packet buffer
if(ports[i].haspacket){
- packetlooper = ports[i].packet; // pull into buffer
+ packetlooper = ports[i].packet; // pull into buffer
packet_clean(&ports[i].packet); // reset packet states
ports[i].haspacket = TP_NO_PACKET;
+ // TODO: update heartbeat / buffer depth
pin_clear(ports[i].stlb); // for debugging: we have seen a packet on this port
@@ -258,13 +258,18 @@ int main (void)
tp_putchar(&ports[i], packetlooper.raw[c]);
}
+ handle_packet();
// put data in block, error if returns 0 b/c overfull ringbuffer
/*
if(!tp_putdata(&ports[i], packetlooper.raw, packetlooper.size)){
pin_clear(ports[i].stlr);
}
*/
- }
+ }
+
+ // packet handler
+ // pull a packet from the buffer,
+ // handle_packet()
/*
if(!rb_empty(ports[i].rbrx)){
tp_putchar(&ports[i], rb_get(ports[i].rbrx));
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/node.h b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/node.h
index b40c692..96c9cc9 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/node.h
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/node.h
@@ -1,5 +1,5 @@
typedef struct {
uint8_t portBufferSizes[4];
- uint16_t LUT[][4]; // TODO: fix representation
- uint16_t myAddress;
+ uint16_t LUT[1024][4]; // TODO: fix representation
+ uint16_t myAddress;
} node_t;
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.c b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.c
index 4e2ed3c..65cd0bb 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.c
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.c
@@ -1,5 +1,7 @@
#include "packet.h"
#include "node.h"
+#include "packet_handling.h"
+#include <string.h>
int parse_type(packet_t* p) {
return p->raw[0];
@@ -10,7 +12,7 @@ void update_LUT(node_t* n, uint16_t src, uint8_t hopCount, uint8_t port) {
}
void send_packet(packet_t* p, uint8_t port) {
-
+ // TODO:
}
void broadcast_packet(packet_t* p, uint8_t exclude) {
@@ -20,9 +22,14 @@ void broadcast_packet(packet_t* p, uint8_t exclude) {
if (exclude != 3) send_packet(p, 3);
}
-packet_t turn_to_standard_flood(node_t n, packet_t* p) {
- packet_t newPacket = {.raw = p->raw, .destination = p->destination, .source = n->myAddress,
- .hopcount = p->hopcount, .size = p->size, .counter = p->counter};
+packet_t* turn_to_standard_flood(node_t* n, packet_t* p) {
+ packet_t* newPacket = (packet_t*)malloc(sizeof(packet_t));
+ memcpy((void*)newPacket->raw, (const void*)p->raw, (size_t)256);
+ newPacket->destination = p->destination;
+ newPacket->source = n->myAddress;
+ newPacket->hopcount = p->hopcount;
+ newPacket->size = p->size;
+ newPacket->counter = p->counter;
return newPacket;
}
@@ -30,9 +37,9 @@ void handle_packet(node_t* n, packet_t* p, uint8_t port) {
if (parse_type(p) != BUFFER_UPDATE) {
update_LUT(n, p->source, p->hopcount, port);
}
- switch parse_type(p) {
+ switch (parse_type(p)) {
case STANDARD:
- if (p->destination == n.myAddress) {
+ if (p->destination == n->myAddress) {
//process
//reply
} else {
@@ -48,12 +55,12 @@ void handle_packet(node_t* n, packet_t* p, uint8_t port) {
}
send_packet(p, bestPort);
} else {
- broadcast_packet(turn_to_standard_flood(n, p));
+ broadcast_packet(turn_to_standard_flood(n, p), port);
}
}
break;
case ACK:
- if (p->destination == n.myAddress) {
+ if (p->destination == n->myAddress) {
//process
} else {
p->hopcount++;
@@ -68,13 +75,13 @@ void handle_packet(node_t* n, packet_t* p, uint8_t port) {
}
send_packet(p, bestPort);
} else {
- broadcast_packet(turn_to_standard_flood(n, p));
+ broadcast_packet(turn_to_standard_flood(n, p), port);
}
}
break;
case STANDARD_FLOOD:
n->LUT[p->destination][port] = 255;
- if (p->destination == n.myAddress) {
+ if (p->destination == n->myAddress) {
//process
//reply
} else {
@@ -96,7 +103,7 @@ void handle_packet(node_t* n, packet_t* p, uint8_t port) {
break;
case ACK_FLOOD:
n->LUT[p->destination][port] = 255;
- if (p->destination == n.myAddress) {
+ if (p->destination == n->myAddress) {
//process
} else {
p->hopcount++;
@@ -118,7 +125,5 @@ void handle_packet(node_t* n, packet_t* p, uint8_t port) {
case BUFFER_UPDATE:
n->portBufferSizes[port] = p->raw[0];
break;
- default:
- // not possible
}
}
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.h b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.h
new file mode 100644
index 0000000..7f8c316
--- /dev/null
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/packet_handling.h
@@ -0,0 +1,28 @@
+/*
+ * packet_handling.h
+ *
+ * Created: 12/7/2017 2:14:08 PM
+ * Author: Jake
+ */
+
+
+#ifndef PACKET_HANDLING_H_
+#define PACKET_HANDLING_H_
+
+
+
+int parse_type(packet_t* p);
+
+void update_LUT(node_t* n, uint16_t src, uint8_t hopCount, uint8_t port);
+
+void send_packet(packet_t* p, uint8_t port);
+
+void broadcast_packet(packet_t* p, uint8_t exclude);
+
+packet_t* turn_to_standard_flood(node_t* n, packet_t* p);
+
+void handle_packet(node_t* n, packet_t* p, uint8_t port);
+
+
+
+#endif /* PACKET_HANDLING_H_ */
\ No newline at end of file
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.c b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.c
index 1725da8..1138af4 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.c
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.c
@@ -81,7 +81,7 @@ void tp_packetparser(tinyport_t *tp){
case TP_PACKETSTATE_OUTSIDE:
// check if start, add 1st byte, change state
// if not start, assume buffer depth data, update
- if(data == TP_DELIMITER_START){
+ if(data == TP_DELIMITER_START){ // TODO: more types, and types, not delimiters
tp->packetstate = TP_PACKETSTATE_INSIDE;
tp->packet.raw[tp->packet.counter] = data;
tp->packet.counter ++;
diff --git a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.h b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.h
index 9b96f80..e17f99a 100644
--- a/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.h
+++ b/embedded/atsams70-tinyrouter/atsams70-tinyrouter/src/tinyport.h
@@ -49,7 +49,7 @@
#define TP_DELIMITER_START 255
#define UART_BAUD_DIVIDER 81 // 977: 9600 baud, 81: 115200, 10: 921600
-#define RINGBUFFER_SIZE 512 // in bytes, or 4 full length packets, have 384KBytes total in system
+#define RINGBUFFER_SIZE 1024 // in bytes, or 4 full length packets, have 384KBytes total in system
#include "asf.h"
#include "pin.h"
--
GitLab