From 7a6cfce0ca499f180235b70461a6511380da6f70 Mon Sep 17 00:00:00 2001
From: Ryan Meagher <35713572+RyanMeagher@users.noreply.github.com>
Date: Wed, 29 Jun 2022 18:22:10 -0700
Subject: [PATCH] drivers/barometer/invensense: fix icp10111 and icp10100

* fix icp so it compiles
* add icp10111 and icp10100 DEVTPYE
---
 src/drivers/barometer/invensense/Kconfig                 | 3 +++
 src/drivers/barometer/invensense/icp10100/CMakeLists.txt | 2 +-
 src/drivers/barometer/invensense/icp10100/ICP10100.cpp   | 1 -
 src/drivers/barometer/invensense/icp10100/Kconfig        | 7 +++++++
 src/drivers/barometer/invensense/icp10111/CMakeLists.txt | 2 +-
 src/drivers/barometer/invensense/icp10111/Kconfig        | 6 ++++++
 6 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/drivers/barometer/invensense/Kconfig
 create mode 100644 src/drivers/barometer/invensense/icp10100/Kconfig
 create mode 100644 src/drivers/barometer/invensense/icp10111/Kconfig

diff --git a/src/drivers/barometer/invensense/Kconfig b/src/drivers/barometer/invensense/Kconfig
new file mode 100644
index 0000000000..772bb882e8
--- /dev/null
+++ b/src/drivers/barometer/invensense/Kconfig
@@ -0,0 +1,3 @@
+menu "Invensense"
+rsource "*/Kconfig"
+endmenu #Invensense
diff --git a/src/drivers/barometer/invensense/icp10100/CMakeLists.txt b/src/drivers/barometer/invensense/icp10100/CMakeLists.txt
index 7b7ffadab8..d00ea60bcc 100755
--- a/src/drivers/barometer/invensense/icp10100/CMakeLists.txt
+++ b/src/drivers/barometer/invensense/icp10100/CMakeLists.txt
@@ -32,7 +32,7 @@
 ############################################################################
 
 px4_add_module(
-	MODULE drivers__invensense__icp10100
+	MODULE drivers__barometer__invensense__icp10100
 	MAIN icp10100
 	COMPILE_FLAGS
 	SRCS
diff --git a/src/drivers/barometer/invensense/icp10100/ICP10100.cpp b/src/drivers/barometer/invensense/icp10100/ICP10100.cpp
index 437b05b641..836194e16e 100755
--- a/src/drivers/barometer/invensense/icp10100/ICP10100.cpp
+++ b/src/drivers/barometer/invensense/icp10100/ICP10100.cpp
@@ -233,7 +233,6 @@ ICP10100::RunImpl()
 				float b = (_pcal[0] - a) * (s1 + c);
 				float _pressure_Pa = a + b / (c + _raw_p);
 
-				const hrt_abstime nowx = hrt_absolute_time();
 				float temperature = _temperature_C;
 				float pressure = _pressure_Pa;
 
diff --git a/src/drivers/barometer/invensense/icp10100/Kconfig b/src/drivers/barometer/invensense/icp10100/Kconfig
new file mode 100644
index 0000000000..f5ee5a5139
--- /dev/null
+++ b/src/drivers/barometer/invensense/icp10100/Kconfig
@@ -0,0 +1,7 @@
+menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10100
+	bool "icp10100"
+	default n
+	---help---
+		Enable support for icp10100
+
+
diff --git a/src/drivers/barometer/invensense/icp10111/CMakeLists.txt b/src/drivers/barometer/invensense/icp10111/CMakeLists.txt
index ec2a3858b9..b0771e222d 100755
--- a/src/drivers/barometer/invensense/icp10111/CMakeLists.txt
+++ b/src/drivers/barometer/invensense/icp10111/CMakeLists.txt
@@ -32,7 +32,7 @@
 ############################################################################
 
 px4_add_module(
-	MODULE drivers__invensense__icp10111
+	MODULE drivers__barometer__invensense__icp10111
 	MAIN icp10111
 	COMPILE_FLAGS
 	SRCS
diff --git a/src/drivers/barometer/invensense/icp10111/Kconfig b/src/drivers/barometer/invensense/icp10111/Kconfig
new file mode 100644
index 0000000000..1681c07d38
--- /dev/null
+++ b/src/drivers/barometer/invensense/icp10111/Kconfig
@@ -0,0 +1,6 @@
+menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10111
+	bool "icp10100"
+	default n
+	---help---
+		Enable support for icp10111
+