# HG changeset patch # User StephaneLenclud # Date 1423508687 -3600 # Node ID fc42477ae80ba8b59c701a8dd9a1961cda814073 # Parent 2c844ef1ff4b343cbc055d1fed0920b0fbed74f0 MDM166AA: Now defining the networks mast as Internet connection icon. diff -r 2c844ef1ff4b -r fc42477ae80b FutabaMDM166AA.cpp --- a/FutabaMDM166AA.cpp Sat Feb 07 13:50:11 2015 +0100 +++ b/FutabaMDM166AA.cpp Mon Feb 09 20:04:47 2015 +0100 @@ -13,8 +13,9 @@ const TSetIconStatus KFunctionPerIcon[]= { - &MDM166AA::SetIconNetwork, //EMiniDisplayIconNetwork, - &MDM166AA::SetIconEmail, //EMiniDisplayIconEmail, + &MDM166AA::SetIconNetworkSignal, //EMiniDisplayIconNetworkSignal, + &MDM166AA::SetIconInternet, //EMiniDisplayInternet, + &MDM166AA::SetIconEmail, //EMiniDisplayIconEmail, &MDM166AA::SetIconMute, //EMiniDisplayIconMute, &MDM166AA::SetIconVolume, //EMiniDisplayIconVolume, &MDM166AA::SetIconVolumeLabel, //EMiniDisplayIconVolumeLabel, @@ -31,7 +32,8 @@ */ const int KSegmentsPerIcon[]= { - 4, //EMiniDisplayIconNetwork, + 3, //EMiniDisplayIconNetworkSignal, + 1, //EMiniDisplayIconInternet, 2, //EMiniDisplayIconEmail, 1, //EMiniDisplayIconMute, 14, //EMiniDisplayIconVolume, @@ -47,11 +49,13 @@ */ const int KStatusPerIcon[]= { - 2, //EMiniDisplayIconNetwork, + 2, //EMiniDisplayIconNetworkSignal, + 2, //EMiniDisplayIconInternet, 2, //EMiniDisplayIconEmail, 2, //EMiniDisplayIconMute, - 3, //EMiniDisplayIconVolume, - 2, //EMiniDisplayIconVolumeLabel, 2, //EMiniDisplayIconPlay, + 3, //EMiniDisplayIconVolume, + 2, //EMiniDisplayIconVolumeLabel, + 2, //EMiniDisplayIconPlay, 2, //EMiniDisplayIconPause, 2 //EMiniDisplayIconRecording }; @@ -461,9 +465,22 @@ /** */ -void MDM166AA::SetIconNetwork(int aIndex, int aStatus) +void MDM166AA::SetIconNetworkSignal(int aIndex, int aStatus) { - if (aIndex<0||aIndex>=KSegmentsPerIcon[EMiniDisplayIconNetwork]) + if (aIndex<0||aIndex>=KSegmentsPerIcon[EMiniDisplayIconNetworkSignal]) + { + //Out of range + return; + } + + SendCommandSymbolControl((TIconId)(aIndex+EIconNetworkSignalLow),(aStatus==0?EIconOff:EIconOn)); + } + +/** +*/ +void MDM166AA::SetIconInternet(int aIndex, int aStatus) + { + if (aIndex<0||aIndex>=KSegmentsPerIcon[EMiniDisplayIconInternet]) { //Out of range return; diff -r 2c844ef1ff4b -r fc42477ae80b FutabaMDM166AA.h --- a/FutabaMDM166AA.h Sat Feb 07 13:50:11 2015 +0100 +++ b/FutabaMDM166AA.h Mon Feb 09 20:04:47 2015 +0100 @@ -57,7 +57,8 @@ bool OffScreenMode() const {return iOffScreenMode;} //Icon specific - void SetIconNetwork(int aIndex, int aStatus); + void SetIconNetworkSignal(int aIndex, int aStatus); + void SetIconInternet(int aIndex, int aStatus); void SetIconEmail(int aIndex, int aStatus); void SetIconMute(int aIndex, int aStatus); void SetIconVolumeLabel(int aIndex, int aStatus); diff -r 2c844ef1ff4b -r fc42477ae80b MiniDisplay.h --- a/MiniDisplay.h Sat Feb 07 13:50:11 2015 +0100 +++ b/MiniDisplay.h Mon Feb 09 20:04:47 2015 +0100 @@ -50,7 +50,8 @@ */ typedef enum { - EMiniDisplayIconNetwork=0, + EMiniDisplayIconNetworkSignal=0, + EMiniDisplayIconInternet, EMiniDisplayIconEmail, EMiniDisplayIconMute, EMiniDisplayIconVolume,