Merge pull request #99 from pl4nkton/stm32_fixes

Stm32 fixes

6 files changed, 74 insertions, 24 deletions

diff --git a/testhal/STM32/STM32F0xx/crc/halconf_community.h b/testhal/STM32/STM32F0xx/crc/halconf_community.h
index 2bc41bf..31ac01e 100644
--- a/testhal/STM32/STM32F0xx/crc/halconf_community.h
+++ b/testhal/STM32/STM32F0xx/crc/halconf_community.h
@@ -14,8 +14,8 @@
     limitations under the License.

 */

 

-#ifndef _HALCONF_COMMUNITY_H_

-#define _HALCONF_COMMUNITY_H_

+#ifndef HALCONF_COMMUNITY_H

+#define HALCONF_COMMUNITY_H

 

 /**

  * @brief   Enables the community overlay.

@@ -113,6 +113,6 @@
 #define CRC_USE_MUTUAL_EXCLUSION    TRUE

 #endif

 

-#endif /* _HALCONF_COMMUNITY_H_ */

+#endif /* HALCONF_COMMUNITY_H */

 

 /** @} */

diff --git a/testhal/STM32/STM32F0xx/crc/mcuconf_community.h b/testhal/STM32/STM32F0xx/crc/mcuconf_community.h
index 8df78ec..bbd2608 100644
--- a/testhal/STM32/STM32F0xx/crc/mcuconf_community.h
+++ b/testhal/STM32/STM32F0xx/crc/mcuconf_community.h
@@ -14,8 +14,8 @@
     limitations under the License.
 */
 
-#ifndef _MCUCONF_COMMUNITY_H_
-#define _MCUCONF_COMMUNITY_H_
+#ifndef MCUCONF_COMMUNITY_H
+#define MCUCONF_COMMUNITY_H
 
 /*
  * CRC driver system settings.
@@ -30,4 +30,4 @@
 #define CRCSW_CRC16_TABLE                   TRUE
 #define CRCSW_PROGRAMMABLE                  TRUE
 
-#endif
+#endif /* MCUCONF_COMMUNITY_H */
diff --git a/testhal/STM32/STM32F0xx/onewire/Makefile b/testhal/STM32/STM32F0xx/onewire/Makefile
index e478e3a..de965e3 100644
--- a/testhal/STM32/STM32F0xx/onewire/Makefile
+++ b/testhal/STM32/STM32F0xx/onewire/Makefile
@@ -75,7 +75,7 @@ endif
 PROJECT = ch

 

 # Imported source files and paths

-CHIBIOS = ../../../../../ChibiOS-RT
+CHIBIOS = ../../../../../ChibiOS-RT

 CHIBIOS_CONTRIB = $(CHIBIOS)/../ChibiOS-Contrib

 TESTHAL = $(CHIBIOS_CONTRIB)/testhal/common/onewire

 # Startup files.

@@ -104,7 +104,7 @@ CSRC = $(STARTUPSRC) \
        $(TESTSRC) \

        main.c \

        $(TESTHAL)/testhal_onewire.c

-       

+

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CPPSRC =

diff --git a/testhal/STM32/STM32F0xx/onewire/halconf.h b/testhal/STM32/STM32F0xx/onewire/halconf.h
index c3b1671..64811a5 100644
--- a/testhal/STM32/STM32F0xx/onewire/halconf.h
+++ b/testhal/STM32/STM32F0xx/onewire/halconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -25,8 +25,8 @@
  * @{

  */

 

-#ifndef _HALCONF_H_

-#define _HALCONF_H_

+#ifndef HALCONF_H

+#define HALCONF_H

 

 #include "mcuconf.h"

 

@@ -45,17 +45,17 @@
 #endif

 

 /**

- * @brief   Enables the DAC subsystem.

+ * @brief   Enables the CAN subsystem.

  */

-#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)

-#define HAL_USE_DAC                 FALSE

+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

+#define HAL_USE_CAN                 FALSE

 #endif

 

 /**

- * @brief   Enables the CAN subsystem.

+ * @brief   Enables the DAC subsystem.

  */

-#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)

-#define HAL_USE_CAN                 FALSE

+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)

+#define HAL_USE_DAC                 FALSE

 #endif

 

 /**

@@ -294,7 +294,7 @@
  * @brief   Serial buffers size.

  * @details Configuration parameter, you can change the depth of the queue

  *          buffers depending on the requirements of your application.

- * @note    The default is 64 bytes for both the transmission and receive

+ * @note    The default is 16 bytes for both the transmission and receive

  *          buffers.

  */

 #if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)

@@ -309,13 +309,21 @@
  * @brief   Serial over USB buffers size.

  * @details Configuration parameter, the buffer size must be a multiple of

  *          the USB data endpoint maximum packet size.

- * @note    The default is 64 bytes for both the transmission and receive

+ * @note    The default is 256 bytes for both the transmission and receive

  *          buffers.

  */

 #if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)

 #define SERIAL_USB_BUFFERS_SIZE     256

 #endif

 

+/**

+ * @brief   Serial over USB number of buffers.

+ * @note    The default is 2 buffers.

+ */

+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)

+#define SERIAL_USB_BUFFERS_NUMBER   2

+#endif

+

 /*===========================================================================*/

 /* SPI driver related settings.                                              */

 /*===========================================================================*/

@@ -337,11 +345,43 @@
 #endif

 

 /*===========================================================================*/

+/* UART driver related settings.                                             */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)

+#define UART_USE_WAIT               FALSE

+#endif

+

+/**

+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)

+#define UART_USE_MUTUAL_EXCLUSION   FALSE

+#endif

+

+/*===========================================================================*/

+/* USB driver related settings.                                              */

+/*===========================================================================*/

+

+/**

+ * @brief   Enables synchronous APIs.

+ * @note    Disabling this option saves both code and data space.

+ */

+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)

+#define USB_USE_WAIT                FALSE

+#endif

+

+/*===========================================================================*/

 /* Community drivers's includes                                              */

 /*===========================================================================*/

 

 #include "halconf_community.h"

 

-#endif /* _HALCONF_H_ */

+#endif /* HALCONF_H */

 

 /** @} */

diff --git a/testhal/STM32/STM32F0xx/onewire/halconf_community.h b/testhal/STM32/STM32F0xx/onewire/halconf_community.h
index 91dbfbc..0621fdb 100644
--- a/testhal/STM32/STM32F0xx/onewire/halconf_community.h
+++ b/testhal/STM32/STM32F0xx/onewire/halconf_community.h
@@ -14,8 +14,8 @@
     limitations under the License.

 */

 

-#ifndef _HALCONF_COMMUNITY_H_

-#define _HALCONF_COMMUNITY_H_

+#ifndef HALCONF_COMMUNITY_H

+#define HALCONF_COMMUNITY_H

 

 /**

  * @brief   Enables the community overlay.

@@ -93,6 +93,6 @@
  */

 #define ONEWIRE_USE_SEARCH_ROM      TRUE

 

-#endif /* _HALCONF_COMMUNITY_H_ */

+#endif /* HALCONF_COMMUNITY_H */

 

 /** @} */

diff --git a/testhal/STM32/STM32F0xx/onewire/mcuconf.h b/testhal/STM32/STM32F0xx/onewire/mcuconf.h
index 89b0fd1..7773406 100644
--- a/testhal/STM32/STM32F0xx/onewire/mcuconf.h
+++ b/testhal/STM32/STM32F0xx/onewire/mcuconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -14,6 +14,9 @@
     limitations under the License.

 */

 

+#ifndef MCUCONF_H

+#define MCUCONF_H

+

 /*

  * STM32F0xx drivers configuration.

  * The following settings override the default settings present in

@@ -156,6 +159,13 @@
 #define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")

 

 /*

+ * WDG driver system settings.

+ */

+#define STM32_WDG_USE_IWDG                  FALSE

+

+/*

  * header for community drivers.

  */

 #include "mcuconf_community.h"

+

+#endif /* MCUCONF_H */