Merge pull request #36 from DigitalConfections/Dev1

Ver 0.15
pull/18/head
DigitalConfections 2020-06-30 14:49:48 -04:00 zatwierdzone przez GitHub
commit 54eed8d328
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 6 dodań i 2 usunięć

Wyświetl plik

@ -238,10 +238,13 @@ void doSynchronization(void);
TCCR2B = 0;
TCCR2A |= (1 << WGM21); /* set Clear Timer on Compare Match (CTC) mode with OCR2A setting the top */
#if CAL_SIGNAL_ON_PD3
TCCR2A |= (1 << COM2B0); /* Toggle OC2B (PD3) on compare match */
pinMode(PIN_CAL_OUT,OUTPUT); /* 601Hz Calibration Signal */
TCCR2A |= (1 << COM2A0); /* Toggle OC2A (PB3) on compare match */
#endif /* CAL_SIGNAL_ON_PD3 */
TCCR2B |= (1 << CS22) | (1 << CS21) | (1 << CS20); /* 1024 Prescaler */
OCR2A = 0x0C; /* set frequency to ~300 Hz (0x0c) */
OCR2B = 0x00;
/* Use system clock for Timer/Counter2 */
ASSR &= ~(1 << AS2);
/* Reset Timer/Counter2 Interrupt Mask Register */

Wyświetl plik

@ -70,7 +70,7 @@
/******************************************************
* Set the text that gets displayed to the user */
#define SW_REVISION "0.14"
#define SW_REVISION "0.15"
//#define TRANQUILIZE_WATCHDOG
@ -105,6 +105,7 @@ typedef unsigned char uint8_t;
#define PIN_DIP_1 5
#define PIN_DIP_2 6
#define PIN_AUDIO_OUT 9
#define PIN_CAL_OUT 11
typedef enum {
BEACON = 0,