From a74a7ad1ced534c3f7bcf2fb4fea18ffb8028012 Mon Sep 17 00:00:00 2001
From: Mark Qvist <mark@qvistconsult.com>
Date: Thu, 29 May 2014 11:03:25 +0200
Subject: [PATCH] AX25 demo

---
 Modem/Modem.mk   |   1 +
 Modem/main.c     |   2 ++
 buildrev.h       |   2 +-
 images/Modem.elf | Bin 193389 -> 193409 bytes
 images/Modem.map |  18 +++++++++---------
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Modem/Modem.mk b/Modem/Modem.mk
index da008f8..62bf7f5 100644
--- a/Modem/Modem.mk
+++ b/Modem/Modem.mk
@@ -30,6 +30,7 @@ Modem_WIZARD_CSRC = \
 	bertos/mware/formatwr.c \
 	bertos/mware/hex.c \
 	bertos/struct/heap.c \
+	bertos/net/ax25.c \
 	#
 
 # Files automatically generated by the wizard. DO NOT EDIT, USE Modem_USER_PCSRC INSTEAD!
diff --git a/Modem/main.c b/Modem/main.c
index 3d01f8b..e72e1d3 100644
--- a/Modem/main.c
+++ b/Modem/main.c
@@ -11,6 +11,8 @@
 #include <stdio.h>          // Standard input/output
 #include <string.h>         // String operations
 
+#include <net/ax25.h>
+
 #include "afsk.h"           // Header for AFSK modem
 #include "protocol/mp1.h"   // Header for MP.1 protocol
 
diff --git a/buildrev.h b/buildrev.h
index 427147e..5a7ce8b 100644
--- a/buildrev.h
+++ b/buildrev.h
@@ -1,2 +1,2 @@
-#define VERS_BUILD 1760
+#define VERS_BUILD 1762
 #define VERS_HOST  "shard"
diff --git a/images/Modem.elf b/images/Modem.elf
index 3dc0f64d5cb634358e5518d47468689da4b33a6c..5832e082c0c513467a66288c5abcec66530b87ce 100755
GIT binary patch
delta 1291
zcmXX^QEXII5S_Vq-|qHp``+5c*S+nwbc<{&-Rwf^T52l@EtI7#mPCSDFj`n>1I5x7
zOM<#pL`*=1yvU10Ow;tk79~_ap3wxWfgfoT6QUA~Bz!30!%#xhAS^nw@-z3$nK?6a
z=iWbl54>?baI6xWr=w@@L_NZH8v%S`P_jMl0eH9z01DnT0X#<Zl6~b)Q}P7S1%DL*
zTruL77a*`>I~WO;fc|$7z^GeHFrpte2&XRDt^XX{#CZ++HbG2VjPQuwO(l)>7f7{V
z|ABFPE%Bqek5!$_AJR`V-oV;-^-rmx(bYtFPM>DHvB{3yO=jDPxeOMM$%RW^r|DKg
z@g_Q~6-2TkPkO-WA)oW}K0-0iDfuSGb5|)}-ll$L^A5`JiQQx$8X*&8L&R%z6ddM7
zn9q+B)=P*sv)xBX3Hk*Jm|Nlm1%x}hmO%@eE3-a|6o)DD6hlxs&RTVd6bn$jLygVV
zEU{3%%B@@238R{3r<Jc%ifS`EYr3gp8LDwEu$Cj`sEWwRnr-Y=pqk)v>-gRaQ61pC
zG&_~3?s8=P6s1K`HFCN3gXAnmRmW)^T;Neut?YCjqd}LTy1|+a>^zPt!J4NzZ8iSC
zY7Uh0sw1HX%os8Gy#}C+?{97%_uBXFb;RrEsqQnR#gAJ2G{OWG!+Kt7su`f_K1G*P
zbWtB*gFT$9sak>6Hs?Ic&(j*@30OR$1JnqrfLrZzISae(A9LRm9=o5yllD(!PuYe4
zp3g?QsI(?)Jfo28A6N!h&ZBAaH$lWuW)QGqHw~`IFNnzho3E*I{xTXu;!BzbADJRb
zlb_)zBz7?o<5@I$nu)zkRP$45a*~M*6E(bSO@2~Jj5R{o3_Mr}z|yt!@q>Fm=))sb
zJYD@Y-tLPtlo8Au{t-cbV)|!ej)izsge-Rg@jEXLxI6v$ZAj=5cS!`_PT?!=^hUg{
z<DmQD790xV0k^0hd;GY|9oUCYR;-IbI>dhp(;*~K5+y%Lt->Lc{($yGpeew-DgtS+
zlMXG{XaV^&0%aCRKlARNHe#*s25n!!9w&DWKi7LQgTpTmCHG{8oipFyRQ9F)b*V%z
z6w>6N34Uo=hx<Ty(A!8>c;91ta;NYCB4zM%%FBSV7b}z7-)hcyglx!qP%fC1>GF=e
zu+7^mBiU06TcqAd;h|az2PZ2D_HQE?njBraHS=*?Xn^kA3|=jD=6}Vod;S;n&*M#J
v?xI+PGtRAxq8cA_)GQq@IIH;h+3DlsedjnGqHxanYF5NB?p~V}M`Qm14@K-^

delta 1191
zcmXX_U2GIp6h7a*JKgQ9JG1S&+siKCZn34VwWUfGXthc!*g~-+7E-q)3Kk`TB1me2
zx>W>C#6&YRqtORqs<A*58z08l#8wm@v>G224L<cjNgqsz1S3CPJ!kRdp7VX@_kMTg
zl?%~7|A@YwMZ;w7(<_yguewAbCpYE&b*0UDIYd<XcZ}$~(^#^+wyRl8d4pFE^_MK7
zd+Z&G$XTDPAR4v{T<7$h(L^uUKZ?I0&HRWRcG&L~{;+*g{7q8(mVJu5I(>Q0`QDxs
ze{<ejd9As)hM8X}*+)#Vo06l0LMnU-MAiMgQ1U*GNntq_qU3hQQdY*G>N>_+wsr>2
za=yOAW8L<C&IqdlpH(~gh|9smZZ?&#%cb2%->IM?*)`0&h2vp1_8AVigN^Jes_E@(
zp-#9R&v3}DHXONMTrvxi^+1vRn_=GI!R}fqNx{4*qdNr{m`MR$a<eqdRsj$8@bnDK
zhtgo3M2bsbVuIESS_(5J?H-bQ-vV<`BHaSAFxMo~bAr=yFsr5AhC>YMVD6N(jnd#Y
zm@Wamhk3a?%)HcW5^y(6lhiycX=`yq@nU!-(ISyN0oG<8zgqbvM!BG@Zj{oZg1eQa
z;)IWx&-9UZ{rbknmWw>-5pISLIwQQ(7<WgDsNC94R9oWcDvmDOMQHV&UudXp$8t|{
zw#a*R#bqTa9=3@Z6n8+u`*I<L0q^I9Z`nUyYQ?+WIX>U_Zu<9|V!DG{Te=}MLd|>j
zwh%J1rKNvYOza=pM_9a@g|hT#Oq6di#huHSvp`Ls^FF9O!IY&ZFhWgF3vsLLV(F7Y
zJSRk*yq%@Tg%}c|UeverCuwGq!|c1!|Ft1nv5tQT)jPTiZ`R6ocg>01kIisKynM(f
z5|=k;?MD3+a8#9&!5DD50)^no2);_F%b6g*7)M(1crdvc7i??`-W$aJICciHJ=h+>
zmSFDz+`F_B=uRNP!*kS~XyzF;3Ft`FS`%%H3U6Yh9Rb~mRTkg8oW@Q%MLKeW_a}~E
zNf0}R`F!{%R$tM8KX(=>f7@w9{LD0t`Cm+9Ttrgxyn2N{JcC^F96>*YZ1WSZwGV}q
zUR?}9SNjt)SX6c3cJ`g|EYr{KV7DsxWd`%<VEQ-YF5<jD_nlgXQ@%B;mLu!mA*RRg
d7xT6Ml9+@3M{LwTv;GgWsvah|Jgbh@{|AzY-(&y)

diff --git a/images/Modem.map b/images/Modem.map
index e6154f0..48dc1b4 100644
--- a/images/Modem.map
+++ b/images/Modem.map
@@ -1442,7 +1442,7 @@ END GROUP
  .debug_abbrev  0x0000000000002912      0x233 obj/Modem/bertos/mware/formatwr_P.o
  .debug_abbrev  0x0000000000002b45      0x266 obj/Modem/bertos/drv/kdebug_P.o
 
-.debug_line     0x0000000000000000     0x30da
+.debug_line     0x0000000000000000     0x30ef
  *(.debug_line)
  .debug_line    0x0000000000000000        0x0 obj/Modem/bertos/cpu/avr/drv/ser_avr.o
  .debug_line    0x0000000000000000      0x31b obj/Modem/bertos/cpu/avr/drv/ser_mega.o
@@ -1455,14 +1455,14 @@ END GROUP
  .debug_line    0x0000000000000f58      0x2e2 obj/Modem/bertos/mware/formatwr.o
  .debug_line    0x000000000000123a       0x30 obj/Modem/bertos/mware/hex.o
  .debug_line    0x000000000000126a      0x1bc obj/Modem/bertos/struct/heap.o
- .debug_line    0x0000000000001426      0x1d8 obj/Modem/Modem/main.o
- .debug_line    0x00000000000015fe      0x15d obj/Modem/Modem/hardware.o
- .debug_line    0x000000000000175b      0x49a obj/Modem/Modem/afsk.o
- .debug_line    0x0000000000001bf5      0xa6c obj/Modem/Modem/protocol/mp1.o
- .debug_line    0x0000000000002661      0x1fc obj/Modem/Modem/compression/heatshrink_decoder.o
- .debug_line    0x000000000000285d      0x309 obj/Modem/Modem/compression/heatshrink_encoder.o
- .debug_line    0x0000000000002b66      0x2f0 obj/Modem/bertos/mware/formatwr_P.o
- .debug_line    0x0000000000002e56      0x284 obj/Modem/bertos/drv/kdebug_P.o
+ .debug_line    0x0000000000001426      0x1ed obj/Modem/Modem/main.o
+ .debug_line    0x0000000000001613      0x15d obj/Modem/Modem/hardware.o
+ .debug_line    0x0000000000001770      0x49a obj/Modem/Modem/afsk.o
+ .debug_line    0x0000000000001c0a      0xa6c obj/Modem/Modem/protocol/mp1.o
+ .debug_line    0x0000000000002676      0x1fc obj/Modem/Modem/compression/heatshrink_decoder.o
+ .debug_line    0x0000000000002872      0x309 obj/Modem/Modem/compression/heatshrink_encoder.o
+ .debug_line    0x0000000000002b7b      0x2f0 obj/Modem/bertos/mware/formatwr_P.o
+ .debug_line    0x0000000000002e6b      0x284 obj/Modem/bertos/drv/kdebug_P.o
 
 .debug_frame    0x0000000000000000     0x1774
  *(.debug_frame)