diff --git a/DDSMODOULE.tar.gz b/DDSMODOULE.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0216a3b1aa31b74a1924736562dd5f6961e6917b Binary files /dev/null and b/DDSMODOULE.tar.gz differ diff --git a/DDSModule.tar.gz b/DDSModule.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..16d8f13530dee72366c8440c2d2c1b33f48b334d Binary files /dev/null and b/DDSModule.tar.gz differ diff --git a/UDPManage.cpp b/UDPManage.cpp new file mode 100644 index 0000000000000000000000000000000000000000..36fa6f9717b52a19f6b18819ac289a6e7fc9517b --- /dev/null +++ b/UDPManage.cpp @@ -0,0 +1,75 @@ +#include "UDPManage.hpp" + + + UdpManage::UdpManage(int localPort, int remotePort, const char* localIP, const char* remoteIP ) + { + this->localPort = localPort; + this->remotePort = remotePort; + *this->localIP = *localIP; + *this->remoteIP = *remoteIP; + udpsocket.init(localPort,remotePort,localIP, remoteIP); + this->recvUdpData = 0; + } + + int UdpManage::printfData(){ + if(1 == this->recvUdpData) + { + std::cout << " this->localPort : " << this->localPort << std::endl; + std::cout << " this->remotePort : " << this->remotePort << std::endl; + std::cout << " this->localIP : " << *this->localIP << std::endl; + std::cout << " this->localIP : " << *this->localIP << std::endl; + } + + } + + void UdpManage::recv(){ + flightPara = *(FlightParams *)udpsocket.recvData(); + if(1 == flightPara.is_valid) + { + std::cout << "=== [UDP] Message received Succeed!!" << std::endl; + std::cout << "=== [UDP] Message received Succeed!!" << std::endl; + std::cout << " is_valid : " << flightPara.is_valid << std::endl; + std::cout << " frame_count : " << flightPara.frame_count << std::endl; + std::cout << " platform_id : " << flightPara.platform_id<< std::endl; + printf("platform_name : %s\n\n",flightPara.platform_name); + std::cout << " longitude : " << flightPara.longitude << std::endl; + std::cout << " latitude : " << flightPara.latitude << std::endl; + std::cout << " alt : " << flightPara.alt << std::endl; + std::cout << " northSpeed : " << flightPara.northSpeed << std::endl; + std::cout << " upSpeed : " << flightPara.upSpeed << std::endl; + std::cout << " eastSpeed : " << flightPara.eastSpeed << std::endl; + std::cout << " northAccel : " << flightPara.upAccel << std::endl; + std::cout << " upAccel : " << flightPara.longitude << std::endl; + std::cout << " eastAccel : " << flightPara.eastAccel << std::endl; + std::cout << " pitchAngle : " << flightPara.pitchAngle << std::endl; + std::cout << " headingAngle : " << flightPara.headingAngle << std::endl; + std::cout << " rollAngle : " << flightPara.rollAngle << std::endl; + std::cout << " pitchAngleVel : " << flightPara.pitchAngleVel << std::endl; + std::cout << " headingAngleVel : " << flightPara.headingAngleVel << std::endl; + std::cout << " rollANgleVel : " << flightPara.rollANgleVel << std::endl; + this->recvUdpData = 1; + } + + this.dealData(); + + + } + + void UdpManage::dealData() + { + if (this->recvUdpData == 1) + { + this->dataManage.addData(this.flightPara); + } + + } + + void UdpManage::send() + { + int send_num = udpsocket.sendeData(this->flightData,sizeof(FlightParams)); + if(send_num < 0) + { + printf("[udp_manager]sendto error!\n"); + } + + } diff --git a/UDPManage.hpp b/UDPManage.hpp new file mode 100644 index 0000000000000000000000000000000000000000..f2475b1e19b545a12707d81b9ebce3b6644bb8af --- /dev/null +++ b/UDPManage.hpp @@ -0,0 +1,29 @@ + +#include "UDPsckt.hpp" +#include "FccData.h" +#include "DataManage.hpp" + + +class UdpManage{ +protected: + int localPort; + int remotePort; + char* localIP; + char* remoteIP; + UdpSocket udpsocket; + FlightParams flightPara; + int recvUdpData; + DataManage dataManage; +public: + UdpManage(int localPort, int remotePort, const char* localIP, const char* remoteIP ); + + int printfData(); + + void recv(); + + void send(); + + void dealData(); +}; + + diff --git a/UDPsckt.hpp b/UDPsckt.hpp new file mode 100644 index 0000000000000000000000000000000000000000..d7a9882ee9ef897640af053e1621046507e2f827 --- /dev/null +++ b/UDPsckt.hpp @@ -0,0 +1,73 @@ + + +#include +#include +#include +#include +#include +#include + +class UdpSocket +{ +protected: + int socket_fd; + struct sockaddr_in addr_local; + struct sockaddr_in addr_remote; + char readBuff[1024]; + +public: + UdpSocket(){} + ~UdpSocket(){ close(socket_fd); } + UdpSocket(int localPort, int remotePort, const char* localIP, const char* remoteIP) + { + init(localPort, remotePort, localIP, remoteIP); + } + + bool init(int localPort, int remotePort, const char* localIP, const char* remoteIP) + { + socket_fd = socket(AF_INET,SOCK_DGRAM,0); + if(socket_fd<0) + { + printf("[udp_manager]socket create error !\n"); + return false; + } + + addr_remote.sin_family=AF_INET; + addr_remote.sin_addr.s_addr = inet_addr(remoteIP); + addr_remote.sin_port=htons(remotePort); + + addr_local.sin_family=AF_INET; + addr_local.sin_addr.s_addr = inet_addr(localIP); + addr_local.sin_port=htons(localPort); + + int ret = bind(socket_fd, (struct sockaddr*)&addr_local, sizeof(addr_local)); + if(ret == -1) + { + printf("[udp_manager]socket bind error !\n"); + return false; + } + } + + int sendeData(char *sendData, int len) + { + return sendto(socket_fd, sendData, len, 0, (struct sockaddr*)&addr_remote, sizeof(addr_remote)); + } + + char* recvData() + { + socklen_t addr_local = sizeof(addr_local); + int recv_num = recvfrom(socket_fd,(char*)readBuff,1024,0, (struct sockaddr*)&addr_local, &addr_local); + if(recv_num < 0) + { + printf("[udp_manager]socket recv error !\n"); + return nullptr; + } + + return (char*)readBuff; + } + +}; + + + + diff --git a/aspell-0.60.8-pspell_conf.patch b/aspell-0.60.8-pspell_conf.patch deleted file mode 100644 index a5fe8e4a4539f4da0f8229ead0ed72de1bd1e539..0000000000000000000000000000000000000000 --- a/aspell-0.60.8-pspell_conf.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index e5d2b1a..bc53e34 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1019,6 +1019,8 @@ clean-filterLTLIBRARIES: - install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ -+ mkdir -p $(DESTDIR)$(libdir)/pkgconfig; \ -+ cp aspell.pc $(DESTDIR)$(libdir)/pkgconfig/aspell.pc; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ -diff --git a/aspell.pc.in b/aspell.pc.in -new file mode 100644 -index 0000000..13da044 ---- /dev/null -+++ b/aspell.pc.in -@@ -0,0 +1,12 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+pkgdatadir=@pkgdatadir@ -+ -+Name: Aspell -+Description: A spelling checker. -+Version: @VERSION@ -+Requires: -+Libs: -L${libdir} -laspell -+Cflags: -I${includedir} -diff --git a/configure b/configure -index 8a6e697..995a3df 100755 ---- a/configure -+++ b/configure -@@ -18732,7 +18732,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # # - # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # - --ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" -+ac_config_files="$ac_config_files Makefile gen/Makefile common/Makefile lib/Makefile data/Makefile auto/Makefile modules/Makefile modules/tokenizer/Makefile modules/speller/Makefile modules/speller/default/Makefile interfaces/Makefile interfaces/cc/Makefile aspell.pc scripts/Makefile examples/Makefile prog/Makefile manual/Makefile po/Makefile.in m4/Makefile modules/filter/Makefile myspell/Makefile lib5/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -19887,6 +19887,7 @@ do - "modules/filter/Makefile") CONFIG_FILES="$CONFIG_FILES modules/filter/Makefile" ;; - "myspell/Makefile") CONFIG_FILES="$CONFIG_FILES myspell/Makefile" ;; - "lib5/Makefile") CONFIG_FILES="$CONFIG_FILES lib5/Makefile" ;; -+ "aspell.pc") CONFIG_FILES="$CONFIG_FILES aspell.pc" ;; - - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -diff --git a/scripts/mkconfig b/scripts/mkconfig -index 608e3f7..f15f31c 100755 ---- a/scripts/mkconfig -+++ b/scripts/mkconfig -@@ -15,7 +15,7 @@ case \$1 in - echo "$2" - ;; - --pkgdatadir | pkgdatadir) -- echo "$3" -+ pkg-config aspell --variable=pkgdatadir - ;; - *) - echo "usage: pspell-config version|datadir|pkgdatadir" diff --git a/aspell-rel-0.60.8.tar.gz b/aspell-rel-0.60.8.tar.gz deleted file mode 100644 index 2896594693135de1116dfd2d6338b4926509485b..0000000000000000000000000000000000000000 Binary files a/aspell-rel-0.60.8.tar.gz and /dev/null differ diff --git a/aspell.spec b/aspell.spec deleted file mode 100644 index 39274e56af9db87a19829eb17a4977d9f827b6db..0000000000000000000000000000000000000000 --- a/aspell.spec +++ /dev/null @@ -1,143 +0,0 @@ -Summary: Spell checker -Name: aspell -Version: 0.60.8 -Release: 1 -Epoch: 12 -License: LGPLv2+ and LGPLv2 and GPLv2+ and BSD -URL: http://aspell.net/ -Source: https://github.com/GNUAspell/aspell/archive/refs/tags/aspell-rel-%{version}.tar.gz - -Patch1: aspell-0.60.8-pspell_conf.patch - -BuildRequires: gcc-c++ -BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter -BuildRequires: make, gettext-devel, libtool, texinfo - -%description -GNU Aspell is a spell checker designed to eventually replace Ispell. It can -either be used as a library or as an independent spell checker. Its main -feature is that it does a much better job of coming up with possible -suggestions than just about any other spell checker out there for the -English language, including Ispell and Microsoft Word. It also has many -other technical enhancements over Ispell such as using shared memory for -dictionaries and intelligently handling personal dictionaries when more -than one Aspell process is open at once. - -%package devel -Summary: Libraries and header files for Aspell development -Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: pkgconfig - -%description devel -The aspell-devel package includes libraries -and header files needed for Aspell development. - - -%package help -Summary: Introduce how to use aspell - -%description help -User's Manual for aspell - -%prep -%setup -q -./autogen -%patch1 -p1 -b .mlib - -%build -%configure --disable-rpath -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -%make_build -cp scripts/aspell-import examples/aspell-import -chmod 644 examples/aspell-import -cp manual/aspell-import.1 examples/aspell-import.1 - -%install -%make_install - -mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60 - -mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/ispell ${RPM_BUILD_ROOT}%{_bindir} -mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir} - -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//nroff-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//sgml-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//context-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//email-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//tex-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//texinfo-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//markdown-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/aspell -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.* - -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la -rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la -rm -f ${RPM_BUILD_ROOT}%{_bindir}/aspell-import -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir - -%find_lang %{name} - - -%check -make check - - -%files -f %{name}.lang -%doc TODO COPYING examples/aspell-import examples/aspell-import.1 -%dir %{_libdir}/aspell-0.60 -%{_bindir}/a* -%{_bindir}/ispell -%{_bindir}/pr* -%{_bindir}/run-with-aspell -%{_bindir}/spell -%{_bindir}/word-list-compress -%{_libdir}/lib*.so.* -%{_libdir}/aspell-0.60/* -%{_infodir}/aspell.* -%exclude %{_libdir}/libaspell.la -%exclude %{_libdir}/libpspell.la -%exclude %{_libdir}/aspell-0.60/*-filter.la -%exclude %{_bindir}/aspell-import - - -%files devel -%dir %{_includedir}/pspell -%{_bindir}/pspell-config -%{_includedir}/aspell.h -%{_includedir}/pspell/pspell.h -%{_libdir}/lib*spell.so -%{_libdir}/pkgconfig/* -%{_infodir}/aspell-dev.* - - -%files help -%doc TODO -%{_mandir}/man1/aspell.1.* -%{_mandir}/man1/run-with-aspell.1* -%{_mandir}/man1/word-list-compress.1* -%{_mandir}/man1/prezip-bin.1.* -%{_mandir}/man1/pspell-config.1* - -%changelog -* Sun Nov 6 2022 huyab<1229981468@qq.com> - 12:0.60.8-1 -- update version to 0.60.8-1 - -* Thu Jul 28 2022 wuzx - 12:0.60.6.1-30 -- add sw64 patch - -* Tue Sep 28 2021 yaoxin - 12:0.60.6.1-29 -- fix CVE-2019-20433 - -* Thu Sep 23 2021 liwu - 12:0.60.6.1-28 -- fix CVE-2019-25051 - -* Thu Jul 27 2021 houyingchao - 12:0.60.6.1-27 -- fix CVE-2019-17544 - -* Thu Dec 24 2020 Ge Wang - 12:0.60.6.1-26 -- Modify Source0 url - -* Wed Nov 27 2019 yangjian - 12:0.60.6.1-25 -- Package init diff --git a/aspell.yaml b/aspell.yaml deleted file mode 100644 index 832d70e9591a517afd5dd3640cca4f0ac8ff255a..0000000000000000000000000000000000000000 --- a/aspell.yaml +++ /dev/null @@ -1,5 +0,0 @@ -version_control: git -src_repo: https://git.savannah.gnu.org/git/aspell.git -tag_prefix: "rel-" -separator: "." - diff --git a/cyclonedds-cxx.tar.gz b/cyclonedds-cxx.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5b36a844fc455c2db5e036263439a56cb50be224 Binary files /dev/null and b/cyclonedds-cxx.tar.gz differ diff --git a/cyclonedds-master.zip b/cyclonedds-master.zip new file mode 100644 index 0000000000000000000000000000000000000000..ce72b30d45ec9b96c80a13865eba7f84ed82cb1c Binary files /dev/null and b/cyclonedds-master.zip differ diff --git a/cyclonedds.rar b/cyclonedds.rar new file mode 100644 index 0000000000000000000000000000000000000000..3acda6fb1b9e2a649086ccb40c6ebbf973dbf6a7 Binary files /dev/null and b/cyclonedds.rar differ diff --git a/ddsModule0104.zip b/ddsModule0104.zip new file mode 100644 index 0000000000000000000000000000000000000000..73d376058f99eddf6181cb24a58d9ea58d1d1195 Binary files /dev/null and b/ddsModule0104.zip differ diff --git a/ddsModule_kj600_010501.tar.xz b/ddsModule_kj600_010501.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..42f9a176e46f121de02afeae4cc7de061aa325fc Binary files /dev/null and b/ddsModule_kj600_010501.tar.xz differ diff --git a/ddsModule_kj600_010502_ok.tar.xz b/ddsModule_kj600_010502_ok.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..6dc235721121f6ba90b976b6bcdde9c29d6c91b9 Binary files /dev/null and b/ddsModule_kj600_010502_ok.tar.xz differ diff --git a/fccManage.tar.gz b/fccManage.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1baeb13bab8b34f2443a22191090a7ffa7bc688e Binary files /dev/null and b/fccManage.tar.gz differ