freeslot: comparison car004f/main.c

-:cc8721bd2c03
+:0e71b51c83a5
 #define BRAKE           0
 #define LIGHT_MODES             1       // anzahl der lichtmodi (ohne den modus "aus")
 #define BRAKE_OFF_TIMEOUT       60      // value * 10ms
-#define CAR_DEBUG       1
+//#define CAR_DEBUG       1
 #define EE_CONFIG_ADDR  64
+#define DOUBLE_CLICK_TIMEOUT    50 // 500ms
 void config_save(void) {
 eeprom_write_block( &config, &eeconfig, sizeof(config_t) );
 }
 void brake_on(void) {
 LIGHT_PORT |= _BV(LIGHT_BRAKE); // brake light on
 BRAKE_PORT |= _BV(BRAKE); // brake on
+DDRB &= ~_BV(1);                  // PB1 PWM Output enable
 brake_timeout = BRAKE_OFF_TIMEOUT;
 }
 void brake_off(void) {
 LIGHT_PORT &= ~_BV(LIGHT_BRAKE); // brake light off
 BRAKE_PORT &= ~_BV(BRAKE); // brake off
+DDRB &= ~_BV(1);                  // PB1 PWM Output disable
 brake_timeout = 0;
 }
-uint8_t scan_id(void) {
+uint8_t set_id(void) {
+_delay_ms(100); // short wait
 uint8_t temp;
 timeout = 1;
-// scan for any key press and assign to that controller
+brake_timeout = 0xff;
-while (car_speed[config.slot] == 0) {
+// wait for key press and assign on double click
-for (uint8_t i=0; i<6; i++) {
+while ((car_speed[config.slot] == 0) && (brake_timeout > 1)) {
-if (car_switch[i] == 1) {
+temp = car_switch[config.program];
-// wait for second key press within timeout period to assign successfully
+if (temp == 0) {
-brake_timeout = 0xff;
+// wait for second key press within timeout period to assign successfully
-temp = car_switch[i];
+brake_timeout = DOUBLE_CLICK_TIMEOUT;
-while (brake_timeout > 1) {
+timeout = 1;
-if (temp != car_switch[i]) {
+while (brake_timeout > 1) {
-temp = car_switch[i];
+if (temp != car_switch[config.program]) {
-if (temp == 1) {
+temp = car_switch[config.program];
-config.slot = i;
+if (temp == 0) {
-return 1;
+config.slot = config.program;
-}
+return 1;
-}
-// toggle lights if timeout
-if (timeout == 1) {
-LIGHT_PORT ^= _BV(LIGHT_FRONT);
-timeout = 5;
-}
 }
-return 0;
 }
-}
+// toggle lights if timeout
-// toggle lights if timeout
+if (timeout == 1) {
-if (timeout == 1) {
+LIGHT_PORT ^= _BV(LIGHT_FRONT);
-LIGHT_PORT ^= _BV(LIGHT_FRONT);
+timeout = 5;
-timeout = 10;
+}
 }
-}
+return 0;
+}
+// toggle lights if timeout
+if (timeout == 1) {
+LIGHT_PORT ^= _BV(LIGHT_FRONT);
+timeout = 10;
+}
+}
 return 0;
 }
 int main(void)
 {
 // and set at BOTTOM. Clock Prescaler is 1.
 //OCR1A = 63;                       // Dutycycle of OC1A = 25%
 //OCR1B = 127;                      // Dutycycle of OC1B = 50%
-OCR1A = 0;
+OCR1A = 0xff; // brake PWM?!
-OCR1B = 0;
+OCR1B = 0; // Motor drive PWM
 DDRB &= ~_BV(2);                  // PB2 PWM Output disable
+DDRB &= ~_BV(1);                  // PB1 PWM Output disable
 // configure TIMER0 to overflow every 10ms at 4 MHz
 TIMSK = _BV(TOIE0);         // Timer0 Overflow INT erlauben
 TCNT0  = 100;            // TIMER0 vorladen mit 100
 TCCR0 = _BV(CS02) ;         // Vorteiler auf 256, ab hier läuft der TIMER0
 // config (from eeprom!)
 eeprom_read_block( &config, &eeconfig, sizeof(config_t) );
-#ifdef CAR_DEBUG
+if (config.initialized == 0xff) {
-if (config.initialized == 0) {
-LIGHT_PORT &= ~_BV(LIGHT_FRONT);
-for (temp = 0; temp <= config.slot; temp++) {
-LIGHT_PORT ^= _BV(LIGHT_FRONT);
-_delay_ms(250);
-LIGHT_PORT ^= _BV(LIGHT_FRONT);
-_delay_ms(250);
-}
-}
-#endif
-if (config.initialized != 0) {
 config.slot = 0;
 config.light = 0;
-config.program = 0;
+config.program = 0xff;
 config.initialized = 0;
 config_save();
 }
 if ((config.program != 0xff) || (config.slot > 5 )) {
-temp = scan_id();
+temp = set_id();
 config.program = 0xff;
 config_save();
 if (temp == 1) {
 // acknowledge with the engine
 OCR1B = 25;
 DDRB &= ~_BV(2);                  // PB2 PWM Output disable
-for (temp = 0xff; temp > 0; temp--) {
+for (temp = 128; temp > 0; temp--) {
 DDRB ^= _BV(2);                   // PB2 PWM Output toggle
-_delay_ms(5); // 50 hz
+_delay_ms(2);
 DDRB ^= _BV(2);                   // PB2 PWM Output toggle
-_delay_ms(15); // 50 hz
+_delay_ms(3);
 }
 }
 timeout = 0;
 }
+my_switch = car_switch[config.slot]; // initialize
+my_speed = car_speed[config.slot]; // initialize
 while (1) {
 // main loop
 if (brake_timeout == 1) brake_off();
 // Light cycle if switch pressed without speed
 if (car_speed[config.slot] == 0) {
 if (my_switch != car_switch[config.slot]) {
 my_switch = car_switch[config.slot];
-if (my_switch != 0) {
+if (my_switch == 0) {
 // cycle light
 if (config.light == LIGHT_MODES) config.light = 0; else config.light++;
 if (timeout > 1) {
 // zweiter Tastendruck, Program Mode im EEPROM setzen
-config.program = 1; // TODO: hier muss der slot rein welcher doppelclicked wurde (natuerlich dann auch nicht in der Lichtschaltelogik abfragen!)
+config.program = config.slot; // TODO: hier muss der slot rein welcher doppelclicked wurde (natuerlich dann auch nicht in der Lichtschaltelogik abfragen!)
 } else {
 // erster Tastendruck, timeout setzen
-timeout = 80;
+timeout = DOUBLE_CLICK_TIMEOUT;
 }
 config_save();
 }
 }
 }
 break;
 }
 // timeout reset
-timeout = 0;
+if (timeout == 1) timeout = 0;
 } // main loop end
 };

Mercurial > hg-public > freeslot / file comparison

comparison: car004f/main.c

car004f/main.c