preparing for nvoc

orkblutt · Aug 22, 2017 · 0750513 · 0750513
1 parent d43275e
commit 0750513
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/MiningLigth.pro b/MiningLigth.pro
@@ -10,13 +10,13 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
 TARGET = MinerLamp
 TEMPLATE = app
-VERSION = 0.1.0.620
+VERSION = 0.1.0.647
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked as deprecated (the exact warnings
 # depend on your compiler). Please consult the documentation of the
 # deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS NVIDIA DONATE
+DEFINES += QT_DEPRECATED_WARNINGS NVIDIA #DONATE
 
 
 # You can also make your code fail to compile if you use deprecated APIs.

diff --git a/nvidiaapi.cpp b/nvidiaapi.cpp
@@ -54,8 +54,7 @@ nvidiaAPI::nvidiaAPI():
 
         qDebug() << "NVAPI success " << ret;
 
-        NvEnumGPUs(_gpuHandles, &_gpuCount);
-        qDebug() << _gpuCount;
+
 
     }
 }
@@ -66,6 +65,13 @@ nvidiaAPI::~nvidiaAPI()
 
 }
 
+unsigned int nvidiaAPI::getGPUCount()
+{
+    NvEnumGPUs(_gpuHandles, &_gpuCount);
+    qDebug() << _gpuCount;
+    return _gpuCount;
+}
+
 
 
 void nvidiaAPI::overClock(unsigned int gpu, unsigned int mem)
@@ -146,7 +152,10 @@ unsigned int nvidiaAPI::getPowerLimit(unsigned int gpu)
     NVAPI_GPU_POWER_STATUS pol = { 0 };
     pol.version = NVAPI_GPU_POWER_STATUS_VER;
     if ((ret = NvClientPowerPoliciesGetStatus(_gpuHandles[gpu], &pol)) != NVAPI_OK)
+    {
+        qDebug() << "error";
        return 0;
+    }
 
     return (uint8_t) (pol.entries[0].power / 1000); // in percent
 

diff --git a/nvocdialog.cpp b/nvocdialog.cpp
@@ -11,12 +11,20 @@ nvOCDialog::nvOCDialog(QWidget *parent) :
 
     _nvapi = new nvidiaAPI();
 
-    ui->horizontalSliderPowerPercent->setValue(_nvapi->getPowerLimit(0));
 
-    unsigned int gpuclock = _nvapi->getGpuClock(0);
-    qDebug() << gpuclock;
 
-_nvapi->getGPUOffset(0);
+    unsigned int deviceNumber = _nvapi->getGPUCount();
+    if(deviceNumber)
+    {
+        for(unsigned int i = 0; i < deviceNumber; i++)
+        {
+            ui->comboBoxDevice->addItem(QString("device " + QString::number(i)));
+        }
+int value = _nvapi->getPowerLimit(0);
+qDebug() << value;
+        ui->horizontalSliderPowerPercent->setValue(value);
+    }
+
 
 }
 

diff --git a/nvocdialog.ui b/nvocdialog.ui
@@ -29,7 +29,7 @@
     </widget>
    </item>
    <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBox"/>
+    <widget class="QComboBox" name="comboBoxDevice"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
@@ -41,7 +41,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>GPU:</string>
+      <string>Devices:</string>
      </property>
     </widget>
    </item>
@@ -119,6 +119,13 @@
      </property>
     </widget>
    </item>
+   <item row="0" column="4">
+    <widget class="QCheckBox" name="checkBox_2">
+     <property name="text">
+      <string>Apply to all devices</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>