This commit is contained in:
King Kévin 2017-04-02 13:47:52 +02:00
parent be1f2f9f65
commit 5b2703bda2
3 changed files with 5 additions and 2 deletions

View File

@ -39,7 +39,7 @@
#define I2C_MASTER_I2C 2 /**< I2C peripheral */
/** @} */
/** @defgroup i2c_timer timer peripheral used for timeouts
/** @defgroup i2c_master_timer timer peripheral used for timeouts
* @{
*/
#define I2C_MASTER_TIMER 4 /**< timer peripheral */

View File

@ -161,6 +161,7 @@ uint8_t lex_max7219_displays = 0;
/** write data on SPI bus and handle load signal
* @param[in] data bytes to write
* @param[in] display display number in chain (0xff for all)
*/
static void led_max7219_write(uint16_t data, uint8_t display)
{

4
main.c
View File

@ -56,7 +56,7 @@ volatile bool frame_flag = false; /**< flag set when a frame has passed */
#define SQUARE_WAVE_PORT B /**< port connected to RTC DS1307 square wave output */
#define SQUARE_WAVE_PIN 0 /**< pin connected to RTC DS1307 square wave output */
volatile uint8_t rtc_seconds = 0; /** number of seconds passed incremented by the square wave */
volatile uint8_t rtc_seconds = 0; /**< number of seconds passed incremented by the square wave */
#define FRAME_TIMER 1 /**< timer to count frame time */
#define FRAME_RATE 25 /**< frame rate */
@ -378,6 +378,7 @@ void main(void)
} // main loop
}
/** RTC square wave input ISR to synchronize to seconds and count them */
void EXTI_ISR(SQUARE_WAVE_PIN)(void)
{
exti_reset_request(EXTI(SQUARE_WAVE_PIN)); // reset interrupt
@ -385,6 +386,7 @@ void EXTI_ISR(SQUARE_WAVE_PIN)(void)
rtc_tick_flag = true; // let main know a second passed
}
/** frame timer ISR */
#if FRAME_TIMER==1
void tim1_up_isr(void)
#else