diff --git a/README.md b/README.md index ea7c174..9b2c967 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,12 @@ this software uses these programs: * fftw3: http://www.fftw.org (GPL V.2 or later) * libcodec2 (Linux: standard lib, Windows: from freeDV) +# Download alternatives +* download from github and build from source +* download windows installer and download Odroid and Raspberry images: +https://www.helitron.de/dj0abr/german/technik/sat/modem/images.htm + + # building the software * Linux 1. go into the folder "hsmodem" diff --git a/WinRelease/hsmodem.exe b/WinRelease/hsmodem.exe index 3f293a5..1823757 100755 Binary files a/WinRelease/hsmodem.exe and b/WinRelease/hsmodem.exe differ diff --git a/WinRelease/hsmodem.iobj b/WinRelease/hsmodem.iobj new file mode 100755 index 0000000..054867d Binary files /dev/null and b/WinRelease/hsmodem.iobj differ diff --git a/WinRelease/hsmodem.ipdb b/WinRelease/hsmodem.ipdb new file mode 100755 index 0000000..0d465db Binary files /dev/null and b/WinRelease/hsmodem.ipdb differ diff --git a/WinRelease/hsmodem.pdb b/WinRelease/hsmodem.pdb new file mode 100755 index 0000000..2fe5355 Binary files /dev/null and b/WinRelease/hsmodem.pdb differ diff --git a/WinRelease/oscardata.exe b/WinRelease/oscardata.exe index a6735d2..80be768 100755 Binary files a/WinRelease/oscardata.exe and b/WinRelease/oscardata.exe differ diff --git a/hsmodem/Debug/audio.obj b/hsmodem/Debug/audio.obj new file mode 100755 index 0000000..68fb834 Binary files /dev/null and b/hsmodem/Debug/audio.obj differ diff --git a/hsmodem/Debug/audio_voice.obj b/hsmodem/Debug/audio_voice.obj new file mode 100755 index 0000000..f23e7dd Binary files /dev/null and b/hsmodem/Debug/audio_voice.obj differ diff --git a/hsmodem/Debug/audio_voice_wasapi.obj b/hsmodem/Debug/audio_voice_wasapi.obj new file mode 100755 index 0000000..a61de16 Binary files /dev/null and b/hsmodem/Debug/audio_voice_wasapi.obj differ diff --git a/hsmodem/Debug/audio_wasapi.obj b/hsmodem/Debug/audio_wasapi.obj new file mode 100755 index 0000000..e22ef94 Binary files /dev/null and b/hsmodem/Debug/audio_wasapi.obj differ diff --git a/hsmodem/Debug/codec2.obj b/hsmodem/Debug/codec2.obj new file mode 100755 index 0000000..662c16f Binary files /dev/null and b/hsmodem/Debug/codec2.obj differ diff --git a/hsmodem/Debug/constellation.obj b/hsmodem/Debug/constellation.obj new file mode 100755 index 0000000..5dcf3d7 Binary files /dev/null and b/hsmodem/Debug/constellation.obj differ diff --git a/hsmodem/Debug/crc16.obj b/hsmodem/Debug/crc16.obj new file mode 100755 index 0000000..c7174c9 Binary files /dev/null and b/hsmodem/Debug/crc16.obj differ diff --git a/hsmodem/Debug/fec.obj b/hsmodem/Debug/fec.obj new file mode 100755 index 0000000..dce96aa Binary files /dev/null and b/hsmodem/Debug/fec.obj differ diff --git a/hsmodem/Debug/fft.obj b/hsmodem/Debug/fft.obj new file mode 100755 index 0000000..510b5e2 Binary files /dev/null and b/hsmodem/Debug/fft.obj differ diff --git a/hsmodem/Debug/frame_packer.obj b/hsmodem/Debug/frame_packer.obj new file mode 100755 index 0000000..fa2b8a5 Binary files /dev/null and b/hsmodem/Debug/frame_packer.obj differ diff --git a/hsmodem/Debug/hsmodem.Build.CppClean.log b/hsmodem/Debug/hsmodem.Build.CppClean.log new file mode 100755 index 0000000..cdeeab3 --- /dev/null +++ b/hsmodem/Debug/hsmodem.Build.CppClean.log @@ -0,0 +1,29 @@ +e:\funk\hsmodem\hsmodem\debug\vc140.pdb +e:\funk\hsmodem\hsmodem\debug\vc140.idb +e:\funk\hsmodem\hsmodem\debug\audio.obj +e:\funk\hsmodem\hsmodem\debug\audio_voice.obj +e:\funk\hsmodem\hsmodem\debug\audio_voice_wasapi.obj +e:\funk\hsmodem\hsmodem\debug\audio_wasapi.obj +e:\funk\hsmodem\hsmodem\debug\codec2.obj +e:\funk\hsmodem\hsmodem\debug\constellation.obj +e:\funk\hsmodem\hsmodem\debug\crc16.obj +e:\funk\hsmodem\hsmodem\debug\fec.obj +e:\funk\hsmodem\hsmodem\debug\fft.obj +e:\funk\hsmodem\hsmodem\debug\frame_packer.obj +e:\funk\hsmodem\hsmodem\debug\hsmodem.obj +e:\funk\hsmodem\hsmodem\debug\liquid_if.obj +e:\funk\hsmodem\hsmodem\debug\main_helper.obj +e:\funk\hsmodem\hsmodem\debug\scrambler.obj +e:\funk\hsmodem\hsmodem\debug\speed.obj +e:\funk\hsmodem\hsmodem\debug\symboltracker.obj +e:\funk\hsmodem\hsmodem\debug\udp.obj +e:\funk\hsmodem\hsmodem\debug\voiceprocessor.obj +e:\funk\hsmodem\debug\hsmodem.ilk +e:\funk\hsmodem\debug\hsmodem.exe +e:\funk\hsmodem\debug\hsmodem.pdb +e:\funk\hsmodem\hsmodem\debug\hsmodem.tlog\cl.command.1.tlog +e:\funk\hsmodem\hsmodem\debug\hsmodem.tlog\cl.read.1.tlog +e:\funk\hsmodem\hsmodem\debug\hsmodem.tlog\cl.write.1.tlog +e:\funk\hsmodem\hsmodem\debug\hsmodem.tlog\link.command.1.tlog +e:\funk\hsmodem\hsmodem\debug\hsmodem.tlog\link.read.1.tlog +e:\funk\hsmodem\hsmodem\debug\hsmodem.tlog\link.write.1.tlog diff --git a/hsmodem/Debug/hsmodem.log b/hsmodem/Debug/hsmodem.log new file mode 100755 index 0000000..fe1ec07 --- /dev/null +++ b/hsmodem/Debug/hsmodem.log @@ -0,0 +1,22 @@ + liquid_if.cpp + hsmodem.cpp + fft.cpp + audio_wasapi.cpp + audio.cpp + Code wird generiert... + Kompilieren... + voiceprocessor.cpp + udp.cpp + symboltracker.cpp + speed.cpp + scrambler.cpp + main_helper.cpp + frame_packer.cpp + fec.cpp + crc16.cpp + constellation.cpp + codec2.cpp + audio_voice_wasapi.cpp + audio_voice.cpp + Code wird generiert... + hsmodem.vcxproj -> E:\funk\hsmodem\Debug\hsmodem.exe diff --git a/hsmodem/Debug/hsmodem.obj b/hsmodem/Debug/hsmodem.obj new file mode 100755 index 0000000..29a7fc1 Binary files /dev/null and b/hsmodem/Debug/hsmodem.obj differ diff --git a/hsmodem/Debug/hsmodem.tlog/CL.command.1.tlog b/hsmodem/Debug/hsmodem.tlog/CL.command.1.tlog new file mode 100755 index 0000000..d1f7787 Binary files /dev/null and b/hsmodem/Debug/hsmodem.tlog/CL.command.1.tlog differ diff --git a/hsmodem/Debug/hsmodem.tlog/CL.read.1.tlog b/hsmodem/Debug/hsmodem.tlog/CL.read.1.tlog new file mode 100755 index 0000000..48aea88 Binary files /dev/null and b/hsmodem/Debug/hsmodem.tlog/CL.read.1.tlog differ diff --git a/hsmodem/Debug/hsmodem.tlog/CL.write.1.tlog b/hsmodem/Debug/hsmodem.tlog/CL.write.1.tlog new file mode 100755 index 0000000..8d37c1d Binary files /dev/null and b/hsmodem/Debug/hsmodem.tlog/CL.write.1.tlog differ diff --git a/hsmodem/Debug/hsmodem.tlog/hsmodem.lastbuildstate b/hsmodem/Debug/hsmodem.tlog/hsmodem.lastbuildstate new file mode 100755 index 0000000..a88860f --- /dev/null +++ b/hsmodem/Debug/hsmodem.tlog/hsmodem.lastbuildstate @@ -0,0 +1,2 @@ +#TargetFrameworkVersion=v4.0:PlatformToolSet=v140_xp:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1 +Debug|Win32|E:\funk\hsmodem\| diff --git a/hsmodem/Debug/hsmodem.tlog/link.command.1.tlog b/hsmodem/Debug/hsmodem.tlog/link.command.1.tlog new file mode 100755 index 0000000..6870f52 Binary files /dev/null and b/hsmodem/Debug/hsmodem.tlog/link.command.1.tlog differ diff --git a/hsmodem/Debug/hsmodem.tlog/link.read.1.tlog b/hsmodem/Debug/hsmodem.tlog/link.read.1.tlog new file mode 100755 index 0000000..33a5c18 Binary files /dev/null and b/hsmodem/Debug/hsmodem.tlog/link.read.1.tlog differ diff --git a/hsmodem/Debug/hsmodem.tlog/link.write.1.tlog b/hsmodem/Debug/hsmodem.tlog/link.write.1.tlog new file mode 100755 index 0000000..a679723 Binary files /dev/null and b/hsmodem/Debug/hsmodem.tlog/link.write.1.tlog differ diff --git a/hsmodem/Debug/hsmodem.vcxproj.FileListAbsolute.txt b/hsmodem/Debug/hsmodem.vcxproj.FileListAbsolute.txt new file mode 100755 index 0000000..e69de29 diff --git a/hsmodem/Debug/liquid_if.obj b/hsmodem/Debug/liquid_if.obj new file mode 100755 index 0000000..bcbf5ef Binary files /dev/null and b/hsmodem/Debug/liquid_if.obj differ diff --git a/hsmodem/Debug/main_helper.obj b/hsmodem/Debug/main_helper.obj new file mode 100755 index 0000000..a3f88d3 Binary files /dev/null and b/hsmodem/Debug/main_helper.obj differ diff --git a/hsmodem/Debug/scrambler.obj b/hsmodem/Debug/scrambler.obj new file mode 100755 index 0000000..f7aa14b Binary files /dev/null and b/hsmodem/Debug/scrambler.obj differ diff --git a/hsmodem/Debug/speed.obj b/hsmodem/Debug/speed.obj new file mode 100755 index 0000000..9e9a2cc Binary files /dev/null and b/hsmodem/Debug/speed.obj differ diff --git a/hsmodem/Debug/symboltracker.obj b/hsmodem/Debug/symboltracker.obj new file mode 100755 index 0000000..62a1dbe Binary files /dev/null and b/hsmodem/Debug/symboltracker.obj differ diff --git a/hsmodem/Debug/udp.obj b/hsmodem/Debug/udp.obj new file mode 100755 index 0000000..a2f5d72 Binary files /dev/null and b/hsmodem/Debug/udp.obj differ diff --git a/hsmodem/Debug/vc140.idb b/hsmodem/Debug/vc140.idb new file mode 100755 index 0000000..28d3cad Binary files /dev/null and b/hsmodem/Debug/vc140.idb differ diff --git a/hsmodem/Debug/vc140.pdb b/hsmodem/Debug/vc140.pdb new file mode 100755 index 0000000..222804a Binary files /dev/null and b/hsmodem/Debug/vc140.pdb differ diff --git a/hsmodem/Debug/voiceprocessor.obj b/hsmodem/Debug/voiceprocessor.obj new file mode 100755 index 0000000..b64cc70 Binary files /dev/null and b/hsmodem/Debug/voiceprocessor.obj differ diff --git a/hsmodem/Makefile b/hsmodem/Makefile index 4b7effb..ff13508 100755 --- a/hsmodem/Makefile +++ b/hsmodem/Makefile @@ -1,12 +1,20 @@ -# makefile for hsmodem +# makefile for hsmodem on Linux (PC desktop and ARM) +# usage: +# make ... builds the program and copies all needed files to ../hsmodemLinux +# the shared libs are also copied to this location +# to distribute hsmodem you need the folder hsmodemLinux and its subfolders +# installation: when these files are copied to the target system, +# then (in the target system) run "sudo install". +# This will copy the sharded libs to its final location. CXXFLAGS = -Wall -O3 -std=c++0x -Wno-write-strings -Wno-narrowing LDFLAGS = -lpthread -lrt -lsndfile -lasound -lm -lopus -lbassopus -lbass -lbassenc_opus -lbassenc -lfftw3 -lfftw3_threads -lliquid -lcodec2 OBJ = hsmodem.o constellation.o crc16.o frame_packer.o main_helper.o scrambler.o speed.o fec.o audio.o udp.o fft.o liquid_if.o symboltracker.o audio_voice.o voiceprocessor.o codec2.o default: $(OBJ) - g++ $(CXXFLAGS) -o ../LinuxRelease/hsmodem $(OBJ) $(LDFLAGS) + mkdir -p ../hsmodemLinux + g++ $(CXXFLAGS) -o ../hsmodemLinux/hsmodem $(OBJ) $(LDFLAGS) clean: rm -f *.o - + diff --git a/hsmodem/Release/audio.obj b/hsmodem/Release/audio.obj new file mode 100755 index 0000000..b221788 Binary files /dev/null and b/hsmodem/Release/audio.obj differ diff --git a/hsmodem/Release/audio_voice.obj b/hsmodem/Release/audio_voice.obj new file mode 100755 index 0000000..5e0cb3e Binary files /dev/null and b/hsmodem/Release/audio_voice.obj differ diff --git a/hsmodem/Release/audio_voice_wasapi.obj b/hsmodem/Release/audio_voice_wasapi.obj new file mode 100755 index 0000000..6e3b626 Binary files /dev/null and b/hsmodem/Release/audio_voice_wasapi.obj differ diff --git a/hsmodem/Release/audio_wasapi.obj b/hsmodem/Release/audio_wasapi.obj new file mode 100755 index 0000000..b65c2f2 Binary files /dev/null and b/hsmodem/Release/audio_wasapi.obj differ diff --git a/hsmodem/Release/codec2.obj b/hsmodem/Release/codec2.obj new file mode 100755 index 0000000..5e5013f Binary files /dev/null and b/hsmodem/Release/codec2.obj differ diff --git a/hsmodem/Release/constellation.obj b/hsmodem/Release/constellation.obj new file mode 100755 index 0000000..4a35b8e Binary files /dev/null and b/hsmodem/Release/constellation.obj differ diff --git a/hsmodem/Release/crc16.obj b/hsmodem/Release/crc16.obj new file mode 100755 index 0000000..b607d7c Binary files /dev/null and b/hsmodem/Release/crc16.obj differ diff --git a/hsmodem/Release/fec.obj b/hsmodem/Release/fec.obj new file mode 100755 index 0000000..eeb11b3 Binary files /dev/null and b/hsmodem/Release/fec.obj differ diff --git a/hsmodem/Release/fft.obj b/hsmodem/Release/fft.obj new file mode 100755 index 0000000..df7f26b Binary files /dev/null and b/hsmodem/Release/fft.obj differ diff --git a/hsmodem/Release/frame_packer.obj b/hsmodem/Release/frame_packer.obj new file mode 100755 index 0000000..565ed79 Binary files /dev/null and b/hsmodem/Release/frame_packer.obj differ diff --git a/hsmodem/Release/hsmodem.Build.CppClean.log b/hsmodem/Release/hsmodem.Build.CppClean.log new file mode 100755 index 0000000..3eee5d7 --- /dev/null +++ b/hsmodem/Release/hsmodem.Build.CppClean.log @@ -0,0 +1,28 @@ +e:\funk\hsmodem\hsmodem\release\vc140.pdb +e:\funk\hsmodem\hsmodem\release\voiceprocessor.obj +e:\funk\hsmodem\hsmodem\release\udp.obj +e:\funk\hsmodem\hsmodem\release\symboltracker.obj +e:\funk\hsmodem\hsmodem\release\speed.obj +e:\funk\hsmodem\hsmodem\release\scrambler.obj +e:\funk\hsmodem\hsmodem\release\main_helper.obj +e:\funk\hsmodem\hsmodem\release\liquid_if.obj +e:\funk\hsmodem\hsmodem\release\hsmodem.obj +e:\funk\hsmodem\hsmodem\release\frame_packer.obj +e:\funk\hsmodem\hsmodem\release\fft.obj +e:\funk\hsmodem\hsmodem\release\fec.obj +e:\funk\hsmodem\hsmodem\release\crc16.obj +e:\funk\hsmodem\hsmodem\release\constellation.obj +e:\funk\hsmodem\hsmodem\release\codec2.obj +e:\funk\hsmodem\hsmodem\release\audio_wasapi.obj +e:\funk\hsmodem\hsmodem\release\audio_voice_wasapi.obj +e:\funk\hsmodem\hsmodem\release\audio_voice.obj +e:\funk\hsmodem\hsmodem\release\audio.obj +e:\funk\hsmodem\winrelease\hsmodem.exe +e:\funk\hsmodem\winrelease\hsmodem.pdb +e:\funk\hsmodem\hsmodem\..\winrelease\hsmodem.exe +e:\funk\hsmodem\hsmodem\release\hsmodem.tlog\cl.command.1.tlog +e:\funk\hsmodem\hsmodem\release\hsmodem.tlog\cl.read.1.tlog +e:\funk\hsmodem\hsmodem\release\hsmodem.tlog\cl.write.1.tlog +e:\funk\hsmodem\hsmodem\release\hsmodem.tlog\link.command.1.tlog +e:\funk\hsmodem\hsmodem\release\hsmodem.tlog\link.read.1.tlog +e:\funk\hsmodem\hsmodem\release\hsmodem.tlog\link.write.1.tlog diff --git a/hsmodem/Release/hsmodem.log b/hsmodem/Release/hsmodem.log new file mode 100755 index 0000000..47c0fc8 --- /dev/null +++ b/hsmodem/Release/hsmodem.log @@ -0,0 +1,24 @@ + audio.cpp + audio_voice.cpp + audio_voice_wasapi.cpp + audio_wasapi.cpp + codec2.cpp + constellation.cpp + crc16.cpp + fec.cpp + fft.cpp + frame_packer.cpp + hsmodem.cpp + liquid_if.cpp + main_helper.cpp + scrambler.cpp + speed.cpp + symboltracker.cpp + udp.cpp + voiceprocessor.cpp + Code wird generiert. + 0 of 574 functions ( 0.0%) were compiled, the rest were copied from previous compilation. + 0 functions were new in current compilation + 0 functions had inline decision re-evaluated but remain unchanged + Codegenerierung ist abgeschlossen. + hsmodem.vcxproj -> E:\funk\hsmodem\hsmodem\..\WinRelease\hsmodem.exe diff --git a/hsmodem/Release/hsmodem.obj b/hsmodem/Release/hsmodem.obj new file mode 100755 index 0000000..8fe8d41 Binary files /dev/null and b/hsmodem/Release/hsmodem.obj differ diff --git a/hsmodem/Release/hsmodem.tlog/CL.command.1.tlog b/hsmodem/Release/hsmodem.tlog/CL.command.1.tlog new file mode 100755 index 0000000..d2a90b4 Binary files /dev/null and b/hsmodem/Release/hsmodem.tlog/CL.command.1.tlog differ diff --git a/hsmodem/Release/hsmodem.tlog/CL.read.1.tlog b/hsmodem/Release/hsmodem.tlog/CL.read.1.tlog new file mode 100755 index 0000000..e759a6b Binary files /dev/null and b/hsmodem/Release/hsmodem.tlog/CL.read.1.tlog differ diff --git a/hsmodem/Release/hsmodem.tlog/CL.write.1.tlog b/hsmodem/Release/hsmodem.tlog/CL.write.1.tlog new file mode 100755 index 0000000..55f5f67 Binary files /dev/null and b/hsmodem/Release/hsmodem.tlog/CL.write.1.tlog differ diff --git a/hsmodem/Release/hsmodem.tlog/hsmodem.lastbuildstate b/hsmodem/Release/hsmodem.tlog/hsmodem.lastbuildstate new file mode 100755 index 0000000..d1d5971 --- /dev/null +++ b/hsmodem/Release/hsmodem.tlog/hsmodem.lastbuildstate @@ -0,0 +1,2 @@ +#TargetFrameworkVersion=v4.0:PlatformToolSet=v140_xp:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1 +Release|Win32|E:\funk\hsmodem\| diff --git a/hsmodem/Release/hsmodem.tlog/link.command.1.tlog b/hsmodem/Release/hsmodem.tlog/link.command.1.tlog new file mode 100755 index 0000000..297bc55 Binary files /dev/null and b/hsmodem/Release/hsmodem.tlog/link.command.1.tlog differ diff --git a/hsmodem/Release/hsmodem.tlog/link.read.1.tlog b/hsmodem/Release/hsmodem.tlog/link.read.1.tlog new file mode 100755 index 0000000..9208fb2 Binary files /dev/null and b/hsmodem/Release/hsmodem.tlog/link.read.1.tlog differ diff --git a/hsmodem/Release/hsmodem.tlog/link.write.1.tlog b/hsmodem/Release/hsmodem.tlog/link.write.1.tlog new file mode 100755 index 0000000..9b44f8a Binary files /dev/null and b/hsmodem/Release/hsmodem.tlog/link.write.1.tlog differ diff --git a/hsmodem/Release/hsmodem.vcxproj.FileListAbsolute.txt b/hsmodem/Release/hsmodem.vcxproj.FileListAbsolute.txt new file mode 100755 index 0000000..e69de29 diff --git a/hsmodem/Release/liquid_if.obj b/hsmodem/Release/liquid_if.obj new file mode 100755 index 0000000..6ba76f5 Binary files /dev/null and b/hsmodem/Release/liquid_if.obj differ diff --git a/hsmodem/Release/main_helper.obj b/hsmodem/Release/main_helper.obj new file mode 100755 index 0000000..5fd7653 Binary files /dev/null and b/hsmodem/Release/main_helper.obj differ diff --git a/hsmodem/Release/scrambler.obj b/hsmodem/Release/scrambler.obj new file mode 100755 index 0000000..b0c4906 Binary files /dev/null and b/hsmodem/Release/scrambler.obj differ diff --git a/hsmodem/Release/speed.obj b/hsmodem/Release/speed.obj new file mode 100755 index 0000000..35bcf56 Binary files /dev/null and b/hsmodem/Release/speed.obj differ diff --git a/hsmodem/Release/symboltracker.obj b/hsmodem/Release/symboltracker.obj new file mode 100755 index 0000000..3bdf2e4 Binary files /dev/null and b/hsmodem/Release/symboltracker.obj differ diff --git a/hsmodem/Release/udp.obj b/hsmodem/Release/udp.obj new file mode 100755 index 0000000..b9c5bb4 Binary files /dev/null and b/hsmodem/Release/udp.obj differ diff --git a/hsmodem/Release/vc140.pdb b/hsmodem/Release/vc140.pdb new file mode 100755 index 0000000..c4fc26b Binary files /dev/null and b/hsmodem/Release/vc140.pdb differ diff --git a/hsmodem/Release/voiceprocessor.obj b/hsmodem/Release/voiceprocessor.obj new file mode 100755 index 0000000..6963142 Binary files /dev/null and b/hsmodem/Release/voiceprocessor.obj differ diff --git a/hsmodem/SharedLibs/aarch64/libbass.so b/hsmodem/SharedLibs/aarch64/libbass.so new file mode 100644 index 0000000..2fadd03 Binary files /dev/null and b/hsmodem/SharedLibs/aarch64/libbass.so differ diff --git a/hsmodem/SharedLibs/aarch64/libbassenc.so b/hsmodem/SharedLibs/aarch64/libbassenc.so new file mode 100644 index 0000000..07f4a62 Binary files /dev/null and b/hsmodem/SharedLibs/aarch64/libbassenc.so differ diff --git a/hsmodem/SharedLibs/aarch64/libbassenc_opus.so b/hsmodem/SharedLibs/aarch64/libbassenc_opus.so new file mode 100644 index 0000000..a34c136 Binary files /dev/null and b/hsmodem/SharedLibs/aarch64/libbassenc_opus.so differ diff --git a/hsmodem/SharedLibs/aarch64/libbassopus.so b/hsmodem/SharedLibs/aarch64/libbassopus.so new file mode 100644 index 0000000..4c8c0a4 Binary files /dev/null and b/hsmodem/SharedLibs/aarch64/libbassopus.so differ diff --git a/hsmodem/SharedLibs/aarch64/libliquid.so b/hsmodem/SharedLibs/aarch64/libliquid.so new file mode 100644 index 0000000..e4da177 Binary files /dev/null and b/hsmodem/SharedLibs/aarch64/libliquid.so differ diff --git a/hsmodem/SharedLibs/windows/bass.dll b/hsmodem/SharedLibs/windows/bass.dll new file mode 100755 index 0000000..4be4264 Binary files /dev/null and b/hsmodem/SharedLibs/windows/bass.dll differ diff --git a/hsmodem/SharedLibs/windows/basswasapi.dll b/hsmodem/SharedLibs/windows/basswasapi.dll new file mode 100755 index 0000000..41ed83e Binary files /dev/null and b/hsmodem/SharedLibs/windows/basswasapi.dll differ diff --git a/hsmodem/SharedLibs/windows/libcodec2.dll b/hsmodem/SharedLibs/windows/libcodec2.dll new file mode 100755 index 0000000..d05498e Binary files /dev/null and b/hsmodem/SharedLibs/windows/libcodec2.dll differ diff --git a/hsmodem/SharedLibs/windows/libfftw3-3.dll b/hsmodem/SharedLibs/windows/libfftw3-3.dll new file mode 100755 index 0000000..f5a97b4 Binary files /dev/null and b/hsmodem/SharedLibs/windows/libfftw3-3.dll differ diff --git a/hsmodem/SharedLibs/windows/libgcc_s_dw2-1.dll b/hsmodem/SharedLibs/windows/libgcc_s_dw2-1.dll new file mode 100755 index 0000000..9e32dc2 Binary files /dev/null and b/hsmodem/SharedLibs/windows/libgcc_s_dw2-1.dll differ diff --git a/hsmodem/SharedLibs/windows/libgcc_s_sjlj-1.dll b/hsmodem/SharedLibs/windows/libgcc_s_sjlj-1.dll new file mode 100755 index 0000000..24fa2dc Binary files /dev/null and b/hsmodem/SharedLibs/windows/libgcc_s_sjlj-1.dll differ diff --git a/hsmodem/SharedLibs/windows/libliquid.dll b/hsmodem/SharedLibs/windows/libliquid.dll new file mode 100755 index 0000000..f7eb831 Binary files /dev/null and b/hsmodem/SharedLibs/windows/libliquid.dll differ diff --git a/hsmodem/SharedLibs/windows/liblpcnetfreedv.dll b/hsmodem/SharedLibs/windows/liblpcnetfreedv.dll new file mode 100755 index 0000000..0a452c3 Binary files /dev/null and b/hsmodem/SharedLibs/windows/liblpcnetfreedv.dll differ diff --git a/hsmodem/SharedLibs/windows/libwinpthread-1.dll b/hsmodem/SharedLibs/windows/libwinpthread-1.dll new file mode 100755 index 0000000..357a244 Binary files /dev/null and b/hsmodem/SharedLibs/windows/libwinpthread-1.dll differ diff --git a/hsmodem/SharedLibs/x86_64/libbass.so b/hsmodem/SharedLibs/x86_64/libbass.so new file mode 100644 index 0000000..8839178 Binary files /dev/null and b/hsmodem/SharedLibs/x86_64/libbass.so differ diff --git a/hsmodem/SharedLibs/x86_64/libbassenc.so b/hsmodem/SharedLibs/x86_64/libbassenc.so new file mode 100644 index 0000000..8701b4b Binary files /dev/null and b/hsmodem/SharedLibs/x86_64/libbassenc.so differ diff --git a/hsmodem/SharedLibs/x86_64/libbassenc_opus.so b/hsmodem/SharedLibs/x86_64/libbassenc_opus.so new file mode 100644 index 0000000..ca8b113 Binary files /dev/null and b/hsmodem/SharedLibs/x86_64/libbassenc_opus.so differ diff --git a/hsmodem/SharedLibs/x86_64/libbassopus.so b/hsmodem/SharedLibs/x86_64/libbassopus.so new file mode 100644 index 0000000..7d231f0 Binary files /dev/null and b/hsmodem/SharedLibs/x86_64/libbassopus.so differ diff --git a/hsmodem/SharedLibs/x86_64/libliquid.so b/hsmodem/SharedLibs/x86_64/libliquid.so new file mode 100755 index 0000000..723192d Binary files /dev/null and b/hsmodem/SharedLibs/x86_64/libliquid.so differ diff --git a/hsmodem/audio/3000.pcm b/hsmodem/audio/3000.pcm new file mode 100644 index 0000000..ddc468b Binary files /dev/null and b/hsmodem/audio/3000.pcm differ diff --git a/hsmodem/audio/4000.pcm b/hsmodem/audio/4000.pcm new file mode 100644 index 0000000..107d91c Binary files /dev/null and b/hsmodem/audio/4000.pcm differ diff --git a/hsmodem/audio/4410.pcm b/hsmodem/audio/4410.pcm new file mode 100644 index 0000000..ab0fde9 Binary files /dev/null and b/hsmodem/audio/4410.pcm differ diff --git a/hsmodem/audio/4800.pcm b/hsmodem/audio/4800.pcm new file mode 100644 index 0000000..0c37dd3 Binary files /dev/null and b/hsmodem/audio/4800.pcm differ diff --git a/hsmodem/audio/5500.pcm b/hsmodem/audio/5500.pcm new file mode 100644 index 0000000..01c4be2 Binary files /dev/null and b/hsmodem/audio/5500.pcm differ diff --git a/hsmodem/audio/6000.pcm b/hsmodem/audio/6000.pcm new file mode 100644 index 0000000..e7d836c Binary files /dev/null and b/hsmodem/audio/6000.pcm differ diff --git a/hsmodem/audio/6600.pcm b/hsmodem/audio/6600.pcm new file mode 100644 index 0000000..e4fcfa9 Binary files /dev/null and b/hsmodem/audio/6600.pcm differ diff --git a/hsmodem/audio/7200.pcm b/hsmodem/audio/7200.pcm new file mode 100644 index 0000000..1dc92cb Binary files /dev/null and b/hsmodem/audio/7200.pcm differ diff --git a/hsmodem/audio/amsat.pcm b/hsmodem/audio/amsat.pcm new file mode 100644 index 0000000..7b4e622 Binary files /dev/null and b/hsmodem/audio/amsat.pcm differ diff --git a/hsmodem/audio/kbps.pcm b/hsmodem/audio/kbps.pcm new file mode 100644 index 0000000..f7a895e Binary files /dev/null and b/hsmodem/audio/kbps.pcm differ diff --git a/hsmodem/audio/psk8.pcm b/hsmodem/audio/psk8.pcm new file mode 100644 index 0000000..bf3a2ae Binary files /dev/null and b/hsmodem/audio/psk8.pcm differ diff --git a/hsmodem/audio/qpsk.pcm b/hsmodem/audio/qpsk.pcm new file mode 100644 index 0000000..271a546 Binary files /dev/null and b/hsmodem/audio/qpsk.pcm differ diff --git a/hsmodem/audio/wav2pcm.py b/hsmodem/audio/wav2pcm.py new file mode 100644 index 0000000..753510d --- /dev/null +++ b/hsmodem/audio/wav2pcm.py @@ -0,0 +1,22 @@ +from pydub import AudioSegment +import os +import sys + +def wav2pcm(wav_dir,out_pcm_dir): + + for path,pathname,filenames in os.walk(wav_dir): + for filename in filenames: + + sound = AudioSegment.from_file(os.path.join(path,filename)) + outfilename=os.path.join(out_pcm_dir,filename.split('.wav')[0]+'.pcm') + sound.export(outfilename, format='s16le', bitrate='8k') + + + +if __name__=="__main__": + + if len(sys.argv) != 3: + print("usage: python wav2pcm.py in_dir out_dir") + else: + wav2pcm(sys.argv[1],sys.argv[2]) + diff --git a/hsmodem/hsmodem.h b/hsmodem/hsmodem.h index 3085add..958a7ea 100755 --- a/hsmodem/hsmodem.h +++ b/hsmodem/hsmodem.h @@ -30,7 +30,6 @@ #include #include #include -#include "opus.h" #define _USE_MATH_DEFINES #include @@ -55,12 +54,11 @@ #include #include #include -#include #endif +#include "opus.h" #include "bass.h" #include "basswasapi.h" -#include "bassflac.h" #include "liquid.h" #include "frameformat.h" #include "fec.h" diff --git a/hsmodem/hsmodem.sh b/hsmodem/hsmodem.sh new file mode 100755 index 0000000..07158c2 --- /dev/null +++ b/hsmodem/hsmodem.sh @@ -0,0 +1,46 @@ +#!/bin/bash +echo +echo +echo +echo +echo "this script installs HSmodem on your Linux system" +echo "=================================================" +echo +echo "1. Downloads the sources from github" +echo "2. compiles the sources for your local machine and architecture" +echo "3. copy the shared libraries to it's final location" +echo +echo "Install required packages and libraries. Press ENTER ..." +read +sudo apt-get update +sudo apt-get -y install libopus-dev libfftw3-dev libcodec2-dev libsndfile-dev libasound-dev mono-complete pavucontrol git g++ build-essential +echo +echo "Download hsmodem sources from github. Press ENTER ... " +read +git clone https://github.com/dj0abr/SSB_HighSpeed_Modem +echo +echo "Compile the sources and build the executable program. Press ENTER ..." +read +make -j 4 +echo +echo "copy the shared libraries to it's final location. Press ENTER ..." +read +echo +# now find the shared library directory +# this is the directory where libopus.so is installed +LIBNAME=$(find /usr -name libopus.so | head -1) +LIBFOLDER=$(dirname $LIBNAME) +ARCHITECTURE=$(uname -m) +echo copy shared libraries for $ARCHITECTURE to $LIBFOLDER +echo +if [ ${ARCHITECTURE} == 'x86_64' ]; +then +sudo cp ./SharedLibs/$ARCHITECTURE/*.so $LIBFOLDER +elif [ ${ARCHITECTURE} == 'aarch64' ]; +then +sudo cp ./SharedLibs/$ARCHITECTURE/*.so $LIBFOLDER +else + echo ================================================================ + echo error: no shared libs for $ARCHITECTURE . Install them manually. + echo ================================================================ +fi diff --git a/hsmodem/liquid_if.cpp b/hsmodem/liquid_if.cpp index 9d5b916..9d3514f 100755 --- a/hsmodem/liquid_if.cpp +++ b/hsmodem/liquid_if.cpp @@ -398,8 +398,8 @@ static int ccol_idx = 0; if (++ev >= 10) { ev = 0; - uint32_t re = (uint32_t)(syms.real * 16777216.0); - uint32_t im = (uint32_t)(syms.imag * 16777216.0); + int32_t re = (int32_t)(syms.real * 16777216.0); + int32_t im = (int32_t)(syms.imag * 16777216.0); uint8_t txpl[13]; int idx = 0; txpl[idx++] = 5; // type 5: IQ data follows diff --git a/hsmodemLinux/audio/3000.pcm b/hsmodemLinux/audio/3000.pcm new file mode 100644 index 0000000..ddc468b Binary files /dev/null and b/hsmodemLinux/audio/3000.pcm differ diff --git a/hsmodemLinux/audio/4000.pcm b/hsmodemLinux/audio/4000.pcm new file mode 100644 index 0000000..107d91c Binary files /dev/null and b/hsmodemLinux/audio/4000.pcm differ diff --git a/hsmodemLinux/audio/4410.pcm b/hsmodemLinux/audio/4410.pcm new file mode 100644 index 0000000..ab0fde9 Binary files /dev/null and b/hsmodemLinux/audio/4410.pcm differ diff --git a/hsmodemLinux/audio/4800.pcm b/hsmodemLinux/audio/4800.pcm new file mode 100644 index 0000000..0c37dd3 Binary files /dev/null and b/hsmodemLinux/audio/4800.pcm differ diff --git a/hsmodemLinux/audio/5500.pcm b/hsmodemLinux/audio/5500.pcm new file mode 100644 index 0000000..01c4be2 Binary files /dev/null and b/hsmodemLinux/audio/5500.pcm differ diff --git a/hsmodemLinux/audio/6000.pcm b/hsmodemLinux/audio/6000.pcm new file mode 100644 index 0000000..e7d836c Binary files /dev/null and b/hsmodemLinux/audio/6000.pcm differ diff --git a/hsmodemLinux/audio/6600.pcm b/hsmodemLinux/audio/6600.pcm new file mode 100644 index 0000000..e4fcfa9 Binary files /dev/null and b/hsmodemLinux/audio/6600.pcm differ diff --git a/hsmodemLinux/audio/7200.pcm b/hsmodemLinux/audio/7200.pcm new file mode 100644 index 0000000..1dc92cb Binary files /dev/null and b/hsmodemLinux/audio/7200.pcm differ diff --git a/hsmodemLinux/audio/amsat.pcm b/hsmodemLinux/audio/amsat.pcm new file mode 100644 index 0000000..7b4e622 Binary files /dev/null and b/hsmodemLinux/audio/amsat.pcm differ diff --git a/hsmodemLinux/audio/kbps.pcm b/hsmodemLinux/audio/kbps.pcm new file mode 100644 index 0000000..f7a895e Binary files /dev/null and b/hsmodemLinux/audio/kbps.pcm differ diff --git a/hsmodemLinux/audio/psk8.pcm b/hsmodemLinux/audio/psk8.pcm new file mode 100644 index 0000000..bf3a2ae Binary files /dev/null and b/hsmodemLinux/audio/psk8.pcm differ diff --git a/hsmodemLinux/audio/qpsk.pcm b/hsmodemLinux/audio/qpsk.pcm new file mode 100644 index 0000000..271a546 Binary files /dev/null and b/hsmodemLinux/audio/qpsk.pcm differ diff --git a/hsmodemLinux/hsmodem b/hsmodemLinux/hsmodem new file mode 100755 index 0000000..421cc7f Binary files /dev/null and b/hsmodemLinux/hsmodem differ diff --git a/hsmodemLinux/oscardata.exe b/hsmodemLinux/oscardata.exe new file mode 100755 index 0000000..80be768 Binary files /dev/null and b/hsmodemLinux/oscardata.exe differ diff --git a/oscardata/oscardata/Form1.Designer.cs b/oscardata/oscardata/Form1.Designer.cs index 7b07b30..d40c4b0 100755 --- a/oscardata/oscardata/Form1.Designer.cs +++ b/oscardata/oscardata/Form1.Designer.cs @@ -40,34 +40,53 @@ this.timer_qpsk = new System.Windows.Forms.Timer(this.components); this.panel_txspectrum = new System.Windows.Forms.Panel(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.button_stopBERtest = new System.Windows.Forms.Button(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.button_startBERtest = new System.Windows.Forms.Button(); this.rtb = new System.Windows.Forms.RichTextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.groupBox1 = new System.Windows.Forms.Panel(); this.label_nextimage = new System.Windows.Forms.Label(); this.cb_loop = new System.Windows.Forms.CheckBox(); + this.bt_rximages = new System.Windows.Forms.Button(); + this.button_loadimage = new System.Windows.Forms.Button(); this.comboBox_quality = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); this.checkBox_big = new System.Windows.Forms.CheckBox(); + this.button_cancelimg = new System.Windows.Forms.Button(); + this.button_sendimage = new System.Windows.Forms.Button(); this.label_rximage = new System.Windows.Forms.Label(); this.label_tximage = new System.Windows.Forms.Label(); + this.pictureBox_rximage = new System.Windows.Forms.PictureBox(); + this.pictureBox_tximage = new System.Windows.Forms.PictureBox(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage3 = new System.Windows.Forms.TabPage(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.button2 = new System.Windows.Forms.Button(); + this.bt_openrxfile = new System.Windows.Forms.Button(); this.label_rxfile = new System.Windows.Forms.Label(); this.label_txfile = new System.Windows.Forms.Label(); this.rtb_RXfile = new System.Windows.Forms.RichTextBox(); this.rtb_TXfile = new System.Windows.Forms.RichTextBox(); + this.bt_file_send = new System.Windows.Forms.Button(); + this.bt_sendBinaryFile = new System.Windows.Forms.Button(); + this.bt_file_html = new System.Windows.Forms.Button(); + this.bt_file_ascii = new System.Windows.Forms.Button(); this.tabPage_audio = new System.Windows.Forms.TabPage(); this.groupBox7 = new System.Windows.Forms.GroupBox(); this.rb_codec2 = new System.Windows.Forms.RadioButton(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.rb_opus = new System.Windows.Forms.RadioButton(); this.groupBox6 = new System.Windows.Forms.GroupBox(); + this.pb_voice = new System.Windows.Forms.PictureBox(); this.cb_digitalVoiceRXonly = new System.Windows.Forms.CheckBox(); this.cb_digitalVoice = new System.Windows.Forms.CheckBox(); this.cb_codecloop = new System.Windows.Forms.CheckBox(); this.cb_switchtoLS = new System.Windows.Forms.CheckBox(); this.cb_voiceloop = new System.Windows.Forms.CheckBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.pb_voiceCAPstatus = new System.Windows.Forms.PictureBox(); + this.pb_voicePBstatus = new System.Windows.Forms.PictureBox(); this.label8 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); this.tb_mic = new System.Windows.Forms.TrackBar(); @@ -85,6 +104,8 @@ this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.pb_audioCAPstatus = new System.Windows.Forms.PictureBox(); + this.pb_audioPBstatus = new System.Windows.Forms.PictureBox(); this.label6 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.tb_CAPvol = new System.Windows.Forms.TrackBar(); @@ -118,57 +139,36 @@ this.lb_rxsync = new System.Windows.Forms.Label(); this.pb_rxsync = new System.Windows.Forms.PictureBox(); this.pb_rxsignal = new System.Windows.Forms.PictureBox(); - this.bt_rximages = new System.Windows.Forms.Button(); - this.button_loadimage = new System.Windows.Forms.Button(); - this.button_cancelimg = new System.Windows.Forms.Button(); - this.button_sendimage = new System.Windows.Forms.Button(); - this.pictureBox_rximage = new System.Windows.Forms.PictureBox(); - this.pictureBox_tximage = new System.Windows.Forms.PictureBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.button2 = new System.Windows.Forms.Button(); - this.bt_openrxfile = new System.Windows.Forms.Button(); - this.bt_file_send = new System.Windows.Forms.Button(); - this.bt_sendBinaryFile = new System.Windows.Forms.Button(); - this.bt_file_html = new System.Windows.Forms.Button(); - this.bt_file_ascii = new System.Windows.Forms.Button(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.pb_voice = new System.Windows.Forms.PictureBox(); - this.pb_voiceCAPstatus = new System.Windows.Forms.PictureBox(); - this.pb_voicePBstatus = new System.Windows.Forms.PictureBox(); - this.button_stopBERtest = new System.Windows.Forms.Button(); - this.button_startBERtest = new System.Windows.Forms.Button(); - this.pb_audioCAPstatus = new System.Windows.Forms.PictureBox(); - this.pb_audioPBstatus = new System.Windows.Forms.PictureBox(); this.statusStrip1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox_rximage)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox_tximage)).BeginInit(); this.tabControl1.SuspendLayout(); this.tabPage3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.tabPage_audio.SuspendLayout(); this.groupBox7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.groupBox6.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb_voice)).BeginInit(); this.groupBox5.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb_voiceCAPstatus)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pb_voicePBstatus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_mic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_loadspeaker)).BeginInit(); this.tabPage5.SuspendLayout(); this.groupBox4.SuspendLayout(); this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb_audioCAPstatus)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pb_audioPBstatus)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_CAPvol)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_PBvol)).BeginInit(); this.groupBox2.SuspendLayout(); this.tabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pb_rxsync)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pb_rxsignal)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox_rximage)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox_tximage)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_voice)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_voiceCAPstatus)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_voicePBstatus)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_audioCAPstatus)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_audioPBstatus)).BeginInit(); this.SuspendLayout(); // // timer_udpTX @@ -249,6 +249,20 @@ this.tabPage1.Text = "BER Test"; this.tabPage1.UseVisualStyleBackColor = true; // + // button_stopBERtest + // + this.button_stopBERtest.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button_stopBERtest.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button_stopBERtest.ImageIndex = 8; + this.button_stopBERtest.ImageList = this.imageList1; + this.button_stopBERtest.Location = new System.Drawing.Point(113, 13); + this.button_stopBERtest.Name = "button_stopBERtest"; + this.button_stopBERtest.Size = new System.Drawing.Size(101, 32); + this.button_stopBERtest.TabIndex = 4; + this.button_stopBERtest.Text = "STOP"; + this.button_stopBERtest.UseVisualStyleBackColor = true; + this.button_stopBERtest.Click += new System.EventHandler(this.button_stopBERtest_Click); + // // imageList1 // this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); @@ -267,6 +281,20 @@ this.imageList1.Images.SetKeyName(11, "voice.png"); this.imageList1.Images.SetKeyName(12, "about.png"); // + // button_startBERtest + // + this.button_startBERtest.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button_startBERtest.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button_startBERtest.ImageIndex = 7; + this.button_startBERtest.ImageList = this.imageList1; + this.button_startBERtest.Location = new System.Drawing.Point(6, 13); + this.button_startBERtest.Name = "button_startBERtest"; + this.button_startBERtest.Size = new System.Drawing.Size(101, 32); + this.button_startBERtest.TabIndex = 3; + this.button_startBERtest.Text = "START"; + this.button_startBERtest.UseVisualStyleBackColor = true; + this.button_startBERtest.Click += new System.EventHandler(this.button_startBERtest_Click); + // // rtb // this.rtb.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -327,6 +355,32 @@ this.cb_loop.Text = "loop (send all images in folder)"; this.cb_loop.UseVisualStyleBackColor = true; // + // bt_rximages + // + this.bt_rximages.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.bt_rximages.ImageIndex = 5; + this.bt_rximages.ImageList = this.imageList1; + this.bt_rximages.Location = new System.Drawing.Point(534, 5); + this.bt_rximages.Name = "bt_rximages"; + this.bt_rximages.Size = new System.Drawing.Size(92, 23); + this.bt_rximages.TabIndex = 10; + this.bt_rximages.Text = " RX Images"; + this.bt_rximages.UseVisualStyleBackColor = true; + this.bt_rximages.Click += new System.EventHandler(this.bt_rximages_Click); + // + // button_loadimage + // + this.button_loadimage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button_loadimage.ImageIndex = 5; + this.button_loadimage.ImageList = this.imageList1; + this.button_loadimage.Location = new System.Drawing.Point(265, 5); + this.button_loadimage.Name = "button_loadimage"; + this.button_loadimage.Size = new System.Drawing.Size(88, 23); + this.button_loadimage.TabIndex = 0; + this.button_loadimage.Text = " Load Image"; + this.button_loadimage.UseVisualStyleBackColor = true; + this.button_loadimage.Click += new System.EventHandler(this.button_loadimage_Click); + // // comboBox_quality // this.comboBox_quality.FormattingEnabled = true; @@ -363,6 +417,35 @@ this.checkBox_big.UseVisualStyleBackColor = true; this.checkBox_big.CheckedChanged += new System.EventHandler(this.checkBox_small_CheckedChanged); // + // button_cancelimg + // + this.button_cancelimg.ForeColor = System.Drawing.Color.Red; + this.button_cancelimg.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button_cancelimg.ImageIndex = 8; + this.button_cancelimg.ImageList = this.imageList1; + this.button_cancelimg.Location = new System.Drawing.Point(443, 5); + this.button_cancelimg.Name = "button_cancelimg"; + this.button_cancelimg.Size = new System.Drawing.Size(75, 23); + this.button_cancelimg.TabIndex = 9; + this.button_cancelimg.Text = " Cancel"; + this.button_cancelimg.UseVisualStyleBackColor = true; + this.button_cancelimg.Click += new System.EventHandler(this.button_cancelimg_Click); + // + // button_sendimage + // + this.button_sendimage.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button_sendimage.ForeColor = System.Drawing.Color.Blue; + this.button_sendimage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button_sendimage.ImageIndex = 10; + this.button_sendimage.ImageList = this.imageList1; + this.button_sendimage.Location = new System.Drawing.Point(361, 5); + this.button_sendimage.Name = "button_sendimage"; + this.button_sendimage.Size = new System.Drawing.Size(75, 23); + this.button_sendimage.TabIndex = 1; + this.button_sendimage.Text = "Send"; + this.button_sendimage.UseVisualStyleBackColor = true; + this.button_sendimage.Click += new System.EventHandler(this.button_sendimage_Click); + // // label_rximage // this.label_rximage.AutoSize = true; @@ -383,6 +466,27 @@ this.label_tximage.TabIndex = 4; this.label_tximage.Text = "TX image"; // + // pictureBox_rximage + // + this.pictureBox_rximage.BackgroundImage = global::oscardata.Properties.Resources.image1; + this.pictureBox_rximage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pictureBox_rximage.Location = new System.Drawing.Point(642, 27); + this.pictureBox_rximage.Name = "pictureBox_rximage"; + this.pictureBox_rximage.Size = new System.Drawing.Size(640, 480); + this.pictureBox_rximage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBox_rximage.TabIndex = 3; + this.pictureBox_rximage.TabStop = false; + // + // pictureBox_tximage + // + this.pictureBox_tximage.BackgroundImage = global::oscardata.Properties.Resources.image; + this.pictureBox_tximage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pictureBox_tximage.Location = new System.Drawing.Point(1, 27); + this.pictureBox_tximage.Name = "pictureBox_tximage"; + this.pictureBox_tximage.Size = new System.Drawing.Size(640, 480); + this.pictureBox_tximage.TabIndex = 2; + this.pictureBox_tximage.TabStop = false; + // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage2); @@ -419,6 +523,43 @@ this.tabPage3.Text = "File"; this.tabPage3.UseVisualStyleBackColor = true; // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::oscardata.Properties.Resources.text_big; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox1.Location = new System.Drawing.Point(17, 371); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(127, 134); + this.pictureBox1.TabIndex = 13; + this.pictureBox1.TabStop = false; + // + // button2 + // + this.button2.ForeColor = System.Drawing.Color.Red; + this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button2.ImageIndex = 8; + this.button2.ImageList = this.imageList1; + this.button2.Location = new System.Drawing.Point(17, 218); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(137, 23); + this.button2.TabIndex = 12; + this.button2.Text = "Cancel"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button_cancelimg_Click); + // + // bt_openrxfile + // + this.bt_openrxfile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.bt_openrxfile.ImageIndex = 5; + this.bt_openrxfile.ImageList = this.imageList1; + this.bt_openrxfile.Location = new System.Drawing.Point(17, 306); + this.bt_openrxfile.Name = "bt_openrxfile"; + this.bt_openrxfile.Size = new System.Drawing.Size(137, 30); + this.bt_openrxfile.TabIndex = 11; + this.bt_openrxfile.Text = "Open RX file folder"; + this.bt_openrxfile.UseVisualStyleBackColor = true; + this.bt_openrxfile.Click += new System.EventHandler(this.bt_openrxfile_Click); + // // label_rxfile // this.label_rxfile.AutoSize = true; @@ -457,6 +598,60 @@ this.rtb_TXfile.TabIndex = 4; this.rtb_TXfile.Text = ""; // + // bt_file_send + // + this.bt_file_send.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.bt_file_send.ForeColor = System.Drawing.Color.Blue; + this.bt_file_send.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.bt_file_send.ImageIndex = 10; + this.bt_file_send.ImageList = this.imageList1; + this.bt_file_send.Location = new System.Drawing.Point(17, 157); + this.bt_file_send.Name = "bt_file_send"; + this.bt_file_send.Size = new System.Drawing.Size(137, 30); + this.bt_file_send.TabIndex = 3; + this.bt_file_send.Text = "SEND"; + this.bt_file_send.UseVisualStyleBackColor = true; + this.bt_file_send.Click += new System.EventHandler(this.bt_file_send_Click); + // + // bt_sendBinaryFile + // + this.bt_sendBinaryFile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.bt_sendBinaryFile.ImageIndex = 0; + this.bt_sendBinaryFile.ImageList = this.imageList1; + this.bt_sendBinaryFile.Location = new System.Drawing.Point(17, 89); + this.bt_sendBinaryFile.Name = "bt_sendBinaryFile"; + this.bt_sendBinaryFile.Size = new System.Drawing.Size(137, 23); + this.bt_sendBinaryFile.TabIndex = 2; + this.bt_sendBinaryFile.Text = "Load Binary File"; + this.bt_sendBinaryFile.UseVisualStyleBackColor = true; + this.bt_sendBinaryFile.Click += new System.EventHandler(this.bt_sendBinaryFile_Click); + // + // bt_file_html + // + this.bt_file_html.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.bt_file_html.ImageIndex = 2; + this.bt_file_html.ImageList = this.imageList1; + this.bt_file_html.Location = new System.Drawing.Point(17, 60); + this.bt_file_html.Name = "bt_file_html"; + this.bt_file_html.Size = new System.Drawing.Size(137, 23); + this.bt_file_html.TabIndex = 1; + this.bt_file_html.Text = "Load HTML File"; + this.bt_file_html.UseVisualStyleBackColor = true; + this.bt_file_html.Click += new System.EventHandler(this.button2_Click); + // + // bt_file_ascii + // + this.bt_file_ascii.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.bt_file_ascii.ImageIndex = 9; + this.bt_file_ascii.ImageList = this.imageList1; + this.bt_file_ascii.Location = new System.Drawing.Point(17, 31); + this.bt_file_ascii.Name = "bt_file_ascii"; + this.bt_file_ascii.Size = new System.Drawing.Size(137, 23); + this.bt_file_ascii.TabIndex = 0; + this.bt_file_ascii.Text = " Load ASCII Text File"; + this.bt_file_ascii.UseVisualStyleBackColor = true; + this.bt_file_ascii.Click += new System.EventHandler(this.bt_file_ascii_Click); + // // tabPage_audio // this.tabPage_audio.Controls.Add(this.groupBox7); @@ -492,6 +687,16 @@ this.rb_codec2.Text = "CODEC-2 parametric audio codec. Audio rate: 3200 bps"; this.rb_codec2.UseVisualStyleBackColor = true; // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::oscardata.Properties.Resources.voice_big; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pictureBox2.Location = new System.Drawing.Point(6, 13); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(75, 76); + this.pictureBox2.TabIndex = 22; + this.pictureBox2.TabStop = false; + // // rb_opus // this.rb_opus.AutoSize = true; @@ -519,6 +724,15 @@ this.groupBox6.TabStop = false; this.groupBox6.Text = "Voice Audio Operating Mode"; // + // pb_voice + // + this.pb_voice.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pb_voice.Location = new System.Drawing.Point(308, 19); + this.pb_voice.Name = "pb_voice"; + this.pb_voice.Size = new System.Drawing.Size(440, 85); + this.pb_voice.TabIndex = 22; + this.pb_voice.TabStop = false; + // // cb_digitalVoiceRXonly // this.cb_digitalVoiceRXonly.AutoSize = true; @@ -594,6 +808,26 @@ this.groupBox5.TabStop = false; this.groupBox5.Text = "Loadspeaker / Microphone / Headset"; // + // pb_voiceCAPstatus + // + this.pb_voiceCAPstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; + this.pb_voiceCAPstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pb_voiceCAPstatus.Location = new System.Drawing.Point(387, 58); + this.pb_voiceCAPstatus.Name = "pb_voiceCAPstatus"; + this.pb_voiceCAPstatus.Size = new System.Drawing.Size(21, 21); + this.pb_voiceCAPstatus.TabIndex = 19; + this.pb_voiceCAPstatus.TabStop = false; + // + // pb_voicePBstatus + // + this.pb_voicePBstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; + this.pb_voicePBstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pb_voicePBstatus.Location = new System.Drawing.Point(387, 25); + this.pb_voicePBstatus.Name = "pb_voicePBstatus"; + this.pb_voicePBstatus.Size = new System.Drawing.Size(21, 21); + this.pb_voicePBstatus.TabIndex = 18; + this.pb_voicePBstatus.TabStop = false; + // // label8 // this.label8.AutoSize = true; @@ -793,6 +1027,26 @@ this.groupBox3.TabStop = false; this.groupBox3.Text = "Transceiver Audio"; // + // pb_audioCAPstatus + // + this.pb_audioCAPstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; + this.pb_audioCAPstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pb_audioCAPstatus.Location = new System.Drawing.Point(375, 52); + this.pb_audioCAPstatus.Name = "pb_audioCAPstatus"; + this.pb_audioCAPstatus.Size = new System.Drawing.Size(21, 21); + this.pb_audioCAPstatus.TabIndex = 18; + this.pb_audioCAPstatus.TabStop = false; + // + // pb_audioPBstatus + // + this.pb_audioPBstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; + this.pb_audioPBstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.pb_audioPBstatus.Location = new System.Drawing.Point(375, 19); + this.pb_audioPBstatus.Name = "pb_audioPBstatus"; + this.pb_audioPBstatus.Size = new System.Drawing.Size(21, 21); + this.pb_audioPBstatus.TabIndex = 17; + this.pb_audioPBstatus.TabStop = false; + // // label6 // this.label6.AutoSize = true; @@ -1132,6 +1386,7 @@ // pb_rxsync // this.pb_rxsync.BackgroundImage = global::oscardata.Properties.Resources.redmarker; + this.pb_rxsync.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pb_rxsync.Location = new System.Drawing.Point(1155, 636); this.pb_rxsync.Name = "pb_rxsync"; this.pb_rxsync.Size = new System.Drawing.Size(24, 24); @@ -1141,266 +1396,13 @@ // pb_rxsignal // this.pb_rxsignal.BackgroundImage = global::oscardata.Properties.Resources.redmarker; + this.pb_rxsignal.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pb_rxsignal.Location = new System.Drawing.Point(1047, 636); this.pb_rxsignal.Name = "pb_rxsignal"; this.pb_rxsignal.Size = new System.Drawing.Size(24, 24); this.pb_rxsignal.TabIndex = 17; this.pb_rxsignal.TabStop = false; // - // bt_rximages - // - this.bt_rximages.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.bt_rximages.ImageIndex = 5; - this.bt_rximages.ImageList = this.imageList1; - this.bt_rximages.Location = new System.Drawing.Point(534, 5); - this.bt_rximages.Name = "bt_rximages"; - this.bt_rximages.Size = new System.Drawing.Size(92, 23); - this.bt_rximages.TabIndex = 10; - this.bt_rximages.Text = " RX Images"; - this.bt_rximages.UseVisualStyleBackColor = true; - this.bt_rximages.Click += new System.EventHandler(this.bt_rximages_Click); - // - // button_loadimage - // - this.button_loadimage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button_loadimage.ImageIndex = 5; - this.button_loadimage.ImageList = this.imageList1; - this.button_loadimage.Location = new System.Drawing.Point(265, 5); - this.button_loadimage.Name = "button_loadimage"; - this.button_loadimage.Size = new System.Drawing.Size(88, 23); - this.button_loadimage.TabIndex = 0; - this.button_loadimage.Text = " Load Image"; - this.button_loadimage.UseVisualStyleBackColor = true; - this.button_loadimage.Click += new System.EventHandler(this.button_loadimage_Click); - // - // button_cancelimg - // - this.button_cancelimg.ForeColor = System.Drawing.Color.Red; - this.button_cancelimg.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button_cancelimg.ImageIndex = 8; - this.button_cancelimg.ImageList = this.imageList1; - this.button_cancelimg.Location = new System.Drawing.Point(443, 5); - this.button_cancelimg.Name = "button_cancelimg"; - this.button_cancelimg.Size = new System.Drawing.Size(75, 23); - this.button_cancelimg.TabIndex = 9; - this.button_cancelimg.Text = " Cancel"; - this.button_cancelimg.UseVisualStyleBackColor = true; - this.button_cancelimg.Click += new System.EventHandler(this.button_cancelimg_Click); - // - // button_sendimage - // - this.button_sendimage.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button_sendimage.ForeColor = System.Drawing.Color.Blue; - this.button_sendimage.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button_sendimage.ImageIndex = 10; - this.button_sendimage.ImageList = this.imageList1; - this.button_sendimage.Location = new System.Drawing.Point(361, 5); - this.button_sendimage.Name = "button_sendimage"; - this.button_sendimage.Size = new System.Drawing.Size(75, 23); - this.button_sendimage.TabIndex = 1; - this.button_sendimage.Text = "Send"; - this.button_sendimage.UseVisualStyleBackColor = true; - this.button_sendimage.Click += new System.EventHandler(this.button_sendimage_Click); - // - // pictureBox_rximage - // - this.pictureBox_rximage.BackgroundImage = global::oscardata.Properties.Resources.image1; - this.pictureBox_rximage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.pictureBox_rximage.Location = new System.Drawing.Point(642, 27); - this.pictureBox_rximage.Name = "pictureBox_rximage"; - this.pictureBox_rximage.Size = new System.Drawing.Size(640, 480); - this.pictureBox_rximage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox_rximage.TabIndex = 3; - this.pictureBox_rximage.TabStop = false; - // - // pictureBox_tximage - // - this.pictureBox_tximage.BackgroundImage = global::oscardata.Properties.Resources.image; - this.pictureBox_tximage.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pictureBox_tximage.Location = new System.Drawing.Point(1, 27); - this.pictureBox_tximage.Name = "pictureBox_tximage"; - this.pictureBox_tximage.Size = new System.Drawing.Size(640, 480); - this.pictureBox_tximage.TabIndex = 2; - this.pictureBox_tximage.TabStop = false; - // - // pictureBox1 - // - this.pictureBox1.BackgroundImage = global::oscardata.Properties.Resources.text_big; - this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pictureBox1.Location = new System.Drawing.Point(17, 371); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(127, 134); - this.pictureBox1.TabIndex = 13; - this.pictureBox1.TabStop = false; - // - // button2 - // - this.button2.ForeColor = System.Drawing.Color.Red; - this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.ImageIndex = 8; - this.button2.ImageList = this.imageList1; - this.button2.Location = new System.Drawing.Point(17, 218); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(137, 23); - this.button2.TabIndex = 12; - this.button2.Text = "Cancel"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button_cancelimg_Click); - // - // bt_openrxfile - // - this.bt_openrxfile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.bt_openrxfile.ImageIndex = 5; - this.bt_openrxfile.ImageList = this.imageList1; - this.bt_openrxfile.Location = new System.Drawing.Point(17, 306); - this.bt_openrxfile.Name = "bt_openrxfile"; - this.bt_openrxfile.Size = new System.Drawing.Size(137, 30); - this.bt_openrxfile.TabIndex = 11; - this.bt_openrxfile.Text = "Open RX file folder"; - this.bt_openrxfile.UseVisualStyleBackColor = true; - this.bt_openrxfile.Click += new System.EventHandler(this.bt_openrxfile_Click); - // - // bt_file_send - // - this.bt_file_send.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bt_file_send.ForeColor = System.Drawing.Color.Blue; - this.bt_file_send.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.bt_file_send.ImageIndex = 10; - this.bt_file_send.ImageList = this.imageList1; - this.bt_file_send.Location = new System.Drawing.Point(17, 157); - this.bt_file_send.Name = "bt_file_send"; - this.bt_file_send.Size = new System.Drawing.Size(137, 30); - this.bt_file_send.TabIndex = 3; - this.bt_file_send.Text = "SEND"; - this.bt_file_send.UseVisualStyleBackColor = true; - this.bt_file_send.Click += new System.EventHandler(this.bt_file_send_Click); - // - // bt_sendBinaryFile - // - this.bt_sendBinaryFile.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.bt_sendBinaryFile.ImageIndex = 0; - this.bt_sendBinaryFile.ImageList = this.imageList1; - this.bt_sendBinaryFile.Location = new System.Drawing.Point(17, 89); - this.bt_sendBinaryFile.Name = "bt_sendBinaryFile"; - this.bt_sendBinaryFile.Size = new System.Drawing.Size(137, 23); - this.bt_sendBinaryFile.TabIndex = 2; - this.bt_sendBinaryFile.Text = "Load Binary File"; - this.bt_sendBinaryFile.UseVisualStyleBackColor = true; - this.bt_sendBinaryFile.Click += new System.EventHandler(this.bt_sendBinaryFile_Click); - // - // bt_file_html - // - this.bt_file_html.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.bt_file_html.ImageIndex = 2; - this.bt_file_html.ImageList = this.imageList1; - this.bt_file_html.Location = new System.Drawing.Point(17, 60); - this.bt_file_html.Name = "bt_file_html"; - this.bt_file_html.Size = new System.Drawing.Size(137, 23); - this.bt_file_html.TabIndex = 1; - this.bt_file_html.Text = "Load HTML File"; - this.bt_file_html.UseVisualStyleBackColor = true; - this.bt_file_html.Click += new System.EventHandler(this.button2_Click); - // - // bt_file_ascii - // - this.bt_file_ascii.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.bt_file_ascii.ImageIndex = 9; - this.bt_file_ascii.ImageList = this.imageList1; - this.bt_file_ascii.Location = new System.Drawing.Point(17, 31); - this.bt_file_ascii.Name = "bt_file_ascii"; - this.bt_file_ascii.Size = new System.Drawing.Size(137, 23); - this.bt_file_ascii.TabIndex = 0; - this.bt_file_ascii.Text = " Load ASCII Text File"; - this.bt_file_ascii.UseVisualStyleBackColor = true; - this.bt_file_ascii.Click += new System.EventHandler(this.bt_file_ascii_Click); - // - // pictureBox2 - // - this.pictureBox2.BackgroundImage = global::oscardata.Properties.Resources.voice_big; - this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pictureBox2.Location = new System.Drawing.Point(6, 13); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(75, 76); - this.pictureBox2.TabIndex = 22; - this.pictureBox2.TabStop = false; - // - // pb_voice - // - this.pb_voice.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.pb_voice.Location = new System.Drawing.Point(308, 19); - this.pb_voice.Name = "pb_voice"; - this.pb_voice.Size = new System.Drawing.Size(440, 85); - this.pb_voice.TabIndex = 22; - this.pb_voice.TabStop = false; - // - // pb_voiceCAPstatus - // - this.pb_voiceCAPstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; - this.pb_voiceCAPstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pb_voiceCAPstatus.Location = new System.Drawing.Point(387, 58); - this.pb_voiceCAPstatus.Name = "pb_voiceCAPstatus"; - this.pb_voiceCAPstatus.Size = new System.Drawing.Size(21, 21); - this.pb_voiceCAPstatus.TabIndex = 19; - this.pb_voiceCAPstatus.TabStop = false; - // - // pb_voicePBstatus - // - this.pb_voicePBstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; - this.pb_voicePBstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pb_voicePBstatus.Location = new System.Drawing.Point(387, 25); - this.pb_voicePBstatus.Name = "pb_voicePBstatus"; - this.pb_voicePBstatus.Size = new System.Drawing.Size(21, 21); - this.pb_voicePBstatus.TabIndex = 18; - this.pb_voicePBstatus.TabStop = false; - // - // button_stopBERtest - // - this.button_stopBERtest.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button_stopBERtest.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button_stopBERtest.ImageIndex = 8; - this.button_stopBERtest.ImageList = this.imageList1; - this.button_stopBERtest.Location = new System.Drawing.Point(113, 13); - this.button_stopBERtest.Name = "button_stopBERtest"; - this.button_stopBERtest.Size = new System.Drawing.Size(101, 32); - this.button_stopBERtest.TabIndex = 4; - this.button_stopBERtest.Text = "STOP"; - this.button_stopBERtest.UseVisualStyleBackColor = true; - this.button_stopBERtest.Click += new System.EventHandler(this.button_stopBERtest_Click); - // - // button_startBERtest - // - this.button_startBERtest.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button_startBERtest.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button_startBERtest.ImageIndex = 7; - this.button_startBERtest.ImageList = this.imageList1; - this.button_startBERtest.Location = new System.Drawing.Point(6, 13); - this.button_startBERtest.Name = "button_startBERtest"; - this.button_startBERtest.Size = new System.Drawing.Size(101, 32); - this.button_startBERtest.TabIndex = 3; - this.button_startBERtest.Text = "START"; - this.button_startBERtest.UseVisualStyleBackColor = true; - this.button_startBERtest.Click += new System.EventHandler(this.button_startBERtest_Click); - // - // pb_audioCAPstatus - // - this.pb_audioCAPstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; - this.pb_audioCAPstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pb_audioCAPstatus.Location = new System.Drawing.Point(375, 52); - this.pb_audioCAPstatus.Name = "pb_audioCAPstatus"; - this.pb_audioCAPstatus.Size = new System.Drawing.Size(21, 21); - this.pb_audioCAPstatus.TabIndex = 18; - this.pb_audioCAPstatus.TabStop = false; - // - // pb_audioPBstatus - // - this.pb_audioPBstatus.BackgroundImage = global::oscardata.Properties.Resources.ok; - this.pb_audioPBstatus.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.pb_audioPBstatus.Location = new System.Drawing.Point(375, 19); - this.pb_audioPBstatus.Name = "pb_audioPBstatus"; - this.pb_audioPBstatus.Size = new System.Drawing.Size(21, 21); - this.pb_audioPBstatus.TabIndex = 17; - this.pb_audioPBstatus.TabStop = false; - // // Form1 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1433,16 +1435,23 @@ this.tabPage2.PerformLayout(); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox_rximage)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox_tximage)).EndInit(); this.tabControl1.ResumeLayout(false); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.tabPage_audio.ResumeLayout(false); this.groupBox7.ResumeLayout(false); this.groupBox7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.groupBox6.ResumeLayout(false); this.groupBox6.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb_voice)).EndInit(); this.groupBox5.ResumeLayout(false); this.groupBox5.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb_voiceCAPstatus)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pb_voicePBstatus)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_mic)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_loadspeaker)).EndInit(); this.tabPage5.ResumeLayout(false); @@ -1450,6 +1459,8 @@ this.groupBox4.PerformLayout(); this.groupBox3.ResumeLayout(false); this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pb_audioCAPstatus)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pb_audioPBstatus)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_CAPvol)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tb_PBvol)).EndInit(); this.groupBox2.ResumeLayout(false); @@ -1457,15 +1468,6 @@ this.tabPage4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pb_rxsync)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pb_rxsignal)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox_rximage)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox_tximage)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_voice)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_voiceCAPstatus)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_voicePBstatus)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_audioCAPstatus)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pb_audioPBstatus)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/oscardata/oscardata/Form1.cs b/oscardata/oscardata/Form1.cs index 9170be2..1719eab 100755 --- a/oscardata/oscardata/Form1.cs +++ b/oscardata/oscardata/Form1.cs @@ -31,6 +31,7 @@ using System.Drawing.Drawing2D; using System.Diagnostics; using System.Threading; using oscardata.Properties; +using System.Reflection; namespace oscardata { @@ -52,6 +53,28 @@ namespace oscardata // init GUI InitializeComponent(); + // needed for ARM mono, which cannot load a picbox directly from file + var bmp = new Bitmap(Resources.image); + pictureBox_rximage.BackgroundImage = bmp; + + bmp = new Bitmap(Resources.image1); + pictureBox_tximage.BackgroundImage = bmp; + + // if this program was started from another loacation + // set the working directory to the path of the .exe file + // so it can find hsmodem(.exe) + try + { + String s = Assembly.GetExecutingAssembly().Location; + s = Path.GetDirectoryName(s); + Directory.SetCurrentDirectory(s); + Console.WriteLine("working path: " + s); + } + catch (Exception e) + { + Console.WriteLine("cannot set working path: " + e.ToString()); + } + // test OS type OperatingSystem osversion = System.Environment.OSVersion; statics.OSversion = osversion.Platform.ToString(); @@ -755,7 +778,8 @@ namespace oscardata ih.SaveJpgAtFileSize(img, TXimagefilename, max_size); } - pictureBox_tximage.Load(TXimagefilename); + //pictureBox_tximage.Load(TXimagefilename); this does not work under ARM mono + pictureBox_tximage.BackgroundImage = Image.FromFile(TXimagefilename); TXRealFileSize = statics.GetFileSize(TXimagefilename); ShowTXstatus(); txcommand = statics.Image; @@ -1317,7 +1341,7 @@ namespace oscardata catch { tb_callsign.Text = ""; - cb_speed.Text = "4000 QPSK BW: 2400 Hz (default QO-100)"; + cb_autostart.Checked = true; } if (cb_audioPB.Text.Length <= 1) cb_audioPB.Text = "Default"; diff --git a/oscardata/oscardata/Form1.resx b/oscardata/oscardata/Form1.resx index b151281..6d389e7 100755 --- a/oscardata/oscardata/Form1.resx +++ b/oscardata/oscardata/Form1.resx @@ -137,7 +137,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABw - FwAAAk1TRnQBSQFMAgEBDQEAAcgBAAHIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + FwAAAk1TRnQBSQFMAgEBDQEAAdgBAAHYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAUADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/oscardata/oscardata/Properties/documentation.pdf b/oscardata/oscardata/Properties/documentation.pdf deleted file mode 100644 index d4108b1..0000000 Binary files a/oscardata/oscardata/Properties/documentation.pdf and /dev/null differ diff --git a/oscardata/oscardata/Properties/draft-spittka-payload-rtp-opus-03.pdf b/oscardata/oscardata/Properties/draft-spittka-payload-rtp-opus-03.pdf deleted file mode 100644 index e6f5fdc..0000000 Binary files a/oscardata/oscardata/Properties/draft-spittka-payload-rtp-opus-03.pdf and /dev/null differ diff --git a/oscardata/oscardata/bin/Debug/oscardata.exe b/oscardata/oscardata/bin/Debug/oscardata.exe new file mode 100755 index 0000000..c747714 Binary files /dev/null and b/oscardata/oscardata/bin/Debug/oscardata.exe differ diff --git a/oscardata/oscardata/bin/Debug/oscardata.exe.config b/oscardata/oscardata/bin/Debug/oscardata.exe.config new file mode 100755 index 0000000..e743be0 --- /dev/null +++ b/oscardata/oscardata/bin/Debug/oscardata.exe.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/oscardata/oscardata/bin/Debug/oscardata.pdb b/oscardata/oscardata/bin/Debug/oscardata.pdb new file mode 100755 index 0000000..58af86c Binary files /dev/null and b/oscardata/oscardata/bin/Debug/oscardata.pdb differ diff --git a/oscardata/oscardata/bin/Release/oscardata.exe b/oscardata/oscardata/bin/Release/oscardata.exe index a6735d2..80be768 100755 Binary files a/oscardata/oscardata/bin/Release/oscardata.exe and b/oscardata/oscardata/bin/Release/oscardata.exe differ diff --git a/oscardata/oscardata/bin/Release/oscardata.exe.config b/oscardata/oscardata/bin/Release/oscardata.exe.config new file mode 100755 index 0000000..e743be0 --- /dev/null +++ b/oscardata/oscardata/bin/Release/oscardata.exe.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/oscardata/oscardata/bin/Release/oscardata.pdb b/oscardata/oscardata/bin/Release/oscardata.pdb new file mode 100755 index 0000000..9c7efec Binary files /dev/null and b/oscardata/oscardata/bin/Release/oscardata.pdb differ diff --git a/oscardata/oscardata/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/oscardata/oscardata/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs new file mode 100755 index 0000000..182bcf0 --- /dev/null +++ b/oscardata/oscardata/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferences.cache new file mode 100755 index 0000000..c35bce7 Binary files /dev/null and b/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100755 index 0000000..07afeec Binary files /dev/null and b/oscardata/oscardata/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/oscardata/oscardata/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/oscardata/oscardata/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll new file mode 100755 index 0000000..9586d8c Binary files /dev/null and b/oscardata/oscardata/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.Form1.resources b/oscardata/oscardata/obj/Debug/oscardata.Form1.resources new file mode 100755 index 0000000..0779065 Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.Form1.resources differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.Form2_showtext.resources b/oscardata/oscardata/obj/Debug/oscardata.Form2_showtext.resources new file mode 100755 index 0000000..6c05a97 Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.Form2_showtext.resources differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.Properties.Resources.resources b/oscardata/oscardata/obj/Debug/oscardata.Properties.Resources.resources new file mode 100755 index 0000000..d639180 Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.Properties.Resources.resources differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.csproj.CoreCompileInputs.cache b/oscardata/oscardata/obj/Debug/oscardata.csproj.CoreCompileInputs.cache new file mode 100755 index 0000000..c555a3a --- /dev/null +++ b/oscardata/oscardata/obj/Debug/oscardata.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +9e2591805e48c9de90be794d8c80dc9ff27fb5a3 diff --git a/oscardata/oscardata/obj/Debug/oscardata.csproj.FileListAbsolute.txt b/oscardata/oscardata/obj/Debug/oscardata.csproj.FileListAbsolute.txt new file mode 100755 index 0000000..b500c7c --- /dev/null +++ b/oscardata/oscardata/obj/Debug/oscardata.csproj.FileListAbsolute.txt @@ -0,0 +1,11 @@ +E:\funk\hsmodem\oscardata\oscardata\bin\Debug\oscardata.exe.config +E:\funk\hsmodem\oscardata\oscardata\bin\Debug\oscardata.exe +E:\funk\hsmodem\oscardata\oscardata\bin\Debug\oscardata.pdb +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.Form1.resources +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.Properties.Resources.resources +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.csproj.GenerateResource.cache +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.csproj.CoreCompileInputs.cache +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.exe +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.pdb +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.Form2_showtext.resources +E:\funk\hsmodem\oscardata\oscardata\obj\Debug\oscardata.csprojAssemblyReference.cache diff --git a/oscardata/oscardata/obj/Debug/oscardata.csproj.GenerateResource.cache b/oscardata/oscardata/obj/Debug/oscardata.csproj.GenerateResource.cache new file mode 100755 index 0000000..07d7467 Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.csproj.GenerateResource.cache differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.csprojAssemblyReference.cache b/oscardata/oscardata/obj/Debug/oscardata.csprojAssemblyReference.cache new file mode 100755 index 0000000..fcb839c Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.csprojAssemblyReference.cache differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.exe b/oscardata/oscardata/obj/Debug/oscardata.exe new file mode 100755 index 0000000..c747714 Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.exe differ diff --git a/oscardata/oscardata/obj/Debug/oscardata.pdb b/oscardata/oscardata/obj/Debug/oscardata.pdb new file mode 100755 index 0000000..58af86c Binary files /dev/null and b/oscardata/oscardata/obj/Debug/oscardata.pdb differ diff --git a/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs new file mode 100755 index 0000000..182bcf0 --- /dev/null +++ b/oscardata/oscardata/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferences.cache b/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100755 index 0000000..3141672 Binary files /dev/null and b/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100755 index 0000000..5c61bb0 Binary files /dev/null and b/oscardata/oscardata/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/oscardata/oscardata/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/oscardata/oscardata/obj/Release/TempPE/Properties.Resources.Designer.cs.dll new file mode 100755 index 0000000..278570b Binary files /dev/null and b/oscardata/oscardata/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/oscardata/oscardata/obj/Release/oscardata.Form1.resources b/oscardata/oscardata/obj/Release/oscardata.Form1.resources new file mode 100755 index 0000000..d08524f Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.Form1.resources differ diff --git a/oscardata/oscardata/obj/Release/oscardata.Form2_showtext.resources b/oscardata/oscardata/obj/Release/oscardata.Form2_showtext.resources new file mode 100755 index 0000000..6c05a97 Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.Form2_showtext.resources differ diff --git a/oscardata/oscardata/obj/Release/oscardata.Properties.Resources.resources b/oscardata/oscardata/obj/Release/oscardata.Properties.Resources.resources new file mode 100755 index 0000000..d639180 Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.Properties.Resources.resources differ diff --git a/oscardata/oscardata/obj/Release/oscardata.csproj.CoreCompileInputs.cache b/oscardata/oscardata/obj/Release/oscardata.csproj.CoreCompileInputs.cache new file mode 100755 index 0000000..90ecca0 --- /dev/null +++ b/oscardata/oscardata/obj/Release/oscardata.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +f689faaaeada03b7ced4435f518c6a73110138e7 diff --git a/oscardata/oscardata/obj/Release/oscardata.csproj.FileListAbsolute.txt b/oscardata/oscardata/obj/Release/oscardata.csproj.FileListAbsolute.txt new file mode 100755 index 0000000..e8d5a7c --- /dev/null +++ b/oscardata/oscardata/obj/Release/oscardata.csproj.FileListAbsolute.txt @@ -0,0 +1,11 @@ +E:\funk\hsmodem\oscardata\oscardata\bin\Release\oscardata.exe.config +E:\funk\hsmodem\oscardata\oscardata\bin\Release\oscardata.exe +E:\funk\hsmodem\oscardata\oscardata\bin\Release\oscardata.pdb +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.Form1.resources +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.Properties.Resources.resources +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.csproj.GenerateResource.cache +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.csproj.CoreCompileInputs.cache +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.exe +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.pdb +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.Form2_showtext.resources +E:\funk\hsmodem\oscardata\oscardata\obj\Release\oscardata.csprojAssemblyReference.cache diff --git a/oscardata/oscardata/obj/Release/oscardata.csproj.GenerateResource.cache b/oscardata/oscardata/obj/Release/oscardata.csproj.GenerateResource.cache new file mode 100755 index 0000000..d6a9491 Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.csproj.GenerateResource.cache differ diff --git a/oscardata/oscardata/obj/Release/oscardata.csprojAssemblyReference.cache b/oscardata/oscardata/obj/Release/oscardata.csprojAssemblyReference.cache new file mode 100755 index 0000000..f77f36b Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.csprojAssemblyReference.cache differ diff --git a/oscardata/oscardata/obj/Release/oscardata.exe b/oscardata/oscardata/obj/Release/oscardata.exe new file mode 100755 index 0000000..80be768 Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.exe differ diff --git a/oscardata/oscardata/obj/Release/oscardata.pdb b/oscardata/oscardata/obj/Release/oscardata.pdb new file mode 100755 index 0000000..9c7efec Binary files /dev/null and b/oscardata/oscardata/obj/Release/oscardata.pdb differ diff --git a/oscardata/oscardata/udp.cs b/oscardata/oscardata/udp.cs index 4ccb2ab..b68dab7 100755 --- a/oscardata/oscardata/udp.cs +++ b/oscardata/oscardata/udp.cs @@ -141,29 +141,10 @@ namespace oscardata lastb[0] = b[i]; // test if aligned - int re = 0, im = 0; - if (lastb[0] == 0 && lastb[1] == 0 && lastb[2] == 3 && lastb[3] == 0xe8) + Int32 re = 0, im = 0; + if (lastb[0] == 0xe8 && lastb[1] == 3 && lastb[2] == 0 && lastb[3] == 0) { - // we are aligned to a re value - re = lastb[4]; - re <<= 8; - re += lastb[5]; - re <<= 8; - re += lastb[6]; - re <<= 8; - re += lastb[7]; - - im = lastb[8]; - im <<= 8; - im += lastb[9]; - im <<= 8; - im += lastb[10]; - im <<= 8; - im += lastb[11]; - } - else if (lastb[0] == 0xe8 && lastb[1] == 3 && lastb[2] == 0 && lastb[3] == 0) - { - // we are aligned to a re value + // we are aligned re = lastb[7]; re <<= 8; re += lastb[6]; @@ -194,7 +175,7 @@ namespace oscardata static int maxdrawanz = 160; static int drawanz = 0; static Bitmap bm; - static void drawBitmap(int re, int im) + static void drawBitmap(Int32 re, Int32 im) { if (re == 0 && im == 0) return; if (++drawanz >= maxdrawanz && uq_iq.Count() <= 1) @@ -260,35 +241,6 @@ namespace oscardata } if (wait) Thread.Sleep(1); } - - /* - while (statics.running) - { - autoEvent.WaitOne(); - try - { - while (uq_tx.Count() > 0) - { - // TX data available - Byte[] b = uq_tx.Getarr(); - udpc.Send(b, b.Length, statics.ModemIP, statics.UdpTXport); - if (b[0] < 16) break; // continue without pause for internal control messages, or break for TX messages - } - } - catch (Exception e) - { - String err = e.ToString(); - } - - // do not wait in case of internal messages - if (statics.getDatarate() != actdatarate) - { - // rate has been changed, reset the timer - wait_datarate = (int)(((double)statics.UdpBlocklen * 8.0 * 1000.0 / (double)(statics.getDatarate()))); - TTimer.Change(0, wait_datarate); - actdatarate = statics.getDatarate(); - } - }*/ } public static void UdpBCsend(Byte[] b, String ip, int port)