Support DHO800/900 models in MacOS Port

README

@@ -0,0 +1,85 @@
+# DSRemote-macOS
+
+DSRemote ported to work with Rigol DHO800 and DHO900 series. Currently at experimental stage.
+
+This is a quick and dirty patched version of [DSRemote](https://teuniz.net/DSRemote/) to allow building on macOS without USB support.
+
+## Compiling on macOS without USB support
+
+Install [Homebrew](https://brew.sh).
+
+brew install make git qt@5
+
+brew link qt@5
+
+git clone <https://github.com/snarkyerica/DSRemote-macOS.git>
+
+cd DSRemote-macOS
+
+qmake
+
+make -j8 (replace 8 with the number of threads you'd like to use)
+
+Copy the resulting .app file into your Applications folder, right click and Open.
+
+
+
+Original README follows.
+
+
+
+# DSRemote
+
+Operate your Rigol oscilloscope from your Linux desktop
+========================================================
+
+webpage and info: <https://www.teuniz.net/DSRemote/>
+
+Compiling and installing on Ubuntu Linux and derivatives
+---------------------------------------------------------
+
+sudo apt-get update
+sudo apt-get install g++ make git qtbase5-dev-tools qtbase5-dev qt5-default
+git clone <https://gitlab.com/Teuniz/DSRemote.git>
+cd DSRemote
+qmake
+make -j4
+sudo make install
+dsremote
+
+For USB connection setup use the following commands
+----------------------------------------------------
+
+sudo groupadd usbtmc
+sudo usermod -a -G usbtmc <username>
+reboot
+
+Now you can run the program by typing: dsremote
+
+(USB connection does not work on modern USB host controllers thanks to
+a bug in the scopes' firmware that Rigol does not want to fix.)
+
+ Read also the file readme_usbtcm_driver.txt
+ and the file notes.txt.
+
+Supported devices
+---------------
+
+DS6000 and DS1000Z series oscilloscopes.
+
+### MSO4000/DS4000 series
+
+There is some basic support like capturing screenshots.
+
+Not tested yet:
+
+* Record & Playback function
+* Wave Inspector
+* serial decoding.
+
+Note:
+This is a private project made available to the public. No pullrequests!
+If you believe you found a bug or want to add some feature, open an issue on Gitlab or send me an email.
+In case you want to add some code, send me a diff, no pull requests, they will be ignored.
+Also, all requests regarding to support other platforms and/or other tools will be ignored.
+Again, this a Linux & GCC & Make project. That means no Mac/windows/Clang/CMake etc.

global.h

@@ -35,7 +35,7 @@
 
 
 #define PROGRAM_NAME          "DSRemote"
-#define PROGRAM_VERSION       "0.41_2311302014"
+#define PROGRAM_VERSION       "0.41_2311302014_MAC"
 
 #define MAX_PATHLEN            (1024)
 

interface.cpp

@@ -4143,7 +4143,7 @@ void UI_Mainwindow::trigAdjustDialClicked(QPoint)
 
   statusLabel->setText(str);
 
-  snprintf(str, 512, ":TRIG:EDG:LEV %e", devparms.triggeredgelevel[devparms.triggeredgesource]);
+  snprintf(str, 512, ":TRIGger:EDGE:LEVel %e", devparms.triggeredgelevel[devparms.triggeredgesource]);
 
   set_cue_cmd(str);
 }
@@ -4155,7 +4155,11 @@ void UI_Mainwindow::toggle_fft()
   {
     devparms.math_fft = 0;
 
-    if(devparms.modelserie != 1)
+    if(devparms.modelserie == 7)
+    {
+      set_cue_cmd(":MATH1:DISP OFF");
+    }
+    else if(devparms.modelserie != 1)
     {
       set_cue_cmd(":CALC:MODE OFF");
     }
@@ -4168,7 +4172,13 @@ void UI_Mainwindow::toggle_fft()
   }
   else
   {
-    if(devparms.modelserie != 1)
+    if(devparms.modelserie == 7)
+    {
+      set_cue_cmd(":MATH:OPER FFT");
+
+      set_cue_cmd(":MATH1:DISP ON");
+    }
+    else if(devparms.modelserie != 1)
     {
       set_cue_cmd(":CALC:MODE FFT");
     }