_Config.h file and all protocol settings for PPM mode

Multiprotocol/Multiprotocol.ino

@@ -4,7 +4,7 @@
 	http://www.rcgroups.com/forums/showthread.php?t=2165676
     https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/edit/master/README.md
 
-					Thanks to PhracturedBlue
+	Thanks to PhracturedBlue, Hexfet, Goebish and all protocol developers
 				Ported  from deviation firmware 
 
  This project is free software: you can redistribute it and/or modify
@@ -23,71 +23,10 @@
 #include <avr/eeprom.h>
 #include <avr/pgmspace.h>
 #include <util/delay.h>
+#include "Multiprotocol.h"
 
-//******************************************************
-//******************************************************
-// Multiprotocol module configuration starts here
-
-//Uncomment the type of TX
-#define TX_ER9X			//ER9X AETR (988<->2012µs)
-//#define TX_DEVO7		//DEVO7 EATR (1120<->1920µs)
-//#define TX_SPEKTRUM	//Spektrum TAER (1100<->1900µs)
-//#define TX_HISKY		//HISKY AETR (1100<->1900µs)
-
-#include "multiprotocol.h"
-
-//Uncomment to enable 8 channels serial protocol, 16 otherwise
-//#define NUM_SERIAL_CH_8
-
-//Uncomment to enable telemetry
-#define TELEMETRY
-
-//Comment protocols to exclude from compilation
-#define	BAYANG_NRF24L01_INO
-#define	CG023_NRF24L01_INO
-#define	CX10_NRF24L01_INO
-#define	DEVO_CYRF6936_INO
-#define	DSM2_CYRF6936_INO
-#define	ESKY_NRF24L01_INO
-#define	FLYSKY_A7105_INO
-#define	FRSKY_CC2500_INO
-#define	HISKY_NRF24L01_INO
-#define	HUBSAN_A7105_INO
-#define	KN_NRF24L01_INO
-#define	SLT_NRF24L01_INO
-#define	SYMAX_NRF24L01_INO
-#define	V2X2_NRF24L01_INO
-#define	YD717_NRF24L01_INO
-//#define	FRSKYX_CC2500_INO
-
-//Update this table to set which protocol/sub_protocol is called for the corresponding dial number
-static const uint8_t PPM_prot[15][2]= { {MODE_FLYSKY	, Flysky	},	//Dial=1
-										{MODE_HUBSAN	, 0			},	//Dial=2
-										{MODE_FRSKY		, 0			},	//Dial=3
-										{MODE_HISKY		, Hisky		},	//Dial=4
-										{MODE_V2X2		, 0			},	//Dial=5
-										{MODE_DSM2		, DSM2		},	//Dial=6
-										{MODE_DEVO		, 0			},	//Dial=7
-										{MODE_YD717		, YD717		},	//Dial=8
-										{MODE_KN		, WLTOYS	},	//Dial=9
-										{MODE_SYMAX		, SYMAX		},	//Dial=10
-										{MODE_SLT		, 0			},	//Dial=11
-										{MODE_CX10		, CX10_BLUE	},	//Dial=12
-										{MODE_CG023		, CG023		},	//Dial=13
-										{MODE_BAYANG	, 0			},	//Dial=14
-										{MODE_SYMAX		, SYMAX5C	}	//Dial=15
-										};
-
-//CC2500 RF module frequency adjustment, use in case you cannot bind with Frsky RX
-//Note: this is set via Option when serial protocol is used
-//values from 0-127 offset increase frequency, values from 255 to 127 decrease base frequency
-//uint8_t fine = 0x00;
-uint8_t fine = 0xd7;	//* 215=-41 *
-
-// Multiprotocol module configuration ends here
-//******************************************************
-//******************************************************
-
+//Multiprotocol module configuration file
+#include "_Config.h"
 
 //Global constants/variables
 
@@ -132,11 +71,7 @@ uint8_t mode_select;
 uint8_t protocol_flags=0,protocol_flags2=0;
 
 // Serial variables
-#if defined(NUM_SERIAL_CH_8) //8 channels serial protocol
-#define RXBUFFER_SIZE 14
-#else //16 channels serial protocol
 #define RXBUFFER_SIZE 25
-#endif
 #define TXBUFFER_SIZE 12
 volatile uint8_t rx_buff[RXBUFFER_SIZE];
 volatile uint8_t rx_ok_buff[RXBUFFER_SIZE];
@@ -213,18 +148,22 @@ void setup()
 	LED_SET_OUTPUT; 
 
 	// Read or create protocol id
-	MProtocol_id=random_id(10,false);
-	MProtocol_id_master=MProtocol_id;
+	MProtocol_id_master=random_id(10,false);
+	
 	
-	//Set power transmission flags
-	POWER_FLAG_on;	//By default high power for everything
-
 	//Protocol and interrupts initialization
 	if(mode_select != MODE_SERIAL)
 	{ // PPM
-		cur_protocol[0]= PPM_prot[mode_select-1][0];
-		sub_protocol   = PPM_prot[mode_select-1][1];
-		protocol_init(cur_protocol[0]);
+		mode_select--;
+		cur_protocol[0]	=	PPM_prot[mode_select].protocol;
+		sub_protocol   	=	PPM_prot[mode_select].sub_proto;
+		MProtocol_id	=	PPM_prot[mode_select].rx_num + MProtocol_id_master;
+		option			=	PPM_prot[mode_select].option;
+		if(PPM_prot[mode_select].power)		POWER_FLAG_on;
+		if(PPM_prot[mode_select].autobind)	AUTOBIND_FLAG_on;
+		mode_select++;
+
+		protocol_init();
 
 		//Configure PPM interrupt
 		EICRA |=(1<<ISC11);		// The rising edge of INT1 pin D3 generates an interrupt request
@@ -250,7 +189,7 @@ void loop()
 		{ // Protocol needs to be changed
 			LED_OFF;									//led off during protocol init
 			module_reset();								//reset previous module
-			protocol_init(cur_protocol[0]&0x1F);		//init new protocol
+			protocol_init();							//init new protocol
 			CHANGE_PROTOCOL_FLAG_off;					//done
 		}
 	}
@@ -341,7 +280,8 @@ static void CheckTimer(uint16_t (*cb)(void))
 	}
 }
 
-static void protocol_init(uint8_t protocol)
+// Protocol start
+static void protocol_init()
 {
 	uint16_t next_callback=0;		// Default is immediate call back
 	remote_callback = 0;
@@ -358,7 +298,7 @@ static void protocol_init(uint8_t protocol)
 	CTRL1_on;	//NRF24L01 antenna RF3 by default
 	CTRL2_off;	//NRF24L01 antenna RF3 by default
 	
-	switch(protocol)	// Init the requested protocol
+	switch(cur_protocol[0]&0x1F)	// Init the requested protocol
 	{
 #if defined(FLYSKY_A7105_INO)
 		case MODE_FLYSKY:
@@ -496,7 +436,6 @@ static void update_serial_data()
 		POWER_FLAG_on;	//power high
 				
 	option=rx_ok_buff[2];
-	fine=option;		// Update FrSky fine tuning
 
 	if( ((rx_ok_buff[0]&0x5F) != (cur_protocol[0]&0x5F)) || ( (rx_ok_buff[1]&0x7F) != cur_protocol[1] ) )
 	{ // New model has been selected
@@ -511,19 +450,7 @@ static void update_serial_data()
 			CHANGE_PROTOCOL_FLAG_on;			//restart protocol with bind
 	cur_protocol[0] = rx_ok_buff[0];			//store current protocol
 
-// decode channel values
-#if defined(NUM_SERIAL_CH_8) //8 channels serial protocol
-	Servo_data[0]=rx_ok_buff[3]+((rx_ok_buff[11]&0xC0)<<2);
-	Servo_data[1]=rx_ok_buff[4]+((rx_ok_buff[11]&0x30)<<4);
-	Servo_data[2]=rx_ok_buff[5]+((rx_ok_buff[11]&0x0C)<<6);
-	Servo_data[3]=rx_ok_buff[6]+((rx_ok_buff[11]&0x03)<<8);
-	Servo_data[4]=rx_ok_buff[7]+((rx_ok_buff[12]&0xC0)<<2);
-	Servo_data[5]=rx_ok_buff[8]+((rx_ok_buff[12]&0x30)<<4);
-	Servo_data[6]=rx_ok_buff[9]+((rx_ok_buff[12]&0x0C)<<6);
-	Servo_data[7]=rx_ok_buff[10]+((rx_ok_buff[12]&0x03)<<8);
-	for(uint8_t i=0;i<8;i++)
-		Servo_data[i]=((Servo_data[i]*5)>>2)+860;	//range 860-2140;
-#else //16 channels serial protocol
+	// decode channel values
 	volatile uint8_t *p=rx_ok_buff+2;
 	uint8_t dec=-3;
 	for(uint8_t i=0;i<NUM_CHN;i++)
@@ -537,7 +464,6 @@ static void update_serial_data()
 		p++;
 		Servo_data[i]=((((*((uint32_t *)p))>>dec)&0x7FF)*5)/8+860;	//value range 860<->2140 -125%<->+125%
 	}
-#endif
 	RX_FLAG_off;								//data has been processed
 }
 
@@ -617,16 +543,6 @@ uint16_t limit_channel_100(uint8_t ch)
 	return Servo_data[ch];
 }
 
-// Convert 32b id to rx_tx_addr
-static void set_rx_tx_addr(uint32_t id)
-{ // Used by almost all protocols
-	rx_tx_addr[0] = (id >> 24) & 0xFF;
-	rx_tx_addr[1] = (id >> 16) & 0xFF;
-	rx_tx_addr[2] = (id >>  8) & 0xFF;
-	rx_tx_addr[3] = (id >>  0) & 0xFF;
-	rx_tx_addr[4] = 0xC1;	// for YD717: always uses first data port
-}
-
 #if defined(TELEMETRY)
 void Serial_write(uint8_t data)
 {
@@ -641,21 +557,12 @@ void Serial_write(uint8_t data)
 
 static void Mprotocol_serial_init()
 {
-#if defined(NUM_SERIAL_CH_8) //8 channels serial protocol
-	#define BAUD 125000
-	#include <util/setbaud.h>	
-	UBRR0H = UBRRH_VALUE;
-	UBRR0L = UBRRL_VALUE;
-	//Set frame format to 8 data bits, no parity, 1 stop bit
-	UCSR0C |= (1<<UCSZ01)|(1<<UCSZ00);
-#else //16 channels serial protocol
 	#define BAUD 100000
 	#include <util/setbaud.h>	
 	UBRR0H = UBRRH_VALUE;
 	UBRR0L = UBRRL_VALUE;
 	//Set frame format to 8 data bits, even parity, 2 stop bits
 	UCSR0C |= (1<<UPM01)|(1<<USBS0)|(1<<UCSZ01)|(1<<UCSZ00);
-#endif
 	while ( UCSR0A & (1 << RXC0) )//flush receive buffer
 		UDR0;
 	//enable reception and RC complete interrupt
@@ -663,6 +570,16 @@ static void Mprotocol_serial_init()
 	UCSR0B |= (1<<TXEN0);//tx enable
 }
 
+// Convert 32b id to rx_tx_addr
+static void set_rx_tx_addr(uint32_t id)
+{ // Used by almost all protocols
+	rx_tx_addr[0] = (id >> 24) & 0xFF;
+	rx_tx_addr[1] = (id >> 16) & 0xFF;
+	rx_tx_addr[2] = (id >>  8) & 0xFF;
+	rx_tx_addr[3] = (id >>  0) & 0xFF;
+	rx_tx_addr[4] = 0xC1;	// for YD717: always uses first data port
+}
+
 static uint32_t random_id(uint16_t adress, uint8_t create_new)
 {
 	uint32_t id;
@@ -694,6 +611,7 @@ static uint32_t random_id(uint16_t adress, uint8_t create_new)
 /**************************/
 /**************************/
 
+//PPM
 ISR(INT1_vect)
 {	// Interrupt on PPM pin
 	static int8_t chan=-1;
@@ -722,53 +640,7 @@ ISR(INT1_vect)
 	Prev_TCNT1+=Cur_TCNT1;
 }
 
-#if defined(TELEMETRY)
-ISR(USART_UDRE_vect)
-{	// Transmit interrupt
-	uint8_t t = tx_tail;
-	if(tx_head!=t)
-	{
-		if(++t>=TXBUFFER_SIZE)//head 
-		t=0;
-		UDR0=tx_buff[t];
-		tx_tail=t;
-	}
-	if (t == tx_head)
-		UCSR0B &= ~(1<<UDRIE0); // Check if all data is transmitted . if yes disable transmitter UDRE interrupt
-}
-#endif
-
-#if defined(NUM_SERIAL_CH_8) //8 channels serial protocol
-ISR(USART_RX_vect)
-{	// RX interrupt
-	static uint16_t crc = 0;
-
-	if(idx==0)
-	{	// Let's try to sync at this point
-		OCR1B=TCNT1+5000L;		// timer for 2500us
-		TIFR1=(1<<OCF1B);		// clear OCR1B match flag
-		TIMSK1 |=(1<<OCIE1B);	// enable interrupt on compare B match
-		crc=0;
-	}
-	if(idx<RXBUFFER_SIZE-1)
-	{	// Store bytes in buffer and calculate crc as we go
-		rx_buff[idx]=UDR0;
-		crc = (crc<<8) ^ pgm_read_word(&CRCTable[((uint8_t)(crc>>8) ^ rx_buff[idx++]) & 0xFF]);
-	}
-	else
-	{	// A frame has been received and needs to be checked before giving it to main
-	 	TIMSK1 &=~(1<<OCIE1B);		// disable interrupt on compare B match
-		if(UDR0==(uint8_t)(crc & 0xFF) && !IS_RX_FLAG_on)
-		{ //Good frame received and main has finished with previous buffer
-			for(idx=0;idx<RXBUFFER_SIZE;idx++)
-				rx_ok_buff[idx]=rx_buff[idx];	// Duplicate the buffer
-			RX_FLAG_on;		//flag for main to process servo data
-			LED_ON;
-		}
-		idx=0;
-	}
-}
-#else //16 channels serial protocol
+//Serial RX
 ISR(USART_RX_vect)
 {	// RX interrupt
 	if((UCSR0A&0x1C)==0)			// Check frame error, data overrun and parity error
@@ -805,9 +677,26 @@ ISR(USART_RX_vect)
 		idx=0;		// Error encountered discard full frame...
 	}
 }
-#endif
 
+//Serial timer
 ISR(TIMER1_COMPB_vect)
 {	// Timer1 compare B interrupt
 	idx=0;
 }
+
+#if defined(TELEMETRY)
+//Serial TX
+ISR(USART_UDRE_vect)
+{	// Transmit interrupt
+	uint8_t t = tx_tail;
+	if(tx_head!=t)
+	{
+		if(++t>=TXBUFFER_SIZE)//head 
+		t=0;
+		UDR0=tx_buff[t];
+		tx_tail=t;
+	}
+	if (t == tx_head)
+		UCSR0B &= ~(1<<UDRIE0); // Check if all data is transmitted . if yes disable transmitter UDRE interrupt
+}
+#endif