Merge d7007117eb into 7e30f0601a

README.md

@@ -43,6 +43,19 @@ It also requires a modern C++17 compiler (GCC 8 minimum).
     conda create -n M17 vs2019_win-64 cmake ninja pkg-config boost-cpp gtest gmock gtest libcodec2
     conda activate M17
 
+### Extra Steps for Visual Studio 2022 - Inside Conda environment type:
+    conda env list
+    
+### Then navigate to the M17 path shown eg: 
+    C:\Users\USERNAME\.conda\envs\M17
+### Navigate to: 
+    \etc\conda\activate.d\
+    
+### And replace ```vs2019_compiler_vars.bat```  with the [File](https://raw.githubusercontent.com/Paulo-D2000/m17-cxx-demod/file_in_out/vs2019_compiler_vars.bat).
+    
+### Back Inside Conda environment type:
+    conda activate M17
+
 ### And then from the top level of the m17-cxx-demod repo, execute win_build.bat
 
 ## Running

apps/m17-demod.cpp

@@ -19,6 +19,11 @@
 #include <iostream>
 #include <vector>
 
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
 const char VERSION[] = "2.2";
 
 bool display_lsf = false;
@@ -438,6 +443,22 @@ int main(int argc, char* argv[])
 {
     using namespace mobilinkd;
     using namespace std::string_literals;
+	
+#ifdef WIN32
+	// Set "stdin" to have binary mode:
+   auto result = _setmode( _fileno( stdin ), _O_BINARY );
+   if( result == -1 )
+      perror( "Cannot set mode" );
+   else
+      std::cerr << "'stdin' successfully changed to binary mode\n";
+  
+  // Set "stdout" to have binary mode:
+  result = _setmode( _fileno( stdout ), _O_BINARY );
+   if( result == -1 )
+      perror( "Cannot set mode" );
+   else
+      std::cerr << "'stdout' successfully changed to binary mode\n";
+#endif
 
     auto config = Config::parse(argc, argv);
     if (!config) return 0;

apps/m17-mod.cpp

@@ -30,6 +30,11 @@
 
 #include <cstdlib>
 
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif
+
 #include <signal.h>
 
 // Generated using scikit-commpy
@@ -628,6 +633,22 @@ void transmit(queue_t& queue, const lsf_t& lsf)
 int main(int argc, char* argv[])
 {
     using namespace mobilinkd;
+	
+#ifdef WIN32
+	// Set "stdin" to have binary mode:
+   auto result = _setmode( _fileno( stdin ), _O_BINARY );
+   if( result == -1 )
+      perror( "Cannot set mode" );
+   else
+      std::cerr << "'stdin' successfully changed to binary mode\n";
+  
+  // Set "stdout" to have binary mode:
+  result = _setmode( _fileno( stdout ), _O_BINARY );
+   if( result == -1 )
+      perror( "Cannot set mode" );
+   else
+      std::cerr << "'stdout' successfully changed to binary mode\n";
+#endif
 
     auto config = Config::parse(argc, argv);
     if (!config) return 0;
@@ -687,6 +708,22 @@ int main(int argc, char* argv[])
 {
     using namespace mobilinkd;
     using namespace std::chrono_literals;
+	
+#ifdef WIN32
+	// Set "stdin" to have binary mode:
+   auto result = _setmode( _fileno( stdin ), _O_BINARY );
+   if( result == -1 )
+      perror( "Cannot set mode" );
+   else
+      std::cerr << "'stdin' successfully changed to binary mode\n";
+  
+  // Set "stdout" to have binary mode:
+  result = _setmode( _fileno( stdout ), _O_BINARY );
+   if( result == -1 )
+      perror( "Cannot set mode" );
+   else
+      std::cerr << "'stdout' successfully changed to binary mode\n";
+#endif
 
     auto config = Config::parse(argc, argv);
     if (!config) return 0;