Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-29 19:17:28 +08:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity

[telemetry] Bluegiga cleanup and rename

Browse Source
This commit is contained in:
Christophe De Wagter
2015-08-17 16:59:33 +02:00
parent e759a90463
commit c3d0bf6637
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/control_panel_example.xml
+2 -2
View File
@@ -46,11 +46,11 @@
<arg flag="--port" constant="/dev/ttyUSB1"/> <arg flag="--port" constant="/dev/ttyUSB1"/>
<arg flag="--id" constant="1"/> <arg flag="--id" constant="1"/>
</program> </program>
<program name="BluegigaUsbDongleScanner" command="sw/tools/bluegiga_usb_dongle/drone-telemetry-demo"> <program name="BluegigaUsbDongleScanner" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
<arg flag="/dev/ttyACM2"/> <arg flag="/dev/ttyACM2"/>
<arg flag="scan" /> <arg flag="scan" />
</program> </program>
<program name="BluegigaUsbDongle" command="sw/tools/bluegiga_usb_dongle/drone-telemetry-demo"> <program name="BluegigaUsbDongle" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
<arg flag="/dev/ttyACM2"/> <arg flag="/dev/ttyACM2"/>
<arg flag="00:07:00:2d:d6:bb" /> <arg flag="00:07:00:2d:d6:bb" />
<arg flag="4242" /> <arg flag="4242" />
sw/tools/bluegiga_usb_dongle/.gitignore
+1 -1
View File
@@ -1,2 +1,2 @@
*.d *.d
drone-telemetry-demo bluegiga_usb_driver
sw/tools/bluegiga_usb_dongle/Makefile
+2 -2
View File
@@ -1,7 +1,7 @@
Q=@ Q=@
CC = gcc CC = gcc
TARGET = drone-telemetry-demo TARGET = bluegiga_usb_driver
MACHINE = $(shell $(CC) -dumpmachine) MACHINE = $(shell $(CC) -dumpmachine)
# Windows # Windows
@@ -22,7 +22,7 @@ DEPS := $(SRCS:.c=.d)
all: $(TARGET) all: $(TARGET)
%.o: %.c %.o: %.c
i$(Q)$(CC) -O3 -Wall -c -fmessage-length=0 -DPLATFORM_$(PLATFORM) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" $(Q)$(CC) -O3 -Wall -c -fmessage-length=0 -DPLATFORM_$(PLATFORM) -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
$(TARGET): $(OBJS) $(TARGET): $(OBJS)
@echo 'Building target: $@' @echo 'Building target: $@'
sw/tools/bluegiga_usb_dongle/main.c
+2 -3
View File
@@ -189,7 +189,7 @@ int cmp_bdaddr(bd_addr first, bd_addr second)
* @param second Second address * @param second Second address
* @return returns how many bytes are the same * @return returns how many bytes are the same
*/ */
int cmp_addr(uint8 first[], uint8 second[]) int cmp_addr(const uint8 first[], const uint8 second[])
{ {
int i; int i;
for (i = 5; i >= 0; i--) { for (i = 5; i >= 0; i--) {
@@ -755,10 +755,9 @@ int main(int argc, char *argv[])
//pthread_create(&threads[2], NULL, send_paparazzi_comms, NULL); //pthread_create(&threads[2], NULL, send_paparazzi_comms, NULL);
// Message loop // Message loop
char in;
while (state != state_finish) { while (state != state_finish) {
if (kbhit()) { if (kbhit()) {
in = getchar(); getchar();
break; break;
} }
usleep(1000); usleep(1000);