fix inconsistent ButtonLED v ButtonLed file naming, duplicate definitions; just keep the one in the separate package.

git-svn-id: svn+ssh://svn.code.sf.net/p/openlcb/svn/trunk/prototypes/C@3012 87536cb5-86f1-4cdc-8fc6-3f0f71bcd267

Author: bobjacobsen

IoBlink/IoBlink.ino

@@ -1,4 +1,4 @@
-#include <ButtonLED.h>
+#include <ButtonLed.h>
 #define NPINS 50
 ButtonLed b[NPINS];
 

IoIoTesting1/IoIoTesting1.ino

@@ -1,5 +1,5 @@
 #include <Arduino.h>
-#include <ButtonLED.h>
+#include <ButtonLed.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>

Io_16P_16C_default/Io_16P_16C_default.ino

@@ -1,6 +1,6 @@
 #include <reset.h>
 
-#include <ButtonLED.h>
+#include <ButtonLed.h>
 
 #include <EEPROM.h>
 

Io_16P_16C_default/MyBlueGoldHandler.h

@@ -1,7 +1,7 @@
 #ifndef __MYBLUEGOLDHANDLER_H__
 #define __MYBLUEGOLDHANDLER_H__
 
-#include <ButtonLED.h>
+#include <ButtonLed.h>
 
 #include "OLCB_Virtual_Node.h"
 #include "MyEventHandler.h"

Io_16P_16C_default/MyEventHandler.h

@@ -1,7 +1,7 @@
 #ifndef __MYEVENTHANDLER_H__
 #define __MYEVENTHANDLER_H__
 
-#include "ButtonLED.h"
+#include "ButtonLed.h"
 
 #include "OLCB_Virtual_Node.h"
 #include "OLCB_Event_Handler.h"

OlcbBasicNode/OlcbBasicNode.ino

@@ -23,6 +23,7 @@
 // from the top level file (this file)
 #include <EEPROM.h>
 #include <can.h>
+#include <ButtonLed.h>
 
 #include "OlcbCommonVersion.h"
 #include "NodeID.h"

OlcbDesktopCAN/ButtonLed.cpp

@@ -1,4 +1,4 @@
-#include <ButtonLED.h>
+#include <ButtonLed.h>
 
 //#include <Arduino.h>
 

libraries/OlcbArduinoCAN/ButtonLed.cpp renamed to libraries/ButtonLED/ButtonLed.cpp

@@ -1,4 +1,4 @@
-#include <ButtonLED.h>
+#include "ButtonLed.h"
 
 //#include <Arduino.h>
 
@@ -50,7 +50,7 @@ bool ButtonLed::unique() {
 }
 //     state: F T T F
 // lastState: F T T F
-//   returns: F T F Fbool
+//   returns: F T F F 
 
 void ButtonLed::process() {
   long now = millis();

libraries/OlcbArduinoCAN/ButtonLed.h renamed to libraries/ButtonLED/ButtonLed.h

@@ -1,5 +1,5 @@
-#ifndef ButtonLed_h
-#define ButtonLed_h
+#ifndef ButtonLED_h
+#define ButtonLED_h
 
 // ButtonLED class
 // By David Harris   Copyright 2010
@@ -37,7 +37,6 @@ class ButtonLed {
     int lastButtonPeriod;     // last period processed for button
     bool lastState;           // state of button in last scan
     bool newState;            // state of button this scan
-    //bool next, bnext;         // wait-next-timeslot flag in output loop
     void init(uint8_t s);     // init
 	bool lastUState;
   public:

libraries/ButtonLED/nbproject/configurations.xml

@@ -4,7 +4,7 @@
     <logicalFolder name="HeaderFiles"
                    displayName="Header Files"
                    projectFiles="true">
-      <itemPath>ButtonLED.h</itemPath>
+      <itemPath>ButtonLed.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
                    displayName="Resource Files"

libraries/OlcbArduinoCAN/Makefile

@@ -6,7 +6,7 @@ LIB := libopenlcbArduinoCAN.a
 
 include ../../standard.mk
 
-INCLUDE_OPTIONS := -I${PWD} -I${PWD}/../OlcbCommonCAN -I${PWD}/../CAN
+INCLUDE_OPTIONS := -I${PWD} -I${PWD}/../OlcbCommonCAN -I${PWD}/../CAN -I${PWD}/../ButtonLED
 
 lib:
 	${ARDUINO_ROOT}hardware/tools/avr/bin/avr-g++ -c -g  ${CC_OPTIONS_ARDUINO} ${INCLUDE_ARDUINO} ${INCLUDE_OPTIONS} *.cpp 

libraries/OlcbTestCAN/scaffold/ButtonLed.cpp

@@ -1,4 +1,4 @@
-#include <ButtonLED.h>
+#include <ButtonLed.h>
 
 //#include <Arduino.h>
 

libraries/OpenLCB/Makefile

@@ -6,7 +6,7 @@ LIB := libOpenLCB.a
 
 include ../../standard.mk
 
-INCLUDE_OPTIONS := -I${PWD} -I${PWD}/../CAN
+INCLUDE_OPTIONS := -I${PWD} -I${PWD}/../CAN -I${PWD}/../ButtonLED
 
 lib:
 	${ARDUINO_ROOT}hardware/tools/avr/bin/avr-g++ -c -g  ${CC_OPTIONS_ARDUINO} ${INCLUDE_ARDUINO} ${INCLUDE_OPTIONS} *.cpp