WebSVN - NaviCtrl - Diff - Rev 356 and 360

 /*#######################################################################################*/
 /* !!! THIS IS NOT FREE SOFTWARE !!!                                                     */
 /*#######################################################################################*/
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// + Copyright (c) 2008 Ingo Busker, Holger Buss
-// + Nur für den privaten Gebrauch / NON-COMMERCIAL USE ONLY
-// + FOR NON COMMERCIAL USE ONLY
 // + www.MikroKopter.com
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// + Software Nutzungsbedingungen (english version: see below)
-// + Es gilt für das gesamte Projekt (Hardware, Software, Binärfiles, Sourcecode und Dokumentation),
+// + der Fa. HiSystems GmbH, Flachsmeerstrasse 2, 26802 Moormerland - nachfolgend Lizenzgeber genannt -
-// + dass eine Nutzung (auch auszugsweise) nur für den privaten (nicht-kommerziellen) Gebrauch zulässig ist.
+// + Der Lizenzgeber räumt dem Kunden ein nicht-ausschließliches, zeitlich und räumlich* unbeschränktes Recht ein, die im den
-// + Sollten direkte oder indirekte kommerzielle Absichten verfolgt werden, ist mit uns (info@mikrokopter.de) Kontakt
+// + Mikrocontroller verwendete Firmware für die Hardware Flight-Ctrl, Navi-Ctrl, BL-Ctrl, MK3Mag & PC-Programm MikroKopter-Tool
-// + bzgl. der Nutzungsbedingungen aufzunehmen.
+// + - nachfolgend Software genannt - nur für private Zwecke zu nutzen.
-// + Eine kommerzielle Nutzung ist z.B.Verkauf von MikroKoptern, Bestückung und Verkauf von Platinen oder Bausätzen,
+// + Der Einsatz dieser Software ist nur auf oder mit Produkten des Lizenzgebers zulässig.
-// + Verkauf von Luftbildaufnahmen, usw.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// + Werden Teile des Quellcodes (mit oder ohne Modifikation) weiterverwendet oder veröffentlicht,
+// + Die vom Lizenzgeber gelieferte Software ist urheberrechtlich geschützt. Alle Rechte an der Software sowie an sonstigen im
-// + unterliegen sie auch diesen Nutzungsbedingungen und diese Nutzungsbedingungen incl. Copyright müssen dann beiliegen
+// + Rahmen der Vertragsanbahnung und Vertragsdurchführung überlassenen Unterlagen stehen im Verhältnis der Vertragspartner ausschließlich dem Lizenzgeber zu.
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// + Die in der Software enthaltenen Copyright-Vermerke, Markenzeichen, andere Rechtsvorbehalte, Seriennummern sowie
-// + Sollte die Software (auch auszugesweise) oder sonstige Informationen des MikroKopter-Projekts
+// + sonstige der Programmidentifikation dienenden Merkmale dürfen vom Kunden nicht verändert oder unkenntlich gemacht werden.
-// + auf anderen Webseiten oder sonstigen Medien veröffentlicht werden, muss unsere Webseite "http://www.mikrokopter.de"
+// + Der Kunde trifft angemessene Vorkehrungen für den sicheren Einsatz der Software. Er wird die Software gründlich auf deren
-// + eindeutig als Ursprung verlinkt werden
+// + Verwendbarkeit zu dem von ihm beabsichtigten Zweck testen, bevor er diese operativ einsetzt.
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// + Die Haftung des Lizenzgebers wird - soweit gesetzlich zulässig - begrenzt in Höhe des typischen und vorhersehbaren
-// + Keine Gewähr auf Fehlerfreiheit, Vollständigkeit oder Funktion
+// + Schadens. Die gesetzliche Haftung bei Personenschäden und nach dem Produkthaftungsgesetz bleibt unberührt. Dem Lizenzgeber steht jedoch der Einwand
-// + Benutzung auf eigene Gefahr
+// + des Mitverschuldens offen.
+// + Der Kunde trifft angemessene Vorkehrungen für den Fall, dass die Software ganz oder teilweise nicht ordnungsgemäß arbeitet.
+// + Er wird die Software gründlich auf deren Verwendbarkeit zu dem von ihm beabsichtigten Zweck testen, bevor er diese operativ einsetzt.
-// + Wir übernehmen keinerlei Haftung für direkte oder indirekte Personen- oder Sachschäden
+// + Der Kunde wird er seine Daten vor Einsatz der Software nach dem Stand der Technik sichern.
+// + Der Kunde ist darüber unterrichtet, dass der Lizenzgeber seine Daten im zur Vertragsdurchführung erforderlichen Umfang
-// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// + und auf Grundlage der Datenschutzvorschriften erhebt, speichert, verarbeitet und, sofern notwendig, an Dritte übermittelt.
-// + Die Portierung oder Nutzung der Software (oder Teile davon) auf andere Systeme (ausser der Hardware von www.mikrokopter.de) ist nur
+// + *) Die räumliche Nutzung bezieht sich nur auf den Einsatzort, nicht auf die Reichweite der programmierten Software.
-// + mit unserer Zustimmung zulässig
+// + #### ENDE DER NUTZUNGSBEDINGUNGEN ####'
+// +  Hinweis: Informationen über erweiterte Nutzungsrechte (wie z.B. Nutzung für nicht-private Zwecke) sind auf Anfrage per Email an info(@)hisystems.de verfügbar.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// + Die Funktion printf_P() unterliegt ihrer eigenen Lizenz und ist hiervon nicht betroffen
+// + Software LICENSING TERMS
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-// + Redistributions of source code (with or without modifications) must retain the above copyright notice,
+// + of HiSystems GmbH, Flachsmeerstrasse 2, 26802 Moormerland, Germany - the Licensor -
-// + this list of conditions and the following disclaimer.
+// + The Licensor grants the customer a non-exclusive license to use the microcontroller firmware of the Flight-Ctrl, Navi-Ctrl, BL-Ctrl, and MK3Mag hardware
-// +   * Neither the name of the copyright holders nor the names of contributors may be used to endorse or promote products derived
+// + (the Software) exclusively for private purposes. The License is unrestricted with respect to time and territory*.
-// +     from this software without specific prior written permission.
+// + The Software may only be used with the Licensor's products.
-// +   * The use of this project (hardware, software, binary files, sources and documentation) is only permitted
+// + The Software provided by the Licensor is protected by copyright. With respect to the relationship between the parties to this
-// +     for non-commercial use (directly or indirectly)
-// +     Commercial use (for excample: selling of MikroKopters, selling of PCBs, assembly, ...) is only permitted
+// + agreement, all rights pertaining to the Software and other documents provided during the preparation and execution of this
-// +     with our written permission
+// + agreement shall be the property of the Licensor.
-// +   * If sources or documentations are redistributet on other webpages, out webpage (http://www.MikroKopter.de) must be
+// + The information contained in the Software copyright notices, trademarks, other legal reservations, serial numbers and other
-// +     clearly linked as origin
-// +   * porting the sources to other systems or using the software on other systems (except hardware from www.mikrokopter.de) is not allowed
+// + features that can be used to identify the program may not be altered or defaced by the customer.
-//
-// +  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// + The customer shall be responsible for taking reasonable precautions
-// +  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// + for the safe use of the Software. The customer shall test the Software thoroughly regarding its suitability for the
-// +  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// + intended purpose before implementing it for actual operation. The Licensor's liability shall be limited to the extent of typical and
-// +  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// + foreseeable damage to the extent permitted by law, notwithstanding statutory liability for bodily injury and product
-// +  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// + liability. However, the Licensor shall be entitled to the defense of contributory negligence.
-// +  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// + The customer will take adequate precautions in the case, that the software is not working properly. The customer will test
-// +  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// + the software for his purpose before any operational usage. The customer will backup his data before using the software.
-// +  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// + The customer understands that the Licensor collects, stores and processes, and, where required, forwards, customer data
-// +  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// + to third parties to the extent necessary for executing the agreement, subject to applicable data protection and privacy regulations.
-// +  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// + *) The territory aspect only refers to the place where the Software is used, not its programmed range.
-// +  POSSIBILITY OF SUCH DAMAGE.
+// + #### END OF LICENSING TERMS ####
+// + Note: For information on license extensions (e.g. commercial use), please contact us at info(@)hisystems.de.
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "91x_lib.h"
 #include "fat16.h"
 #include "settings.h"
 #include "uart1.h"
 typedef struct
+{
         ParamId_t ParamId;
         s8  Name[17]; // 0 terminator is the last byte
         u8  Group;   // 0 = reserved  1,2,3,4
         u16 Value;
         u16 Default;
         u16 Min;
         u16 Max;
 } __attribute__((packed)) Parameter_t;
 Parameter_t CFG_Parameter[] =
+{
   //{PID                                , "1234567890123456" , Group, Value, Default,   Min,    Max },
         {PID_KML_LOGGING                        , "KMLLOGGING      " ,     1,   500,     500,    0,             60000},   // the log interval for KML logging, 0 = off
         {PID_GPX_LOGGING                        , "GPXLOGGING      " ,     1,  1000,    1000,    0,     60000},   // the log interval for GPX logging, 0 = off
         {PID_ABSOLUTE_FLYING_ALT        , "MAX_FLYING_ALT  " ,     1,     0,       0,    0,     30000},   // in [m]
         {PID_ABSOLUTE_FLYING_RANGE      , "MAX_FLYING_RANGE" ,     1,     0,       0,    0,     60000},   // in [m]
         {PID_AUTO_DESCEND_RANGE         , "DESCEND_RANGE   " ,     1,     0,       0,    0,     60000},   // in [m]
         {PID_GPS_SBAS_CONFIG            , "GPS_SBAS_DGPS_ON" ,     1,     1,       1,    0,             1},
         {PID_GPS_AUTOCONFIG                     , "GPSAUTOCONFIG   " ,     1,     1,       1,    0,             1}
 };
 //----------------------------------------------------------------------------------
 // initialize all parameters by its default value
 void Settings_SetDefaultValues(void)
+{
         u8 i;
         // run thrue all parameters and set value to default
         for (i = 0; i < sizeof(CFG_Parameter) / sizeof(Parameter_t); i++)
+        {
                 CFG_Parameter[i].Value  = CFG_Parameter[i].Default;
+        }
+}
 //----------------------------------------------------------------------------------
 // set parameter from string based name and value
 u8 Settings_SetParameterFromString(s8 *name, s8 *value)
+{
         u8 i, retval = 0;
         s8 string[] = "                \0"; // null terminated string of 16 characters
         if((name == NULL) || (value == NULL)) return(retval);
         i = strlen(name);                                       // lenght of the parameter name
         if (i > 16) i = 16;                                     // cut off at 16
         memcpy(string, name, i);                        // copy name to local buffer
     // search name in parameter list
         for (i = 0; i < sizeof(CFG_Parameter) / sizeof(Parameter_t); i++)
+        {
                 if(strncmp(string, CFG_Parameter[i].Name, 16) == 0) // names are matching
+                {
                         CFG_Parameter[i].Value = (u16)atoi(value); // convert string to number and set value
                         // out of range ?
                         if((CFG_Parameter[i].Value < CFG_Parameter[i].Min) || (CFG_Parameter[i].Value > CFG_Parameter[i].Max))
                         {       // print a warning
                                 sprintf(text,"\r\n%s <-- %d is out of range [%d...%d]", string, CFG_Parameter[i].Value, CFG_Parameter[i].Min, CFG_Parameter[i].Max);
                                 UART1_PutString(text);
                                 CFG_Parameter[i].Value = CFG_Parameter[i].Default;  // fallback to default
+                        }
                         retval = 1; // value in range
                         break; // end loop
+                }
+        }
         if(!retval)
+        {
                 sprintf(text,"\r\n%s <-- unknown parameter\r\n", string);
                 UART1_PutString(text);
+        }
         return(retval);
+}
 //----------------------------------------------------------------------------------
 // read settings from file on sd-card
 void Settings_Init(void)
+{
         #define LINE_MAX 32
         File_t *fp;
         s8 settingsline[LINE_MAX];
         s8 *name, *value;
         u8 i;
         s8 filename[] = "settings.ini";
         UART1_PutString("\n\r Settings init...");
         Settings_SetDefaultValues();
         if(Fat16_IsValid())
         {       // check if settings file is existing
                 if(fexist_(filename))
+                {
                         fp = fopen_(filename, 'r');             // try to open the file
                         if (fp == NULL)                                                 // could not open the file
+                        {
                                 UART1_PutString("ERROR: Opening settings file!");
                                 return;
+                        }
                         // read all lines from file
                         while(fgets_(settingsline, LINE_MAX, fp) != 0)
+                        {
                                 if ( // ignorelines starting with \r,\n,' ',';','#'
                                         (settingsline[0] != '\n') &&
                                         (settingsline[0] != '\r') &&
                                         (settingsline[0] != ' ' ) &&
                                         (settingsline[0] != ';' ) &&
                                         (settingsline[0] != '#' )
+                                        )
+                                {
                                         name  = strtok(settingsline, "="); // get name
                                         value = strtok(NULL, "="); // get value
                                         if ((name != NULL) && (value != NULL))
+                                        {
                                                 u8 i;
                                                 for(i=0; name[i]; i++) name[i] = toupper(name[i]);
                                                 Settings_SetParameterFromString(name, value);
+                                        }
+                                }
+                        }
                         fclose_(fp);
                         UART1_PutString("ok");
                         return;
+                }
                 else // settings file does not exist
                 {       // create default settings file
                         fp = fopen_("settings.ini", 'w');               // try to open the file
                         if(fp == NULL)
+                        {
                                 UART1_PutString("ERROR: Creating default settings file!");
                                 return;
+                        }
                         // run thrue all parameters and set value to default
                         for (i = 0; i < sizeof(CFG_Parameter) / sizeof(Parameter_t); i++)
+                        {
                                 sprintf(settingsline, "%s = %d\r\n", CFG_Parameter[i].Name, CFG_Parameter[i].Default);
                                 fputs_(settingsline, fp); // write to file
+                        }
                         fputs_("\r\n", fp); // newline at the end of file
                         fclose_(fp);
                         UART1_PutString("Default settings file created!");
                         return;
+                }
+        }
         else // no acces to fat 16 filesystem
+        {
                 UART1_PutString("Using default values!");
                 return;
+        }
+}
 //----------------------------------------------------------------------------------
 // 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;
                         retval = 1;
                         break;
+                }
+        }
         return retval;
+}

Subversion Repositories NaviCtrl

(root)/tags/V2.04a/settings.c @ 822 - Rev 356 → 360