Updated OZW headers

Author: gizmocuz

hardware/openzwave/Defs.h

@@ -192,7 +192,7 @@ namespace OpenZWave
 #define snprintf sprintf_s
 #define strcasecmp _stricmp
 #define sscanf sscanf_s
-#define strncpy strncpy_s
+#define strncpy(x, y, z) strncpy_s(x, sizeof(x), y, sizeof(x)-1)
 #define strncat strncat_s
 
 

hardware/openzwave/Driver.h

@@ -269,15 +269,12 @@ namespace OpenZWave
 		//void ReleaseNodes();
 
 		ControllerInterface			m_controllerInterfaceType;				// Specifies the controller's hardware interface
-OPENZWAVE_EXPORT_WARNINGS_OFF
 		string					m_controllerPath;							// name or path used to open the controller hardware.
-OPENZWAVE_EXPORT_WARNINGS_ON
 		Controller*				m_controller;								// Handles communications with the controller hardware.
 		uint32					m_homeId;									// Home ID of the Z-Wave controller.  Not valid until the DriverReady notification has been received.
-OPENZWAVE_EXPORT_WARNINGS_OFF
+
 		string					m_libraryVersion;							// Version of the Z-Wave Library used by the controller.
 		string					m_libraryTypeName;							// Name describing the library type.
-OPENZWAVE_EXPORT_WARNINGS_ON
 		uint8					m_libraryType;								// Type of library used by the controller.
 
 		uint8					m_serialAPIVersion[2];

hardware/openzwave/Msg.h

@@ -172,9 +172,8 @@ namespace OpenZWave
 
 
 		void MultiEncap();						// Encapsulate the data inside a MultiInstance/Multicommand message
-OPENZWAVE_EXPORT_WARNINGS_OFF
+
 		string			m_logText;
-OPENZWAVE_EXPORT_WARNINGS_ON
 		bool			m_bFinal;
 		bool			m_bCallbackRequired;
 

hardware/openzwave/Notification.h

@@ -129,14 +129,14 @@ namespace OpenZWave
 		enum UserAlertNotification
 		{
 			Alert_None,							/**< No Alert Currently Present */
-			Alert_ConfigOutOfDate,				/**< One of the Config Files is out of date. Use GetNodeId to determine which node is affected. */
+			Alert_ConfigOutOfDate,				/**< One of the Config Files is out of date. Use GetNodeId to determine which node is effected. */
 			Alert_MFSOutOfDate,					/**< the manufacturer_specific.xml file is out of date. */
 			Alert_ConfigFileDownloadFailed, 	/**< A Config File failed to download */
 			Alert_DNSError,						/**< A error occurred performing a DNS Lookup */
-			Alert_NodeReloadReqired,			/**< A new Config file has been discovered for this node, and its pending a Reload to Take Effect */
+			Alert_NodeReloadRequired,			/**< A new Config file has been discovered for this node, and its pending a Reload to Take affect */
 			Alert_UnsupportedController,		/**< The Controller is not running a Firmware Library we support */
 			Alert_ApplicationStatus_Retry,  	/**< Application Status CC returned a Retry Later Message */
-			Alert_ApplicationStatus_Queued, 	/**< Command Has been Queued for execution later */
+			Alert_ApplicationStatus_Queued, 	/**< Command Has been Queued for later execution */
 			Alert_ApplicationStatus_Rejected,	/**< Command has been rejected */
 		};
 
@@ -256,9 +256,7 @@ namespace OpenZWave
 		uint8				m_event;
 		uint8				m_command;
 		UserAlertNotification m_useralerttype;
-OPENZWAVE_EXPORT_WARNINGS_OFF
 		string				m_comport;
-OPENZWAVE_EXPORT_WARNINGS_ON
 	};
 
 } //namespace OpenZWave

hardware/openzwave/Options.h

@@ -241,11 +241,11 @@ namespace OpenZWave
 
 OPENZWAVE_EXPORT_WARNINGS_OFF
 		map<string,Option*>	m_options;										// Map of option names to values.
+OPENZWAVE_EXPORT_WARNINGS_ON
 		string				m_xml;											// Path to XML options file.
 		string				m_commandLine;									// String containing command line options.
 		string				m_SystemPath;
 		string				m_LocalPath;
-OPENZWAVE_EXPORT_WARNINGS_ON
 		bool				m_locked;										// If true, the options are final and AddOption can no longer be called.
 		static Options*		s_instance;
 	};

hardware/openzwave/Utils.h

@@ -65,11 +65,44 @@ namespace OpenZWave
 	void split (std::vector<std::string>& lst, const std::string& input, const std::string& separators, bool remove_empty = true);
 
 	/**
-	 * Trim Whitespace from the start and end of a string.
+	 * remove all Whitespace from of a string.
 	 * \param s the string to trim
 	 * \return the trimmed string
 	 */
-	std::string &trim ( std::string &s );
+	std::string &removewhitespace ( std::string &s );
+
+	/**
+	 * @brief Left Trim
+	 *
+	 * Trims whitespace from the left end of the provided std::string
+	 *
+	 * @param[out] s The std::string to trim
+	 *
+	 * @return The modified std::string&
+	 */
+	std::string& ltrim(std::string& s);
+
+	/**
+	 * @brief Right Trim
+	 *
+	 * Trims whitespace from the right end of the provided std::string
+	 *
+	 * @param[out] s The std::string to trim
+	 *
+	 * @return The modified std::string&
+	 */
+	std::string& rtrim(std::string& s);
+
+	/**
+	 * @brief Trim
+	 *
+	 * Trims whitespace from both ends of the provided std::string
+	 *
+	 * @param[out] s The std::string to trim
+	 *
+	 * @return The modified std::string&
+	 */
+	std::string& trim(std::string& s);
 
 
 	void PrintHex(std::string prefix, uint8_t const *data, uint32 const length);

hardware/openzwave/ValueIDIndexes.h

@@ -0,0 +1,43 @@
+//-----------------------------------------------------------------------------
+//
+//	ValueIDIndexes.h
+//
+//	List of all Possible ValueID Indexes in OZW
+//
+//	Copyright (c) 2010 Mal Lansell <openzwave@lansell.org>
+//
+//	SOFTWARE NOTICE AND LICENSE
+//
+//	This file is part of OpenZWave.
+//
+//	OpenZWave is free software: you can redistribute it and/or modify
+//	it under the terms of the GNU Lesser General Public License as published
+//	by the Free Software Foundation, either version 3 of the License,
+//	or (at your option) any later version.
+//
+//	OpenZWave is distributed in the hope that it will be useful,
+//	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//	GNU Lesser General Public License for more details.
+//
+//	You should have received a copy of the GNU Lesser General Public License
+//	along with OpenZWave.  If not, see <http://www.gnu.org/licenses/>.
+//
+//-----------------------------------------------------------------------------
+
+
+
+/* This file is includes the pre-processed ValueIDIndexesDefines.h to avoid problems
+ * with MSVC not supporting enough arguments with Macro's.
+ * If you are adding a ValueID, you should add its index ENUM to ValuIDIndexDefines.def and the run
+ * 'make updateIndexDefines' to regenerate the the ValueIDIndexDefines.h file
+ */
+
+#include <cstring>
+
+#ifndef _ValueIDIndexes_H
+#define _ValueIDIndexes_H
+
+#include "ValueIDIndexesDefines.h"
+
+#endif

hardware/openzwave/ValueIDIndexesDefines.h

@@ -33,6 +33,8 @@
 #include "platform/Controller.h"
 
 
+#ifdef USE_HID
+
 struct hid_device_;
 
 typedef struct hid_device_ hid_device;
@@ -151,5 +153,7 @@ namespace OpenZWave
 
 } // namespace OpenZWave
 
+#endif
+
 #endif //_HidController_H
 

hardware/openzwave/platform/HidController.h

@@ -30,6 +30,8 @@
 
 #include <string>
 #include <assert.h>
+
+#include "ValueIDIndexes.h"
 #include "Defs.h"
 
 class TiXmlElement;