WebSVN - FlightCtrl - Diff - Rev 1221 and 1222 - /branches/V0.73d Code Redesign killagreg/eeprom.c

 #include <string.h>
 #include "eeprom.h"
 #include "printf_P.h"
 #include "led.h"
 #include "main.h"
+#include "fc.h"
 // byte array in eeprom
-uint8_t EEPromArray[E2END+1] EEMEM;
+uint8_t EEPromArray[E2END+1] EEMEM;
-paramset_t ParamSet;
+paramset_t              ParamSet;
 MixerTable_t    Mixer;
+}
 /***************************************************/
 /*       Read Parameter from EEPROM as byte        */
 /***************************************************/
-uint8_t GetParamByte(uint8_t param_id)
+uint8_t GetParamByte(uint16_t param_id)
+{
         return eeprom_read_byte(&EEPromArray[EEPROM_ADR_PARAM_BEGIN + param_id]);
+}
 /***************************************************/
 /*       Write Parameter to EEPROM as byte         */
 /***************************************************/
-void SetParamByte(uint8_t param_id, uint8_t value)
+void SetParamByte(uint16_t param_id, uint8_t value)
+{
         eeprom_write_byte(&EEPromArray[EEPROM_ADR_PARAM_BEGIN + param_id], value);
+}
 /***************************************************/
 /*       Read Parameter from EEPROM as word        */
 /***************************************************/
-uint16_t GetParamWord(uint8_t param_id)
+uint16_t GetParamWord(uint16_t param_id)
+{
         return eeprom_read_word((uint16_t *) &EEPromArray[EEPROM_ADR_PARAM_BEGIN + param_id]);
+}
 /***************************************************/
 /*       Write Parameter to EEPROM as word         */
 /***************************************************/
-void SetParamWord(uint8_t param_id, uint16_t value)
 void SetParamWord(uint16_t param_id, uint16_t value)
         eeprom_write_word((uint16_t *) &EEPromArray[EEPROM_ADR_PARAM_BEGIN + param_id], value);
         eeprom_write_word((uint16_t *) &EEPromArray[EEPROM_ADR_PARAM_BEGIN + param_id], value);
+}
         SetActiveParamSet(setnumber);
         LED_Init();
+}
+/***************************************************/
+/*          Read MixerTable from EEPROM            */
+/***************************************************/
+uint8_t MixerTable_ReadFromEEProm(void)
+{
+        if(eeprom_read_byte(&EEPromArray[EEPROM_ADR_MIXER_TABLE]) == EEMIXER_REVISION)
+        {
+                eeprom_read_block((uint8_t *) &Mixer, &EEPromArray[EEPROM_ADR_MIXER_TABLE], sizeof(Mixer));
+                return 1;
+        }
+        else return 0;
+}
+/***************************************************/
+/*          Write Mixer Table to EEPROM            */
+/***************************************************/
+uint8_t MixerTable_WriteToEEProm(void)
+{
+        if(Mixer.Revision == EEMIXER_REVISION)
+        {
+                eeprom_write_block((uint8_t *) &Mixer, &EEPromArray[EEPROM_ADR_MIXER_TABLE], sizeof(Mixer));
+                return 1;
+        }
+        else return 0;
+}
+/***************************************************/
+/*    Default Values for Mixer Table               */
+/***************************************************/
+void MixerTable_Default(void) // Quadro
+{
+        uint8_t i;
+        Mixer.Revision = EEMIXER_REVISION;
+        // clear mixer table
+        for(i = 0; i < 16; i++)
+        {
+                Mixer.Motor[i][MIX_GAS]  = 0;
+                Mixer.Motor[i][MIX_NICK] = 0;
+                Mixer.Motor[i][MIX_ROLL] = 0;
+                Mixer.Motor[i][MIX_YAW]  = 0;
+        }
+        // default = Quadro
+        Mixer.Motor[0][MIX_GAS] = 64; Mixer.Motor[0][MIX_NICK] = +64; Mixer.Motor[0][MIX_ROLL] =   0; Mixer.Motor[0][MIX_YAW] = +64;
+        Mixer.Motor[1][MIX_GAS] = 64; Mixer.Motor[1][MIX_NICK] = -64; Mixer.Motor[1][MIX_ROLL] =   0; Mixer.Motor[1][MIX_YAW] = +64;
+        Mixer.Motor[2][MIX_GAS] = 64; Mixer.Motor[2][MIX_NICK] =   0; Mixer.Motor[2][MIX_ROLL] = -64; Mixer.Motor[2][MIX_YAW] = -64;
+        Mixer.Motor[3][MIX_GAS] = 64; Mixer.Motor[3][MIX_NICK] =   0; Mixer.Motor[3][MIX_ROLL] = +64; Mixer.Motor[3][MIX_YAW] = -64;
+        memcpy(Mixer.Name, "Quadro\0", 7);
+}
 /***************************************************/
 /*       Get active parameter set                  */
 /***************************************************/
 uint8_t GetActiveParamSet(void)
+{
 /***************************************************/
 /*       Initialize EEPROM Parameter Sets          */
 /***************************************************/
 void ParamSet_Init(void)
+{
-        uint8_t Channel_Backup  = 0;
+        uint8_t Channel_Backup  = 0, i;
         // parameter version  check
-        if(eeprom_read_byte(&EEPromArray[PID_VERSION]) != EEPARAM_VERSION)
+        if(eeprom_read_byte(&EEPromArray[PID_PARAM_REVISION]) != EEPARAM_REVISION)
+        {
                 // if version check faild
-                printf("\n\rInit. EEPROM");
+                printf("\n\rInit Parameter in EEPROM");
+                eeprom_write_byte(&EEPromArray[EEPROM_ADR_MIXER_TABLE], 0xFF); // reset also mixer table
-                // check if cannel mapping backup is valid
+                // check if channel mapping backup is valid
                 if(             (eeprom_read_byte(&EEPromArray[EEPROM_ADR_CHANNELS+0]) < 12)
                     &&  (eeprom_read_byte(&EEPromArray[EEPROM_ADR_CHANNELS+1]) < 12)
                     &&  (eeprom_read_byte(&EEPromArray[EEPROM_ADR_CHANNELS+2]) < 12)
                     &&  (eeprom_read_byte(&EEPromArray[EEPROM_ADR_CHANNELS+3]) < 12)
+                   )
+                {
                         Channel_Backup = 1;
+                }
                 // fill all 5 parameter settings
-                for (uint8_t i = 1;i < 6; i++)
+                for (i = 1;i < 6; i++)
+                {
                         switch(i)
+                        {
                                 case 1:
                                         ParamSet_DefaultSet1(); // Fill ParamSet Structure to default parameter set 1 (Sport)
                         ParamSet_WriteToEEProm(i);
+                }
                 // default-Setting is parameter set 3
                 SetActiveParamSet(3);
                 // update version info
-                SetParamByte(PID_VERSION, EEPARAM_VERSION);
+                SetParamByte(PID_PARAM_REVISION, EEPARAM_REVISION);
+        }
         // read active parameter set to ParamSet stucture
         ParamSet_ReadFromEEProm(GetActiveParamSet());
         printf("\n\rUsing Parameter Set %d", GetActiveParamSet());
+        // load mixer table
+        if(!MixerTable_ReadFromEEProm() )
+        {
+                printf("\n\rGenerating default Mixer Table");
+                MixerTable_Default(); // Quadro
+                MixerTable_WriteToEEProm();
+        }
+        // determine motornumber
+        RequiredMotors = 0;
+        for(i = 0; i < 16; i++)
+        {
+                if(Mixer.Motor[i][MIX_GAS] > 0) RequiredMotors++;
+        }
+        printf("\n\rMixer-Config: '%s' (%u Motors)",Mixer.Name, RequiredMotors);
+        printf("\n\r==============================");
+}

Subversion Repositories FlightCtrl

(root)/branches/V0.73d Code Redesign killagreg/eeprom.c - Rev 1221 → 1222