| /branches/salvo_gps/Basis_v0067g/trunk/Flight-Ctrl_MEGA644_V0_01a.hex |
|---|
| 1153,7 → 1153,7 |
| :1048000080E88093730888E78093740856E9509392 |
| :10481000750894E6909376088FE5809377088CE38B |
| :10482000809378081092790880E280937A083AE5BC |
| :1048300030937B0880E180937C0882E880937D0838 |
| :1048300030937B0888E180937C0882E880937D0830 |
| :1048400010927E0810928E0810928F081092900895 |
| :104850001092910890937F0888E2809380081092CC |
| :1048600093082093810850938208709383082093C3 |
| 1644,7 → 1644,7 |
| :1066B000943019F41092530503C083E0809353057E |
| :1066C0008091530590E008C080915305882331F0F4 |
| :1066D0001092530580E090E00E94F23CC0903F0988 |
| :1066E000D0904009C114D10429F080919D058A30D1 |
| :1066E000D0904009C114D10429F080919D058C30CF |
| :1066F00009F442988090630590906405840197FEA8 |
| :1067000004C00027112708191909053111053CF0AB |
| :106710008091660884FD03C081E080939C05E09031 |
| /branches/salvo_gps/Basis_v0067g/trunk/eeprom.c |
|---|
| 38,7 → 38,7 |
| EE_Parameter.UfoAusrichtung = 0; // X oder + Formation |
| EE_Parameter.I_Faktor = 32; |
| EE_Parameter.UserParam1 = 90; // P Anteil GPS |
| EE_Parameter.UserParam2 = 16; // I Anteil GPS |
| EE_Parameter.UserParam2 = 24; // I Anteil GPS |
| EE_Parameter.UserParam3 = 130; //D Anteil GPS |
| EE_Parameter.UserParam4 = 0; //zur freien Verwendung |
| EE_Parameter.UserParam5 = 0; // zur freien Verwendung |
| /branches/salvo_gps/Basis_v0067g/trunk/fc.c |
|---|
| 605,12 → 605,24 |
| delay_neutral = 0; |
| modell_fliegt = 0; |
| SetNeutral(); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_NICK],NeutralAccX / 256); // ACC-NeutralWerte speichern |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_NICK+1],NeutralAccX % 256); // ACC-NeutralWerte speichern |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_ROLL],NeutralAccY / 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_ROLL+1],NeutralAccY % 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_Z],(int)NeutralAccZ / 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_Z+1],(int)NeutralAccZ % 256); |
| if (ACC_FIXED > 0) |
| { |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_NICK],ACC_NICK_NEUTRAL / 256); // ACC-NeutralWerte speichern |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_NICK+1],ACC_NICK_NEUTRAL % 256); // ACC-NeutralWerte speichern |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_ROLL],ACC_ROLL_NEUTRAL / 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_ROLL+1],ACC_ROLL_NEUTRAL % 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_Z],(int)ACC_Z_NEUTRAL / 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_Z+1],(int)ACC_Z_NEUTRAL % 256); |
| } |
| else |
| { |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_NICK],NeutralAccX / 256); // ACC-NeutralWerte speichern |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_NICK+1],NeutralAccX % 256); // ACC-NeutralWerte speichern |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_ROLL],NeutralAccY / 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_ROLL+1],NeutralAccY % 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_Z],(int)NeutralAccZ / 256); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACC_Z+1],(int)NeutralAccZ % 256); |
| } |
| Piep(GetActiveParamSetNumber()); |
| } |
| } |
| 1106,7 → 1118,7 |
| n= GPS_CRTL(gps_cmd); //GPS Lageregelung beenden |
| } |
| } |
| if (gps_state != GPS_CRTL_IDLE) if (TimerWerteausgabe == 10) LED_J16_OFF; //led im GPS Mode schnell blinken lassen |
| if (gps_state != GPS_CRTL_IDLE) if (TimerWerteausgabe == 12) LED_J16_OFF; //led im GPS Mode schnell blinken lassen |
| // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| /branches/salvo_gps/Basis_v0067g/trunk/fc.h |
|---|
| 6,10 → 6,11 |
| #define _FC_H |
| extern volatile unsigned int I2CTimeout; |
| //Salvo 9.12.2007 Neutralwerte fuer ACC Sensor nur noch infohalber drin |
| //Salvo 9.12.2007 Neutralwerte fuer ACC Sensor nur verwendet wenn ACC_FIXED >0 |
| #define ACC_FIXED 0 // wenn > 0werden diese Werte beim ACC Kalbibrieren ins Eeprom geschrieben |
| #define ACC_NICK_NEUTRAL 518 // ADC Wandler Wert in Neutrallage (0g): Vom individuellen Sensor abhaengig |
| #define ACC_ROLL_NEUTRAL 516 // ADC Wandler wert in Neutrallage (0g) |
| #define ACC_Z_NEUTRAL 740 // ADC Wandler wert in Neutrallage (0g) |
| #define ACC_WAAGRECHT_LIMIT 100 // Nick und Roll kleiner als dieser Wert gelten als Kriterium fuer waagrechte Lage |
| // Salvo End |
| //Salvo 2.9.2007 Ersatzkompass: Gyroincrements/Grad als Defaultwert ***** |
| /branches/salvo_gps/Basis_v0067g/trunk/flightctrl.aws |
|---|
| 1,0 → 0,0 |
| <AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA644"/><Files><File00000 Name="G:\Mikrokopter\Flight_Crtl\v0067g\timer0.c" Position="268 103 896 595" LineCol="191 0"/><File00001 Name="G:\Mikrokopter\Flight_Crtl\v0067g\analog.h" Position="290 132 910 594" LineCol="0 0"/><File00002 Name="G:\Mikrokopter\Flight_Crtl\v0067g\makefile" Position="312 161 932 623" LineCol="411 0"/><File00003 Name="G:\Mikrokopter\Flight_Crtl\v0067g\main.c" Position="334 190 954 652" LineCol="123 0"/></Files></AVRWorkspace> |
| <AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA644"/><Files><File00000 Name="G:\Mikrokopter\Flight_Crtl\v0067g\timer0.c" Position="268 103 1250 595" LineCol="191 0"/><File00001 Name="G:\Mikrokopter\Flight_Crtl\v0067g\analog.h" Position="290 132 1264 594" LineCol="0 0"/><File00002 Name="G:\Mikrokopter\Flight_Crtl\v0067g\makefile" Position="312 161 1286 623" LineCol="411 0"/><File00003 Name="G:\Mikrokopter\Flight_Crtl\v0067g\main.c" Position="334 190 1308 652" LineCol="125 0"/></Files></AVRWorkspace> |