Skip to content

Commit

Permalink
Removed ARM->RC link, test.miml
Browse files Browse the repository at this point in the history
  • Loading branch information
ThirteenFish committed Jun 26, 2013
1 parent 4710fa3 commit b046cf3
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 71 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DOXYFILE := ./Doxyfile
OBJECTS += fcfutils.o fcfmain.o utils_sockets.o utils_libusb-1.0.o
#OBJECTS += fcfutils.o fcfmain.o utils_sockets.o

MAINMIML ?= test.miml
MAINMIML ?= main.miml
MIMLMK ?= miml.mk

-include $(MIMLMK)
Expand Down
2 changes: 1 addition & 1 deletion build_for_flight.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh
make clean
MAINMIML=main.miml make live
make live
1 change: 0 additions & 1 deletion main.miml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ messages:
- LOG.log_receive_gps

ARM.arm_send_signal: # - [code, char*]
- RC.rc_receive_arm
- LOG.log_receive_arm

RC.rc_send_servo: # - [data, RollServo_adjustment*]
Expand Down
10 changes: 1 addition & 9 deletions rollcontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ static uint16_t scale_gyro(int16_t gyr){

static void step(struct pollfd * pfd){
char buf[8];
while(!read(pfd->fd, buf, 8));
read(pfd->fd, buf, 8); //clears timerfd
RC_INPUT_STRUCT_TYPE input;
RC_OUTPUT_STRUCT_TYPE output;

Expand Down Expand Up @@ -66,14 +66,6 @@ void rc_receive_imu(ADISMessage * imu){
// printf("%d\n", roll);
}

void rc_receive_arm(char * signal){
if(signal[0]){
launch = 1;
}else{
launch = 0;
}
}

void rc_raw_ld_in(unsigned char * signal, int len, unsigned char* timestamp){
launch = (signal[0]) ? 1 : 0;
}
1 change: 0 additions & 1 deletion rollcontrol.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ typedef struct{
void rollcontrol_init(void); // [miml:init]

void rc_receive_imu(ADISMessage *); // [miml:receiver]
void rc_receive_arm(char *); // [miml:receiver]
void rc_raw_ld_in(unsigned char *, int, unsigned char*); // [miml:receiver]

void rc_send_servo(RollServoMessage*); // [miml:sender]
Expand Down
3 changes: 0 additions & 3 deletions rollcontrol.miml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ receivers:
rc_receive_imu:
- [data, ADISMessage*]

rc_receive_arm:
- [code, char*]

rc_raw_ld_in:
- [code, unsigned char*]
- [len, int]
Expand Down
55 changes: 0 additions & 55 deletions test.miml

This file was deleted.

0 comments on commit b046cf3

Please sign in to comment.