WebSVN - NaviCtrl - Diff - Rev 41 and 88

 // + Copyright (c) 2008 Ingo Busker, Holger Buss
 // + Nur für den privaten Gebrauch
 // + FOR NON COMMERCIAL USE ONLY
 // + www.MikroKopter.com
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Es gilt für das gesamte Projekt (Hardware, Software, Binärfiles, Sourcecode und Dokumentation),
 // + dass eine Nutzung (auch auszugsweise) nur für den privaten (nicht-kommerziellen) Gebrauch zulässig ist.
 // + Sollten direkte oder indirekte kommerzielle Absichten verfolgt werden, ist mit uns (info@mikrokopter.de) Kontakt
 // + bzgl. der Nutzungsbedingungen aufzunehmen.
 // + Eine kommerzielle Nutzung ist z.B.Verkauf von MikroKoptern, Bestückung und Verkauf von Platinen oder Bausätzen,
 // + Verkauf von Luftbildaufnahmen, usw.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Werden Teile des Quellcodes (mit oder ohne Modifikation) weiterverwendet oder veröffentlicht,
 // + unterliegen sie auch diesen Nutzungsbedingungen und diese Nutzungsbedingungen incl. Copyright müssen dann beiliegen
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Sollte die Software (auch auszugesweise) oder sonstige Informationen des MikroKopter-Projekts
 // + auf anderen Webseiten oder sonstigen Medien veröffentlicht werden, muss unsere Webseite "http://www.mikrokopter.de"
 // + eindeutig als Ursprung verlinkt werden
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Keine Gewähr auf Fehlerfreiheit, Vollständigkeit oder Funktion
 // + Benutzung auf eigene Gefahr
 // + Wir übernehmen keinerlei Haftung für direkte oder indirekte Personen- oder Sachschäden
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Die PORTIERUNG der Software (oder Teile davon) auf andere Systeme (ausser der Hardware von www.mikrokopter.de) ist nur
 // + mit unserer Zustimmung zulässig
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Die Funktion printf_P() unterliegt ihrer eigenen Lizenz und ist hiervon nicht betroffen
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 // + Redistributions of source code (with or without modifications) must retain the above copyright notice,
 // + this list of conditions and the following disclaimer.
 // +   * Neither the name of the copyright holders nor the names of contributors may be used to endorse or promote products derived
 // +     from this software without specific prior written permission.
 // +   * The use of this project (hardware, software, binary files, sources and documentation) is only permitted
 // +     for non-commercial use (directly or indirectly)
 // +     Commercial use (for excample: selling of MikroKopters, selling of PCBs, assembly, ...) is only permitted
 // +     with our written permission
 // +   * If sources or documentations are redistributet on other webpages, out webpage (http://www.MikroKopter.de) must be
 // +     clearly linked as origin
 // +   * PORTING this software (or part of it) to systems (other than hardware from www.mikrokopter.de) is NOT allowed
 //
 // +  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 // +  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 // +  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 // +  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 // +  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 // +  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 // +  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 // +  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // +  POSSIBILITY OF SUCH DAMAGE.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "91x_lib.h"
 #include "fat16.h"
 #include "settings.h"
 #include "uart1.h"
-struct str_setting_parameter CFG_Parameter[] =
+typedef struct
+{
+        ParamId_t ParamId;
-{
+        s8  Name[16];
+        u8  Group;   // 0 = reserved  1,2,3,4
+        u16 Value;
+        u16 Default;
+        u16 Min;
+        u16 Max;
+} __attribute__((packed)) Parameter_t;
+Parameter_t CFG_Parameter[] =
-  //{"1234567890123456"   , "12345678901234567890123456789012", Group, Value, Default  , Min,   Max },
+{
-    {"Parameter1      " , "12345678901234567890123456789012",     1    , 0     , 222   , 200  , 230 },
+  //{PID             , "1234567890123456" , Group, Value, Default,   Min,       Max },
-    {"Parameter2      " , "12345678901234567890123456789012",     1    , 0     , 0     , 0    , 220 },
+        {PID_KML_LOGGING , "KMLLogging      " ,     1,   500,     500,          0,      60000}, // the log interval for KML logging, 0 = off
-    {"Parameter22     " , "12345678901234567890123456789012",     1    , 0     , 0     , 0    , 220 },
+        {PID_GPX_LOGGING , "GPXLogging      " ,     1,     0,       0,          0,      60000}   // the log interval for GPX logging, 0 = off
 };
 //----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
+// initialize all parameters by its default value
+void Settings_SetDefaultValues(void)
-void InitDefaultParameters(void)
+{
-{
+        u8 i;
-  u8 i;
+        // run thrue all parameters and set value to default
-  for (i=0;i<sizeof(CFG_Parameter) / sizeof(struct str_setting_parameter);i++)
+        for (i = 0; i < sizeof(CFG_Parameter) / sizeof(Parameter_t); i++)
-  {
     CFG_Parameter[i].Value  = CFG_Parameter[i].Default;
                 CFG_Parameter[i].Value  = CFG_Parameter[i].Default;
+        }
+}
+//----------------------------------------------------------------------------------
-//----------------------------------------------------------------------------------
+// set parameter from string based name and value
-void SetParameter(char *name, char *value)
+void Settings_SetParameterFromString(s8 *name, s8 *value)
 {
-  u8 i;
+        u8 i;
-  char string[] = "                \0";
+        s8 string[] = "                \0"; // null terminated string of 16 characters
-  i=strlen(name);
+        i = strlen(name);                                       // lenght of the parameter name
-  if (i>16) i=16;
+        if (i > 16) i = 16;                                     // cut off at 16
+        memcpy(string, name, i);                        // copy name to local buffer
-  memcpy(string, name, i);
+        //sprintf(text,"#%s#%s#\n\r", name, string);  SerialPutString(text);
-//  sprintf(text,"#%s#%s#\n\r", name, string);  SerialPutString(text);
+    // search name in parameter list
-  for (i=0;i<sizeof(CFG_Parameter) / sizeof(struct str_setting_parameter);i++)
+        for (i = 0; i < sizeof(CFG_Parameter) / sizeof(Parameter_t); i++)
-  {
+        {
- //   sprintf(text,"#%s#\n\r", CFG_Parameter[i].Name);    SerialPutString(text);
+                //sprintf(text,"#%s#\n\r", CFG_Parameter[i].Name);    SerialPutString(text);
-     if (strncmp(string, CFG_Parameter[i].Name, 16) == 0)
+                if(strncmp(string, CFG_Parameter[i].Name, 16) == 0) // names are matching
-          {
-            CFG_Parameter[i].Value = (unsigned char) atoi(value);
+                {
+                        CFG_Parameter[i].Value = (u16)atoi(value); // convert string to number and set value
+                        // range within min/max
-                if (CFG_Parameter[i].Value < CFG_Parameter[i].Min || CFG_Parameter[i].Value > CFG_Parameter[i].Max)
+                        if(CFG_Parameter[i].Value < CFG_Parameter[i].Min) CFG_Parameter[i].Value = CFG_Parameter[i].Min;
-                    CFG_Parameter[i].Value  = CFG_Parameter[i].Default;
+                        //sprintf(text,"%s = %d\n\r", string, CFG_Parameter[i].Value);
-                sprintf(text,"%s = %d\n\r", string, CFG_Parameter[i].Value);    SerialPutString(text);
+                        //SerialPutString(text);
-                break;
+                        break; // end loop
+                }
-          }
+        }
-   }
+}
-}
+//----------------------------------------------------------------------------------
+// read settings from file on sd-card
-//----------------------------------------------------------------------------------
-void ReadSetting(u8 number)
+void Settings_Init(void)
- {
+{
-   File_t *fp;
+        #define LINE_MAX 32
-   u8 text[32];
-   u8 tmp;
+        File_t *fp;
-   u8 *token;
+        u8 text[LINE_MAX];
+        u8 *token;
-   InitDefaultParameters();
+        Settings_SetDefaultValues();
-   SerialPutString("\n\rReading setting file...\n\r");
+        SerialPutString("\n\rReading settings from file...\n\r");
-   fp = fopen_("setting1.txt", 'r');
+        fp = fopen_("settings.ini", 'r');
-   if (fp == NULL)
+        if (fp == NULL) // could not open the file
-   {
+        {
+                SerialPutString("ERROR: File not found !");
-     SerialPutString("ERROR: File not found !\n\r");
+                return;
+        }
-     return;
+        // read all lines from file
-   }
+        while(fgets_(text, LINE_MAX, fp) != NULL)
+        {
+                if ( // ignorelines starting with \r,\n,' ',';','#'
+                        (text[0] != '\n') &&
-   for (tmp=0;tmp<10;tmp++)
                         (text[0] != '\r') &&
-            fgets_(text , 31, fp);
+                        (text[0] != ' ' ) &&
-                if (text[0] == 0) break;
+                        (text[0] != ';' ) &&
+                        (text[0] != '#' )
                 if (text[0] != '\n' && text[0] != '\r' && text[0] != ' ' && text[0] != ';' && text[0] != '#')
                 {
-                        token = strtok(text, "=");
-                        if (token != NULL)
+                        token = strtok(text, "="); //find the '='
                         if (token != NULL) // if '=' has been found
                           //SerialPutString(token);SerialPutString(" --> ");
-                  SetParameter(token, strtok(NULL, "="));
+                          //SerialPutString(token);SerialPutString(" --> ");
+                  Settings_SetParameterFromString(token, strtok(NULL, "="));
-                          //SerialPutString("\n\r");
+                          //SerialPutString("\n\r");
+                        }
+                }
+        }
+        fclose_(fp);
+        SerialPutString("ok");
+}
+//----------------------------------------------------------------------------------
+// read value of a paramter identified by its id
+// returns 1 on success and 0 on error
+u8 Settings_GetParamValue(ParamId_t Pid, u16 * pValue)
+{
+        u8 i, retval = 0;
+        for (i = 0; i < sizeof(CFG_Parameter) / sizeof(Parameter_t); i++)
+        {
+                if(CFG_Parameter[i].ParamId == Pid)
+                {
+                        *pValue = CFG_Parameter[i].Value;

Subversion Repositories NaviCtrl

(root)/tags/V0.28m/settings.c @ 401 - Rev 41 → 88