From 9cf7536bf3e942e65d82952e44c3e903d51696b8 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sun, 5 Aug 2012 09:30:51 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4530
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 tools/eclipse/config_wizard/META-INF/MANIFEST.MF   |   2 +-
 .../boards/stm32f0xx/templates/board.h.ftl         |   7 +++----
 .../resources/gencfg/xml/stm32f0board.xml          |   2 +-
 .../org.chibios.tools.eclipse.config_1.0.2.jar     | Bin 1845778 -> 1845764 bytes
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/eclipse/config_wizard/META-INF/MANIFEST.MF b/tools/eclipse/config_wizard/META-INF/MANIFEST.MF
index 8d3f5f45a..96de4cd14 100644
--- a/tools/eclipse/config_wizard/META-INF/MANIFEST.MF
+++ b/tools/eclipse/config_wizard/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui.ide
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: chibios-org
+Bundle-Vendor: chibios.org
 Bundle-ClassPath: .,
  lib/jdom-2.0.2.jar,
  lib/freemarker.jar,
diff --git a/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.h.ftl b/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.h.ftl
index 798161f83..30fda47df 100644
--- a/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.h.ftl
+++ b/tools/eclipse/config_wizard/resources/gencfg/processors/boards/stm32f0xx/templates/board.h.ftl
@@ -103,9 +103,8 @@
 #define PIN_ODR_HIGH(n)             (1U << (n))
 #define PIN_OTYPE_PUSHPULL(n)       (0U << (n))
 #define PIN_OTYPE_OPENDRAIN(n)      (1U << (n))
-#define PIN_OSPEED_400K(n)          (0U << ((n) * 2))
-#define PIN_OSPEED_2M(n)            (1U << ((n) * 2))
-#define PIN_OSPEED_10M(n)           (2U << ((n) * 2))
+#define PIN_OSPEED_2M(n)            (0U << ((n) * 2))
+#define PIN_OSPEED_10M(n)           (1U << ((n) * 2))
 #define PIN_OSPEED_40M(n)           (3U << ((n) * 2))
 #define PIN_PUPDR_FLOATING(n)       (0U << ((n) * 2))
 #define PIN_PUPDR_PULLUP(n)         (1U << ((n) * 2))
@@ -208,7 +207,7 @@ ${line + ")"}
     [/#if]
     [#assign speed = pin.@Speed[0] /]
     [#if speed == "Minimum"]
-      [#assign out = "PIN_OSPEED_400K(" + port_name + "_" + name + ")" /]
+      [#assign out = "PIN_OSPEED_2M(" + port_name + "_" + name + ")" /]
     [#elseif speed == "Low"]
       [#assign out = "PIN_OSPEED_2M(" + port_name + "_" + name + ")" /]
     [#elseif speed == "High"]
diff --git a/tools/eclipse/config_wizard/resources/gencfg/xml/stm32f0board.xml b/tools/eclipse/config_wizard/resources/gencfg/xml/stm32f0board.xml
index 57ec5f9e5..7e4dd5459 100644
--- a/tools/eclipse/config_wizard/resources/gencfg/xml/stm32f0board.xml
+++ b/tools/eclipse/config_wizard/resources/gencfg/xml/stm32f0board.xml
@@ -120,7 +120,7 @@
         ID="SWDAT"
         Type="PushPull"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Level="High"
         Mode="Alternate"
         Alternate="0" />
diff --git a/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.2.jar b/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.2.jar
index 6da515a9a..3ecd62c5d 100644
Binary files a/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.2.jar and b/tools/eclipse/plugins/org.chibios.tools.eclipse.config_1.0.2.jar differ
-- 
cgit v1.2.3