# HG changeset patch # User Malte Bayer # Date 1323457337 -3600 # Node ID ea1e8dcbec44f58fef9b738ced4d4806e264302f # Parent 66dd5763dfb38b2cd0588eb7b6d76720d42b6c72 added pitlane skeleton based on trackswitch diff -r 66dd5763dfb3 -r ea1e8dcbec44 pitlane/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pitlane/Makefile Fri Dec 09 20:02:17 2011 +0100 @@ -0,0 +1,94 @@ +PRG=main + +MCU=atmega8 +FUSES=-U lfuse:w:0xAE:m -U hfuse:w:0xd9:m +#FUSES=-U lfuse:w:0x83:m -U hfuse:w:0xd9:m +# original fuses: 83 / d8 +BOOTFUSES=-U lfuse:w:0xff:m -U hfuse:w:0xce:m + +#F_CPU=4185600 +#F_CPU = 14318000 + +F_CPU = 8000000 +BAUD=38400 + +ISP_BAUD = 115200 + +#SRC = main.c seriald.c driver/ADC.c driver/clock.c driver/timer.c +#SRC = main.c driver/rs232.c driver/manchester.c +SRC = main.c driver/rs232.c + +################################################################### +# You possibly do not need to change settings below this marker +################################################################### + +# Binaries to be used +# You may add the path to them if they are not in the PATH variable. +CC = avr-gcc +OBJCOPY = avr-objcopy +OBJDUMP = avr-objdump +AVRDUDE = avrdude +PERL = perl + +# Optional library search path +LIBS = + +# Compiler options for all c source files +CFLAGS += -g -Wall -mmcu=$(MCU) -DBAUD=$(BAUD) -DF_CPU=$(F_CPU)UL -std=gnu99 +CFLAGS += -funsigned-char +CFLAGS += -funsigned-bitfields +CFLAGS += -fpack-struct +CFLAGS += -fshort-enums +CFLAGS += -Wstrict-prototypes +CFLAGS += -Wundef +#CFLAGS += -save-temps + +# optimize for size +CFLAGS += -Os +# dont optimize +#CFLAGS += -O0 + +# Linker options +LDFLAGS = -Wl,-Map,$(PRG).map + +# Enable floating-point support in printf +#LDFLAGS += -Wl,-u,vfprintf -lprintf_flt -lm + +################################################################### +# TARGET DEFINITIONS: + + +all: code + +code: $(PRG).hex + +$(PRG).elf: $(SRC:.c=.o) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + +%.lst: %.elf + $(OBJDUMP) -h -S $< > $@ + +%.hex: %.elf + $(OBJCOPY) -j .text -j .data -O ihex $< $@ + rm $(PRG).elf + rm $(PRG).map + +program: code + $(AVRDUDE) -c stk500v2 -b $(ISP_BAUD) -i 1 -p $(MCU) -V -U flash:w:$(PRG).hex:i + +fuse: + $(AVRDUDE) -c stk500 -p $(MCU) -V $(FUSES) + +clean: + rm -rf *.o *.elf *.elf.src *.s *.i + rm -rf driver/*.o + +upgrade: code + $(RESETCOMMAND) + ./bootloader -d $(NETDEV) -b $(UPGRADE_BAUD) -p $(PRG).hex + +bootloader: bootload.hex + $(AVRDUDE) -p $(MCU) -c stk500 -V -U flash:w:bootload.hex:i + +bootfuses: + $(AVRDUDE) -p $(MCU) -c stk500 $(BOOTFUSES) diff -r 66dd5763dfb3 -r ea1e8dcbec44 pitlane/driver --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pitlane/driver Fri Dec 09 20:02:17 2011 +0100 @@ -0,0 +1,1 @@ +../blackbox/driver \ No newline at end of file diff -r 66dd5763dfb3 -r ea1e8dcbec44 pitlane/info --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pitlane/info Fri Dec 09 20:02:17 2011 +0100 @@ -0,0 +1,13 @@ +Original firmware: +- acts as a simple single switch +- Adds 150µS low phase to each controller / ghostcar packet + +New Firmware: +- acts as single switch +- acts as car time sensor on both lanes +- send "car entered / leaved pitlane" through ResponseWire to CU + +Future plan: +Configurable via serial interface on CU: + - Adds 150µS low phase to each controller / ghostcar packet + so "normal" refueling works \ No newline at end of file diff -r 66dd5763dfb3 -r ea1e8dcbec44 pitlane/main.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pitlane/main.c Fri Dec 09 20:02:17 2011 +0100 @@ -0,0 +1,325 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "main.h" + +#include "driver/rs232.h" +#include "util/delay.h" + + +ISR ( USART_RXC_vect ) { +} + +#define PULSE_PORT PORTD +#define PULSE_BIT PD2 +#define RESPONSE_PORT PORTC +#define RESPONSE_PIN PC1 +#define SOLENOID_A_PORT PORTB +#define SOLENOID_B_PORT PORTB +#define SOLENOID_A_PIN PB1 +#define SOLENOID_B_PIN PB2 + +#define TRACKSWITCH_TYPE 2 // 1=double, 2=single, 3=pitlane + + +// internal analog comparator doesnt work well +//#define ANALOG_COMPARATOR 1 + +volatile uint16_t data = 0; +volatile uint8_t data_len = 0; +volatile uint8_t bitbuf_len = 0; +volatile uint16_t bitbuf = 0; +volatile uint8_t car_speed[8]; +volatile uint8_t car_switch[8]; +volatile uint16_t car0, car1, car2; +volatile uint16_t car0_new, car0_old; +volatile uint16_t car1_new, car1_old; +volatile uint16_t car2_new, car2_old; + +volatile uint8_t response = 0; +uint8_t self_id = 0b1111; // ONLY ONE pitlane + +void send_response(uint16_t data) { + /* frame format: + 1 startbit + 2 car id + 3 car id + 4 car id + 5 track change status bit 1 + 6 track change status bit 2 + 7 sender id + 8 sender id + 9 sender id + 9 sender id + 10 device type + 11 device type + 12 device type + 13 device type + 14 reserved + 15 reserved + 16 stopbit + */ + uint8_t index = 16; // bit count maximum + uint8_t enable = DDR(RESPONSE_PORT) | _BV(RESPONSE_PIN); + uint8_t disable = DDR(RESPONSE_PORT) & ~_BV(RESPONSE_PIN); + data |= 0b100000000000001; // make sure start/stop bits are set + data = 0b1010101010101011; + while (index != 0) { + if ((data & 1) != 0) { + DDR(RESPONSE_PORT) = enable; // enable response output + } else { + DDR(RESPONSE_PORT) = disable; // disable response output + } + data = data >> 1; // next bit prepare + index--; // decrement index + _delay_us(49); // bit valid phase + } + // finally be sure to release the bus! + DDR(RESPONSE_PORT) = disable; // disable response output +} + + +ISR ( INT0_vect ) { + GICR &= ~_BV(INT0) ; // Disable INT0 + // Startsignal erkannt, ab hier den Timer2 starten, + // der liest dann alle 50µs den Zustand ein und schreibt das + // empfangene Bit in den Puffer + bitbuf = 0; // init + bitbuf_len = 0b10000000; // init 1 pulse received + TCNT2 = 0; + TIMSK |= _BV(OCIE2); //enable timer2 interrupt +} + +ISR ( TIMER2_COMP_vect ) { + uint8_t clock; + uint8_t state; + uint8_t state2; + if ((bitbuf_len & 0b10000000) == 0) clock = 0; else clock = 0xff; + if ((bitbuf_len & 0b01000000) == 0) state = 0; else state = 0xff; + if ((PIN(PULSE_PORT) & _BV(PULSE_BIT)) == 0) state2 = 0xff; else state2 = 0; + + if (clock) { + bitbuf_len &= ~_BV(7); // switch clock to low + // second pulse of bit + if ((state==state2) & state2) { + // two cycles high: packet end received + data_len = (bitbuf_len & 0b00111111); + TIMSK &= ~_BV(OCIE2); //disable timer2 interrupt + GICR |= _BV(INT0) ; // Enable INT0 + + //data = bitbuf; // output data + // write data of controllers to array + if (data_len == 10) { // controller data packet + clock = (bitbuf >> 6) & 0b00000111; + car_speed[clock] = (bitbuf >> 1) & 0x0F; + car_switch[clock] = (bitbuf >> 5) & 1; + // current response for this car? + if (response != 0) { + if ( ((response & 0b00001110) >> 1) == clock) { + // add our ID to response: + send_response(response | (self_id << 6)); + response = 0; + } + } + } + + + } else { + bitbuf_len++; // increment bit counter + bitbuf = bitbuf << 1; // shift bits + if (state2 == 0) bitbuf |= 1; // receive logic one + } + } else { + bitbuf_len |= _BV(7); // switch clock to high + // first pulse of bit + if (state2) { + bitbuf_len |= _BV(6); // store new state + } else { + bitbuf_len &= ~_BV(6); // store new state + } + } +} + + +ISR (TIMER1_OVF_vect) { + // reset both car counters to overflow + car0_old = 0xffff; + car1_old = 0xffff; + // pitlane exit sensor + car2_old = 0xffff; +} + +ISR (INT1_vect) { + // car0 detector + uint16_t tmp = 0; + car0_new = TCNT1; // get current counter + if (car0_old < car0_new) { + // calculate difference + if (car0 == 0) tmp = car0_new-car0_old; + if ( (tmp > 54) && (tmp < 74) ) car0 = 1; + if ( (tmp > 118) && (tmp < 138) ) car0 = 2; + if ( (tmp > 186) && (tmp < 206) ) car0 = 3; + if ( (tmp > 246) && (tmp < 266) ) car0 = 4; + if ( (tmp > 310) && (tmp < 330) ) car0 = 5; + if ( (tmp > 374) && (tmp < 394) ) car0 = 6; + } + car0_old = car0_new; +} + +// ISR (TIMER1_CAPT_vect) { +#ifdef ANALOG_COMPARATOR +ISR (ANA_COMP_vect) { + // car1 detector + uint16_t tmp = 0; + car1_new = TCNT1; // get current counter + if (car1_old < car1_new) { + // calculate difference + if (car1 == 0) tmp = car1_new-car1_old; + if ( (tmp > 50) && (tmp < 78) ) car1 = 1; + if ( (tmp > 114) && (tmp < 146) ) car1 = 2; + if ( (tmp > 183) && (tmp < 210) ) car1 = 3; + if ( (tmp > 242) && (tmp < 270) ) car1 = 4; + if ( (tmp > 310) && (tmp < 330) ) car1 = 5; + if ( (tmp > 374) && (tmp < 394) ) car1 = 6; + } + car1_old = car1_new; +} +#else +// ALTERNATIV: +ISR (TIMER1_CAPT_vect) { + // car1 detector + uint16_t tmp = 0; + car1_new = TCNT1; // get current counter + if (car1_old < car1_new) { + // calculate difference + if (car1 == 0) tmp = car1_new-car1_old; + if ( (tmp > 50) && (tmp < 78) ) car1 = 1; + if ( (tmp > 114) && (tmp < 146) ) car1 = 2; + if ( (tmp > 183) && (tmp < 210) ) car1 = 3; + if ( (tmp > 242) && (tmp < 270) ) car1 = 4; + if ( (tmp > 310) && (tmp < 330) ) car1 = 5; + if ( (tmp > 374) && (tmp < 394) ) car1 = 6; + } + car1_old = car1_new; +} +#endif + +void solenoid_delay(void) { + _delay_ms(10); +} + + + + +int main(void) +{ + uint8_t car0_state, car1_state; + + // setup data bit timer2 + TCCR2 = (1<0) ) { + response = (1 | ((car0_state-1)<<1) | (1 << 4)); + // trigger solenoid A + RS232_putc('A'); + RS232_putc('B'); + RS232_putc('0'+car0_state); + RS232_putc('\n'); + + SOLENOID_A_PORT |= _BV(SOLENOID_A_PIN); + solenoid_delay(); + SOLENOID_A_PORT &= ~_BV(SOLENOID_A_PIN); + solenoid_delay(); + } + if (car0_state != 0) { + response = (1 | ((car0_state-1)<<1)); + RS232_putc('A'); + RS232_putc('A'); + RS232_putc('0'+car0_state); + RS232_putc('\n'); + } + } car0 = 0; + + + if (car1 != car1_state) { + car1_state = car1; + if ( (car1_state != 0) && (car_switch[car1_state-1] == 0) && (car_speed[car1_state-1]>0) ) { + response = (1 | ((car1_state-1)<<1) | (3 << 4)); + // trigger solenoid B + RS232_putc('B'); + RS232_putc('A'); + RS232_putc('0'+car1_state); + RS232_putc('\n'); + + SOLENOID_B_PORT |= _BV(SOLENOID_B_PIN); + solenoid_delay(); + SOLENOID_B_PORT &= ~_BV(SOLENOID_B_PIN); + solenoid_delay(); + } + if (car1_state != 0) { + response = (1 | ((car1_state-1)<<1) | (2 << 4)); + RS232_putc('B'); + RS232_putc('B'); + RS232_putc('0'+car1_state); + RS232_putc('\n'); + } + } car1 = 0; + + + } // main loop end +}; + diff -r 66dd5763dfb3 -r ea1e8dcbec44 pitlane/main.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pitlane/main.h Fri Dec 09 20:02:17 2011 +0100 @@ -0,0 +1,1 @@ +../blackbox/main.h \ No newline at end of file