Revert "Merge branch 'Pascal' into master"

This reverts commit fc5495b6d1, reversing
changes made to f3838ae4b0.
This commit is contained in:
Pascal Langer
2017-12-30 05:32:43 +01:00
parent fc5495b6d1
commit bef562964d
17 changed files with 5 additions and 54 deletions

View File

@@ -179,7 +179,6 @@ static void AFHDS2A_build_packet(uint8_t type)
packet[0] = 0x56;
for(uint8_t ch=0; ch<14; ch++)
{
#ifdef FAILSAFE_ENABLE
uint16_t failsafeMicros = (Failsafe_data[CH_AETR[ch]]*5)/8+860;
if( failsafeMicros!=FAILSAFE_CHANNEL_HOLD+860)
@@ -193,7 +192,6 @@ static void AFHDS2A_build_packet(uint8_t type)
packet[9 + ch*2] = 0xff;
packet[10+ ch*2] = 0xff;
}
}
break;
case AFHDS2A_PACKET_SETTINGS:

View File

@@ -1,4 +1,3 @@
/* **************************
* By Midelic on RCGroups *
**************************
@@ -351,5 +350,4 @@ uint16_t initFrSkyX()
FrX_receive_seq = 0 ;
return 10000;
}
#endif

View File

@@ -17,7 +17,6 @@
// Version
//******************
#define VERSION_MAJOR 1
#define VERSION_MINOR 2
#define VERSION_REVISION 0
#define VERSION_PATCH_LEVEL 0

View File

@@ -1,4 +1,3 @@
/*********************************************************
Multiprotocol Tx code
by Midelic and Pascal Langer(hpnuts)
@@ -1657,4 +1656,6 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
WDTCSR = 0; // Disable Watchdog interrupt
}
}
#endif
#endif

View File

@@ -1,4 +1,3 @@
/*
This project is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by