Merge ba4526ee89c2b5a946a659eea2c9581c36254809 into 049db615e3dcdc0405b33c0c3126ad3770b45293

This commit is contained in:
Dennis 2017-11-28 07:40:50 +00:00 committed by GitHub
commit 3fa99fff48
5 changed files with 5 additions and 7 deletions

View File

@ -439,4 +439,4 @@ uint16_t initCABELL(void)
return packet_period;
}
#endif
#endif

View File

@ -779,4 +779,4 @@ Commands from TX to module use values > 127 for command type
data[1-22] Failsafe data, encoded like normal channel data, with the expection
that 0 means hold for that channel and 2047 means no pulses
*/
*/

View File

@ -1585,4 +1585,4 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
WDTCSR = 0; // Disable Watchdog interrupt
}
}
#endif
#endif

View File

@ -3,12 +3,10 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Multiprotocol is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>.
*/
@ -338,4 +336,4 @@
#define eeprom_read_byte EEPROM.read
#else
#define EE_ADDR uint8_t*
#endif
#endif

View File

@ -155,4 +155,4 @@
#endif
#if MAX_PPM_CHANNELS>16
#error MAX_PPM_CHANNELS must be below or equal to 16. The default for this value is 16.
#endif
#endif