Version 2.6.1: some GPIO changes changes for STM32F10x (in IRSND).

git-svn-id: svn://mikrocontroller.net/irmp@142 aeb2e35e-bfc4-4214-b83c-9e8de998ed28

3 files changed, 8 insertions, 7 deletions

diff --git a/README.txt b/README.txt
index 6ccebf3..58afd88 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ IRMP - Infrared Multi Protocol Decoder
 --------------------------------------

 

 Version IRMP:  2.6.0 09.07.2014

-Version IRSND: 2.6.0 10.07.2014

+Version IRSND: 2.6.1 10.07.2014

 

 Dokumentation:

  

diff --git a/irsnd.c b/irsnd.c
index 2ba1e28..c5f7004 100644
--- a/irsnd.c
+++ b/irsnd.c
@@ -13,7 +13,7 @@
  * ATmega164, ATmega324, ATmega644,  ATmega644P, ATmega1284, ATmega1284P

  * ATmega88,  ATmega88P, ATmega168,  ATmega168P, ATmega328P

  *

- * $Id: irsnd.c,v 1.78 2014/07/10 09:48:23 fm Exp $

+ * $Id: irsnd.c,v 1.79 2014/07/10 10:38:07 fm Exp $

  *

  * This program is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -593,6 +593,7 @@ irsnd_init (void)
         RCC_AHBPeriphClockCmd(IRSND_PORT_RCC, ENABLE);

 #    elif defined (ARM_STM32F10X)

         RCC_APB2PeriphClockCmd(IRSND_PORT_RCC, ENABLE);

+        // RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE); // only in case of remapping, not necessary for default port-timer mapping

 #    elif defined (ARM_STM32F4XX)

         RCC_AHB1PeriphClockCmd(IRSND_PORT_RCC, ENABLE);

 #    endif

@@ -610,7 +611,7 @@ irsnd_init (void)
         GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;

         GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;

         GPIO_Init(IRSND_PORT, &GPIO_InitStructure);

-        GPIO_PinRemapConfig(, ENABLE);         // TODO: remapping required

+        // GPIO_PinRemapConfig(GPIO_*Remap*_TIM[IRSND_TIMER_NUMBER], ENABLE); // only in case of remapping, not necessary for default port-timer mapping

 #    endif

 

         /* TIMx clock enable */

diff --git a/irsndconfig.h b/irsndconfig.h
index f237484..402f125 100644
--- a/irsndconfig.h
+++ b/irsndconfig.h
@@ -5,7 +5,7 @@
  *

  * Copyright (c) 2010-2013 Frank Meyer - frank(at)fli4l.de

  *

- * $Id: irsndconfig.h,v 1.60 2014/07/10 09:49:24 fm Exp $

+ * $Id: irsndconfig.h,v 1.61 2014/07/10 10:38:07 fm Exp $

  *

  * ATMEGA88 @ 8 MHz

  *

@@ -114,10 +114,10 @@
  * ARM STM32 section:

  *---------------------------------------------------------------------------------------------------------------------------------------------------

  */

-#elif defined (ARM_STM32)                                               // use A6 as IR output on STM32

-#  define IRSND_PORT_LETTER                     A

+#elif defined (ARM_STM32)                                               // use B6 as IR output on STM32

+#  define IRSND_PORT_LETTER                     B

 #  define IRSND_BIT_NUMBER                      6

-#  define IRSND_TIMER_NUMBER                    10

+#  define IRSND_TIMER_NUMBER                    4

 #  define IRSND_TIMER_CHANNEL_NUMBER            1                       // only channel 1 can be used at the moment, others won't work

 

 /*---------------------------------------------------------------------------------------------------------------------------------------------------