瀏覽代碼

reenabled pwm

Malte Veerman 10 年之前
父節點
當前提交
fbec330077
共有 2 個文件被更改,包括 4 次插入3 次删除
  1. 2 1
      share/src/sensors.cpp
  2. 2 2
      share/src/sensors.h

+ 2 - 1
share/src/sensors.cpp

@@ -184,7 +184,8 @@ void Temp::setName(const QString &name)
 {
     KConfigGroup names = m_config->group("names");
     KConfigGroup localNames = names.group(m_parent->name());
-    if (name != localNames.readEntry("temp" + QString::number(m_index), QString()))
+    if (name != localNames.readEntry("temp" + QString::number(m_index), QString())
+        && !name.isEmpty())
     {
         localNames.writeEntry(m_parent->name() + "temp" + QString::number(m_index), name);
         emit nameChanged();

+ 2 - 2
share/src/sensors.h

@@ -137,7 +137,7 @@ protected:
 class FANCONTROL_GUI_EXPORT PwmFan : public Fan
 {
     Q_OBJECT
-    //Q_PROPERTY(int pwm READ pwm WRITE setPwm NOTIFY pwmChanged)
+    Q_PROPERTY(int pwm READ pwm NOTIFY pwmChanged)
     Q_PROPERTY(Temp * temp READ temp WRITE setTemp NOTIFY tempChanged)
     Q_PROPERTY(bool hasTemp READ hasTemp WRITE setHasTemp NOTIFY hasTempChanged)
     Q_PROPERTY(int minTemp READ minTemp WRITE setMinTemp NOTIFY minTempChanged)
@@ -151,7 +151,7 @@ public:
 
     explicit PwmFan(Hwmon *parent, uint index);
 
-//    int pwm() const { return m_pwm; }
+    int pwm() const { return m_pwm; }
 //    void setPwm(int pwm) { if (pwm != m_pwm) { m_pwm = pwm; emit pwmChanged(); writePwm(); } }
     Temp * temp() const { return m_temp; }
     bool hasTemp() const { return m_hasTemp; }