projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master'
[fw/altos]
/
src
/
kernel
/
ao_config.h
diff --git
a/src/kernel/ao_config.h
b/src/kernel/ao_config.h
index f43401be6051a812f0c9854a408f832a64b83ed9..bf57d9543a11102f09dc3d29bdfb4bdf5ffe2b7b 100644
(file)
--- a/
src/kernel/ao_config.h
+++ b/
src/kernel/ao_config.h
@@
-58,7
+58,7
@@
#endif
#define AO_CONFIG_MAJOR 1
#endif
#define AO_CONFIG_MAJOR 1
-#define AO_CONFIG_MINOR 2
5
+#define AO_CONFIG_MINOR 2
6
/* All cc1200 devices support limiting TX power to 10mW */
#if !defined(HAS_RADIO_10MW) && defined(AO_CC1200_SPI)
/* All cc1200 devices support limiting TX power to 10mW */
#if !defined(HAS_RADIO_10MW) && defined(AO_CC1200_SPI)
@@
-134,6
+134,7
@@
struct ao_config {
#if HAS_RADIO_10MW
uint8_t radio_10mw; /* minor version 25 */
#endif
#if HAS_RADIO_10MW
uint8_t radio_10mw; /* minor version 25 */
#endif
+ uint8_t report_feet; /* minor version 26 */
};
struct ao_config_1_24 {
};
struct ao_config_1_24 {