Changeset 44389

Timestamp:

11/23/19 22:55:29 (4 years ago)

Author:

gost

Message:

test vuduo oled

Location:

titan/titan

Files:

• oled.h (modified) (3 diffs)
• skin.h (modified) (1 diff)

titan/titan/oled.h

@@ -63 +63 @@
         else if(checkbox("VUDUO4K") == 1)
         {
-                //ret = write(lcdfd1, buf, xres * yres * 4);
-                //test loop
-                bi = 0;
-                for(i = 0; i < 240; i = i + 1)
-                {
-                        for(i1 = 0; i1 < 400; i1 = i1 + 1)
-                        {
-                                lfb1[(480*i*4)+i1] = buf[bi];
-                                bi = bi+1;
-                        }
-                }
-                
-                ret = write(lcdfd1, lfb1, 480 * 320 * 4);
-                //if(ret != xres * yres * 4)
-                if(ret != 480 * 320 * 4)
+                ret = write(lcdfd1, buf, xres * yres * 4);
+                if(ret != xres * yres * 4)
                         err("write to oled2 VUDUO4K - %s - was not ok", getconfig("vfddev", NULL));
         }
@@ -138 +125 @@
                 }
         }
-        else if(checkbox("DM900") == 1 || checkbox("DM920") == 1  || checkbox("VUDUO4K") == 1)
+        else if(checkbox("DM900") == 1 || checkbox("DM920") == 1)
         {
                 if(status.updatevfd == PAUSE)
@@ -151 +138 @@
                                 OLED_all = getscreen(getskinconfig("OLED_dream2", NULL));
                 }
-        }               
+        }
+        else if(checkbox("VUDUO4K") == 1)               
+        {
+                if(status.updatevfd == PAUSE)
+                        OLED_all = getscreen("OLED_vu1_menu");
+                else if(status.standby > 0)
+                        OLED_all = getscreen("OLED_vu1_standby");
+                else
+                {
+                        if(getskinconfig("OLED_vu1", NULL) == NULL)
+                                OLED_all = getscreen("OLED_vu1");
+                        else
+                                OLED_all = getscreen(getskinconfig("OLED_vu1", NULL));
+                }
+        }
                 
         

titan/titan/skin.h

@@ -4320 +4320 @@
                                 }
                         }
+                        else if(node->name != NULL && ostrstr(node->name, "OLED_vu1") != NULL) {
+                                debug(100, "alloc OLED_vu1 framebuffer");
+                                oledskinfb = oledaddfb(480, 320);
+                                if(oledskinfb == NULL)
+                                {
+                                        if(flag == 0 || flag == 4)
+                                                m_unlock(&status.drawingmutex, 0);
+                                        return -2;
+                                }
+                        }
                 }
                 merkskinfb = skinfb;