MDM166AA: Now defining the networks mast as Internet connection icon.
authorStephaneLenclud
Mon, 09 Feb 2015 20:04:47 +0100
changeset 33fc42477ae80b
parent 32 2c844ef1ff4b
child 34 892f755c2612
MDM166AA: Now defining the networks mast as Internet connection icon.
FutabaMDM166AA.cpp
FutabaMDM166AA.h
MiniDisplay.h
     1.1 --- a/FutabaMDM166AA.cpp	Sat Feb 07 13:50:11 2015 +0100
     1.2 +++ b/FutabaMDM166AA.cpp	Mon Feb 09 20:04:47 2015 +0100
     1.3 @@ -13,8 +13,9 @@
     1.4  
     1.5  const TSetIconStatus KFunctionPerIcon[]=
     1.6  	{
     1.7 -	&MDM166AA::SetIconNetwork,	//EMiniDisplayIconNetwork,
     1.8 -    &MDM166AA::SetIconEmail,	//EMiniDisplayIconEmail,
     1.9 +	&MDM166AA::SetIconNetworkSignal,	//EMiniDisplayIconNetworkSignal,
    1.10 +    &MDM166AA::SetIconInternet,			//EMiniDisplayInternet,
    1.11 +	&MDM166AA::SetIconEmail,	//EMiniDisplayIconEmail,
    1.12      &MDM166AA::SetIconMute,	//EMiniDisplayIconMute,
    1.13      &MDM166AA::SetIconVolume, //EMiniDisplayIconVolume,
    1.14  	&MDM166AA::SetIconVolumeLabel,	//EMiniDisplayIconVolumeLabel,
    1.15 @@ -31,7 +32,8 @@
    1.16  */
    1.17  const int KSegmentsPerIcon[]=
    1.18  	{
    1.19 -	4,	//EMiniDisplayIconNetwork,
    1.20 +	3,	//EMiniDisplayIconNetworkSignal,
    1.21 +	1,	//EMiniDisplayIconInternet,
    1.22      2,	//EMiniDisplayIconEmail,
    1.23      1,	//EMiniDisplayIconMute,
    1.24      14, //EMiniDisplayIconVolume,
    1.25 @@ -47,11 +49,13 @@
    1.26  */
    1.27  const int KStatusPerIcon[]=
    1.28  	{
    1.29 -	2,	//EMiniDisplayIconNetwork,
    1.30 +	2,	//EMiniDisplayIconNetworkSignal,
    1.31 +	2,	//EMiniDisplayIconInternet,
    1.32      2,	//EMiniDisplayIconEmail,
    1.33      2,	//EMiniDisplayIconMute,
    1.34 -    3, //EMiniDisplayIconVolume,
    1.35 -	2,	//EMiniDisplayIconVolumeLabel,	2,	//EMiniDisplayIconPlay,
    1.36 +    3,  //EMiniDisplayIconVolume,
    1.37 +	2,	//EMiniDisplayIconVolumeLabel,
    1.38 +	2,	//EMiniDisplayIconPlay,
    1.39  	2,	//EMiniDisplayIconPause,
    1.40  	2	//EMiniDisplayIconRecording
    1.41  	};
    1.42 @@ -461,9 +465,22 @@
    1.43  
    1.44  /**
    1.45  */
    1.46 -void MDM166AA::SetIconNetwork(int aIndex, int aStatus)
    1.47 +void MDM166AA::SetIconNetworkSignal(int aIndex, int aStatus)
    1.48  	{
    1.49 -	if (aIndex<0||aIndex>=KSegmentsPerIcon[EMiniDisplayIconNetwork])
    1.50 +	if (aIndex<0||aIndex>=KSegmentsPerIcon[EMiniDisplayIconNetworkSignal])
    1.51 +		{
    1.52 +		//Out of range
    1.53 +		return;
    1.54 +		}
    1.55 +
    1.56 +	SendCommandSymbolControl((TIconId)(aIndex+EIconNetworkSignalLow),(aStatus==0?EIconOff:EIconOn));
    1.57 +	}
    1.58 +
    1.59 +/**
    1.60 +*/
    1.61 +void MDM166AA::SetIconInternet(int aIndex, int aStatus)
    1.62 +	{
    1.63 +	if (aIndex<0||aIndex>=KSegmentsPerIcon[EMiniDisplayIconInternet])
    1.64  		{
    1.65  		//Out of range
    1.66  		return;
     2.1 --- a/FutabaMDM166AA.h	Sat Feb 07 13:50:11 2015 +0100
     2.2 +++ b/FutabaMDM166AA.h	Mon Feb 09 20:04:47 2015 +0100
     2.3 @@ -57,7 +57,8 @@
     2.4      bool OffScreenMode() const {return iOffScreenMode;}
     2.5  
     2.6  		//Icon specific
     2.7 -	void SetIconNetwork(int aIndex, int aStatus);
     2.8 +	void SetIconNetworkSignal(int aIndex, int aStatus);
     2.9 +	void SetIconInternet(int aIndex, int aStatus);
    2.10  	void SetIconEmail(int aIndex, int aStatus);
    2.11  	void SetIconMute(int aIndex, int aStatus);
    2.12  	void SetIconVolumeLabel(int aIndex, int aStatus);
     3.1 --- a/MiniDisplay.h	Sat Feb 07 13:50:11 2015 +0100
     3.2 +++ b/MiniDisplay.h	Mon Feb 09 20:04:47 2015 +0100
     3.3 @@ -50,7 +50,8 @@
     3.4  */
     3.5  typedef enum
     3.6      {
     3.7 -    EMiniDisplayIconNetwork=0,
     3.8 +    EMiniDisplayIconNetworkSignal=0,
     3.9 +	EMiniDisplayIconInternet,
    3.10      EMiniDisplayIconEmail,
    3.11      EMiniDisplayIconMute,
    3.12      EMiniDisplayIconVolume,