Merge branch 'libopencm3' of cu.loc:git/irmp into libopencm3

# Conflicts:
#	irsnd.c

diff --git a/irsnd.c b/irsnd.c
index fab3d47fac6c238a452a93d054726cea7d64218e..83cc1a022b1f33c26a7e43fa0e6bf3a4b768c3d7 100644 (file)
--- a/irsnd.c
+++ b/irsnd.c
@@ -905,9 +905,8 @@ irsnd_init (void)
         timer_set_oc_mode(IRSND_TIMER, IRSND_TIMER_CHANNEL, TIM_OCM_INACTIVE);\r
         timer_enable_oc_output(IRSND_TIMER, IRSND_TIMER_CHANNEL);\r
         timer_enable_break_main_output(IRSND_TIMER);\r
-\r
         /* Output polarity and GPIO Configuration */\r
-#    if 0\r
+#    if 1\r
         /* (active) high is the default output polarity */\r
         gpio_set_mode(IRSND_PORT, GPIO_MODE_OUTPUT_2_MHZ,\r
                   GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, IRSND_BIT);\r