NerfUS mobile node that manages a target for the Nerf gun firing range
Dependencies: LedController mbed-rtos mbed NerfUSXbee Servomotor TargetManager
Fork of NerfUS by
Diff: source/Target.cpp
- Revision:
- 20:05e2c4941285
- Parent:
- 19:377887760869
- Child:
- 22:d9df16225df3
--- a/source/Target.cpp Wed Mar 08 13:56:18 2017 -0500 +++ b/source/Target.cpp Wed Mar 08 14:05:05 2017 -0500 @@ -32,17 +32,17 @@ servomotor.set_position_up(); } -std::vector<uint8_t> Target::generate_message(uint8_t target_number, Result result, uint16_t timeout_ms) const +std::vector<uint8_t> Target::generate_message(uint8_t target_number, Result result, uint16_t time_taken_ms) const { const uint8_t target_number_and_result = (target_number << 3) + result; - const uint8_t timeout_ms_msb = timeout_ms >> 8; - const uint8_t timeout_ms_lsb = (timeout_ms << 8) >> 8; + const uint8_t time_taken_msb = time_taken_ms >> 8; + const uint8_t time_taken_lsb = (time_taken_ms << 8) >> 8; std::vector<uint8_t> message; message.push_back(target_number_and_result); - message.push_back(timeout_ms_msb); - message.push_back(timeout_ms_lsb); + message.push_back(time_taken_msb); + message.push_back(time_taken_lsb); return message; }