projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added x01 mode
[svn42.git]
/
firmware
/
tuer.pde
diff --git
a/firmware/tuer.pde
b/firmware/tuer.pde
index
7b2b4a0
..
0f2246c
100644
(file)
--- a/
firmware/tuer.pde
+++ b/
firmware/tuer.pde
@@
-38,6
+38,7
@@
int debounce_cnt = 0;
#define CMD_OPEN 'o'
#define CMD_CLOSE 'c'
#define CMD_OPEN 'o'
#define CMD_CLOSE 'c'
+#define CMD_TOGGLE 't'
#define CMD_STATUS 's'
#define CMD_RESET 'r'
#define CMD_STATUS 's'
#define CMD_RESET 'r'
@@
-111,6
+112,7
@@
void start_debounce_timer() // this breaks millis() function, but who cares
TCCR0A = 0; // no prescaler, WGM = 0 (normal)
TCCR0B = 1<<CS00; //
OCR0A = 255; // 1+255 = 256 -> 16us @ 16 MHz
TCCR0A = 0; // no prescaler, WGM = 0 (normal)
TCCR0B = 1<<CS00; //
OCR0A = 255; // 1+255 = 256 -> 16us @ 16 MHz
+ //OCR0A = 255; // 1+255 = 256 -> 12.8us @ 20 MHz
TCNT0 = 0; // reseting timer
TIMSK0 = 1<<OCF0A; // enable Interrupt
TCNT0 = 0; // reseting timer
TIMSK0 = 1<<OCF0A; // enable Interrupt
@@
-280,6
+282,7
@@
void start_step_timer()
TCCR1A = 0; // prescaler 1:256, WGM = 4 (CTC)
TCCR1B = 1<<WGM12 | 1<<CS12; //
OCR1A = 124; // (1+124)*256 = 32000 -> 2 ms @ 16 MHz
TCCR1A = 0; // prescaler 1:256, WGM = 4 (CTC)
TCCR1B = 1<<WGM12 | 1<<CS12; //
OCR1A = 124; // (1+124)*256 = 32000 -> 2 ms @ 16 MHz
+ //OCR1A = 155; // (1+155)*256 = 40000 -> 2 ms @ 20 MHz
TCNT1 = 0; // reseting timer
TIMSK1 = 1<<OCIE1A; // enable Interrupt
}
TCNT1 = 0; // reseting timer
TIMSK1 = 1<<OCIE1A; // enable Interrupt
}
@@
-290,6
+293,7
@@
void start_wait_timer()
TCCR1A = 0; // prescaler 1:256, WGM = 0 (normal)
TCCR1B = 1<<CS12; //
OCR1A = 15624; // (1+15624)*256 = 4000000 -> 250 ms @ 16 MHz
TCCR1A = 0; // prescaler 1:256, WGM = 0 (normal)
TCCR1B = 1<<CS12; //
OCR1A = 15624; // (1+15624)*256 = 4000000 -> 250 ms @ 16 MHz
+ //OCR1A = 19530; // (1+19530)*256 = 5000000 -> 250 ms @ 20 MHz
TCNT1 = 0; // reseting timer
TIMSK1 = 1<<OCIE1A; // enable Interrupt
}
TCNT1 = 0; // reseting timer
TIMSK1 = 1<<OCIE1A; // enable Interrupt
}
@@
-300,6
+304,7
@@
void start_error_timer()
TCCR1A = 0; // prescaler 1:256, WGM = 4 (CTC)
TCCR1B = 1<<WGM12 | 1<<CS12; //
OCR1A = 31249; // (1+31249)*256 = 8000000 -> 500 ms @ 16 MHz
TCCR1A = 0; // prescaler 1:256, WGM = 4 (CTC)
TCCR1B = 1<<WGM12 | 1<<CS12; //
OCR1A = 31249; // (1+31249)*256 = 8000000 -> 500 ms @ 16 MHz
+ //OCR1A = 39061; // (1+39061)*256 = 10000000 -> 500 ms @ 20 MHz
TCNT1 = 0; // reseting timer
TIMSK1 = 1<<OCIE1A; // enable Interrupt
}
TCNT1 = 0; // reseting timer
TIMSK1 = 1<<OCIE1A; // enable Interrupt
}
@@
-359,6
+364,12
@@
ISR(TIMER1_COMPA_vect)
stop_timer();
reset_stepper();
current_state = IDLE;
stop_timer();
reset_stepper();
current_state = IDLE;
+ Serial.print("Status: ");
+ if(is_opened())
+ Serial.print("opened");
+ else if(is_closed())
+ Serial.print("closed");
+ Serial.println(", idle");
return;
}
else if(current_state == ERROR) {
return;
}
else if(current_state == ERROR) {
@@
-416,6
+427,7
@@
void init_heartbeat()
TCCR2A = 1<<WGM21; // prescaler 1:1024, WGM = 2 (CTC)
TCCR2B = 1<<CS22 | 1<<CS21 | 1<<CS20; //
OCR2A = 155; // (1+155)*1024 = 159744 -> ~10 ms @ 16 MHz
TCCR2A = 1<<WGM21; // prescaler 1:1024, WGM = 2 (CTC)
TCCR2B = 1<<CS22 | 1<<CS21 | 1<<CS20; //
OCR2A = 155; // (1+155)*1024 = 159744 -> ~10 ms @ 16 MHz
+ //OCR2A = 194; // (1+194)*1024 = 199680 -> ~10 ms @ 20 MHz
TCNT2 = 0; // reseting timer
TIMSK2 = 1<<OCIE2A; // enable Interrupt
heartbeat_on();
TCNT2 = 0; // reseting timer
TIMSK2 = 1<<OCIE2A; // enable Interrupt
heartbeat_on();
@@
-548,16
+560,27
@@
void loop()
else
Serial.println("Error: Operation in progress");
}
else
Serial.println("Error: Operation in progress");
}
+ else if (command == CMD_TOGGLE) {
+ if(current_state == IDLE) {
+ if(is_closed())
+ start_open();
+ else
+ start_close();
+ Serial.println("Ok");
+ }
+ else
+ Serial.println("Error: Operation in progress");
+ }
else if (command == CMD_STATUS)
print_status();
else
Serial.println("Error: unknown command");
}
else if (command == CMD_STATUS)
print_status();
else
Serial.println("Error: unknown command");
}
- if(manual_open() && !is_opened() && current_state == IDLE) {
+ if(manual_open() && !is_opened() && (current_state == IDLE || current_state == ERROR)) {
Serial.println("open forced manually");
start_open();
}
Serial.println("open forced manually");
start_open();
}
- if(manual_close() && !is_closed() && current_state == IDLE) {
+ if(manual_close() && !is_closed() && (current_state == IDLE || current_state == ERROR)) {
Serial.println("close forced manually");
start_close();
}
Serial.println("close forced manually");
start_close();
}