From cde926760d46e21ca0ebd68d4bed1bdb79c5797a Mon Sep 17 00:00:00 2001
From: Piotr Lewandowski <plewandowski012@gmail.com>
Date: Wed, 29 Nov 2023 23:50:09 +0100
Subject: [PATCH] wspr-format

---
 paker.hpp                                     |  74 +++++-------------
 .../paker_test.dir/paker_test.cpp.o           | Bin 31472 -> 31984 bytes
 utils/build/paker_test                        | Bin 34976 -> 34984 bytes
 3 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/paker.hpp b/paker.hpp
index 1c91d53..df7f98d 100644
--- a/paker.hpp
+++ b/paker.hpp
@@ -236,59 +236,25 @@ namespace Protocol
                  {'l', 18, "ABCDEFGHIJKLMNOPQR"},
                  {'U', 10, "0123456789"},
                  {'P', 28, "ABCDEFGHIJKLMNOPQRSTUVWXYZab"},
-                 {'s', 3, "01Q"}, // seq for wspr
+         };
+
+         static constexpr auto WsprElmCnt = 8;
+         static constexpr TFormatElement WsprFormatElements[WsprElmCnt] =
+             {
+                 {'0', 1, " "},          // nothing
+                 {'S', 1, "01Q"},        // sequence number
+                 {'x', 26, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"},
+                 {'X', 36, "ABCDEFGHIJKLMNOPRSTQUWXYVZ0123456789"},
+                 {'l', 18, "ABCDEFGHIJKLMNOPQR"},
+                 {'U', 10, "0123456789"},
+                 {'P', 28, "ABCDEFGHIJKLMNOPQRSTUVWXYZab"},
          };
       };
 
       template <const char pattern[]>
-      using CFormatWithDefaultElements = CFormat<TPatternFormats::DefElmCnt, TPatternFormats::DefaultFormatElements, pattern>;
-
-      // class CFT4PacketFactory
-      // {
-      //    static constexpr char FT4FormatStr[] = "CQ 4NSxxxxxxx";
-
-      // public:
-      //    static constexpr auto MaxFt4Subframes = 8;
-      //    using TFT4Format = CFormatWithDefaultElements<FT4FormatStr>;
-      //    using CFT4Encoder = TEncoder<TFT4Format, MaxFt4Subframes>;
-      //    char C8Frames[MaxFt4Subframes][TFT4Format::GetLen() + 1];
-      //    CFT4Encoder FT4Encoder;
-
-      //    unsigned char u8EncodedFrames = 0;
-      //    CFT4PacketFactory() : FT4Encoder(C8Frames){};
-
-      //    const char *GetPacket(unsigned int u32Idx)
-      //    {
-      //       if (u32Idx >= MaxFt4Subframes)
-      //          return "NOT VALID";
-
-      //       return C8Frames[u32Idx];
-      //    }
-
-      //    bool AppendWsFrame(const char *p8WsFrame)
-      //    {
-      //       auto const SeqIdx = TFT4Format::GetSeqNrIdx();
-      //       if (strlen(p8WsFrame) != TFT4Format::GetLen() ||
-      //           p8WsFrame[SeqIdx] < '0' || p8WsFrame[SeqIdx] > '9')
-      //          return false;
-
-      //       auto const FrameNr = p8WsFrame[SeqIdx] - '0';
-
-      //       memcpy(C8Frames[FrameNr], p8WsFrame, TFT4Format::GetLen());
-      //       return true;
-      //    }
-
-      //    unsigned int EncodeRaw(unsigned char *p8Data, unsigned int u32BitLen)
-      //    {
-      //       u8EncodedFrames = FT4Encoder.EncodeBigEndian(p8Data, u32BitLen);
-      //       return u8EncodedFrames;
-      //    }
-
-      //    unsigned int DecodeFrames(unsigned char u8FramesToDecode, unsigned char *pOutData, unsigned int u32OutBuffLen)
-      //    {
-      //       return FT4Encoder.DecodeBigEndian(u8FramesToDecode, pOutData, u32OutBuffLen);
-      //    }
-      // };
+      using CFormatWithDefaultElementsT = CFormat<TPatternFormats::DefElmCnt, TPatternFormats::DefaultFormatElements, pattern>;
+      template <const char pattern[]>
+      using CWsprFormatT = CFormat<TPatternFormats::WsprElmCnt, TPatternFormats::WsprFormatElements, pattern>;
 
       template <class CEncoder>
       class CPacketFactoryT
@@ -333,14 +299,14 @@ namespace Protocol
             return Encoder.DecodeBigEndian(u8FramesToDecode, pOutData, u32OutBuffLen);
          }
       };
-
-      template <const char C8Format[], unsigned int MaxElements> 
-      using CPacketFactory = CPacketFactoryT<TEncoder<CFormatWithDefaultElements<C8Format>, MaxElements>>;
+      
+      template <const char C8Format[], template<auto> class CFromatT, unsigned int MaxElements> 
+      using CPacketFactory = CPacketFactoryT<TEncoder<CFromatT<C8Format>, MaxElements>>;
  
       static constexpr char Ft4FromatString[] = "CQ 4NSxxxxxxx";
-      using CFT4PacketFactory = CPacketFactory<Ft4FromatString, 8>;
+      using CFT4PacketFactory = CPacketFactory<Ft4FromatString,CFormatWithDefaultElementsT, 8>;
 
       static constexpr char WsprFormatString[] = "CQ SUUxxx llUU P";
-      using CWsprPacketFactory = CPacketFactory<WsprFormatString, 8>;
+      using CWsprPacketFactory = CPacketFactory<WsprFormatString, CWsprFormatT, 8>;
    }
 }
diff --git a/utils/build/CMakeFiles/paker_test.dir/paker_test.cpp.o b/utils/build/CMakeFiles/paker_test.dir/paker_test.cpp.o
index f5d9cbaf7cc027df8cdc8c6a850bc525f35be8d7..c9c2b35928c06e0cfdf1650403cf9115016a0ec9 100644
GIT binary patch
delta 6355
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
BPY(b9

delta 6132
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
Oc)ecvbitL@!2bYw5$}uu

diff --git a/utils/build/paker_test b/utils/build/paker_test
index 72a19769d6ee475783141de857c29238bce5f4b1..720a4258064c19f47d768472339bffa29dce1965 100755
GIT binary patch
delta 3870
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

delta 3425
zcmZ{ndsI}%9mi*`F1m;b_~5d;z=D9HCIU$-F=~Yh$f6<}2q>bWMFpb*J`i$<N;wcr
z!Pn0y223z&tA?hMP107;6Pp^X6<^6Y8X*d{HYC2VO>>%))am!$ne`7(de7P4XXg8z
znLDpL_wK=MTFW+VYcy}!Hu^WdXZ)CXo$=dtZOP9o2g#h5%wOg?;DcY?44JRXdyM^L
z{%U{vCI2>Hf1=DjB5l$Zg#W+F<*ITyS^E_a8}qM*RY^@ltJ<3CulIBu=-rY2!Ddf=
zzi%wOj;gG>ZL7NVKzR%H{nIkhNNrY~N_?ZK&pMD=e9HrZ=1Ip}vcVHD=zf37AH4NF
z|MM39EnOI%!p~D+;AH+5Wg(W)_P|Me7F`I;)CP^ANPQ<?OULwG{4Qk%h4UM<HfStA
zMtg(Od8wx_Xfo%!Xq-KT7t>n%WS&4CM4cYkC-FWS=g1t~8pT-ZrcY8gUFq%qH^t}<
zI^-zffn*Qf6|p%|dJUGUsYdE_@1bvmIGy}wqtCZjr#4tN(r3YAdEWMrbUws0D`X4j
zuhWgtclcMHUpWt3w59QMZD<}*REf5GJdzFy8#zf!7*AWmbS-{79SjTgygu?NyF*R_
z^UZWm$OtQ0_|oE4VI`}I*A)MvcsZR*_-sSvc_AV-#wsreF$1gz3yl0lA^gB4mxQRq
z5|x6@;CiqfybN}OH^H#}j747-A_1%c^TAedBlvr;1+4v4h>yUdU^mzcG7H<lrd>q`
zER6lSONdnPBd`#>2G)TizYyXKm<{%Vo56wDjhDe_(C0epfzN}5U@ce=-UnMj*9{>q
zf^UF*;A=fX3>&~$=S?A=8?b?~n7;{;2Vn|W3D$tk;7za{wEkU)F7QQ=VK<!s!@!_h
zLL`C9zyfg5m*_C~VJ~hB?)plIJK$x|&&pWd*FwaClWz-=0hWU$1xWBaLhJx@!1uut
zuo6>W3pRtzU_1CO*ahAIe*pdO3K5JYC<7;fZ-aT@dmzIUKY34xgP5@qR5f*!tq==6
z(%2121I))d63L(7mq91tMt2CIo_3=Q8;0K+{KAMQ>HH4alAQb|O+dU#a}du`1!5=d
zM!Z9RM0|!mNBkLmm*muLc2H=F-O`GKqk|?SJNZ$XlN`anrdN<YOnXe_IAS+_ffz#n
zMU1476eoX@CL^Apd5D+k6~u1ZlM=xlbP_R}Zb8W)%QPoXqbS4$l#G~7ixHPl4dQw_
zfcQ3@n&#9#yh8I+0_lfo1GTeP=w(-^PctUwpI7Kjm))lw$%$9#ge%ly?8s7Dk!sXy
zNR8ktsVy}^YwD!j<WQgGn8Uwz()wh(Pd$>yI_U(Gtw{EC(sd-yAsO0550e9_#5Isd
zQH3jl&!jyrC*MiOkv>N~E~oaei?p;67*$kSgr;@V`82zw3p+BMiqf3gzHYjgX7>rk
zPCL;}PfQQBBp?|{9cfN}i|!&a8azFMFQ&NZPToZB>3_gsRzlVpullaWN@3wyLju`n
z&c{(%G1JK#Y4^<E@qBWnJGE|3%hFeJKXMPw@x;!$%HdkwF(^5~{g$l>>!jhZA3hXq
z;2JE!9Q44g+YVu?8E&m|Q<NJ;;V<a6-{QW8drrCP)McZ|4fkEltKnuC`w5qN!LVqm
zf_oP8X1Mc*OLv?Edx_fMj>hl}_qI*S3(%Hv{eybo8c&+xriDt?F2TYnAXB&f36GKC
z7Ch$WQX*U*bi;7ZDmPZuJwm0Kx@#fciH7@(Q_547>xXGE^fIMCtMm_)epu<oLuFix
z=@Rbs@QEMq$xh-~x-AaRoYCgE2wBH%ylQcEP+XS2VQGMLeMU<)OS#$*sb5!jRIg=L
zt@JTrvV4&Qvtn(GyO7dzm0qv(yGnN}-5;xk^0_Q`j8uA*(JBo#ajX<3D*dNeKyzx8
zzDeoFl)fQS3Ry}|rSKPZ+sA>j)~Cw#o<C{ihI>kvZf%sTG)mQVQ5D?31WETh<$8yj
zPHk{6V#^r)X*Ul%#=HZ|q#n5UuvZMX=PB8wcNAq5kgeOk$1Brt52!DTY<1tURGO{3
z4hQ4BW<%K4L@BF1$)<!zy;14do#u61=`D|ychlbN80%teK#sGvoIcMU6}Q^ljzgLE
zyGb>{YRytXEX@0CDPs%8<><Bpa7UoO*)dY~7Wxk@ge#O=t)8toRX2vV<>(=HY#^iV
zC#tTR5Ecu42(@WLZ8=B<V7x3rR`iZ{2|dWsEmhufIA+3U>y{ml@}1<Kt;h8uZ?yly
zV|VWtCiMiRqkZ#oP~se&=TO^hozJ5l#Fx!TW_*?c;2tv5cg^Tam*(iUsBrXF^TP{K
zHKQ<=_M&{eQHEEWB~PKG(I1Z*uR62Xm&9{*8y{he)xi?-Wdr_PQl~h$Ps8<R*gDFU
z9=<zhA>1jZ>tOzmxzmlh_(U|~$8-|$j+uUF#$n{1tMgb2M@*wO#9UJ;GGjGW&DCv<
zI2w#Tr>H)A2f5GFHg_f8z9x$N3x-qnyhJ0}w<3@(%uDvF@03=U?sKb_npVbwnO^Jp
z)ly2&@0C)hr);4Q+6(u*u_#NmyHr{Z&-(=jl@vlvg<H^Q2&EJ?n7m&!lI|@UMi&d$
zd72AbRXGRMEPG&7k6j)@z022oVwb;ZT74_>4B6=E(KRI|r>tFJ^3~!TSldgAyajHQ
ztu_qLsM2FTUTsXpI<y%~?G^r>qvc2XdG=K%^!M~`%*QL0Q(E;nYd(&5<I49`RiEa3
zKe=jRtlo!eKULMlTN|g!B8_wsxkvwJh}XhXe=!;<u{M54i^{dkkTo_k&ug{oIme5)
VF5Y@%u2fHxt1h0eqpG@5{{!qib=m*`