Changeset 42553

Timestamp:

Jul 23, 2018, 8:43:44 PM (20 months ago)

Author:

gost

Message:

next step IP LCD

Location:

titan

Files:

• plugins/lcdsamsung/lcdsamsung.c (modified) (7 diffs)
• skins/lcdsamsung/skin.xml (modified) (1 diff)

titan/plugins/lcdsamsung/lcdsamsung.c

@@ -425 +425 @@
         {
                 startlcd = createpluginpath("/lcdsamsung/start.sh", 0);
-                startlcd = ostrcat(startlcd, " 99", 1, 0);
+                startlcd = ostrcat(startlcd, " 98 ", 1, 0);
+                startlcd = ostrcat(startlcd, getconfig("lcd_samsung_ip", NULL), 1, 0);
         }
         else
@@ -1180 +1181 @@
         struct skin* listbox = getscreennode(samsung1_main, "listbox");
         struct skin* lcdtype = getscreennode(samsung1_main, "lcdtype");
+        struct skin* lcdip = getscreennode(samsung1_main, "lcdip");
         struct skin* allmenu = getscreennode(samsung1_main, "allmenu");
         struct skin* aktstandby = getscreennode(samsung1_main, "aktstandby");
@@ -1198 +1200 @@
         //wettervorland->hidden = YES;
         wettervorort->hidden = YES;
+  }
+  changeinput(lcdip, getconfig("lcd_samsung_ip", NULL));
+  if(getconfig("lcd_samsung_plugin_type", NULL) == NULL || ostrcmp(getconfig("lcd_samsung_plugin_type", NULL), "d320")  != 0)
+  {
+        lcdip->hidden = YES;
   }
     
@@ -1251 +1258 @@
         addscreenrc(samsung1_main, listbox);
         tmp = listbox->select;
-        
+                
         while(1)
         {
@@ -1273 +1280 @@
                         drawscreen(samsung1_main, 0, 0);
                 }
-                                        
+                if((rcret == getrcconfigint("rcleft", NULL) || rcret == getrcconfigint("rcright", NULL)) && listbox->select != NULL && ostrcmp(listbox->select->name, "lcdtype") == 0)
+                {
+                        if(ostrcmp(lcdtype->ret, "d320") == 0)
+                        {
+                        lcdip->hidden = NO;
+                        } else {
+                        lcdip->hidden = YES;
+                }
+                        
+                        drawscreen(samsung1_main, 0, 0);
+                }                       
                 if(rcret == getrcconfigint("rcexit", NULL))
                         break;
@@ -1282 +1299 @@
                         addconfig("lcd_samsung_plugin_standby", aktstandby->ret);
                         addconfig("lcd_samsung_plugin_wetter", wettervor->ret);
-                        addconfig("lcd_samsung_plugin_wetterort", wettervorort->ret); 
+                        addconfig("lcd_samsung_plugin_wetterort", wettervorort->ret);
+                        addconfig("lcd_samsung_ip", lcdip->ret);
                         //addconfig("lcd_samsung_plugin_wetterplz", wettervorplz->ret);
                         //addconfig("lcd_samsung_plugin_wetterland", wettervorland->ret);
@@ -1295 +1313 @@
                         addconfig("lcd_samsung_plugin_standby", aktstandby->ret);
                         addconfig("lcd_samsung_plugin_wetter", wettervor->ret);
-                        addconfig("lcd_samsung_plugin_wetterort", wettervorort->ret); 
+                        addconfig("lcd_samsung_plugin_wetterort", wettervorort->ret);
+                        addconfig("lcd_samsung_ip", lcdip->ret);
                         //addconfig("lcd_samsung_plugin_wetterplz", wettervorplz->ret);
                         //addconfig("lcd_samsung_plugin_wetterland", wettervorland->ret);

titan/skins/lcdsamsung/skin.xml

@@ -1 +1 @@
 <screen name="samsung1_main" title="Samsung SPF.. Settings" titlealign=center fontcol=fontcol valign=bottom fontsize=30 posx=center posy=center width=50% height=40% bordercol=bordercol bordersize=2 bgcol=bgcol>
 <node bordercol=bordercol scrollbar=auto type=listbox posy=center posx=center name=listbox width=85% height=70%>
-<node name=lcdtype type=choicebox parent=listbox valign=middle posx=0 text="Typenbezeichnung" bordercol=bordercol bordersize=2 width=100% height=25>    
+<node name=lcdtype type=choicebox parent=listbox valign=middle posx=0 text="Typenbezeichnung" bordercol=bordercol bordersize=2 width=100% height=25>
+<node name=lcdip type=inputbox parent=listbox valign=middle posx=0 text="Display IP" bordercol=bordercol bordersize=2 width=100% height=25>     
 <node name=allmenu type=choicebox parent=listbox valign=middle posx=0 text="alle Menus anzeigen" bordercol=bordercol bordersize=2 width=100% height=25>
 <node name=aktstandby type=choicebox parent=listbox valign=middle posx=0 text="aktiv im Standby" bordercol=bordercol bordersize=2 width=100% height=25>