Piotr Lewandowski 2023-12-02 00:38:21 +01:00
rodzic cde926760d
commit f7c44ecbd9
5 zmienionych plików z 22 dodań i 87 usunięć

Wyświetl plik

@ -249,12 +249,22 @@ namespace Protocol
{'U', 10, "0123456789"},
{'P', 28, "ABCDEFGHIJKLMNOPQRSTUVWXYZab"},
};
static constexpr auto Jt9ElmCnt = 3;
static constexpr TFormatElement Jt9FormatElements[Jt9ElmCnt] =
{
{'0', 1, " "}, // nothing
{'S', 1, "01Q"}, // sequence number
{'J', 42, "ABCDEFGHIJKLMNOPRSTQUWXYVZ0123456789 +=./?"},
};
};
template <const char pattern[]>
using CFormatWithDefaultElementsT = CFormat<TPatternFormats::DefElmCnt, TPatternFormats::DefaultFormatElements, pattern>;
template <const char pattern[]>
using CWsprFormatT = CFormat<TPatternFormats::WsprElmCnt, TPatternFormats::WsprFormatElements, pattern>;
template <const char pattern[]>
using CJt9Format = CFormat<TPatternFormats::Jt9ElmCnt, TPatternFormats::Jt9FormatElements, pattern>;
template <class CEncoder>
class CPacketFactoryT
@ -308,5 +318,8 @@ namespace Protocol
static constexpr char WsprFormatString[] = "CQ SUUxxx llUU P";
using CWsprPacketFactory = CPacketFactory<WsprFormatString, CWsprFormatT, 8>;
static constexpr char Jt9FormatString[] = "JJJJJJJJJJJJJ";
using CJt9PacketFactory = CPacketFactory<Jt9FormatString, CJt9Format, 8>;
}
}

Wyświetl plik

@ -12,93 +12,18 @@ set(CMAKE_MAKEFILE_DEPENDS
"CMakeFiles/3.25.1/CMakeCCompiler.cmake"
"CMakeFiles/3.25.1/CMakeCXXCompiler.cmake"
"CMakeFiles/3.25.1/CMakeSystem.cmake"
"/usr/share/cmake-3.25/Modules/CMakeCCompiler.cmake.in"
"/usr/share/cmake-3.25/Modules/CMakeCCompilerABI.c"
"/usr/share/cmake-3.25/Modules/CMakeCInformation.cmake"
"/usr/share/cmake-3.25/Modules/CMakeCXXCompiler.cmake.in"
"/usr/share/cmake-3.25/Modules/CMakeCXXCompilerABI.cpp"
"/usr/share/cmake-3.25/Modules/CMakeCXXInformation.cmake"
"/usr/share/cmake-3.25/Modules/CMakeCommonLanguageInclude.cmake"
"/usr/share/cmake-3.25/Modules/CMakeCompilerIdDetection.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineCCompiler.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineCXXCompiler.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineCompileFeatures.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineCompilerABI.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineCompilerId.cmake"
"/usr/share/cmake-3.25/Modules/CMakeDetermineSystem.cmake"
"/usr/share/cmake-3.25/Modules/CMakeFindBinUtils.cmake"
"/usr/share/cmake-3.25/Modules/CMakeGenericSystem.cmake"
"/usr/share/cmake-3.25/Modules/CMakeInitializeConfigs.cmake"
"/usr/share/cmake-3.25/Modules/CMakeLanguageInformation.cmake"
"/usr/share/cmake-3.25/Modules/CMakeParseImplicitIncludeInfo.cmake"
"/usr/share/cmake-3.25/Modules/CMakeParseImplicitLinkInfo.cmake"
"/usr/share/cmake-3.25/Modules/CMakeParseLibraryArchitecture.cmake"
"/usr/share/cmake-3.25/Modules/CMakeSystem.cmake.in"
"/usr/share/cmake-3.25/Modules/CMakeSystemSpecificInformation.cmake"
"/usr/share/cmake-3.25/Modules/CMakeSystemSpecificInitialize.cmake"
"/usr/share/cmake-3.25/Modules/CMakeTestCCompiler.cmake"
"/usr/share/cmake-3.25/Modules/CMakeTestCXXCompiler.cmake"
"/usr/share/cmake-3.25/Modules/CMakeTestCompilerCommon.cmake"
"/usr/share/cmake-3.25/Modules/CMakeUnixFindMake.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/ADSP-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/ARMClang-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Borland-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Clang-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Cray-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GHS-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GNU-C.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GNU-CXX.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GNU-FindBinUtils.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/GNU.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/HP-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/IAR-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Intel-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/LCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/MSVC-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/NVHPC-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/PGI-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/PathScale-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/SCO-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/TI-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Tasking-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/Watcom-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/XL-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/XLClang-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.25/Modules/Internal/FeatureTesting.cmake"
"/usr/share/cmake-3.25/Modules/Platform/Linux-Determine-CXX.cmake"
"/usr/share/cmake-3.25/Modules/Platform/Linux-GNU-C.cmake"
"/usr/share/cmake-3.25/Modules/Platform/Linux-GNU-CXX.cmake"
"/usr/share/cmake-3.25/Modules/Platform/Linux-GNU.cmake"
@ -114,11 +39,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
# Byproducts of CMake generate step:
set(CMAKE_MAKEFILE_PRODUCTS
"CMakeFiles/3.25.1/CMakeSystem.cmake"
"CMakeFiles/3.25.1/CMakeCCompiler.cmake"
"CMakeFiles/3.25.1/CMakeCXXCompiler.cmake"
"CMakeFiles/3.25.1/CMakeCCompiler.cmake"
"CMakeFiles/3.25.1/CMakeCXXCompiler.cmake"
"CMakeFiles/CMakeDirectoryInformation.cmake"
"wspaker/CMakeFiles/CMakeDirectoryInformation.cmake"
)

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -16,16 +16,16 @@ void Test(Factory& PacketFactory, CTestData& RawFrame)
{
auto const FtFramesCnt = PacketFactory.EncodeRaw((unsigned char *)&RawFrame, sizeof(RawFrame) * 8);
cout << "\nSQ9P paker TEST NR: " << i32TestNr++ << endl;
cout << "paker format: " << CWsprPacketFactory::Format::GetPattern() << endl;
cout << "frame permutations: " << CWsprPacketFactory::Format::GetMaxPermutations() << endl;
cout << "frame bitsize floor: " << CWsprPacketFactory::Format::GetBitSizeFloor() << endl;
cout << "paker format: " << Factory::Format::GetPattern() << endl;
cout << "frame permutations: " << Factory::Format::GetMaxPermutations() << endl;
cout << "frame bitsize floor: " << Factory::Format::GetBitSizeFloor() << endl;
cout << "specific base: ";
;
const char *pattern = CWsprPacketFactory::Format::GetPattern();
const char *pattern = Factory::Format::GetPattern();
for (int i = 0; i < strlen(pattern); i++)
{
cout << pattern[i] << "=" << CWsprPacketFactory::Format::GetBase(pattern[i]) << " ";
cout << pattern[i] << "=" << Factory::Format::GetBase(pattern[i]) << " ";
}
cout << endl
<< endl;
@ -51,7 +51,7 @@ void Test(Factory& PacketFactory, CTestData& RawFrame)
std::cout << std::hex << std::setw(2) << std::setfill('0') << static_cast<int>(((unsigned char *)C8Dupa)[i]);
}
cout << endl;
cout << std::dec << endl;
}
int main()
@ -62,7 +62,9 @@ int main()
CWsprPacketFactory WsprPacketFactory;
CFT4PacketFactory Ft4PacketFactory;
CJt9PacketFactory Jt9PacketFactory;
Test(WsprPacketFactory, RawFrame);
Test(Ft4PacketFactory, RawFrame);
Test(Ft4PacketFactory, RawFrame);
Test(Jt9PacketFactory, RawFrame);
}