From 49bced0b449688ef5532d67615deefeb01d06f72 Mon Sep 17 00:00:00 2001 From: Florent Duchon Date: Tue, 23 Apr 2013 16:46:29 +0200 Subject: digital/beacon: use generic send command --- digital/beacon/src/laser.c | 4 ++-- digital/beacon/src/misc.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/digital/beacon/src/laser.c b/digital/beacon/src/laser.c index 45b4fe07..36df3219 100644 --- a/digital/beacon/src/laser.c +++ b/digital/beacon/src/laser.c @@ -28,9 +28,9 @@ #include "print.h" #include "laser.h" #include "servo.h" -#include "network.h" #include "codewheel.h" #include "calibration.h" +#include "network_send_commands.h" laser_s laser; @@ -158,7 +158,7 @@ ISR(TIMER3_COMPB_vect) #ifdef LOL_NUMBER_2 angle_to_send = (CODEWHEEL_CPR/4 - laser_get_angle_raw()) + (laser.angle_id << 9); #endif - network_send_data(NETWORK_ANGLE_RAW,angle_to_send); + network_send_angle(0,angle_to_send); laser.angle_id++; } } diff --git a/digital/beacon/src/misc.c b/digital/beacon/src/misc.c index 03113a8e..15e9a38d 100644 --- a/digital/beacon/src/misc.c +++ b/digital/beacon/src/misc.c @@ -25,6 +25,7 @@ #include "misc.h" #include "network_specific.h" +#include "network_send_commands.h" static int8_t color = -1; @@ -36,7 +37,7 @@ void jack_on_off(void) jack = 1; else jack = 0; - network_send_data(NETWORK_JACK_STATE,jack); + network_send_jack_state(0xFFFF,jack); } @@ -46,7 +47,7 @@ void jack_update_status(uint8_t value) static uint8_t old_jack = 0; if(value != old_jack) { - network_send_data(NETWORK_JACK_STATE,value); + network_send_jack_state(0xFFFF,value); old_jack = value; } } -- cgit v1.2.3