From 0c3e64a7f50fd97719af549e39d71203d9207e1c Mon Sep 17 00:00:00 2001
From: alexklimaj <alex@arkelectron.com>
Date: Tue, 6 Apr 2021 15:14:00 -0600
Subject: [PATCH] Fix support for Cube Black Heater

---
 boards/px4/fmu-v3/default.cmake | 2 +-
 src/drivers/heater/heater.cpp   | 2 +-
 src/drivers/heater/heater.h     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake
index 65ab6da962..85b1eeb00f 100644
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -27,7 +27,7 @@ px4_add_board(
 		distance_sensor # all available distance sensor drivers
 		dshot
 		gps
-		#heater
+		heater
 		#imu # all available imu drivers
 		imu/analog_devices/adis16448
 		imu/l3gd20
diff --git a/src/drivers/heater/heater.cpp b/src/drivers/heater/heater.cpp
index aca5d55eca..a617a5eaf1 100644
--- a/src/drivers/heater/heater.cpp
+++ b/src/drivers/heater/heater.cpp
@@ -48,7 +48,7 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_io_heater.h>
 
-#if defined(BOARD_USES_PX4IO) and defined(PX4IO_HEATER_ENABLED)
+#if defined(BOARD_USES_PX4IO_VERSION) and defined(PX4IO_HEATER_ENABLED)
 // Heater on some boards is on IO MCU
 // Use ioctl calls to IO driver to turn heater on/off
 #  define HEATER_PX4IO
diff --git a/src/drivers/heater/heater.h b/src/drivers/heater/heater.h
index 37be610630..5c7e921eed 100644
--- a/src/drivers/heater/heater.h
+++ b/src/drivers/heater/heater.h
@@ -129,8 +129,8 @@ private:
 	static struct work_s _work;
 
 	/** File descriptor for PX4IO for heater ioctl's */
-#if defined(HEATER_PX4IO)
-	int _io_fd_ {-1};
+#if defined(PX4IO_HEATER_ENABLED)
+	int _io_fd {-1};
 #endif
 
 	bool _heater_on = false;