ham-ref/satdump
1
0
Fork 0
mirror of https://github.com/SatDump/SatDump synced 2026-08-13 17:47:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Release FengYun-3E / MERSI-LL support

Browse source
This commit is contained in:
Aang23 2021-07-09 22:03:38 +02:00
parent f22209fe7a
commit 5b74bf79d2
9 changed files with 124 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src-core/module.cpp
View file

@ -88,11 +88,8 @@ SATDUMP_DLL std::map<std::string, std::function<std::shared_ptr<ProcessingModule
#include "modules/fengyun/instruments/mwri/module_fengyun_mwri.h"
#include "modules/fengyun/instruments/mwts/module_fengyun_mwts.h"
#include "modules/fengyun/instruments/mwhs2/module_fengyun_mwhs2.h"
<<<<<<< HEAD
#include "modules/fengyun/module_fengyun_satid.h"
=======
#include "modules/fengyun/instruments/mersill/module_fengyun_mersill.h"
>>>>>>> fy-3e
#include "modules/aqua/module_aqua_db_decoder.h"
#include "modules/aqua/instruments/airs/module_aqua_airs.h"
@ -200,11 +197,8 @@ void registerModules()
REGISTER_MODULE(fengyun::mwri::FengyunMWRIDecoderModule);
REGISTER_MODULE(fengyun::mwts::FengyunMWTSDecoderModule);
REGISTER_MODULE(fengyun::mwhs2::FengyunMWHS2DecoderModule);
<<<<<<< HEAD
REGISTER_MODULE(fengyun::satid::FengYunSatIDModule);
=======
REGISTER_MODULE(fengyun::mersill::FengyunMERSILLDecoderModule);
>>>>>>> fy-3e
// Aqua
REGISTER_MODULE(aqua::AquaDBDecoderModule);