diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-09-05 20:59:11 -0600 |
| commit | c0ad087008856cfc2233b977abfc3f1dcbaccdcc (patch) | |
| tree | adc46abc430793112858ce5d1822d3fe0a395e71 /src/telelcotwo-v0.1 | |
| parent | 148b013dd29c26920ddfb53449ed4d8cc5a4b5ee (diff) | |
| parent | 4fdf8ca9ca1cd5a84b03bd7a03c5806af64b413d (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'src/telelcotwo-v0.1')
| -rw-r--r-- | src/telelcotwo-v0.1/ao_pins.h | 9 | ||||
| -rw-r--r-- | src/telelcotwo-v0.1/ao_telelcotwo.c | 3 | ||||
| -rw-r--r-- | src/telelcotwo-v0.1/flash-loader/ao_pins.h | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/telelcotwo-v0.1/ao_pins.h b/src/telelcotwo-v0.1/ao_pins.h index ce797a38..714a5c3a 100644 --- a/src/telelcotwo-v0.1/ao_pins.h +++ b/src/telelcotwo-v0.1/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 @@ -155,14 +156,12 @@ #define AO_BUTTON_0_PORT &stm_gpioa #define AO_BUTTON_0 0 -#define AO_BUTTON_ARM_0 0 +#define AO_BUTTON_BOX 0 #define AO_BUTTON_1_PORT &stm_gpioa #define AO_BUTTON_1 1 -#define AO_BUTTON_ARM_1 1 - -#define AO_BUTTON_ARM_NUM 2 +#define AO_BUTTON_ARM 1 #define AO_BUTTON_2_PORT &stm_gpioa #define AO_BUTTON_2 2 diff --git a/src/telelcotwo-v0.1/ao_telelcotwo.c b/src/telelcotwo-v0.1/ao_telelcotwo.c index 318875e3..b3fcd200 100644 --- a/src/telelcotwo-v0.1/ao_telelcotwo.c +++ b/src/telelcotwo-v0.1/ao_telelcotwo.c @@ -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 diff --git a/src/telelcotwo-v0.1/flash-loader/ao_pins.h b/src/telelcotwo-v0.1/flash-loader/ao_pins.h index 266bff6c..ee29a678 100644 --- a/src/telelcotwo-v0.1/flash-loader/ao_pins.h +++ b/src/telelcotwo-v0.1/flash-loader/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 |