summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2011-03-31 21:22:44 +0200
committerVegard Storheil Eriksen <zyp@jvnv.net>2011-03-31 21:22:44 +0200
commitf228e3268b1cfa28bdaec86d0d3bf22edcdef661 (patch)
tree1cf18ab01fe8202d58003b48851a409ac510a8fd
parentad501b8184ea2879e0b5ce7b18da4c7405e50826 (diff)
Update chibios revision.
m---------chibios0
-rw-r--r--main.cpp21
2 files changed, 10 insertions, 11 deletions
diff --git a/chibios b/chibios
-Subproject e8813b07eba5623db4448db702ad47def7d8261
+Subproject 2aa3090be4b5ff0d74a76c2795ce3af152859ef
diff --git a/main.cpp b/main.cpp
index 8f1785a..18c2ab6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -76,17 +76,16 @@ void foo(PWMDriver*) {
}
static PWMConfig pwmcfg = {
- foo,
- {
- {PWM_OUTPUT_ACTIVE_HIGH, NULL},
- {PWM_OUTPUT_ACTIVE_HIGH, NULL},
- {PWM_OUTPUT_ACTIVE_HIGH, NULL},
- {PWM_OUTPUT_ACTIVE_HIGH, NULL}
- },
-
- PWM_COMPUTE_PSC(STM32_TIMCLK1, 1000000),
- 20000,
- 0
+ 1000000,
+ 1000000 / 50,
+ foo,
+ {
+ {PWM_OUTPUT_ACTIVE_HIGH, NULL},
+ {PWM_OUTPUT_ACTIVE_HIGH, NULL},
+ {PWM_OUTPUT_ACTIVE_HIGH, NULL},
+ {PWM_OUTPUT_ACTIVE_HIGH, NULL}
+ },
+ 0
};
USBSerial usbs;