Pre release clean up

- clang-format
- keywords.txt fixes
- set version in library.properties

INextionNumericalValued.h

@@ -9,18 +9,17 @@
 class INextionNumericalValued : public virtual INextionWidget
 {
 public:
-  INextionNumericalValued(Nextion *nex, uint8_t page,
-                          uint8_t component,
+  INextionNumericalValued(Nextion *nex, uint8_t page, uint8_t component,
                           const char *name)
-    : INextionWidget(nex, page, component, name)
+      : INextionWidget(nex, page, component, name)
   {
   }
 
   uint32_t getValue()
   {
     return getNumberProperty("val");
   }
-  
+
   bool setValue(uint32_t value)
   {
     return setNumberProperty("val", value);

INextionStringValued.h

@@ -9,17 +9,17 @@
 class INextionStringValued : public virtual INextionWidget
 {
 public:
-  INextionStringValued(Nextion *nex, uint8_t page,
-                       uint8_t component, const char *name)
-    : INextionWidget(nex, page, component, name)
+  INextionStringValued(Nextion *nex, uint8_t page, uint8_t component,
+                       const char *name)
+      : INextionWidget(nex, page, component, name)
   {
   }
 
   size_t getText(char *buffer, size_t len)
   {
     return getStringProperty("txt", buffer, len);
   }
-  
+
   bool setText(char *buffer)
   {
     return setStringProperty("txt", buffer);

INextionWidget.cpp

@@ -9,7 +9,7 @@ INextionWidget::INextionWidget(Nextion *nex, uint8_t page, uint8_t component,
 {
 }
 
-bool INextionWidget::setNumberProperty(char * propertyName, uint32_t value)
+bool INextionWidget::setNumberProperty(char *propertyName, uint32_t value)
 {
   size_t commandLen = 8 + strlen(m_name) + strlen(propertyName);
   char comandBuffer[commandLen];
@@ -18,7 +18,7 @@ bool INextionWidget::setNumberProperty(char * propertyName, uint32_t value)
   return m_nextion->checkCommandComplete();
 }
 
-uint32_t INextionWidget::getNumberProperty(char * propertyName)
+uint32_t INextionWidget::getNumberProperty(char *propertyName)
 {
   size_t commandLen = 6 + strlen(m_name) + strlen(propertyName);
   char comandBuffer[commandLen];
@@ -31,7 +31,7 @@ uint32_t INextionWidget::getNumberProperty(char * propertyName)
     return 0;
 }
 
-bool INextionWidget::setStringProperty(char * propertyName, char * value)
+bool INextionWidget::setStringProperty(char *propertyName, char *value)
 {
   size_t commandLen = 7 + strlen(m_name) + strlen(propertyName) + strlen(value);
   char command[commandLen];
@@ -40,11 +40,12 @@ bool INextionWidget::setStringProperty(char * propertyName, char * value)
   return m_nextion->checkCommandComplete();
 }
 
-size_t INextionWidget::getStringProperty(char * propertyName, char * value, size_t len)
+size_t INextionWidget::getStringProperty(char *propertyName, char *value,
+                                         size_t len)
 {
   size_t commandLen = 6 + strlen(m_name) + strlen(propertyName);
   char command[commandLen];
   snprintf(command, commandLen, "get %s.%s", m_name, propertyName);
   m_nextion->sendCommand(command);
   return m_nextion->receiveString(value, len);
-}
+}

INextionWidget.h

@@ -9,11 +9,11 @@ class INextionWidget
 public:
   INextionWidget(Nextion *nex, uint8_t page, uint8_t component,
                  const char *name);
-                 
-  bool setNumberProperty(char * propertyName, uint32_t value);
-  uint32_t getNumberProperty(char * propertyName);
-  bool setStringProperty(char * propertyName, char * value);
-  size_t getStringProperty(char * propertyName, char * buffer, size_t len);
+
+  bool setNumberProperty(char *propertyName, uint32_t value);
+  uint32_t getNumberProperty(char *propertyName);
+  bool setStringProperty(char *propertyName, char *value);
+  size_t getStringProperty(char *propertyName, char *buffer, size_t len);
 
 protected:
   Nextion *m_nextion;

NextionDualStateButton.h

@@ -12,14 +12,15 @@ class NextionDualStateButton : public INextionTouchable,
                                private INextionNumericalValued
 {
 public:
-  NextionDualStateButton(Nextion *nex, uint8_t page, uint8_t component, const char *name)
+  NextionDualStateButton(Nextion *nex, uint8_t page, uint8_t component,
+                         const char *name)
       : INextionWidget(nex, page, component, name)
       , INextionTouchable(nex, page, component, name)
       , INextionColourable(nex, page, component, name)
       , INextionNumericalValued(nex, page, component, name)
   {
   }
-  
+
   bool isActive()
   {
     return getValue();

keywords.txt

@@ -1,6 +1,6 @@
 #######################################
 # Syntax Coloring Map For NeoNextion
-####################################### 
+#######################################
 # Class
 #######################################
 
@@ -24,10 +24,11 @@ NextionTimer	KEYWORD1
 NextionVariableNumeric	KEYWORD1
 NextionVariableString	KEYWORD1
 NextionWaveform	KEYWORD1
+NextionDualStateButton	KEYWORD1
 
 #######################################
-# Methods and Functions 
-#######################################	
+# Methods and Functions
+#######################################
 
 # Nextion
 init	KEYWORD2
@@ -84,6 +85,10 @@ setPictureID	KEYWORD2
 # NextionPage
 show	KEYWORD2
 
+# NextionDualStateButton
+isActive	KEYWORD2
+setActive	KEYWORD2
+
 #######################################
 # Constants
 #######################################

library.properties

@@ -1,5 +1,5 @@
 name=NeoNextion
-version=1.0.1
+version=1.1.0
 author=Dan Nixon
 maintainer=Dan Nixon <[email protected]>
 sentence=Arduino library for controlling Nextion displays