Switch from GPLv2 to GPLv2+

[fw/altos] / src / telebt-v3.0 / ao_pins.h

diff --git a/src/telebt-v3.0/ao_pins.h b/src/telebt-v3.0/ao_pins.h
index 838f0dfcfbc948d73c2e9fa3e8c170ddca96abcb..61cbe9bba62fa2a9ffea5b0844fd52b4a3e1907a 100644 (file)
--- a/src/telebt-v3.0/ao_pins.h
+++ b/src/telebt-v3.0/ao_pins.h
@@ -3,7 +3,8 @@
  *
  * 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
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -52,8 +53,13 @@
 #define USE_SERIAL_2_STDIN     1
 #define DELAY_SERIAL_2_STDIN   1
 #define USE_SERIAL_2_FLOW      1
+#define USE_SERIAL_2_SW_FLOW   1
 #define SERIAL_2_PA2_PA3       1
 #define SERIAL_2_PD5_PD6       0
+#define SERIAL_2_PORT_RTS      (&stm_gpioa)
+#define SERIAL_2_PIN_RTS       0
+#define SERIAL_2_PORT_CTS      (&stm_gpioa)
+#define SERIAL_2_PIN_CTS       1
 
 #define HAS_SERIAL_3           0
 #define USE_SERIAL_3_STDIN     0
@@ -130,7 +136,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-       printf("tick: %5u %5d batt: %5d\n", \
+       printf("tick: %5u batt %5d\n", \
               (p)->tick, \
               (p)->adc.v_batt);
 
@@ -168,7 +174,7 @@ struct ao_adc {
 #define ao_serial_btm_getchar  ao_serial2_getchar
 #define ao_serial_btm_putchar  ao_serial2_putchar
 #define _ao_serial_btm_pollchar        _ao_serial2_pollchar
-#define _ao_serial_btm_sleep   _ao_serial2_sleep
+#define _ao_serial_btm_sleep_for       _ao_serial2_sleep_for
 #define ao_serial_btm_set_speed ao_serial2_set_speed
 #define ao_serial_btm_drain    ao_serial2_drain
 #define ao_serial_btm_rx_fifo  (ao_stm_usart2.rx_fifo)