|
@@ -18,17 +18,17 @@
|
|
|
#include "event-system.h"
|
|
|
|
|
|
/* Defines */
|
|
|
-#define TIMER2_HZ 250
|
|
|
+#define TIMER2_HZ 250
|
|
|
#define TIMER2_PRESCALER 256
|
|
|
#define TIMER2_CS (1<<CS22 | 1<<CS21 | 0<<CS20)
|
|
|
-#define TIMER2_CNT (0x100 - (F_CPU / TIMER2_PRESCALER / TIMER2_HZ))
|
|
|
+#define TIMER2_CNT (0x100 - (F_CPU / TIMER2_PRESCALER / TIMER2_HZ))
|
|
|
|
|
|
/* Variables */
|
|
|
static volatile uint8_t Digit[4] = {1, 2, 3, 4};
|
|
|
static rtc_t RTC;
|
|
|
volatile struct {
|
|
|
- uint8_t RTC_Int: 1;
|
|
|
- uint8_t rezerv: 7;
|
|
|
+ uint8_t RTC_Int: 1;
|
|
|
+ uint8_t rezerv: 7;
|
|
|
} Flag;
|
|
|
static btn_t Button[BTN_NUM] = {
|
|
|
{0, evBTN1Pressed, evBTN1Holded, BUTTON1_PIN},
|
|
@@ -65,8 +65,9 @@ void main(void) {
|
|
|
|
|
|
// Initialize Event State Machine
|
|
|
ES_Init(stShowTime);
|
|
|
+ showTime();
|
|
|
|
|
|
- RTOS_SetTask(btnProcess, 0, 10000);
|
|
|
+ RTOS_SetTask(btnProcess, 10, 10);
|
|
|
|
|
|
/** main loop */
|
|
|
do {
|
|
@@ -84,7 +85,7 @@ void main(void) {
|
|
|
|
|
|
event = ES_GetEvent();
|
|
|
if (event) {
|
|
|
- ES_Dispatch(event);
|
|
|
+ //ES_Dispatch(event);
|
|
|
}
|
|
|
|
|
|
// крутим диспетчер
|
|
@@ -131,7 +132,7 @@ static void dotOn(void) {
|
|
|
}
|
|
|
|
|
|
static void dotOff(void) {
|
|
|
- PORTD &= ~(DOT_PIN);
|
|
|
+ //PORTD &= ~(DOT_PIN);
|
|
|
}
|
|
|
|
|
|
void dotOnPersistent(void) {
|
|
@@ -222,7 +223,7 @@ void showYear(void) {
|
|
|
* @brief RTC one seconds interrupt
|
|
|
*/
|
|
|
ISR (INT1_vect) {
|
|
|
- Flag.RTC_Int = 1;
|
|
|
+ Flag.RTC_Int = 1;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -241,7 +242,7 @@ ISR(TIMER2_OVF_vect) {
|
|
|
|
|
|
// power off lamps
|
|
|
PORTD = pd;
|
|
|
- PORTC = pc;
|
|
|
+ PORTC = pc;
|
|
|
|
|
|
switch (idx) {
|
|
|
case 0:
|
|
@@ -280,5 +281,5 @@ ISR(TIMER2_OVF_vect) {
|
|
|
* @brief заглушка для неиспользуемых прерываний
|
|
|
*/
|
|
|
ISR(__vector_default,ISR_NAKED) {
|
|
|
- reti();
|
|
|
+ reti();
|
|
|
}
|