From 2d0a6317a38b81ad0e80aa16a5b838f02ae3d65b Mon Sep 17 00:00:00 2001
From: Scott Allen <saydisp-git@yahoo.ca>
Date: Thu, 3 Mar 2016 00:11:47 -0500
Subject: [PATCH] Combine function __attribute__ statments

Also delete getInput keyword and add buttonsState keyword
---
 keywords.txt    | 2 +-
 src/Arduboy.h   | 4 ++--
 src/core/core.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keywords.txt b/keywords.txt
index 536e43a..6910484 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -14,6 +14,7 @@ Arduboy	KEYWORD1
 
 allPixelsOn	KEYWORD2
 blank	KEYWORD2
+buttonsState	KEYWORD2
 clear	KEYWORD2
 cpuLoad	KEYWORD2
 display	KEYWORD2
@@ -38,7 +39,6 @@ fillTriangle	KEYWORD2
 flipVertical	KEYWORD2
 flipHorizontal	KEYWORD2
 getBuffer	KEYWORD2
-getInput	KEYWORD2
 idle	KEYWORD2
 initRandomSeed	KEYWORD2
 invert	KEYWORD2
diff --git a/src/Arduboy.h b/src/Arduboy.h
index 0429abd..752e8e4 100644
--- a/src/Arduboy.h
+++ b/src/Arduboy.h
@@ -69,7 +69,7 @@ public:
    */
   // void boot(); // defined in core.cpp
 
-  void start() __attribute__((deprecated)) __attribute__ ((warning("use begin() instead")));
+  void start() __attribute__((deprecated, warning("use begin() instead")));
 
   /// Scrolls in the Arduboy logo
   void bootLogo();
@@ -85,7 +85,7 @@ public:
 
   /// Clears display.
   void clear();
-  void clearDisplay() __attribute__((deprecated)) __attribute__ ((warning("use clear() instead")));
+  void clearDisplay() __attribute__((deprecated, warning("use clear() instead")));
 
   /// Copies the contents of the screen buffer to the screen.
   /**
diff --git a/src/core/core.h b/src/core/core.h
index 966e40e..4af92da 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -182,7 +182,7 @@ public:
      * LEFT_BUTTON, A_BUTTON, UP_BUTTON, etc.
      */
 
-    uint8_t static getInput(); __attribute__((deprecated)) __attribute__ ((warning("use buttonsState() instead")));
+    uint8_t static getInput() __attribute__((deprecated, warning("use buttonsState() instead")));
     uint8_t static buttonsState();
 
     // paints 8 pixels (vertically) from a single byte