changeset 277:773f6e8a5842 main

PixyCam commands and node definitions.
author Bob Cook <bob@bobcookdev.com>
date Mon, 30 May 2016 19:03:03 -0700
parents 3b91c5d76887
children f2546f8b4ba7
files main/packages/common/can/can_messages.h main/packages/common/can/can_nodes.h
diffstat 2 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/main/packages/common/can/can_messages.h	Mon May 30 19:01:37 2016 -0700
+++ b/main/packages/common/can/can_messages.h	Mon May 30 19:03:03 2016 -0700
@@ -7,7 +7,7 @@
 // 
 //  Identifiers for Controller Area Network messages.
 //
-//  Copyright (c) 2010-2015 Bob Cook
+//  Copyright (c) 2010-2016 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
@@ -47,6 +47,7 @@
 //      GPS sensor:             0x0100 to 0x010f
 //      Wheels (front & rear):  0x0110 to 0x011f
 //      Sonar (front):          0x0130 to 0x013f
+//      PixyCam sensor:         0x0140 to 0x014f
 //
 // ----------------------------------------------------------------------------------------
 
@@ -243,6 +244,13 @@
 
 // ----------------------------------------------------------------------------------------
 
+const uint16_t can_dataid_pixy_start_tracking = 0x0140;
+const uint16_t can_dataid_pixy_stop_tracking  = 0x0141;
+
+const uint16_t can_dataid_pixy_grabframe = 0x0143;
+
+// ----------------------------------------------------------------------------------------
+
 #if !defined( __AVR__ )
 #pragma pack(pop)
 #endif
--- a/main/packages/common/can/can_nodes.h	Mon May 30 19:01:37 2016 -0700
+++ b/main/packages/common/can/can_nodes.h	Mon May 30 19:03:03 2016 -0700
@@ -7,7 +7,7 @@
 // 
 //  Identifiers for Controller Area Network nodes across multiple projects.
 //
-//  Copyright (c) 2011-2013 Bob Cook
+//  Copyright (c) 2011-2016 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
@@ -52,8 +52,9 @@
 // ----------------------------------------------------------------------------------------
 //  sensor modules
 
-const uint8_t can_node_sensor_gps = 0x0030;
-const uint8_t can_node_sensor_imu = 0x0031;
+const uint8_t can_node_sensor_gps  = 0x0030;
+const uint8_t can_node_sensor_imu  = 0x0031;
+const uint8_t can_node_sensor_pixy = 0x0032;
 
 // ----------------------------------------------------------------------------------------
 #endif  // #if !defined(BCDRL_COMMON_CAN_CAN_NODES_H)