changeset 171:cb2333758fb8 main

New node (odr-motion) and new messages re: emergency conditions.
author Bob Cook <bob@bobcookdev.com>
date Sat, 12 Jan 2013 15:21:52 -0800
parents 9ebb7a1db87d
children 11b03779b561 ac37f2690f0b
files main/packages/common/can/can_messages.h main/packages/common/can/can_nodes.h
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/packages/common/can/can_messages.h	Tue Jan 01 11:34:03 2013 -0800
+++ b/main/packages/common/can/can_messages.h	Sat Jan 12 15:21:52 2013 -0800
@@ -7,7 +7,7 @@
 // 
 //  Identifiers for Controller Area Network messages.
 //
-//  Copyright (c) 2012 Bob Cook
+//  Copyright (c) 2010-2013 Bob Cook
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -49,9 +49,16 @@
 //
 // ----------------------------------------------------------------------------------------
 
+const uint16_t can_dataid_emergency = 0x0001;
+const uint16_t can_dataid_all_clear = 0x0002;
+
+// ----------------------------------------------------------------------------------------
+
 const uint16_t can_dataid_heartbeat = 0x0010;
 const uint32_t can_heartbeat_data   = 0x54414542;
 
+// ----------------------------------------------------------------------------------------
+
 const uint16_t can_dataid_odrmgr_update = 0x0011;
 
 typedef struct
--- a/main/packages/common/can/can_nodes.h	Tue Jan 01 11:34:03 2013 -0800
+++ b/main/packages/common/can/can_nodes.h	Sat Jan 12 15:21:52 2013 -0800
@@ -7,7 +7,7 @@
 // 
 //  Identifiers for Controller Area Network nodes across multiple projects.
 //
-//  Copyright (c) 2011 Bob Cook
+//  Copyright (c) 2011-2013 Bob Cook
 //
 //  Permission is hereby granted, free of charge, to any person obtaining a copy
 //  of this software and associated documentation files (the "Software"), to deal
@@ -45,6 +45,7 @@
 const uint8_t can_node_odr_manager     = 0x0001;
 const uint8_t can_node_odr_controller  = 0x0002;
 const uint8_t can_node_odr_sonar_front = 0x0003;
+const uint8_t can_node_odr_motion      = 0x0004;
 
 // ----------------------------------------------------------------------------------------
 //  sensor modules