Skip to content

Commit

Permalink
Test FW corrected
Browse files Browse the repository at this point in the history 
/ Corrected GPIO configuration to drive RGB LEds
  • Loading branch information
Walter Lucetti committed Jun 29, 2014
1 parent 8ac6fbc commit ffdeed2
Show file tree
Hide file tree
Showing 49 changed files with 1,264 additions and 910 deletions.
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/dma.h.bak
View file
@@ -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
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/gpio.h.bak
View file
@@ -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
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/i2c.h.bak
View file
@@ -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.
******************************************************************************
Expand Down
36 changes: 36 additions & 0 deletions Firmware/Inc/Backup/leds_handler.h.bak
View file
@@ -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
8 changes: 7 additions & 1 deletion Firmware/Inc/Backup/stm32f4xx_it.h.bak
View file
@@ -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.
******************************************************************************
*
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/tim.h.bak
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/usart.h.bak
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/usb_device.h.bak
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/usbd_conf.h.bak
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/Backup/usbd_desc.h.bak
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/dma.h
View file
@@ -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
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/gpio.h
View file
@@ -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
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/i2c.h
View file
@@ -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.
******************************************************************************
Expand Down
3 changes: 3 additions & 0 deletions Firmware/Inc/leds_handler.h
View file
Expand Up @@ -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 );

Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/stm32f4xx_it.h
View file
@@ -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.
******************************************************************************
*
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/tim.h
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/usart.h
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/usb_device.h
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/usbd_conf.h
View file
@@ -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.
******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion Firmware/Inc/usbd_desc.h
View file
@@ -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.
******************************************************************************
Expand Down
Binary file modified Firmware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.axf
View file
Binary file not shown.
35 changes: 1 addition & 34 deletions ...ware/Projects/MDK-ARM/Sonar-Module Configuration/Sonar-Module Configuration.build_log.htm
View file
Expand Up @@ -4,42 +4,9 @@
<h1>µVision Build Log</h1>
<h2>Project:</h2>
C:\Users\Walter\Documents\GitHub\RoboDiscovery-F4\Firmware\Projects\MDK-ARM\Sonar-Module.uvproj
Project File Date: 06/28/2014
Project File Date: 06/29/2014

<h2>Output:</h2>
Build target 'Sonar-Module Configuration'
compiling main.c...
linking...
Program Size: Code=20352 RO-data=440 RW-data=380 ZI-data=5364
FromELF: creating hex file...
"Sonar-Module Configuration\Sonar-Module Configuration.axf" - 0 Error(s), 0 Warning(s).
</pre>
</body>
</html>
.

pinK_idx = GPIO_PIN_9;
..\..\Src\leds_handler.c(48): warning: #69-D: integer conversion resulted in truncation
pinK_idx = GPIO_PIN_10;
..\..\Src\leds_handler.c(50): warning: #69-D: integer conversion resulted in truncation
pinK_idx = GPIO_PIN_11;
..\..\Src\leds_handler.c(52): warning: #69-D: integer conversion resulted in truncation
pinK_idx = GPIO_PIN_12;
..\..\Src\leds_handler.c(54): warning: #69-D: integer conversion resulted in truncation
pinK_idx = GPIO_PIN_13;
..\..\Src\leds_handler.c(74): warning: #127-D: expected a statement
}
..\..\Src\leds_handler.c(38): warning: #550-D: variable "pinK_idx" was set but never used
uint8_t pinK_idx;
..\..\Src\leds_handler.c: 8 warnings, 0 errors
linking...
Program Size: Code=19944 RO-data=440 RW-data=380 ZI-data=5364
"Sonar-Module Configuration\Sonar-Module Configuration.axf" - 0 Error(s), 8 Warning(s).
440 RW-data=380 ZI-data=5364
"Sonar-Module Configuration\Sonar-Module Configuration.axf" - 0 Error(s), 0 Warning(s).
tion.axf: Error: L6218E: Undefined symbol HAL_PCDEx_SetRxFiFo (referred from usbd_conf.o).
Sonar-Module Configuration\Sonar-Module Configuration.axf: Error: L6218E: Undefined symbol HAL_PCDEx_SetTxFiFo (referred from usbd_conf.o).
Not enough information to list image symbols.
Finished: 1 information, 0 warning and 2 error messages.
"Sonar-Module Configuration\Sonar-Module Configuration.axf" - 2 Error(s), 1 Warning(s).
Target not created

0 comments on commit ffdeed2

Please sign in to comment.