From 56a495fbd70440529e4996831aa5b2919a95a1d7 Mon Sep 17 00:00:00 2001
From: Joe Finney <joe@comp.lancs.ac.uk>
Date: Tue, 12 Jan 2016 17:29:54 +0000
Subject: [PATCH] microbit: Update of MESEvent codes to avoid MICROBIT_EVT_ANY
 collision

Events listed recorded in MESEvents.h were enumerated from zero.
This is not ideal, as MicroBitMessageBus uses a code of zero for
MICROBIT_EVT_ANY - a wildcard mechanism to register interest in all events
from a given ID.

All event values recorded in MESEvents.h have therefore incremented.
---
 inc/MESEvents.h | 82 ++++++++++++++++++++++++-------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/inc/MESEvents.h b/inc/MESEvents.h
index 7164a84..641429e 100644
--- a/inc/MESEvents.h
+++ b/inc/MESEvents.h
@@ -9,63 +9,63 @@
 // Events that master devices respond to:
 //
 #define MES_REMOTE_CONTROL_ID               1001
-#define MES_REMOTE_CONTROL_EVT_PLAY         0
-#define MES_REMOTE_CONTROL_EVT_PAUSE        1
-#define MES_REMOTE_CONTROL_EVT_STOP         2
-#define MES_REMOTE_CONTROL_EVT_NEXTTRACK    3
-#define MES_REMOTE_CONTROL_EVT_PREVTRACK    4
-#define MES_REMOTE_CONTROL_EVT_FORWARD      5
-#define MES_REMOTE_CONTROL_EVT_REWIND       6
-#define MES_REMOTE_CONTROL_EVT_VOLUMEUP     7
-#define MES_REMOTE_CONTROL_EVT_VOLUMEDOWN   8
+#define MES_REMOTE_CONTROL_EVT_PLAY         1
+#define MES_REMOTE_CONTROL_EVT_PAUSE        2
+#define MES_REMOTE_CONTROL_EVT_STOP         3
+#define MES_REMOTE_CONTROL_EVT_NEXTTRACK    4
+#define MES_REMOTE_CONTROL_EVT_PREVTRACK    5
+#define MES_REMOTE_CONTROL_EVT_FORWARD      6
+#define MES_REMOTE_CONTROL_EVT_REWIND       7
+#define MES_REMOTE_CONTROL_EVT_VOLUMEUP     8
+#define MES_REMOTE_CONTROL_EVT_VOLUMEDOWN   9
 
 
 #define MES_CAMERA_ID                       1002
-#define MES_CAMERA_EVT_LAUNCH_PHOTO_MODE    0
-#define MES_CAMERA_EVT_LAUNCH_VIDEO_MODE    1
-#define MES_CAMERA_EVT_TAKE_PHOTO           2
-#define MES_CAMERA_EVT_START_VIDEO_CAPTURE  3
-#define MES_CAMERA_EVT_STOP_VIDEO_CAPTURE   4
-#define MES_CAMERA_EVT_STOP_PHOTO_MODE      5
-#define MES_CAMERA_EVT_STOP_VIDEO_MODE      6
-#define MES_CAMERA_EVT_TOGGLE_FRONT_REAR    7
+#define MES_CAMERA_EVT_LAUNCH_PHOTO_MODE    1
+#define MES_CAMERA_EVT_LAUNCH_VIDEO_MODE    2
+#define MES_CAMERA_EVT_TAKE_PHOTO           3
+#define MES_CAMERA_EVT_START_VIDEO_CAPTURE  4
+#define MES_CAMERA_EVT_STOP_VIDEO_CAPTURE   5
+#define MES_CAMERA_EVT_STOP_PHOTO_MODE      6
+#define MES_CAMERA_EVT_STOP_VIDEO_MODE      7
+#define MES_CAMERA_EVT_TOGGLE_FRONT_REAR    8
 
 
 #define MES_ALERTS_ID                       1004
 // TODO Multiple DISPLAY_TOAST event values
-#define MES_ALERT_EVT_DISPLAY_TOAST         0
-#define MES_ALERT_EVT_VIBRATE               1
+#define MES_ALERT_EVT_DISPLAY_TOAST         1
+#define MES_ALERT_EVT_VIBRATE               2
 // TODO PLAY_SOUND and ALARMN to be combined
-#define MES_ALERT_EVT_PLAY_SOUND            2
-#define MES_ALERT_EVT_PLAY_RINGTONE         3
-#define MES_ALERT_EVT_FIND_MY_PHONE         4
-#define MES_ALERT_EVT_ALARM1                5 
-#define MES_ALERT_EVT_ALARM2                6
-#define MES_ALERT_EVT_ALARM3                7
-#define MES_ALERT_EVT_ALARM4                8
-#define MES_ALERT_EVT_ALARM5                9
-#define MES_ALERT_EVT_ALARM6                10
+#define MES_ALERT_EVT_PLAY_SOUND            3
+#define MES_ALERT_EVT_PLAY_RINGTONE         4
+#define MES_ALERT_EVT_FIND_MY_PHONE         5
+#define MES_ALERT_EVT_ALARM1                6
+#define MES_ALERT_EVT_ALARM2                7
+#define MES_ALERT_EVT_ALARM3                8
+#define MES_ALERT_EVT_ALARM4                9
+#define MES_ALERT_EVT_ALARM5                10
+#define MES_ALERT_EVT_ALARM6                11
 
 //
 // Events that master devices generate:
 //
 #define MES_SIGNAL_STRENGTH_ID              1101
-#define MES_SIGNAL_STRENGTH_EVT_NO_BAR      0
-#define MES_SIGNAL_STRENGTH_EVT_ONE_BAR     1
-#define MES_SIGNAL_STRENGTH_EVT_TWO_BAR     2
-#define MES_SIGNAL_STRENGTH_EVT_THREE_BAR   3
-#define MES_SIGNAL_STRENGTH_EVT_FOUR_BAR    4
+#define MES_SIGNAL_STRENGTH_EVT_NO_BAR      1
+#define MES_SIGNAL_STRENGTH_EVT_ONE_BAR     2
+#define MES_SIGNAL_STRENGTH_EVT_TWO_BAR     3
+#define MES_SIGNAL_STRENGTH_EVT_THREE_BAR   4
+#define MES_SIGNAL_STRENGTH_EVT_FOUR_BAR    5
 
 
 #define MES_DEVICE_INFO_ID                  1103
-#define MES_DEVICE_ORIENTATION_LANDSCAPE    0
-#define MES_DEVICE_ORIENTATION_PORTRAIT     1
-#define MES_DEVICE_GESTURE_NONE             2
-#define MES_DEVICE_GESTURE_DEVICE_SHAKEN    3
-#define MES_DEVICE_DISPLAY_OFF              4
-#define MES_DEVICE_DISPLAY_ON               5
-#define MES_DEVICE_INCOMING_CALL            6
-#define MES_DEVICE_INCOMING_MESSAGE         7
+#define MES_DEVICE_ORIENTATION_LANDSCAPE    1
+#define MES_DEVICE_ORIENTATION_PORTRAIT     2
+#define MES_DEVICE_GESTURE_NONE             3
+#define MES_DEVICE_GESTURE_DEVICE_SHAKEN    4
+#define MES_DEVICE_DISPLAY_OFF              5
+#define MES_DEVICE_DISPLAY_ON               6
+#define MES_DEVICE_INCOMING_CALL            7
+#define MES_DEVICE_INCOMING_MESSAGE         8
 
 
 #endif