| /branches/salvo_gps/Basis_v0067g/trunk/GPS.c |
|---|
| 548,7 → 548,7 |
| debug_gp_5 = (int)int_north; // zum Debuggen |
| //I Werte begrenzen |
| #define INT1_MAX (GPS_NICKROLL_MAX * GPS_V*2)/10// auf 20 Prozent des maximalen Nick/Rollwert begrenzen |
| #define INT1_MAX (GPS_NICKROLL_MAX * GPS_V*3)/10// auf 30 Prozent des maximalen Nick/Rollwert begrenzen |
| int_east1 = ((((long)int_east) * Parameter_UserParam2)/32)/GPS_USR_PAR_FKT; |
| int_north1 = ((((long)int_north) * Parameter_UserParam2)/32)/GPS_USR_PAR_FKT; |
| if (int_east1 > INT1_MAX) int_east1 = INT1_MAX; //begrenzen |
| 601,7 → 601,7 |
| if (hold_fast > 0) //schneller Coming Home Modus |
| { |
| // P Werte begrenzen |
| #define P1_F_MAX (GPS_NICKROLL_MAX * GPS_V*7)/10 // auf 80 Prozent des Maximalen Nick/Rollwert begrenzen |
| #define P1_F_MAX (GPS_NICKROLL_MAX * GPS_V*7)/10 // auf 70 Prozent des Maximalen Nick/Rollwert begrenzen |
| if (delta_east > P1_F_MAX) delta_east = P1_F_MAX; |
| else if (delta_east < -P1_F_MAX) delta_east = -P1_F_MAX; |
| if (delta_north > P1_F_MAX) delta_north = P1_F_MAX; |
| /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="266 101 1182 710" LineCol="164 0" State="Maximized"/><File00001 Name="G:\Mikrokopter\Flight_Crtl\v0067g\analog.h" Position="288 130 1218 738" LineCol="0 0" State="Maximized"/><File00002 Name="G:\Mikrokopter\Flight_Crtl\v0067g\makefile" Position="310 159 1240 767" LineCol="7 0" State="Maximized"/><File00003 Name="G:\Mikrokopter\Flight_Crtl\v0067g\main.c" Position="332 188 1262 796" LineCol="30 47" State="Maximized"/><File00004 Name="G:\Mikrokopter\Flight_Crtl\v0067g\fc.c" Position="262 71 1402 978" LineCol="55 26" State="Maximized"/><File00005 Name="G:\Mikrokopter\Flight_Crtl\v0067g\GPS.c" Position="376 246 1288 829" LineCol="1 44" State="Maximized"/></Files></AVRWorkspace> |
| <AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA644"/><Files><File00000 Name="G:\Mikrokopter\Flight_Crtl\v0067g\timer0.c" Position="266 101 1182 710" LineCol="164 0" State="Maximized"/><File00001 Name="G:\Mikrokopter\Flight_Crtl\v0067g\analog.h" Position="288 130 1218 738" LineCol="0 0" State="Maximized"/><File00002 Name="G:\Mikrokopter\Flight_Crtl\v0067g\makefile" Position="310 159 1240 767" LineCol="7 0" State="Maximized"/><File00003 Name="G:\Mikrokopter\Flight_Crtl\v0067g\main.c" Position="332 188 1262 796" LineCol="16 63" State="Maximized"/><File00004 Name="G:\Mikrokopter\Flight_Crtl\v0067g\gps.h" Position="354 217 1266 800" LineCol="112 25" State="Maximized"/><File00005 Name="G:\Mikrokopter\Flight_Crtl\v0067g\GPS.c" Position="262 71 1402 978" LineCol="0 0" State="Maximized"/></Files></AVRWorkspace> |
| /branches/salvo_gps/Basis_v0067g/trunk/makefile |
|---|
| 5,7 → 5,7 |
| #------------------------------------------------------------------- |
| HAUPT_VERSION = 0 |
| NEBEN_VERSION = 7 |
| VERSION_INDEX = 2 |
| VERSION_INDEX = 3 |
| VERSION_KOMPATIBEL = 7 # PC-Kompatibilität |
| #------------------------------------------------------------------- |