Merge branch 'master' into multiarch5 including MTCAP POE

6 files changed, 9 insertions, 10 deletions

diff --git a/configure.ac b/configure.ac
index e5e16b0..97499a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mts-io], [1.6.0])
+AC_INIT([mts-io], [4.1.4])
 AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([config.h])
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index 3c6dbe4..ef28a7c 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -3,10 +3,7 @@
  *
  * Copyright (C) 2014 by Multi-Tech Systems
  * Copyright (C) 2016 by Multi-Tech Systems
- *
- * Authors: James Maki <jmaki@multitech.com>
- *          Jesse Gilles <jgilles@multitech.com>
- *          Mike Fiore <mfiore@multitech.com>
+ * Copyright (C) 2019 by Multi-Tech Systems
  *
  * 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
@@ -655,7 +652,8 @@ mts_id_eeprom_load(void)
         log_debug("mts_id_eeprom: noradio=%d",noradio);
         
 	if (((tmp=HW_VERSION_MTCAP_0_0),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) ||
-            ((tmp=HW_VERSION_MTCAP_0_1),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0)) {
+            ((tmp=HW_VERSION_MTCAP_0_1),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) ||
+            ((tmp=HW_VERSION_MTCAP_0_2),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0)) {
                 /* See if we have no radio, and if so, prune out the stuff that follows */
                 if(noradio) {
                     struct attribute **ap = mtcap_0_0_platform_attribute_group.attrs;
@@ -880,6 +878,7 @@ mts_id_eeprom_load(void)
 	log_info("capa-wifi: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI) ? "yes" : "no");
 	log_info("capa-bluetooth: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_BLUETOOTH) ? "yes" : "no");
 	log_info("capa-lora: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_LORA) ? "yes" : "no");
+	log_info("capa-battery: %s", DEVICE_CAPA(id_eeprom.capa, CAPA_BATTERY) ? "yes" : "no");
 
 	if (DEVICE_CAPA(id_eeprom.capa, CAPA_BLUETOOTH)) {
 		log_info("mac-bluetooth: %02X:%02X:%02X:%02X:%02X:%02X",
diff --git a/io-module/mts_capab.c b/io-module/mts_capab.c
index 8495d87..17c505a 100644
--- a/io-module/mts_capab.c
+++ b/io-module/mts_capab.c
@@ -25,6 +25,7 @@ static struct capab_map_s capabilities_map[] = {
 		{ CAPA_BLUETOOTH, "bluetooth"},
 		{ CAPA_WIFI,      "wifi"},
 		{ CAPA_LORA,      "lora"},
+		{ CAPA_BATTERY,   "battery"},
 };
 
 static ssize_t capab_show_value(struct device *dev, struct device_attribute *at, char *buf) {
@@ -48,6 +49,7 @@ static DEVICE_ATTR_RO_MTS(capa_attr_adc,  "adc",       capab_show_value);
 static DEVICE_ATTR_RO_MTS(capa_attr_bt,   "bluetooth", capab_show_value);
 static DEVICE_ATTR_RO_MTS(capa_attr_wifi, "wifi",      capab_show_value);
 static DEVICE_ATTR_RO_MTS(capa_attr_lora, "lora",      capab_show_value);
+static DEVICE_ATTR_RO_MTS(capa_attr_battery, "battery",      capab_show_value);
 
 static struct attribute *mts_capa_attributes[] = {
 		&capa_attr_gps.attr,
@@ -57,6 +59,7 @@ static struct attribute *mts_capa_attributes[] = {
 		&capa_attr_bt.attr,
 		&capa_attr_wifi.attr,
 		&capa_attr_lora.attr,
+		&capa_attr_battery.attr,
 		NULL,
 };
 
diff --git a/io-module/mts_eeprom.h b/io-module/mts_eeprom.h
index 478a107..8e1d76c 100644
--- a/io-module/mts_eeprom.h
+++ b/io-module/mts_eeprom.h
@@ -64,4 +64,5 @@ do { \
 /* Used for rs9113 detection in Conduit 0.1 and others */
 #define CAPA_WIFI				DEVICE_CAPA_VALUE(1, 6)
 #define CAPA_LORA				DEVICE_CAPA_VALUE(1, 3)  // on-board lora
+#define CAPA_BATTERY				DEVICE_CAPA_VALUE(1, 4)  // 1st battery type
 #endif /* __MTS_EEPROM_H */
diff --git a/io-tool/mts-io-sysfs b/io-tool/mts-io-sysfs
index a7f7455..db1e6eb 100755
--- a/io-tool/mts-io-sysfs
+++ b/io-tool/mts-io-sysfs
@@ -4,8 +4,6 @@
 #
 # Copyright (C) 2010 by Multi-Tech Systems
 #
-# Author: James Maki <jmaki@multitech.com>
-#
 # 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; either version 2 of the License, or
diff --git a/io-tool/mts-io-sysfs-inc.sh b/io-tool/mts-io-sysfs-inc.sh
index cec9943..3731b1b 100644
--- a/io-tool/mts-io-sysfs-inc.sh
+++ b/io-tool/mts-io-sysfs-inc.sh
@@ -4,8 +4,6 @@
 #
 # Copyright (C) 2010 by Multi-Tech Systems
 #
-# Author: James Maki <jmaki@multitech.com>
-#
 # 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; either version 2 of the License, or