Changeset 33 in svn

Timestamp:

Mar 25, 2015 6:14:42 PM (11 years ago)

Author:

megakiss

Message:

 

Location:

trunk/zasc/app_c

Files:

• DST_DB.c (modified) (3 diffs)
• DST_EEPROM.c (modified) (2 diffs)
• DST_EEPROM.h (modified) (1 diff)
• DST_WinFactory.c (modified) (1 diff)

trunk/zasc/app_c/DST_DB.c

@@ -652 +652 @@
 int DST_DB_IsExceptRF(int rf)
 {
-        if (DST_EEPROM_GetFrequencySetting() == 0) return 0;
+        if (DST_EEPROM_GetMinRF() == DST_MinRF() && DST_EEPROM_GetMaxRF() == DST_MaxRF()) return 0;
         if (rf < DST_EEPROM_GetMinRF()) return 0;
         if (rf > DST_EEPROM_GetMaxRF()) return 0;
@@ -661 +661 @@
 int DST_DB_GetExceptRFCount()
 {
-        if (DST_EEPROM_GetFrequencySetting() == 0) return 0;
+        if (DST_EEPROM_GetMinRF() == DST_MinRF() && DST_EEPROM_GetMaxRF() == DST_MaxRF()) return 0;
         return DST_EEPROM_GetMaxRF() - DST_EEPROM_GetMinRF() + 1;
 }
@@ -675 +675 @@
 {
         int i=0;
-        if (DST_EEPROM_GetFrequencySetting() == 0)
+        if (DST_EEPROM_GetMinRF() == DST_MinRF() && DST_EEPROM_GetMaxRF() == DST_MaxRF())
         {
                 return GetNextRF(rf);

trunk/zasc/app_c/DST_EEPROM.c

@@ -33 +33 @@
         {"VI", 0, 1, 0},
         {"PreferredConn", 0, 1, 0},
-        {"FrequencySetting", 0, 1, 0}, 
         {"MinRF", 0, RF_COUNT-1, 0}, 
-        {"MaxRF", 0, RF_COUNT-1, 0}
+        {"MaxRF", 0, RF_COUNT-1, RF_COUNT-1}
 };
 // unsigned aspect_4x3o_4x3i:2; // 0~2
@@ -106 +105 @@
 void DST_EEPROM_FactoryInit()
 {
-        int FrequncySetting = DST_EEPROM_GetFrequencySetting();
         int MinRF = DST_EEPROM_GetMinRF(); // ÀÌ °ªÀº »ç¿ëÀÚ °øÀåÃʱâÈ­Çصµ Áö¿öÁö¸é ¾È µÈ´Ù.
         int MaxRF = DST_EEPROM_GetMaxRF(); // ÀÌ °ªÀº »ç¿ëÀÚ °øÀåÃʱâÈ­Çصµ Áö¿öÁö¸é ¾È µÈ´Ù.
         memset(&db_config, 0, sizeof(_DB_CONFIG_) * DB_CONFIG_MAX);
-        DST_EEPROM_SetFrequencySetting(FrequncySetting);
         DST_EEPROM_SetMinRF(MinRF);
         DST_EEPROM_SetMaxRF(MaxRF);

trunk/zasc/app_c/DST_EEPROM.h

@@ -54 +54 @@
 DS_U8 DST_GetSleepTimer();
 
-#define DST_EEPROM_SetFrequencySetting(value) DST_EEPROM_SetConfig("FrequencySetting",value) 
-#define DST_EEPROM_GetFrequencySetting() DST_EEPROM_GetConfig("FrequencySetting")
 #define DST_EEPROM_SetMinRF(value) DST_EEPROM_SetConfig("MinRF",value) 
 #define DST_EEPROM_GetMinRF() DST_EEPROM_GetConfig("MinRF")

trunk/zasc/app_c/DST_WinFactory.c

@@ -61 +61 @@
                 this->SetTimeOut(this, 0);
                 // °øÀåÃʱâÈ­
-                DST_EEPROM_SetFrequencySetting(0); // DST_EEPROM_SetNeedReset¿¡¼­ ÃʱâÈ­ ÇÏÁö ¾Ê±â¶§¹®¿¡ °­Á¦·Î ±âº»°ªÀ» ½áÁØ´Ù.
-                DST_EEPROM_SetMinRF(0); // DST_EEPROM_SetNeedReset¿¡¼­ ÃʱâÈ­ ÇÏÁö ¾Ê±â¶§¹®¿¡ °­Á¦·Î ±âº»°ªÀ» ½áÁØ´Ù.
-                DST_EEPROM_SetMaxRF(0); // DST_EEPROM_SetNeedReset¿¡¼­ ÃʱâÈ­ ÇÏÁö ¾Ê±â¶§¹®¿¡ °­Á¦·Î ±âº»°ªÀ» ½áÁØ´Ù.
+                DST_EEPROM_SetMinRF(-1); // DST_EEPROM_SetNeedReset¿¡¼­ ÃʱâÈ­ ÇÏÁö ¾Ê±â¶§¹®¿¡ °­Á¦·Î ±âº»°ªÀ» ½áÁØ´Ù.
+                DST_EEPROM_SetMaxRF(-1); // DST_EEPROM_SetNeedReset¿¡¼­ ÃʱâÈ­ ÇÏÁö ¾Ê±â¶§¹®¿¡ °­Á¦·Î ±âº»°ªÀ» ½áÁØ´Ù.
                 DST_EEPROM_SetNeedReset(1);
                 DST_DB_Sync();