diff --git a/Firmware/Inc/Backup/dma.h.bak b/Firmware/Inc/Backup/dma.h.bak index 7e70405..fc14421 100644 --- a/Firmware/Inc/Backup/dma.h.bak +++ b/Firmware/Inc/Backup/dma.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : dma.h - * Date : 28/06/2014 15:25:44 + * Date : 29/06/2014 17:37:36 * Description : This file contains all the function prototypes for * the dma.c file ****************************************************************************** diff --git a/Firmware/Inc/Backup/gpio.h.bak b/Firmware/Inc/Backup/gpio.h.bak index c8d4ef3..f57f150 100644 --- a/Firmware/Inc/Backup/gpio.h.bak +++ b/Firmware/Inc/Backup/gpio.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : gpio.h - * Date : 28/06/2014 15:25:43 + * Date : 29/06/2014 17:37:36 * Description : This file contains all the functions prototypes for * the gpio ****************************************************************************** diff --git a/Firmware/Inc/Backup/i2c.h.bak b/Firmware/Inc/Backup/i2c.h.bak index 374566c..0c4ac5f 100644 --- a/Firmware/Inc/Backup/i2c.h.bak +++ b/Firmware/Inc/Backup/i2c.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : I2C.h - * Date : 28/06/2014 15:25:44 + * Date : 29/06/2014 17:37:37 * Description : This file provides code for the configuration * of the I2C instances. ****************************************************************************** diff --git a/Firmware/Inc/Backup/leds_handler.h.bak b/Firmware/Inc/Backup/leds_handler.h.bak new file mode 100644 index 0000000..58aef63 --- /dev/null +++ b/Firmware/Inc/Backup/leds_handler.h.bak @@ -0,0 +1,36 @@ +#ifndef _LEDS_HANDLER_H_ +#define _LEDS_HANDLER_H_ + +#include "gpio.h" + +#define LED_ON 0 +#define LED_OFF 1 + +#define LED_RED 0 +#define LED_GREEN 1 +#define LED_BLUE 2 +#define LED_YELLOW 3 +#define LED_PURPLE 4 +#define LED_CYAN 5 +#define LED_WHITE 6 +#define LED_BLACK 7 + +// Initialize RGB Leds turning all off +void initRgbLeds( void ); + +// Sets the state of the Red Led on Discovery Board +void setLedDiscRed( uint8_t state ); + +// Toggle Red Led on Discovery Board +void toggleLedDiscRed( void ); + +// Sets the state of the Blue Led on Discovery Board +void setLedDiscBlue( uint8_t state ); + +// Toggle Blue Led on Discovery Board +void toggleLedDiscBlue( void ); + +// Sets the state of one of the 16 RGB Leds on the RoboDiscovery +void setStateLedColor( uint8_t ledIdx, uint8_t color ); + +#endif diff --git a/Firmware/Inc/Backup/stm32f4xx_it.h.bak b/Firmware/Inc/Backup/stm32f4xx_it.h.bak index fac2bcb..e34a340 100644 --- a/Firmware/Inc/Backup/stm32f4xx_it.h.bak +++ b/Firmware/Inc/Backup/stm32f4xx_it.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file stm32f4xx_it.h - * @date 28/06/2014 15:25:46 + * @date 29/06/2014 17:37:39 * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * @@ -46,9 +46,15 @@ /* Exported macro ------------------------------------------------------------*/ /* Exported functions ------------------------------------------------------- */ +void DMA2_Stream2_IRQHandler(void); void OTG_FS_IRQHandler(void); +void DMA1_Stream6_IRQHandler(void); void SysTick_Handler(void); +void DMA2_Stream7_IRQHandler(void); +void OTG_FS_WKUP_IRQHandler(void); +void DMA1_Stream5_IRQHandler(void); void USART2_IRQHandler(void); +void USART1_IRQHandler(void); #ifdef __cplusplus } diff --git a/Firmware/Inc/Backup/tim.h.bak b/Firmware/Inc/Backup/tim.h.bak index a3d5d37..d385531 100644 --- a/Firmware/Inc/Backup/tim.h.bak +++ b/Firmware/Inc/Backup/tim.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : TIM.h - * Date : 28/06/2014 15:25:45 + * Date : 29/06/2014 17:37:38 * Description : This file provides code for the configuration * of the TIM instances. ****************************************************************************** diff --git a/Firmware/Inc/Backup/usart.h.bak b/Firmware/Inc/Backup/usart.h.bak index ca22164..0a20916 100644 --- a/Firmware/Inc/Backup/usart.h.bak +++ b/Firmware/Inc/Backup/usart.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : USART.h - * Date : 28/06/2014 15:25:45 + * Date : 29/06/2014 17:37:38 * Description : This file provides code for the configuration * of the USART instances. ****************************************************************************** diff --git a/Firmware/Inc/Backup/usb_device.h.bak b/Firmware/Inc/Backup/usb_device.h.bak index 7c27e89..a64913a 100644 --- a/Firmware/Inc/Backup/usb_device.h.bak +++ b/Firmware/Inc/Backup/usb_device.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file : USB_DEVICE - * @date : 28/06/2014 15:25:45 + * @date : 29/06/2014 17:37:38 * @version : v1.0_Cube * @brief : Header for usb_device file. ****************************************************************************** diff --git a/Firmware/Inc/Backup/usbd_conf.h.bak b/Firmware/Inc/Backup/usbd_conf.h.bak index de197fd..d888fe0 100644 --- a/Firmware/Inc/Backup/usbd_conf.h.bak +++ b/Firmware/Inc/Backup/usbd_conf.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file : usbd_conf.h - * @date : 28/06/2014 15:25:45 + * @date : 29/06/2014 17:37:38 * @version : v1.0_Cube * @brief : Header for usbd_conf file. ****************************************************************************** diff --git a/Firmware/Inc/Backup/usbd_desc.h.bak b/Firmware/Inc/Backup/usbd_desc.h.bak index 031bc8e..01153fd 100644 --- a/Firmware/Inc/Backup/usbd_desc.h.bak +++ b/Firmware/Inc/Backup/usbd_desc.h.bak @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file : usbd_desc.h - * @date : 28/06/2014 15:25:46 + * @date : 29/06/2014 17:37:38 * @version : v1.0_Cube * @brief : Header for usbd_desc file. ****************************************************************************** diff --git a/Firmware/Inc/dma.h b/Firmware/Inc/dma.h index 75dcab1..3b73cfe 100644 --- a/Firmware/Inc/dma.h +++ b/Firmware/Inc/dma.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : dma.h - * Date : 28/06/2014 15:44:09 + * Date : 29/06/2014 18:03:42 * Description : This file contains all the function prototypes for * the dma.c file ****************************************************************************** diff --git a/Firmware/Inc/gpio.h b/Firmware/Inc/gpio.h index b9057d6..e5466c1 100644 --- a/Firmware/Inc/gpio.h +++ b/Firmware/Inc/gpio.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : gpio.h - * Date : 28/06/2014 15:44:09 + * Date : 29/06/2014 18:03:42 * Description : This file contains all the functions prototypes for * the gpio ****************************************************************************** diff --git a/Firmware/Inc/i2c.h b/Firmware/Inc/i2c.h index 9796344..b8817b4 100644 --- a/Firmware/Inc/i2c.h +++ b/Firmware/Inc/i2c.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : I2C.h - * Date : 28/06/2014 15:44:09 + * Date : 29/06/2014 18:03:42 * Description : This file provides code for the configuration * of the I2C instances. ****************************************************************************** diff --git a/Firmware/Inc/leds_handler.h b/Firmware/Inc/leds_handler.h index 66b437b..58aef63 100644 --- a/Firmware/Inc/leds_handler.h +++ b/Firmware/Inc/leds_handler.h @@ -15,6 +15,9 @@ #define LED_WHITE 6 #define LED_BLACK 7 +// Initialize RGB Leds turning all off +void initRgbLeds( void ); + // Sets the state of the Red Led on Discovery Board void setLedDiscRed( uint8_t state ); diff --git a/Firmware/Inc/stm32f4xx_it.h b/Firmware/Inc/stm32f4xx_it.h index 238dec7..82ad9e8 100644 --- a/Firmware/Inc/stm32f4xx_it.h +++ b/Firmware/Inc/stm32f4xx_it.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file stm32f4xx_it.h - * @date 28/06/2014 15:44:10 + * @date 29/06/2014 18:03:43 * @brief This file contains the headers of the interrupt handlers. ****************************************************************************** * diff --git a/Firmware/Inc/tim.h b/Firmware/Inc/tim.h index 4658688..3f79d3b 100644 --- a/Firmware/Inc/tim.h +++ b/Firmware/Inc/tim.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : TIM.h - * Date : 28/06/2014 15:44:10 + * Date : 29/06/2014 18:03:43 * Description : This file provides code for the configuration * of the TIM instances. ****************************************************************************** diff --git a/Firmware/Inc/usart.h b/Firmware/Inc/usart.h index d4f7c29..ee010a7 100644 --- a/Firmware/Inc/usart.h +++ b/Firmware/Inc/usart.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * File Name : USART.h - * Date : 28/06/2014 15:44:10 + * Date : 29/06/2014 18:03:43 * Description : This file provides code for the configuration * of the USART instances. ****************************************************************************** diff --git a/Firmware/Inc/usb_device.h b/Firmware/Inc/usb_device.h index da72334..3da1a0a 100644 --- a/Firmware/Inc/usb_device.h +++ b/Firmware/Inc/usb_device.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file : USB_DEVICE - * @date : 28/06/2014 15:44:10 + * @date : 29/06/2014 18:03:43 * @version : v1.0_Cube * @brief : Header for usb_device file. ****************************************************************************** diff --git a/Firmware/Inc/usbd_conf.h b/Firmware/Inc/usbd_conf.h index ec5c9bc..9646ae3 100644 --- a/Firmware/Inc/usbd_conf.h +++ b/Firmware/Inc/usbd_conf.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file : usbd_conf.h - * @date : 28/06/2014 15:44:10 + * @date : 29/06/2014 18:03:43 * @version : v1.0_Cube * @brief : Header for usbd_conf file. ****************************************************************************** diff --git a/Firmware/Inc/usbd_desc.h b/Firmware/Inc/usbd_desc.h index 69427ed..17b5987 100644 --- a/Firmware/Inc/usbd_desc.h +++ b/Firmware/Inc/usbd_desc.h @@ -1,7 +1,7 @@ /** ****************************************************************************** * @file : usbd_desc.h - * @date : 28/06/2014 15:44:10 + * @date : 29/06/2014 18:03:43 * @version : v1.0_Cube * @brief : Header for usbd_desc file. ****************************************************************************** diff --git a/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.axf b/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.axf index 0d46292..34eea84 100644 Binary files a/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.axf and b/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.axf differ diff --git a/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.build_log.htm b/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.build_log.htm index 5b25822..4850c67 100644 --- a/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.build_log.htm +++ b/Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.build_log.htm @@ -4,42 +4,9 @@