1.1 --- a/FutabaVfd.h	Mon Jul 07 22:27:56 2014 +0200
     1.2 +++ b/FutabaVfd.h	Tue Jul 08 18:59:41 2014 +0200
     1.3 @@ -8,6 +8,7 @@
     1.4  #include "hidapi.h"
     1.5  #include "HidDevice.h"
     1.6  #include "BitArray.h"
     1.7 +#include "MiniDisplay.h"
     1.8  
     1.9  #ifndef MIN
    1.10  #define MIN(a,b) (((a)<(b))?(a):(b))
    1.11 @@ -117,13 +118,7 @@
    1.12  class GP1212A01A : public GP1212XXXX
    1.13  	{
    1.14  public:
    1.15 -    enum Request
    1.16 -        {
    1.17 -        ERequestNone,
    1.18 -        ERequestDeviceId,
    1.19 -        ERequestFirmwareRevision,
    1.20 -        ERequestPowerSupplyStatus
    1.21 -        };
    1.22 +
    1.23  
    1.24  public:
    1.25      GP1212A01A();
    1.26 @@ -163,10 +158,10 @@
    1.27      void SetFrameDifferencing(bool aOn){iUseFrameDifferencing=aOn;}
    1.28      bool FrameDifferencing() const {return iUseFrameDifferencing;}
    1.29      //
    1.30 -    bool RequestPending(){return iRequest!=ERequestNone;}
    1.31 -    Request CurrentRequest(){return iRequest;}
    1.32 -    void CancelRequest(){iRequest=ERequestNone;}
    1.33 -    Request AttemptRequestCompletion();
    1.34 +    bool RequestPending(){return iRequest!=EMiniDisplayRequestNone;}
    1.35 +    TMiniDisplayRequest CurrentRequest(){return iRequest;}
    1.36 +    void CancelRequest(){iRequest=EMiniDisplayRequestNone;}
    1.37 +    TMiniDisplayRequest AttemptRequestCompletion();
    1.38      FutabaVfdReport& InputReport() {return iInputReport;}
    1.39      bool PowerOn(){return iPowerOn;}
    1.40  
    1.41 @@ -208,7 +203,7 @@
    1.42  	//unsigned char iFrameBeta[256*64];
    1.43  	//unsigned char *iFrontBuffer;
    1.44  	//unsigned char *iBackBuffer;
    1.45 -    Request iRequest;
    1.46 +    TMiniDisplayRequest iRequest;
    1.47      FutabaVfdReport iInputReport;
    1.48      bool iPowerOn;
    1.49  	};