remove extra files

add_compile_definitions(_BLUEZ_HCI_)

CMakeLists.txt

@@ -20,8 +20,10 @@ if (POLICY CMP0115)
   cmake_policy(SET CMP0115 NEW)
 endif()
 
+add_compile_definitions(_BLUEZ_HCI_)
+
 project (GoveeBTTempLogger
-    VERSION 3.20241008.0
+    VERSION 3.20241010.0
     DESCRIPTION "Listen and log Govee Thermometer Bluetooth Low Energy Advertisments via BlueZ and DBus"
     HOMEPAGE_URL https://github.com/wcbonner/GoveeBTTempLogger
 )
@@ -37,15 +39,14 @@ pkg_check_modules( dbus REQUIRED dbus-1 )
 add_executable (goveebttemplogger
     goveebttemplogger.cpp
     goveebttemplogger-version.h
-    goveebttemplogger-hci.cpp
-    goveebttemplogger-hci.h
     att-types.h
     uuid.c
     uuid.h
     wimiso8601.cpp
     wimiso8601.h
     )
 
+
 target_link_libraries(goveebttemplogger
     -lbluetooth
     -lstdc++fs

GoveeBTTempLogger.vcxproj

@@ -78,7 +78,6 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="goveebttemplogger-hci.cpp" />
     <ClCompile Include="goveebttemplogger.cpp" />
     <ClCompile Include="gvh-organizelogs.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
@@ -118,8 +117,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="att-types.h" />
-    <ClInclude Include="goveebttemplogger-hci.h" />
-    <ClInclude Include="goveebttemplogger.h" />
     <ClInclude Include="uuid.h" />
     <ClInclude Include="wimiso8601.h" />
   </ItemGroup>

goveebttemplogger.cpp

@@ -53,8 +53,6 @@
 // https://www.argenox.com/library/bluetooth-low-energy/using-raspberry-pi-ble/
 //
 
-//#define _BLUEZ_HCI_
-
 #include <algorithm>
 #include <cfloat>
 #include <climits>
@@ -4527,10 +4525,12 @@ static void usage(int argc, char **argv)
 	std::cout << "    -b | --battery graph Draw the battery status on SVG graphs. 1:daily, 2:weekly, 4:monthly, 8:yearly" << std::endl;
 	std::cout << "    -x | --minmax graph  Draw the minimum and maximum temperature and humidity status on SVG graphs. 1:daily, 2:weekly, 4:monthly, 8:yearly" << std::endl;
 	std::cout << "    -d | --download      Periodically attempt to connect and download stored data" << std::endl;
-	std::cout << "    -p | --passive       Bluetooth LE Passive Scanning" << std::endl;
 	std::cout << "    -n | --no-bluetooth  Monitor Logging Directory and process logs without Bluetooth Scanning" << std::endl;
-	std::cout << "    -H | --HCI           Prefer deprecated BlueZ HCI interface instead of DBus" << std::endl;
 	std::cout << "    -M | --monitor       Monitor Logging Directory" << std::endl;
+	#ifdef _BLUEZ_HCI_
+	std::cout << "    -H | --HCI           Prefer deprecated BlueZ HCI interface instead of DBus" << std::endl;
+	std::cout << "    -p | --passive       Bluetooth LE Passive Scanning" << std::endl;
+	#endif // _BLUEZ_HCI_
 	std::cout << std::endl;
 }
 static const char short_options[] = "hl:t:v:m:o:C:a:f:s:i:T:cb:x:dpnHM";