Changeset 19 in svn

Timestamp:

Mar 25, 2015 3:42:26 PM (11 years ago)

Author:

megakiss

Message:

 

Location:

trunk/zasc/app_c

Files:

• DST_CommonAPI.c (modified) (2 diffs)
• DST_EEPROM.c (modified) (1 diff)
• DST_WinFrequencySetting.c (modified) (2 diffs)

trunk/zasc/app_c/DST_CommonAPI.c

@@ -27 +27 @@
 DS_U8 DST_MinRF()
 {
-        //return 0;
-        return DST_EEPROM_GetMinRF();
+        return 0;
+        //return DST_EEPROM_GetMinRF();
 }
 
@@ -34 +34 @@
 DS_U8 DST_MaxRF()
 {
-        //return RF_COUNT - DST_MinRF() - 1; // RF 85¹ø Index 83
-        return DST_EEPROM_GetMaxRF();
+        return RF_COUNT - DST_MinRF() - 1; // RF 85¹ø Index 83
+        //return DST_EEPROM_GetMaxRF();
 }
 

trunk/zasc/app_c/DST_EEPROM.c

@@ -33 +33 @@
         {"VI", 0, 1, 0},
         {"PreferredConn", 0, 1, 0},
-        {"MinRF", 0, RF_COUNT-1-4, 0}, // ÃÖ¼Ò °øÁßÆÄ5°³
-        {"MaxRF", 1, RF_COUNT-1, RF_COUNT-1}
+        {"MinRF", -1, RF_COUNT-1, -1}, 
+        {"MaxRF", -1, RF_COUNT-1, -1}
 };
 // unsigned aspect_4x3o_4x3i:2; // 0~2

trunk/zasc/app_c/DST_WinFrequencySetting.c

@@ -93 +93 @@
         {
                 this->RegisterAllKey(this);
+                // background
                 this->DrawImage(this, 0, 0, newcon2_gui_banner_4line_back, false);
         
-        
                 int nLineHeight = (this->rect.h) / 6;
-                
+                // title
                 this->setFontStyle(this, 18, 0xFFC8C8C8, ALIGN_MIDDLE, ALIGN_CENTER);
                 this->DrawText(this, 0, 0, this->rect.w, nLineHeight*2, (char*)"Frequency Setting", &(this->font));
-                
+                // display max
+                if (nPos == 0)
+                {
+                        this->setFontStyle(this, 17, 0xFFFFFFFF, ALIGN_MIDDLE, ALIGN_CENTER);
+                }
+                else
+                {
+                        this->setFontStyle(this, 15, 0xFFAAAAAA, ALIGN_MIDDLE, ALIGN_CENTER);
+                }
+                int num = DST_EEPROM_GetMinRF();
                 char strText[256];
-                int num = DST_EEPROM_GetMinRF();
-                int rf = DST_GetFrequencyNumberbyIndex(num);
-                int freq = DST_GetMHzFrequencybyIndex(num);
+                if (num > 0)
+                {
+                        int rf = DST_GetFrequencyNumberbyIndex(num);
+                        int freq = DST_GetMHzFrequencybyIndex(num);
+                        sprintf(strText, "< Min : %d ( %dMHz ) >", rf, freq);
+                }
+                else
+                {
+                        sprintf(strText, "< Min : OFF >");
+                }
+                this->DrawText(this, 0, nLineHeight * 2, this->rect.w, nLineHeight, (char*)strText, &(this->font));
+                // display min
                 if (nPos == 0)
                 {
+                        this->setFontStyle(this, 15, 0xFFAAAAAA, ALIGN_MIDDLE, ALIGN_CENTER);
+                }
+                else
+                {
                         this->setFontStyle(this, 17, 0xFFFFFFFF, ALIGN_MIDDLE, ALIGN_CENTER);
-                        sprintf(strText, "< Min : %d ( %dMHz ) >", rf, freq);
-                }
-                else
-                {
-                        this->setFontStyle(this, 15, 0xFFAAAAAA, ALIGN_MIDDLE, ALIGN_CENTER);
-                        sprintf(strText, "Min : %d ( %dMHz )", rf, freq);
-                }
-                this->DrawText(this, 0, nLineHeight * 2, this->rect.w, nLineHeight, (char*)strText, &(this->font));
-                
+                }
                 num = DST_EEPROM_GetMaxRF();
-                rf = DST_GetFrequencyNumberbyIndex(num);
-                freq = DST_GetMHzFrequencybyIndex(num);
-                if (nPos == 0)
-                {
-                        this->setFontStyle(this, 15, 0xFFAAAAAA, ALIGN_MIDDLE, ALIGN_CENTER);
-                        sprintf(strText, "Max : %d ( %dMHz )", rf, freq);
-                }
-                else
-                {
-                        this->setFontStyle(this, 17, 0xFFFFFFFF, ALIGN_MIDDLE, ALIGN_CENTER);
+                if (num > 0)
+                {
+                        int rf = DST_GetFrequencyNumberbyIndex(num);
+                        int freq = DST_GetMHzFrequencybyIndex(num);
                         sprintf(strText, "< Max : %d ( %dMHz ) >", rf, freq);
                 }
-                
+                else
+                {
+                        sprintf(strText, "< Max : OFF >");
+                }
                 this->DrawText(this, 0, nLineHeight * 3, this->rect.w, nLineHeight, (char*)strText, &(this->font));
-                
+                // descriptor
                 this->setFontStyle(this, 15, 0xFF666666, ALIGN_MIDDLE, ALIGN_CENTER);
                 this->DrawText(this, 0, nLineHeight * 5, this->rect.w, nLineHeight, (char*)"Channel/Volume : Next", &(this->font));
@@ -141 +152 @@
         void IncreaseMaxRF()
         {
+                if (DST_EEPROM_GetMaxRF() >= DST_MaxRF()) 
+                {
+                        DST_EEPROM_SetMaxRF(DST_MaxRF());
+                        return;
+                }
                 DST_EEPROM_SetMaxRF(DST_EEPROM_GetMaxRF() + 1);
         }
         void DecreaseMinRF()
         {
+                if (DST_EEPROM_GetMinRF() < DST_MinRF()) 
+                {
+                        DST_EEPROM_SetMinRF(-1);
+                        return;
+                }
                 DST_EEPROM_SetMinRF(DST_EEPROM_GetMinRF() - 1);
         }
         void IncreaseMinRF()
         {
+                if (DST_EEPROM_GetMinRF() >= DST_MinRF()) 
+                {
+                        DST_EEPROM_SetMinRF(DST_MinRF());
+                        return;
+                }
                 DST_EEPROM_SetMinRF(DST_EEPROM_GetMinRF() + 1);
-                if (DST_EEPROM_GetMaxRF() - DST_EEPROM_GetMinRF() < 4)
-                {
-                        IncreaseMaxRF();
-                }
-                if (DST_EEPROM_GetMaxRF() - DST_EEPROM_GetMinRF() < 4)
-                {
-                        DST_EEPROM_SetMinRF(DST_EEPROM_GetMaxRF()-4);
-                }
         }
         void DecreaseMaxRF()
         {
+                if (DST_EEPROM_GetMaxRF() < DST_MaxRF()) 
+                {
+                        DST_EEPROM_SetMaxRF(-1);
+                        return;
+                }
                 DST_EEPROM_SetMaxRF(DST_EEPROM_GetMaxRF() - 1);
-                if (DST_EEPROM_GetMaxRF() - DST_EEPROM_GetMinRF() < 4)
-                {
-                        DecreaseMinRF();
-                }
-                if (DST_EEPROM_GetMaxRF() - DST_EEPROM_GetMinRF() < 4)
-                {
-                        DST_EEPROM_SetMaxRF(DST_EEPROM_GetMinRF()+4);
-                }
         }
         void CFrequncySettingWin_KeyInput(CWindow *this, DS_U8 key, bool bRepeat)