Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2542 → Rev 2543

/trunk/Spektrum.c
12,6 → 12,7
unsigned char s_excnt = 0; // Bitcounter for Spektrum-Expander
unsigned char s_exparity = 0; // Parity Bit for Spektrum-Expander
signed char s_exdata[11]; // Data for Spektrum-Expander
#endif
 
void s_update(unsigned char channel, signed int value) // Channel-Diff numbercrunching and finally assign new stickvalue to PPM_in
{
19,7 → 20,6
else PPM_diff[channel] = 0;
PPM_in[channel] = value;
}
#endif
 
//############################################################################
// USART1 initialisation from killagreg
/trunk/Spektrum.h
8,5 → 8,6
void SpektrumBinding(void);
extern unsigned char SpektrumTimer;
extern void SpektrumParser(unsigned char c);
void s_update(unsigned char channel, signed int value); // Channel-Diff numbercrunching and finally assign new stickvalue to PPM_in
 
#endif //_RC_H
/trunk/eeprom.h
110,7 → 110,8
#define RECEIVER_ACT_DSL 5
#define RECEIVER_HOTT 6
#define RECEIVER_SBUS 7
#define RECEIVER_USER 8
#define RECEIVER_MLINK 8
#define RECEIVER_USER 9
 
#define RECEIVER_UNKNOWN 0xFF
 
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/libfc644.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/main.c
389,6 → 389,8
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
if(NewSBusData) ProcessSBus();
else
if(NewMlinkData) ProcessMlinkData();
else
#endif
{
if(BytegapSPI == 0) SPI_TransmitByte();
/trunk/main.h
2,7 → 2,7
#define _MAIN_H
 
//#define REDUNDANT_FC_SLAVE
#define REDUNDANT_FC_MASTER
//#define REDUNDANT_FC_MASTER
 
//#define DEBUG // use to activate debug output to MK-Tool: use Debug(text);
//#define ACT_S3D_SUMMENSIGNAL
85,6 → 85,7
#include "debug.h"
#include "sbus.h"
#include "jeti_ex.h"
#include "M-Link.h"
 
#endif //_MAIN_H
 
/trunk/makefile
6,7 → 6,7
#-------------------------------------------------------------------
VERSION_MAJOR = 2
VERSION_MINOR = 9
VERSION_PATCH = 10
VERSION_PATCH = 11
VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change!
VERSION_SERIAL_MINOR = 0 # Serial Protocol
NC_SPI_COMPATIBLE = 75 # Navi-Kompatibilität
147,7 → 147,7
SRC = main.c uart.c timer0.c analog.c menu.c eeprom.c
SRC += twimaster.c rc.c fc.c GPS.c spi.c led.c Spektrum.c
SRC += mymath.c jetimenu.c capacity.c debug.c
SRC += hottmenu.c sbus.c user_receiver.c
SRC += hottmenu.c sbus.c user_receiver.c M-Link.c
SRC += jeti_ex.c
##########################################################################################################
 
/trunk/user_receiver.c
1,3 → 1,5
#include "Spektrum.h"
#include "main.h"
//############################################################################
// Implement your own RC-decoding routines here
//############################################################################
11,7 → 13,6
// SpektrumUartInit(); // or use an existing routine like this
};
 
 
//############################################################################
// Is called by the uart RX interrupt
// UDR contains the received byte
18,6 → 19,6
//############################################################################
void User_RX_Parser(unsigned char udr)
{
// place your code here
};
 
/trunk/version.txt
796,6 → 796,9
2.09k (14.04.2015)
- bugfix in Jeti-Menu
 
2.09L (14.04.2015)
- MULTIPLEX-M-Link servo protocol implemented (12 & 16 Channels)
 
toDo:
- CalAthmospheare nachführen