Rev 683 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 683 | Rev 685 | ||
|---|---|---|---|
| Line 50... | Line 50... | ||
| 50 | // + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN// + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
50 | // + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN// + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
| 51 | // + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
51 | // + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 52 | // + POSSIBILITY OF SUCH DAMAGE. |
52 | // + POSSIBILITY OF SUCH DAMAGE. |
| 53 | // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
53 | // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| Line -... | Line 54... | ||
| - | 54 | ||
| 54 | 55 | ||
| 55 | #include "main.h" |
56 | #include "main.h" |
| - | 57 | #include "eeprom.h" |
|
| - | 58 | #include "timer0.h" |
|
| - | 59 | #include "_Settings.h" |
|
| - | 60 | #include "analog.h" |
|
| - | 61 | #include "fc.h" |
|
| - | 62 | #include "gps.h" |
|
| - | 63 | #include "uart.h" |
|
| - | 64 | #include "rc.h" |
|
| Line 56... | Line 65... | ||
| 56 | #include "eeprom.c" |
65 | #include "twimaster.h" |
| 57 | 66 | ||
| 58 | unsigned char h,m,s; |
67 | unsigned char h,m,s; |
| 59 | volatile unsigned int I2CTimeout = 100; |
68 | volatile unsigned int I2CTimeout = 100; |
| Line 240... | Line 249... | ||
| 240 | Mess_IntegralRoll = (Umschlag180Roll - 10000L); |
249 | Mess_IntegralRoll = (Umschlag180Roll - 10000L); |
| 241 | Mess_IntegralRoll2 = Mess_IntegralRoll; |
250 | Mess_IntegralRoll2 = Mess_IntegralRoll; |
| 242 | } |
251 | } |
| 243 | if(AdValueGyrRoll < 15) MesswertRoll = -1000; |
252 | if(AdValueGyrRoll < 15) MesswertRoll = -1000; |
| 244 | if(AdValueGyrRoll < 7) MesswertRoll = -2000; |
253 | if(AdValueGyrRoll < 7) MesswertRoll = -2000; |
| 245 | if(PlatinenVersion == 10) |
254 | if(BoardRelease == 10) |
| 246 | { |
255 | { |
| 247 | if(AdValueGyrRoll > 1010) MesswertRoll = +1000; |
256 | if(AdValueGyrRoll > 1010) MesswertRoll = +1000; |
| 248 | if(AdValueGyrRoll > 1017) MesswertRoll = +2000; |
257 | if(AdValueGyrRoll > 1017) MesswertRoll = +2000; |
| 249 | } |
258 | } |
| 250 | else |
259 | else |
| Line 267... | Line 276... | ||
| 267 | Mess_IntegralNick = (Umschlag180Nick - 10000L); |
276 | Mess_IntegralNick = (Umschlag180Nick - 10000L); |
| 268 | Mess_IntegralNick2 = Mess_IntegralNick; |
277 | Mess_IntegralNick2 = Mess_IntegralNick; |
| 269 | } |
278 | } |
| 270 | if(AdValueGyrNick < 15) MesswertNick = -1000; |
279 | if(AdValueGyrNick < 15) MesswertNick = -1000; |
| 271 | if(AdValueGyrNick < 7) MesswertNick = -2000; |
280 | if(AdValueGyrNick < 7) MesswertNick = -2000; |
| 272 | if(PlatinenVersion == 10) |
281 | if(BoardRelease == 10) |
| 273 | { |
282 | { |
| 274 | if(AdValueGyrNick > 1010) MesswertNick = +1000; |
283 | if(AdValueGyrNick > 1010) MesswertNick = +1000; |
| 275 | if(AdValueGyrNick > 1017) MesswertNick = +2000; |
284 | if(AdValueGyrNick > 1017) MesswertNick = +2000; |
| 276 | } |
285 | } |
| 277 | else |
286 | else |