LCDDataArray is now a vector.

Author: netfab

src/bin/daemon/LCDPlugins/LCDPlugin.cpp

@@ -36,7 +36,7 @@ PBMFrame::PBMFrame(const uint16_t num)
 	:	_numFrames(num)
 {
 	/* initialize PBM frame container */
-	_PBMData.resize( (DEFAULT_PBM_WIDTH / 8) * DEFAULT_PBM_HEIGHT, 0 );
+	_PBMData.resize( DEFAULT_PBM_DATA_IN_BYTES, 0 );
 }
 
 const bool PBMFrame::switchToNextFrame(const uint16_t currentFrameCounter)

src/bin/daemon/LCDPlugins/PBM.hpp

@@ -22,9 +22,9 @@
 #ifndef SRC_BIN_DAEMON_LCDPLUGINS_PBM_HPP_
 #define SRC_BIN_DAEMON_LCDPLUGINS_PBM_HPP_
 
-#include <array>
 #include <vector>
 
+/* LCD screen real sizes in pixels */
 #define				  LCD_SCREEN_HEIGHT		43
 #define				   LCD_SCREEN_WIDTH		160
 
@@ -33,10 +33,10 @@
 #define		DEFAULT_PBM_HEIGHT_IN_BYTES		(DEFAULT_PBM_HEIGHT/8)
 #define		 DEFAULT_PBM_WIDTH_IN_BYTES		(DEFAULT_PBM_WIDTH/8)
 
-#define PBM_DATA_IN_BYTES (DEFAULT_PBM_WIDTH_IN_BYTES * DEFAULT_PBM_HEIGHT)
+#define		  DEFAULT_PBM_DATA_IN_BYTES		(DEFAULT_PBM_WIDTH_IN_BYTES * DEFAULT_PBM_HEIGHT)
 
 /* LCD header length */
-#define LCD_BUFFER_OFFSET 32
+#define			 LCD_DATA_HEADER_OFFSET		32
 
 // formula when PBM_HEIGHT not multiple of 8
 // TODO do we need it ?
@@ -46,7 +46,7 @@ namespace GLogiK
 {
 
 typedef std::vector<unsigned char> PBMDataArray;
-typedef std::array<unsigned char, PBM_DATA_IN_BYTES+LCD_BUFFER_OFFSET> LCDDataArray;
+typedef std::vector<unsigned char> LCDDataArray;
 
 } // namespace GLogiK
 

src/bin/daemon/LCDScreenPluginsManager.cpp

@@ -19,6 +19,7 @@
  *
  */
 
+#include <algorithm>
 #include <new>
 
 #include "lib/utils/utils.hpp"
@@ -87,7 +88,9 @@ LCDScreenPluginsManager::LCDScreenPluginsManager(const std::string & product)
 		GKSysLog(LOG_WARNING, WARNING, "no LCD screen plugin initialized");
 		_noPlugins = true;
 	}
-	_LCDBuffer.fill(0x0);
+
+	/* initialize LCD frame container */
+	_LCDBuffer.resize( DEFAULT_PBM_DATA_IN_BYTES + LCD_DATA_HEADER_OFFSET, 0 );
 }
 
 LCDScreenPluginsManager::~LCDScreenPluginsManager() {
@@ -224,15 +227,17 @@ LCDDataArray & LCDScreenPluginsManager::getNextLCDScreenBuffer(
 					(*_itCurrentPlugin)->getNextPBMFrame(_pFonts, LCDKey, _currentPluginLocked)
 				);
 			}
-			else /* else blank screen */
-				_LCDBuffer.fill(0x0);
+			else {
+				/* blank screen */
+				std::fill(_LCDBuffer.begin(), _LCDBuffer.end(), 0x0);
+			}
 		}
 		catch (const GLogiKExcept & e) {
 			LOG(ERROR) << e.what();
-			_LCDBuffer.fill(0x0);
+			std::fill(_LCDBuffer.begin(), _LCDBuffer.end(), 0x0);
 		}
 
-		std::fill_n(_LCDBuffer.begin(), LCD_BUFFER_OFFSET, 0);
+		std::fill_n(_LCDBuffer.begin(), LCD_DATA_HEADER_OFFSET, 0x0);
 	}
 
 	/* the keyboard needs this magic byte */
@@ -323,7 +328,7 @@ void LCDScreenPluginsManager::dumpPBMDataIntoLCDBuffer(LCDDataArray & LCDBuffer,
 							<< " bit: " << bit << "\n";
 #endif
 
-				LCDBuffer[LCD_BUFFER_OFFSET + LCDCol + indexOffset] =
+				LCDBuffer[LCD_DATA_HEADER_OFFSET + LCDCol + indexOffset] =
 					(((PBMData[PBMByte + (DEFAULT_PBM_WIDTH_IN_BYTES * 0) + indexOffset] >> bit) & 1) << 0 ) |
 					(((PBMData[PBMByte + (DEFAULT_PBM_WIDTH_IN_BYTES * 1) + indexOffset] >> bit) & 1) << 1 ) |
 					(((PBMData[PBMByte + (DEFAULT_PBM_WIDTH_IN_BYTES * 2) + indexOffset] >> bit) & 1) << 2 ) |