VSCP framework head revision merged

Author: BlueAndi

VSCP/src/VSCP.cpp

@@ -89,7 +89,8 @@ VSCP::VSCP() :
     mStatusLampPin(0),                      /* Status Lamp pin */
     mInitButtonPin(0),                      /* Segment initialization button pin */
     mStatusLampState(VSCP_LAMP_STATE_OFF),  /* Status lamp startup state is off */
-    mStatusLampPeriod(200),                 /* 200 ms status lamp blinking period */
+    mStatusLampFastPeriod(250),             /* 250 ms fast status lamp blinking period */
+    mStatusLampSlowPeriod(1000),            /* 1 s slow status lamp blinking period */
     mStatusLampTimer(),                     /* Status lamp timer for blinking */
     mVSCPTimerPeriod(250),                  /* 250 ms VSCP timer period */
     mVSCPTimer()                            /* Timer instance used to handle the VSCP framework timers */
@@ -289,16 +290,21 @@ void VSCP::processStatusLamp(void)
             digitalWrite(mStatusLampPin, HIGH);
             break;
 
-        case VSCP_LAMP_STATE_BLINK:
-            mStatusLampTimer.start(mStatusLampPeriod, false);
+        case VSCP_LAMP_STATE_BLINK_SLOW:
+            mStatusLampTimer.start(mStatusLampSlowPeriod, false);
+            break;
+
+        case VSCP_LAMP_STATE_BLINK_FAST:
+            mStatusLampTimer.start(mStatusLampFastPeriod, false);
             break;
 
         default:
             break;
         }
     }
     /* Shall the lamp blink? */
-    else if (VSCP_LAMP_STATE_BLINK == mStatusLampState)
+    else if ((VSCP_LAMP_STATE_BLINK_SLOW == mStatusLampState) ||
+             (VSCP_LAMP_STATE_BLINK_FAST == mStatusLampState))
     {
         /* Toggle status lamp? */
         if (true == mStatusLampTimer.isTimeout())

VSCP/src/VSCP.h

@@ -245,17 +245,18 @@ class VSCP
     /* Never copy the VSCP framework */
     VSCP& operator=(const VSCP& vscp);
 
-    bool                mIsInitialized;     /**< Is framework initialized or not */
+    bool                mIsInitialized;         /**< Is framework initialized or not */
 
-    int                 mStatusLampPin;     /**< Status lamp pin */
-    int                 mInitButtonPin;     /**< Segment initialization button pin */
+    int                 mStatusLampPin;         /**< Status lamp pin */
+    int                 mInitButtonPin;         /**< Segment initialization button pin */
 
-    VSCP_LAMP_STATE     mStatusLampState;   /**< Current state of the status lamp */
-    const unsigned int  mStatusLampPeriod;  /**< Status lamp blinking periode in ms */
-    SwTimer             mStatusLampTimer;   /**< Status lamp timer used for blinking */
+    VSCP_LAMP_STATE     mStatusLampState;       /**< Current state of the status lamp */
+    const unsigned int  mStatusLampFastPeriod;  /**< Fast status lamp blinking periode in ms */
+    const unsigned int  mStatusLampSlowPeriod;  /**< Slow status lamp blinking periode in ms */
+    SwTimer             mStatusLampTimer;       /**< Status lamp timer used for blinking */
 
-    const unsigned int  mVSCPTimerPeriod;   /**< VSCP timer period in ms */
-    SwTimer             mVSCPTimer;         /**< VSCP timer */
+    const unsigned int  mVSCPTimerPeriod;       /**< VSCP timer period in ms */
+    SwTimer             mVSCPTimer;             /**< VSCP timer */
 
     /**
      * Process the status lamp.

VSCP/src/framework/vscp_action.c

@@ -1,27 +1,27 @@
 /* The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2014 - 2015, Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- * 
+ *
  */
 
 /*******************************************************************************
@@ -35,9 +35,6 @@
 @section desc Description
 @see vscp_action.h
 
-@section svn Subversion
-$Rev: 449 $
-$Date: 2015-01-05 20:23:52 +0100 (Mo, 05 Jan 2015) $
 *******************************************************************************/
 
 /*******************************************************************************

VSCP/src/framework/vscp_action.h

@@ -1,27 +1,27 @@
 /* The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2014 - 2015, Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- * 
+ *
  */
 
 /*******************************************************************************
@@ -36,10 +36,6 @@
 This module contains the user specific decision matrix (standard, extension
 and next generation) actions.
 
-@section svn Subversion
-$Author: amerkle $
-$Rev: 449 $
-$Date: 2015-01-05 20:23:52 +0100 (Mo, 05 Jan 2015) $
 *******************************************************************************/
 /** @defgroup vscp_action VSCP actions
  * This module contains the user specific decision matrix (standard, extension

VSCP/src/framework/vscp_app_reg.c

@@ -1,27 +1,27 @@
 /* The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2014 - 2015, Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- * 
+ *
  */
 
 /*******************************************************************************
@@ -35,10 +35,6 @@
 @section desc Description
 @see vscp_app_reg.h
 
-@section svn Subversion
-$Author: amerkle $
-$Rev: 449 $
-$Date: 2015-01-05 20:23:52 +0100 (Mo, 05 Jan 2015) $
 *******************************************************************************/
 
 /*******************************************************************************

VSCP/src/framework/vscp_app_reg.h

@@ -1,27 +1,27 @@
 /* The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2014 - 2015, Andreas Merkle
  * http://www.blue-andi.de
  * vscp@blue-andi.de
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- * 
+ *
  */
 
 /*******************************************************************************
@@ -35,16 +35,12 @@
 @section desc Description
 This module contains the access to the application specific registers.
 
-@section svn Subversion
-$Author: amerkle $
-$Rev: 449 $
-$Date: 2015-01-05 20:23:52 +0100 (Mo, 05 Jan 2015) $
 *******************************************************************************/
 /** @defgroup vscp_app_reg VSCP application registers
  * This module provides the access to the application registers.
  * @{
  */
- 
+
 /*
  * Don't forget to set JAVADOC_AUTOBRIEF to YES in the doxygen file to generate
  * a correct module description.