Cleaned up warnings and comments.

This commit is contained in:
skarg
2007-03-10 20:03:14 +00:00
parent 912f17996c
commit 5d15c86541
3 changed files with 22 additions and 20 deletions
+11 -12
View File
@@ -245,15 +245,13 @@ typedef enum {
PROP_TIME_SYNCHRONIZATION_INTERVAL = 204, PROP_TIME_SYNCHRONIZATION_INTERVAL = 204,
PROP_TRIGGER = 205, PROP_TRIGGER = 205,
PROP_UTC_TIME_SYNCHRONIZATION_RECIPIENTS = 206, PROP_UTC_TIME_SYNCHRONIZATION_RECIPIENTS = 206,
/* enumerations 207-211 are used in Addendum d to /* enumerations 207-211 are used in Addendum d to ANSI/ASHRAE 135-2004 */
ANSI/ASHRAE 135-2004 */
PROP_NODE_SUBTYPE = 207, PROP_NODE_SUBTYPE = 207,
PROP_NODE_TYPE = 208, PROP_NODE_TYPE = 208,
PROP_STRUCTURED_OBJECT_LIST = 209, PROP_STRUCTURED_OBJECT_LIST = 209,
PROP_SUBORDINATE_ANNOTATIONS = 210, PROP_SUBORDINATE_ANNOTATIONS = 210,
PROP_SUBORDINATE_LIST = 211, PROP_SUBORDINATE_LIST = 211,
/* enumerations 212-225 are used in Addendum e to /* enumerations 212-225 are used in Addendum e to ANSI/ASHRAE 135-2004 */
ANSI/ASHRAE 135-2004 */
PROP_ACTUAL_SHED_LEVEL = 212, PROP_ACTUAL_SHED_LEVEL = 212,
PROP_DUTY_WINDOW = 213, PROP_DUTY_WINDOW = 213,
PROP_EXPECTED_SHED_LEVEL = 214, PROP_EXPECTED_SHED_LEVEL = 214,
@@ -261,6 +259,7 @@ typedef enum {
/* enumerations 216-217 are used in Addendum i to ANSI/ASHRAE 135-2004 */ /* enumerations 216-217 are used in Addendum i to ANSI/ASHRAE 135-2004 */
PROP_BLINK_PRIORITY_THRESHOLD = 216, PROP_BLINK_PRIORITY_THRESHOLD = 216,
PROP_BLINK_TIME = 217, PROP_BLINK_TIME = 217,
/* enumerations 212-225 are used in Addendum e to ANSI/ASHRAE 135-2004 */
PROP_REQUESTED_SHED_LEVEL = 218, PROP_REQUESTED_SHED_LEVEL = 218,
PROP_SHED_DURATION = 219, PROP_SHED_DURATION = 219,
PROP_SHED_LEVEL_DESCRIPTIONS = 220, PROP_SHED_LEVEL_DESCRIPTIONS = 220,
@@ -272,14 +271,14 @@ typedef enum {
PROP_LIGHTING_COMMAND_PRIORITY = 225, PROP_LIGHTING_COMMAND_PRIORITY = 225,
/* enumerations 226-235 are used in Addendum f to ANSI/ASHRAE 135-2004 */ /* enumerations 226-235 are used in Addendum f to ANSI/ASHRAE 135-2004 */
/* enumerations 236-243 are used in Addendum i to ANSI/ASHRAE 135-2004 */ /* enumerations 236-243 are used in Addendum i to ANSI/ASHRAE 135-2004 */
PROP_OFF_DELAY = 236, PROP_OFF_DELAY = 236,
PROP_ON_DELAY = 237, PROP_ON_DELAY = 237,
PROP_POWER = 238, PROP_POWER = 238,
PROP_POWER_ON_VALUE = 239, PROP_POWER_ON_VALUE = 239,
PROP_PROGRESS_VALUE = 240, PROP_PROGRESS_VALUE = 240,
PROP_RAMP_RATE = 241, PROP_RAMP_RATE = 241,
PROP_STEP_INCREMENT = 242, PROP_STEP_INCREMENT = 242,
PROP_SYSTEM_FAILURE_VALUE = 243, PROP_SYSTEM_FAILURE_VALUE = 243,
/* The special property identifiers all, optional, and required */ /* The special property identifiers all, optional, and required */
/* are reserved for use in the ReadPropertyConditional and */ /* are reserved for use in the ReadPropertyConditional and */
/* ReadPropertyMultiple services or services not defined in this standard. */ /* ReadPropertyMultiple services or services not defined in this standard. */
+8 -6
View File
@@ -116,11 +116,7 @@ static float Full_Duty_Baseline[MAX_LOAD_CONTROLS];
shall be equal to the size of the Shed_Level_Descriptions shall be equal to the size of the Shed_Level_Descriptions
array. The behavior of this object when the Shed_Levels array. The behavior of this object when the Shed_Levels
array contains duplicate entries is a local matter. */ array contains duplicate entries is a local matter. */
static unsigned Shed_Levels[MAX_LOAD_CONTROLS][MAX_SHED_LEVELS] = { static unsigned Shed_Levels[MAX_LOAD_CONTROLS][MAX_SHED_LEVELS];
1,
2,
3,
};
/* represents a description of the shed levels that the /* represents a description of the shed levels that the
Load Control object can take on. It is the same for Load Control object can take on. It is the same for
@@ -164,6 +160,9 @@ void Load_Control_Init(void)
Actual_Shed_Level[i].value.level = 0; Actual_Shed_Level[i].value.level = 0;
Load_Control_Request_Written[i] = false; Load_Control_Request_Written[i] = false;
Start_Time_Property_Written[i] = false; Start_Time_Property_Written[i] = false;
for (j = 0; j < MAX_SHED_LEVELS; j++) {
Shed_Levels[i][j] = j + 1;
}
} }
} }
@@ -992,6 +991,7 @@ bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA * wp_data,
#include <string.h> #include <string.h>
#include "ctest.h" #include "ctest.h"
#if 0
static void Load_Control_WriteProperty_Request_Shed_Percent(Test * pTest, static void Load_Control_WriteProperty_Request_Shed_Percent(Test * pTest,
int instance, unsigned percent) int instance, unsigned percent)
{ {
@@ -1017,6 +1017,7 @@ static void Load_Control_WriteProperty_Request_Shed_Percent(Test * pTest,
&error_class, &error_code); &error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
#endif
static void Load_Control_WriteProperty_Request_Shed_Level(Test * pTest, static void Load_Control_WriteProperty_Request_Shed_Level(Test * pTest,
int instance, unsigned level) int instance, unsigned level)
@@ -1044,6 +1045,7 @@ static void Load_Control_WriteProperty_Request_Shed_Level(Test * pTest,
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
#if 0
static void Load_Control_WriteProperty_Request_Shed_Amount(Test * pTest, static void Load_Control_WriteProperty_Request_Shed_Amount(Test * pTest,
int instance, float amount) int instance, float amount)
{ {
@@ -1069,6 +1071,7 @@ static void Load_Control_WriteProperty_Request_Shed_Amount(Test * pTest,
&error_class, &error_code); &error_class, &error_code);
ct_test(pTest, status == true); ct_test(pTest, status == true);
} }
#endif
static void Load_Control_WriteProperty_Enable(Test * pTest, int instance, static void Load_Control_WriteProperty_Enable(Test * pTest, int instance,
bool enable) bool enable)
@@ -1221,7 +1224,6 @@ static void Load_Control_WriteProperty_Start_Time(Test * pTest, int instance,
void testLoadControlStateMachine(Test * pTest) void testLoadControlStateMachine(Test * pTest)
{ {
unsigned i = 0, j = 0; unsigned i = 0, j = 0;
int len = 0;
uint8_t level = 0; uint8_t level = 0;
Load_Control_Init(); Load_Control_Init();
+1
View File
@@ -234,6 +234,7 @@ bool Lighting_Output_Present_Value_Relinquish(uint32_t object_instance,
float Lighting_Output_Progress_Value(uint32_t object_instance) float Lighting_Output_Progress_Value(uint32_t object_instance)
{ {
float value = LIGHTING_RELINQUISH_DEFAULT; float value = LIGHTING_RELINQUISH_DEFAULT;
unsigned index = 0;
Lighting_Output_Init(); Lighting_Output_Init();
index = Lighting_Output_Instance_To_Index(object_instance); index = Lighting_Output_Instance_To_Index(object_instance);