Merge pull request #82 from Digitelektro/develop

Develop

Author: Digitelektro

installer/.gitignore

@@ -0,0 +1 @@
+meteordemod.exe

installer/installer.iss

@@ -0,0 +1,76 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "meteordemod"
+#define MyAppVersion "2.5.5"
+#define MyAppPublisher "Digitelektro"
+#define MyAppURL "https://github.com/Digitelektro/MeteorDemod"
+#define MyAppExeName "meteordemod.exe"
+
+#define AppSourcesFolder ".."
+#define OpenCVSourcesFolder "..\..\..\opencv\own_build_x86\bin\Release\"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{3D10F735-AF6A-4032-BA76-620319357A77}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+DisableProgramGroupPage=yes
+LicenseFile={#AppSourcesFolder}\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only.)
+;PrivilegesRequired=lowest
+PrivilegesRequiredOverridesAllowed=dialog
+OutputDir=./
+OutputBaseFilename=meteordemod
+Compression=lzma
+SolidCompression=yes
+WizardStyle=modern
+; Tell Windows Explorer to reload the environment
+ChangesEnvironment=yes
+
+[Registry]
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \
+    ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \
+    Check: NeedsAddPath(ExpandConstant('{app}'))
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+Source: "{#AppSourcesFolder}\build\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#AppSourcesFolder}\resources\*"; DestDir: "{app}\resources\"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#OpenCVSourcesFolder}\opencv_core343.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#OpenCVSourcesFolder}\opencv_imgcodecs343.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#OpenCVSourcesFolder}\opencv_imgproc343.dll"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+
+
+[Code]
+
+function NeedsAddPath(Path: string): boolean;
+var
+  OrigPath: string;
+begin
+  if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
+    'SYSTEM\CurrentControlSet\Control\Session Manager\Environment',
+    'Path', OrigPath)
+  then begin
+    Result := True;
+    exit;
+  end;
+  
+  { look for the path with leading and trailing semicolon }
+  { Pos() returns 0 if not found }
+  Result := Pos(';' + Uppercase(Path) + ';', ';' + Uppercase(OrigPath) + ';') = 0;
+end;
+

readme.md

@@ -80,6 +80,8 @@ sudo make install
 ## Usage
 Input parameters:
 
+-sat --satellite Satellite settings name from settings.ini
+
 -t --tle        Two-line element set (TLE) file for calculating overlays
 
 -i --input      Input *.S file or *.wav
@@ -90,8 +92,17 @@ Input parameters:
 
 -d --date       Optional, specify date for decoding older files (format: dd-mm-yyyy)
 
+-m --mode       Specify modulation type (qpsk or oqpsk, default: qpsk)
+
+-int --int      Deinterleave, needed for 80k mode
+
+-diff --diff    Differential decode, may need for newer satellites
+
 Other settings can be found in the settings.ini file.
 
+### Example command for 80k mode Meteor M2-3: 
+
+``` meteordemod -m oqpsk -int 1 -diff 1 -s 80e3 -sat METEOR-M-2-3 -i input_baseband.wav -t weather.tle -o ./```
 
 ## Development
 Master branch is for the latest stable version, beta branch for beta versions, development is ongoing on other branches.