Skip to content

Commit 27885fa

Browse files
committed
Prefix enums to proghibit name clash with other libraries.
1 parent 78b5df4 commit 27885fa

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

libraries/MySensors/MyMessage.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ typedef enum {
3030
C_REQ = 2,
3131
C_INTERNAL = 3,
3232
C_STREAM = 4 // For Firmware and other larger chunks of data that need to be divided into pieces.
33-
} command;
33+
} mysensor_command;
3434

3535
// Type of sensor data (for set/req/ack messages)
3636
typedef enum {
@@ -40,33 +40,33 @@ typedef enum {
4040
V_HEATER, V_HEATER_SW, V_LIGHT_LEVEL, V_VAR1, V_VAR2, V_VAR3, V_VAR4, V_VAR5,
4141
V_UP, V_DOWN, V_STOP, V_IR_SEND, V_IR_RECEIVE, V_FLOW, V_VOLUME, V_LOCK_STATUS,
4242
V_DUST_LEVEL, V_VOLTAGE, V_CURRENT
43-
} data;
43+
} mysensor_data;
4444

4545
// Type of internal messages (for internal messages)
4646
typedef enum {
4747
I_BATTERY_LEVEL, I_TIME, I_VERSION, I_ID_REQUEST, I_ID_RESPONSE,
4848
I_INCLUSION_MODE, I_CONFIG, I_FIND_PARENT, I_FIND_PARENT_RESPONSE,
4949
I_LOG_MESSAGE, I_CHILDREN, I_SKETCH_NAME, I_SKETCH_VERSION,
5050
I_REBOOT, I_GATEWAY_READY
51-
} internal;
51+
} mysensor_internal;
5252

5353
// Type of sensor (for presentation message)
5454
typedef enum {
5555
S_DOOR, S_MOTION, S_SMOKE, S_LIGHT, S_DIMMER, S_COVER, S_TEMP, S_HUM, S_BARO, S_WIND,
5656
S_RAIN, S_UV, S_WEIGHT, S_POWER, S_HEATER, S_DISTANCE, S_LIGHT_LEVEL, S_ARDUINO_NODE,
5757
S_ARDUINO_REPEATER_NODE, S_LOCK, S_IR, S_WATER, S_AIR_QUALITY, S_CUSTOM, S_DUST,
5858
S_SCENE_CONTROLLER
59-
} sensor;
59+
} mysensor_sensor;
6060

6161
// Type of data stream (for streamed message)
6262
typedef enum {
6363
ST_FIRMWARE_CONFIG_REQUEST, ST_FIRMWARE_CONFIG_RESPONSE, ST_FIRMWARE_REQUEST, ST_FIRMWARE_RESPONSE,
6464
ST_SOUND, ST_IMAGE
65-
} stream;
65+
} mysensor_stream;
6666

6767
typedef enum {
6868
P_STRING, P_BYTE, P_INT16, P_UINT16, P_LONG32, P_ULONG32, P_CUSTOM, P_FLOAT32
69-
} payload;
69+
} mysensor_payload;
7070

7171

7272

0 commit comments

Comments
 (0)