# HG changeset patch
# User StephaneLenclud
# Date 1423142789 -3600
# Node ID 9b44c6e1651c5c75e19f4f1c01be5bd42bdce618
# Parent  0d426caeaefe2f368b3f9ef20e1cbea972e9e82a
More cleanup.

diff -r 0d426caeaefe -r 9b44c6e1651c Display.h
--- a/Display.h	Thu Feb 05 14:02:27 2015 +0100
+++ b/Display.h	Thu Feb 05 14:26:29 2015 +0100
@@ -29,6 +29,7 @@
 	virtual int MinBrightness() const=0;
 	virtual int MaxBrightness() const=0;
 	virtual void SetBrightness(int aBrightness)=0;
+	//
 	virtual void Clear()=0;
 	virtual void Fill()=0;
 	//
@@ -36,7 +37,7 @@
 
 	//Request management
 	virtual void Request(TMiniDisplayRequest /*aRequest*/){ /*No request supported by default*/ };
-	virtual TMiniDisplayRequest AttemptRequestCompletion()=0;
+	virtual TMiniDisplayRequest AttemptRequestCompletion(){return EMiniDisplayRequestNone;};
 	
 	virtual TMiniDisplayRequest CurrentRequest(){return iRequest;}
     virtual void CancelRequest(){iRequest=EMiniDisplayRequestNone;}
diff -r 0d426caeaefe -r 9b44c6e1651c FutabaGP1212.h
--- a/FutabaGP1212.h	Thu Feb 05 14:02:27 2015 +0100
+++ b/FutabaGP1212.h	Thu Feb 05 14:26:29 2015 +0100
@@ -20,7 +20,7 @@
 class GP1212XXXX : public FutabaGraphicDisplay
 	{
 public:
-	//From FutabaVfd
+	//From GraphicDisplay
     virtual int MinBrightness() const {return 0;}
     virtual int MaxBrightness() const {return 5;}
     virtual int WidthInPixels() const {return KGP12xWidthInPixels;}
diff -r 0d426caeaefe -r 9b44c6e1651c FutabaGP1212A02.cpp
--- a/FutabaGP1212A02.cpp	Thu Feb 05 14:02:27 2015 +0100
+++ b/FutabaGP1212A02.cpp	Thu Feb 05 14:26:29 2015 +0100
@@ -31,8 +31,7 @@
     iFrameAlpha(NULL),
     iFrameBeta(NULL),
     iFrameGamma(NULL),
-    iNeedFullFrameUpdate(0),
-    iPowerOn(false)
+    iNeedFullFrameUpdate(0)
 	{
 	iDeviceId[0]=0;
 	iFirmwareRevision[0]=0;
@@ -721,27 +720,6 @@
     }
 
 /**
-*/
-bool GP1212A02A::IsPowerOn()
-	{
-	return iPowerOn;
-	}
-
-/**
-*/
-char* GP1212A02A::DeviceId()
-	{
-	return iDeviceId;
-	}
-
-/**
-*/
-char* GP1212A02A::FirmwareRevision()
-	{
-	return iFirmwareRevision;
-	}
-
-/**
 VFD Power ON/OFF 
 [Code]1BH,4AH,42H,Ps
 [Function]Control of the power supply for VFD 
diff -r 0d426caeaefe -r 9b44c6e1651c FutabaGP1212A02.h
--- a/FutabaGP1212A02.h	Thu Feb 05 14:02:27 2015 +0100
+++ b/FutabaGP1212A02.h	Thu Feb 05 14:26:29 2015 +0100
@@ -26,7 +26,7 @@
     ~GP1212A02A();
 
 	//From DisplayBase
-	int Open();
+	virtual int Open();
 	virtual void SwapBuffers();
 	virtual void TurnPowerOn();
 	virtual void TurnPowerOff();
@@ -34,6 +34,11 @@
 	virtual void ShowClock();
 	virtual void HideClock();
 	virtual bool SupportClock(){return true;}
+	virtual void SetBrightness(int aBrightness);
+	virtual void Clear();
+	virtual void Fill();
+    virtual TMiniDisplayRequest AttemptRequestCompletion();
+	virtual void Request(TMiniDisplayRequest aRequest);
 
 
 
@@ -41,12 +46,8 @@
 	virtual void SetPixel(unsigned char aX, unsigned char aY, unsigned int aPixel);
 	virtual void SetAllPixels(unsigned char aPattern);
     virtual int FrameBufferSizeInBytes() const {return KGP12xFrameBufferSizeInBytes;}
-	virtual void SetBrightness(int aBrightness);
-	virtual void Clear();
-	virtual void Fill();
-	virtual void Request(TMiniDisplayRequest aRequest);
+	
 
-	
 		
 	//
 	void ToggleOffScreenMode();
@@ -55,12 +56,7 @@
     //
     void SetFrameDifferencing(bool aOn){iUseFrameDifferencing=aOn;}
     bool FrameDifferencing() const {return iUseFrameDifferencing;}
-    //    
-    TMiniDisplayRequest AttemptRequestCompletion();
     FutabaVfdReport& InputReport() {return iInputReport;}
-    bool IsPowerOn();
-	char* DeviceId();
-	char* FirmwareRevision();
 
 private:
 
@@ -203,15 +199,9 @@
     BitArrayLow* iFrameGamma;
     //
     int iNeedFullFrameUpdate;
-	//unsigned char iFrameBeta[256*64];
-	//unsigned char *iFrontBuffer;
-	//unsigned char *iBackBuffer;
+	//
     FutabaVfdReport iInputReport;
 	//
-	char iDeviceId[KFutabaMaxHidReportSize];
-	char iFirmwareRevision[KFutabaMaxHidReportSize];
-    bool iPowerOn;
-	//
 	unsigned short iNextFrameAddress;
 	};
 
diff -r 0d426caeaefe -r 9b44c6e1651c FutabaMDM166AA.cpp
--- a/FutabaMDM166AA.cpp	Thu Feb 05 14:02:27 2015 +0100
+++ b/FutabaMDM166AA.cpp	Thu Feb 05 14:26:29 2015 +0100
@@ -318,15 +318,6 @@
     }
 
 /**
-Tries to complete our current request if we have one pending.
- */
-TMiniDisplayRequest MDM166AA::AttemptRequestCompletion()
-    {
-	return EMiniDisplayRequestNone;
-	}
-
-
-/**
 Set our screen brightness.
 @param The desired brightness level. Must be between MinBrightness and MaxBrightness.
 */
diff -r 0d426caeaefe -r 9b44c6e1651c FutabaMDM166AA.h
--- a/FutabaMDM166AA.h	Thu Feb 05 14:02:27 2015 +0100
+++ b/FutabaMDM166AA.h	Thu Feb 05 14:26:29 2015 +0100
@@ -51,9 +51,6 @@
 	void ToggleOffScreenMode();
     void SetOffScreenMode(bool aOn);
     bool OffScreenMode() const {return iOffScreenMode;}
-    //    
-    TMiniDisplayRequest AttemptRequestCompletion();
-
 
 private: