Changeset 429
- Timestamp:
- 02/17/07 22:50:23 (2 years ago)
- Files:
-
- trunk/hal/lpc2106-cmucam3/servo.c (modified) (1 diff)
- trunk/hal/virtual-cam/gpio.c (modified) (1 diff)
- trunk/hal/virtual-cam/servo.c (modified) (1 diff)
- trunk/include/cc3.h (modified) (1 diff)
- trunk/projects/cmucam2/cmucam2.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/hal/lpc2106-cmucam3/servo.c
r421 r429 49 49 servo_val[servo] = pos; 50 50 return true; 51 } 52 53 uint8_t cc3_gpio_get_servo_position (uint8_t servo) 54 { 55 if (servo >= MAX_SERVOS) { 56 return 0; 57 } 58 return servo_val[servo]; 51 59 } 52 60 trunk/hal/virtual-cam/gpio.c
r420 r429 30 30 } 31 31 32 void cc3_gpio_set_value (uint8_t pin, bool value) 33 { 34 35 } trunk/hal/virtual-cam/servo.c
r420 r429 51 51 servo_val[servo] = pos; 52 52 return true; 53 } 54 55 uint8_t cc3_gpio_get_servo_position (uint8_t servo) 56 { 57 if (servo >= MAX_SERVOS) 58 return 0; 59 return servo_val[servo]; 53 60 } 54 61 trunk/include/cc3.h
r420 r429 440 440 441 441 /** 442 * Get a the position of a servo. 443 * 444 * @param[in] pin The pin to query. 445 * @return The servo position value. 446 */ 447 uint8_t cc3_gpio_get_servo_position (uint8_t pin); 448 449 /** 442 450 * Configure a GPIO pin as input, output, or servo. 443 451 * trunk/projects/cmucam2/cmucam2.c
r428 r429 56 56 TRACK_INVERT, 57 57 SERVO_OUTPUT, 58 GET_SERVO, 58 59 CMUCAM2_CMD_END // Must be last entry so array sizes are correct 59 60 } cmucam2_command_t; … … 85 86 cmucam2_cmds[SET_SERVO] = "SV"; 86 87 // SP servo parameters 87 // GP get servo position88 cmucam2_cmds[GET_SERVO] = "GS"; 88 89 // SM servo mask 89 90 cmucam2_cmds[SERVO_OUTPUT] = "SO"; … … 625 626 break; 626 627 628 case GET_SERVO: 629 if (n != 1) { 630 error = true; 631 break; 632 } 633 634 print_ACK (); 635 printf("%d\r", cc3_gpio_get_servo_position(arg_list[0])); 636 break; 637 627 638 case SERVO_OUTPUT: 628 639 if (n != 2) {
