Skip to content

Commit

Permalink
Merge pull request #264 from tudelft/v4.0_fix_servo_cam
Browse files Browse the repository at this point in the history
[bugfix] digital_cam_servo should not access fbw variables
  • Loading branch information
flixr committed Aug 11, 2012
2 parents 3b3aa06 + 0a7dd99 commit 67bb2cf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sw/airborne/modules/digital_cam/servo_cam_ctrl.h
Expand Up @@ -49,7 +49,7 @@

// Include Servo and airframe servo channels
#include "std.h"
#include "commands.h"
#include "inter_mcu.h"
#include "generated/airframe.h"

extern uint8_t dc_timer;
Expand All @@ -63,8 +63,8 @@ static inline void servo_cam_ctrl_init(void)
dc_timer = 0;
}

#define DC_PUSH(X) commands[X] = -MAX_PPRZ;
#define DC_RELEASE(X) commands[X] = MAX_PPRZ;
#define DC_PUSH(X) ap_state->commands[X] = -MAX_PPRZ;
#define DC_RELEASE(X) ap_state->commands[X] = MAX_PPRZ;

#ifndef DC_SHUTTER_DELAY
#define DC_SHUTTER_DELAY 2 /* 4Hz -> 0.5s */
Expand Down

0 comments on commit 67bb2cf

Please sign in to comment.