Subversion Repositories Projects

Compare Revisions

Regard whitespace Rev 775 → Rev 776

/Spektrum-Diversity/Software/diversity.aps
1,0 → 0,0
<AVRStudio><MANAGEMENT><ProjectName>diversity</ProjectName><Created>23-Jul-2010 13:27:06</Created><LastEdit>26-Jul-2010 16:05:03</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>23-Jul-2010 13:27:06</Created><Version>4</Version><Build>4, 18, 0, 670</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>default\diversity.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>D:\Pendsa\diversity\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega128.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>diversity.c</SOURCEFILE><OTHERFILE>default\diversity.lss</OTHERFILE><OTHERFILE>default\diversity.map</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>NO</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE></EXTERNALMAKEFILE><PART>attiny2313</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>diversity.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS/><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -std=gnu99 -DF_CPU=8000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\Programme\WinAVR-20081205\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\Programme\WinAVR-20081205\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><ProjectFiles><Files><Name>D:\Pendsa\diversity\diversity.c</Name></Files></ProjectFiles><IOView><usergroups/><sort sorted="0" column="0" ordername="1" orderaddress="1" ordergroup="1"/></IOView><Files><File00000><FileId>00000</FileId><FileName>diversity.c</FileName><Status>1</Status></File00000></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
<AVRStudio><MANAGEMENT><ProjectName>diversity</ProjectName><Created>23-Jul-2010 13:27:06</Created><LastEdit>28-Jul-2010 17:47:08</LastEdit><ICON>241</ICON><ProjectType>0</ProjectType><Created>23-Jul-2010 13:27:06</Created><Version>4</Version><Build>4, 18, 0, 670</Build><ProjectTypeName>AVR GCC</ProjectTypeName></MANAGEMENT><CODE_CREATION><ObjectFile>default\diversity.elf</ObjectFile><EntryFile></EntryFile><SaveFolder>D:\Pendsa\diversity\Software\</SaveFolder></CODE_CREATION><DEBUG_TARGET><CURRENT_TARGET>JTAGICE mkII</CURRENT_TARGET><CURRENT_PART>ATmega128.xml</CURRENT_PART><BREAKPOINTS></BREAKPOINTS><IO_EXPAND><HIDE>false</HIDE></IO_EXPAND><REGISTERNAMES><Register>R00</Register><Register>R01</Register><Register>R02</Register><Register>R03</Register><Register>R04</Register><Register>R05</Register><Register>R06</Register><Register>R07</Register><Register>R08</Register><Register>R09</Register><Register>R10</Register><Register>R11</Register><Register>R12</Register><Register>R13</Register><Register>R14</Register><Register>R15</Register><Register>R16</Register><Register>R17</Register><Register>R18</Register><Register>R19</Register><Register>R20</Register><Register>R21</Register><Register>R22</Register><Register>R23</Register><Register>R24</Register><Register>R25</Register><Register>R26</Register><Register>R27</Register><Register>R28</Register><Register>R29</Register><Register>R30</Register><Register>R31</Register></REGISTERNAMES><COM>Auto</COM><COMType>0</COMType><WATCHNUM>0</WATCHNUM><WATCHNAMES><Pane0></Pane0><Pane1></Pane1><Pane2></Pane2><Pane3></Pane3></WATCHNAMES><BreakOnTrcaeFull>0</BreakOnTrcaeFull></DEBUG_TARGET><Debugger><Triggers></Triggers></Debugger><AVRGCCPLUGIN><FILES><SOURCEFILE>diversity.c</SOURCEFILE><OTHERFILE>default\diversity.lss</OTHERFILE><OTHERFILE>default\diversity.map</OTHERFILE></FILES><CONFIGS><CONFIG><NAME>default</NAME><USESEXTERNALMAKEFILE>NO</USESEXTERNALMAKEFILE><EXTERNALMAKEFILE></EXTERNALMAKEFILE><PART>attiny2313</PART><HEX>1</HEX><LIST>1</LIST><MAP>1</MAP><OUTPUTFILENAME>diversity.elf</OUTPUTFILENAME><OUTPUTDIR>default\</OUTPUTDIR><ISDIRTY>0</ISDIRTY><OPTIONS/><INCDIRS/><LIBDIRS/><LIBS/><LINKOBJECTS/><OPTIONSFORALL>-Wall -gdwarf-2 -std=gnu99 -DF_CPU=8000000UL -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums</OPTIONSFORALL><LINKEROPTIONS></LINKEROPTIONS><SEGMENTS/></CONFIG></CONFIGS><LASTCONFIG>default</LASTCONFIG><USES_WINAVR>1</USES_WINAVR><GCC_LOC>C:\Programme\WinAVR-20081205\bin\avr-gcc.exe</GCC_LOC><MAKE_LOC>C:\Programme\WinAVR-20081205\utils\bin\make.exe</MAKE_LOC></AVRGCCPLUGIN><ProjectFiles><Files><Name>D:\Pendsa\diversity\Software\diversity.c</Name></Files></ProjectFiles><IOView><usergroups/><sort sorted="0" column="0" ordername="0" orderaddress="0" ordergroup="0"/></IOView><Files><File00000><FileId>00000</FileId><FileName>diversity.c</FileName><Status>1</Status></File00000></Files><Events><Bookmarks></Bookmarks></Events><Trace><Filters></Filters></Trace></AVRStudio>
/Spektrum-Diversity/Software/diversity.aws
1,0 → 0,0
<AVRWorkspace><IOSettings><CurrentRegisters><WATCHDOG><register register="WDTCR" group="WATCHDOG" display="1" locked="0"/></WATCHDOG></CurrentRegisters></IOSettings><part name="ATmega128"/><Files><File00000 Name="D:\Pendsa\diversity\diversity.c" Position="262 71 1328 776" LineCol="165 66" State="Maximized"/></Files></AVRWorkspace>
<AVRWorkspace><IOSettings><CurrentRegisters/></IOSettings><part name="ATMEGA128"/><Files><File00000 Name="D:\Pendsa\diversity\Software\diversity.c" Position="268 96 1110 580" LineCol="139 0"/></Files></AVRWorkspace>
/Spektrum-Diversity/Software/diversity.c
1,10 → 1,10
// ************************************************************
// ** Spektrum Diversity - use up to 8 satellite receivers **
// ** Spektrum Diversity - use up to 4 satellite receivers **
// ************************************************************
// ** Target: An Atmel ATtiny2313 (RC-Oscillator @ 8 MHz) **
// ** controls a 74HC151 Multiplexer **
// ************************************************************
// ** It monitors the data from 8 satellite receivers and **
// ** It monitors the data from 4 satellite receivers and **
// ** connects a valid one to the output via the multiplexer **
// ************************************************************
// ** LED-Modes during startup (in chronological order) **
26,39 → 26,15
#include <avr/interrupt.h>
#include <util/delay.h>
 
#define LED_OFF PORTD |= 1 << PORTD3
#define LED_ON PORTD &= ~(1 << PORTD3)
#define LED_OFF PORTD |= 1 << PORTD0
#define LED_ON PORTD &= ~(1 << PORTD0)
 
 
volatile unsigned int TimerEvent;
 
 
void SelectSat(unsigned char sat)
{
/*
Re-Assignment due to easier routing on layout: sat -> mux-channel# -> mux-input (seen from µC)
0 -> 2 -> 2
1 -> 1 -> 4
2 -> 0 -> 0
3 -> 3 -> 6
4 -> 4 -> 1
5 -> 5 -> 5
6 -> 6 -> 3
7 -> 7 -> 7
*/
 
 
if (sat == 0) sat = 2;
else if (sat == 1) sat = 4;
else if (sat == 2) sat = 0;
else if (sat == 3) sat = 6;
else if (sat == 4) sat = 1;
else if (sat == 5) sat = 5;
else if (sat == 6) sat = 3;
else if (sat == 7) sat = 7;
 
 
PORTD = (PORTD & 0b00001000) | sat;
PORTD = (PORTD & 0b00000001) | (sat<<3); // Select the Input for 74HC151
}
 
void ResetTimer(void)
69,9 → 45,58
}
 
 
void Binding(void) // Binding sequence for DX7
{
unsigned char i = 0;
 
ISR(TIMER1_OVF_vect) // Triggered every 4,096 msec
DDRB = 0b11110000; // Sat-Pins to output
_delay_ms(80); // Let them boot up
for (i=0;i<3;i++) // send three negative 100µs pulses to all sat's
{
PORTB = 0b00000000;
_delay_us(100);
PORTB = 0b11110000;
_delay_us(100);
}
 
_delay_ms(1000);
DDRB = 0b00000000; // Sat-Pins to input after 1sec
}
 
 
void Testing(void) // Self Test
{
unsigned char i = 0;
unsigned char error = 0;
 
DDRB = 0b11110000; // PORT B OUTPUT FOR SATELLITES, INPUT FOR FEEDBACK
PORTB = 0b00000000;
 
for(i=0;i<4;i++) // Test muxxing of High+Low on every Sat-Input
{
SelectSat(i);
PORTB |= 1 << (i+4);
if (!(PINB & (1<<PB3))) error++;
PORTB &= ~(1 << (i+4));
if (PINB & (1<<PB3)) error++;
}
 
while(1) // Never return
{
if (error == 0) // When no error occured, flash around
{
LED_ON;
_delay_ms(100);
LED_OFF;
_delay_ms(100);
}
}
}
 
 
ISR(TIMER1_OVF_vect) // Triggered every 8,192 msec
{
TimerEvent++;
}
 
79,22 → 104,26
int main(void)
{
unsigned char i = 0;
unsigned int j = 0;
unsigned char active[8];
unsigned char sat = 9;
DDRB = 0b00000000; // PORT A INPUT FOR SATELLITES
DDRD = 0b00001111; // PORT B OUTPUT FOR MUX AND LED
PORTB = 0b11111111; // PORT A PULLUP's FOR (unused) SATELLITES
unsigned char j = 0;
unsigned char active[4];
unsigned char sat = 4;
 
DDRB = 0b00000000; // PORT B INPUT FOR SATELLITES AND FEEDBACK
DDRD = 0b0011001; // PORT D OUTPUT FOR MUX AND LED, INPUT FOR SWITCH & TEST
PORTB = 0b11110000; // PORT B PULLUP's FOR (unused) SATELLITES
PORTD = 0b1100001; // PORT D PULLUP's FOR SWITCH & TEST
 
TCCR1B = ( 1 << CS10 ); // Timer1 Prescaler 1 = 4,096 msec
for (i=0;i<4;i++) active[i] = 0; // Reset active-array
 
if (!(PIND & (1<<PD6))) Binding(); // Initiate Binding when Bind-Button is pressed
if (!(PIND & (1<<PD5))) Testing(); // Initiate Self-Test when Test-Pad is low
 
TCCR1B = ( 1 << CS10 ); // Timer1 Prescaler = 1 -> 8,192 msec
TIMSK = ( 1 << TOIE1 ); // Timer1 Overflow Interrupt Enable
sei(); // Global Interrupts enable
 
for (i=0;i<8;i++) active[i] = 0; // Reset active-array
 
ResetTimer();
while(PINB == 255) // Wait for first signal (SYNC to frame)
while((PINB & 0b11110000) == 0b11110000) // Wait for first signal (SYNC to frame)
{
if (TimerEvent == 10) LED_ON; // Blink while waiting...
if (TimerEvent == 20)
117,12 → 146,12
j++;
}
 
for (i=0;i<8;i++)
for (i=0;i<4;i++)
{
if (!(PINB & (1<<i)))
if (!(PINB & (1<<(i+4))))
{
active[i] = 1;
if (sat == 9) // Select first active satellite (only once)
if (sat == 4) // Select first active satellite (only once)
{
sat = i;
SelectSat(i);
137,12 → 166,12
LED_OFF;
_delay_ms(1000);
 
for (i=0;i<8;i++) // Flash once for every active satellite
for (i=0;i<4;i++) // Flash once for every active satellite
{
if (active[i] == 1)
{
LED_ON;
_delay_ms(200);
_delay_ms(100);
LED_OFF;
_delay_ms(200);
}
155,20 → 184,20
{
ResetTimer();
 
while(PINB == 255) // Wait for first signal (SYNC to frame)
while((PINB & 0b11110000) == 0b11110000) // Wait for first signal (SYNC to frame)
{
if (TimerEvent > 3) break; // (max. 3*8=24ms)
}
for (i=0;i<8;i++) active[i] = 0; // Reset active-array
for (i=0;i<4;i++) active[i] = 0; // Reset active-array
ResetTimer();
 
while(TimerEvent < 1) // Check active satellites (for 1*8=8ms)
{
 
for (i=0;i<8;i++)
for (i=0;i<4;i++)
{
if (!(PINB & (1<<i)))
if (!(PINB & (1<<(i+4))))
{
active[i] = 1;
}
179,7 → 208,7
if (active[sat] == 0) // Detect fail on active satellite
{
LED_ON; // Failure-LED ON (never goes off again)
for (i=0;i<8;i++) // Select lowest active satellite
for (i=0;i<4;i++) // Select lowest active satellite
{
if (active[i] == 1)
{
189,5 → 218,9
}
}
}
 
 
}
 
}