fix Linux FB .

lovyan03 · Jul 25, 2024 · 5e32d57 · 5e32d57
1 parent d16721c
commit 5e32d57
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/lgfx/v1/platforms/common.hpp b/src/lgfx/v1/platforms/common.hpp
@@ -49,15 +49,15 @@ Original Source:
 
 #include "arduino_default/common.hpp"
 
-#elif __has_include(<SDL2/SDL.h>) || __has_include(<SDL.h>)
+#elif (__has_include(<SDL2/SDL.h>) || __has_include(<SDL.h>)) && !defined(LGFX_LINUX_FB)
 
 #include "sdl/common.hpp"
 
-#elif __has_include(<opencv2/opencv.hpp>)
+#elif __has_include(<opencv2/opencv.hpp>) && !defined(LGFX_LINUX_FB)
 
 #include "opencv/common.hpp"
 
-#elif defined (__linux__)
+#elif defined (__linux__) && defined(LGFX_LINUX_FB)
 
 #include "framebuffer/common.hpp"
 

diff --git a/src/lgfx/v1/platforms/device.hpp b/src/lgfx/v1/platforms/device.hpp
@@ -94,7 +94,7 @@ Original Source:
 
 #include "arduino_default/Bus_SPI.hpp"
 
-#elif __has_include(<SDL2/SDL.h>) || __has_include(<SDL.h>)
+#elif (__has_include(<SDL2/SDL.h>) || __has_include(<SDL.h>)) && !defined(LGFX_LINUX_FB)
 
 #include "sdl/Bus_I2C.hpp"
 #include "sdl/Panel_sdl.hpp"

diff --git a/src/lgfx/v1/platforms/framebuffer/Panel_fb.cpp b/src/lgfx/v1/platforms/framebuffer/Panel_fb.cpp
@@ -89,15 +89,11 @@ namespace lgfx
   {
     // unmap fb file from memory
     munmap(_fbp, _screensize);
-    // reset the display mode
-    if (ioctl(_fbfd, FBIOPUT_VSCREENINFO, &_fix_info)) {
-        printf("Error re-setting variable information.\n");
-    }
     // close fb file    
     close(_fbfd);
 
     memset(&_fix_info, 0, sizeof(_fix_info));
-    memset(&_var_info, 0, sizeof(_fix_info));
+    memset(&_var_info, 0, sizeof(_var_info));
   }
 
   Panel_fb::Panel_fb(void) : Panel_Device(), _fbp(nullptr)