Changeset 25515

Timestamp:

01/08/14 11:59:23 (9 years ago)

Author:

gost

Message:

[titan] add standby fancontrol for ufs922

Location:

titan/titan

Files:

• fancontrol.h (modified) (3 diffs)
• global.h (modified) (2 diffs)
• standby.h (modified) (2 diffs)

titan/titan/fancontrol.h

@@ -2 +2 @@
 #define FANCONTROL_H
 
-void screenpanel_settings_fancontrol()
+int getspeedWert(char* speedWert)
 {
-        int rcret = 0;
         int speed = 0;
-        char* speedWert = NULL;
         
-        struct skin* panel_fancontrol = getscreen("panel_settings_fancontrol");
-        struct skin* fanprogress = getscreennode(panel_fancontrol, "fanprogress");
-
-        speedWert = getconfig("fanspeed", NULL);
         if (speedWert != NULL) 
         {
@@ -27 +21 @@
         else 
                 speed = 100;
+        return speed;
+}
+
+void screenpanel_settings_fancontrol()
+{
+        int rcret = 0;
+        int speed = 0;
+        int type = 0;
+        char* speedWert = NULL;
+        
+        struct skin* panel_fancontrol = getscreen("panel_settings_fancontrol");
+        struct skin* fanprogress = getscreennode(panel_fancontrol, "fanprogress");
+        struct skin* titletext = getscreennode(panel_fancontrol, "titeltext");
+
+        speedWert = getconfig("fanspeed", NULL);
+        speed = getspeedWert(speedWert);
                 
+        type = 1; //speed normal
+        changetext(titeltext, "FanControl-normal");
         fanprogress->progresssize = speed;
         drawscreen(panel_fancontrol, 0, 0);
@@ -40 +52 @@
                 }
                 if(rcret == getrcconfigint("rcgreen", NULL)){
-                        setfanspeed(speed, 1);
+                        setfanspeed(speed, type);
                         break;
+                }
+                if(rcret == getrcconfigint("rcyellow", NULL)){
+                        if(type == 1) {
+                                type = 2;
+                                changetext(titeltext, "FanControl-standby");
+                                speed = getspeedWert(getconfig("fanspeedstandby", NULL));
+                        }
+                        else {
+                                type = 1;
+                                changetext(titeltext, "FanControl-normal");
+                                speed = getspeedWert(getconfig("fanspeed", NULL));
+                        }
+                        fanprogress->progresssize = speed;
+                        drawscreen(panel_fancontrol, 0, 0);
                 }
                 if(rcret == getrcconfigint("rcleft", NULL)){

titan/titan/global.h

@@ -6309 +6309 @@
         if(speed < 0)
         {
-                speedWert = getconfig("fanspeed", NULL);
+                if(speed == -1)
+                        speedWert = getconfig("fanspeed", NULL);
+                else
+                        speedWert = getconfig("fanspeedstandby", NULL);
                 if(speedWert == NULL)
                         speedSet = ostrcat(speedSet, "170", 1, 0);
@@ -6333 +6336 @@
         if(aktion == 1)
                 addconfig("fanspeed", speedSet);
+        else
+                addconfig("fanspeedstandby", speedSet);
 
         free(speedSet); speedSet=NULL;

titan/titan/standby.h

@@ -56 +56 @@
                 free(tmpstr); tmpstr=NULL;
         }
+        if(checkbox("UFS922") == 1)
+                setfanspeed(-2, 0);
 
         status.protecttime = 0;
@@ -91 +93 @@
                 }
         }
+        if(checkbox("UFS922") == 1)
+                setfanspeed(-1, 0);
         
         setcecstandby(0);