Skip to content

Commit a39088b

Browse files
committed
update
1 parent b1eb3ba commit a39088b

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

examples/servo/main.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@ int main(void) {
1212
}
1313
returncode_t result = RETURNCODE_EOFF;
1414
uint16_t servo_count = 0;
15-
libtock_servo_number(&servo_count);
15+
libtock_servo_count(&servo_count);
1616
printf("The number of available servomotors is: %d", servo_count);
1717
uint16_t angle = 0;
1818
uint16_t index = 0; // the first index available.
1919

20-
if (libtock_current_servo_angle(index, &angle) == RETURNCODE_ENODEVICE) {
20+
if (libtock_read_servo_angle(index, &angle) == RETURNCODE_ENODEVICE) {
2121
printf("\n The index number is bigger than the available servomotors\n");
2222
return -1;
2323
}
2424

2525
// Changes the angle of the servomotor from 0 to 180 degrees (waiting 0.1 ms between every change).
2626
for (int i = 0; i <= 180; i++) {
2727
// `result` stores the returned code received from the driver.
28-
result = libtock_servo_angle(index, i);
28+
result = libtock_set_servo_angle(index, i);
2929
if (result == RETURNCODE_SUCCESS) {
3030
libtocksync_alarm_delay_ms(100);
3131
// Verifies if the function successfully returned the current angle.
32-
if (libtock_current_servo_angle(index, &angle) == RETURNCODE_SUCCESS) {
32+
if (libtock_read_servo_angle(index, &angle) == RETURNCODE_SUCCESS) {
3333
printf("\nThe current angle is: %d", angle);
3434
} else {
3535
printf("\n This servo cannot return its angle.\n");

libtock/interface/syscalls/servo_syscalls.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ bool libtock_servo_exists(void) {
55
return driver_exists(DRIVER_NUM_SERVO);
66
}
77

8-
returncode_t libtock_servo_number(uint16_t* servo_count) {
8+
returncode_t libtock_servo_count(uint16_t* servo_count) {
99
uint32_t value = 0;
1010
syscall_return_t r = command(DRIVER_NUM_SERVO, 1, 0, 0);
1111
// Converts the returned value stored in `r`
@@ -16,12 +16,12 @@ returncode_t libtock_servo_number(uint16_t* servo_count) {
1616

1717
}
1818

19-
returncode_t libtock_servo_angle(uint16_t index, uint16_t angle) {
19+
returncode_t libtock_set_servo_angle(uint16_t index, uint16_t angle) {
2020
syscall_return_t cval = command(DRIVER_NUM_SERVO, 2, index, angle);
2121
return tock_command_return_novalue_to_returncode(cval);
2222
}
2323

24-
returncode_t libtock_current_servo_angle(uint16_t index, uint16_t* angle) {
24+
returncode_t libtock_read_servo_angle(uint16_t index, uint16_t* angle) {
2525
uint32_t value = 0;
2626
syscall_return_t r = command(DRIVER_NUM_SERVO, 3, index, 0);
2727
// Converts the value returned by the servo, stored in `r`

libtock/interface/syscalls/servo_syscalls.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ extern "C" {
1111
// Check if the servo system call driver is available on this board.
1212
bool libtock_servo_exists(void);
1313
// Returns the number of available servomotors.
14-
returncode_t libtock_servo_number(uint16_t* servo_count);
14+
returncode_t libtock_servo_count(uint16_t* servo_count);
1515
// Change the angle.
16-
returncode_t libtock_servo_angle(uint16_t index, uint16_t angle);
16+
returncode_t libtock_set_servo_angle(uint16_t index, uint16_t angle);
1717
// Requests the current angle from the servo.
18-
returncode_t libtock_current_servo_angle(uint16_t index, uint16_t* angle);
18+
returncode_t libtock_read_servo_angle(uint16_t index, uint16_t* angle);
1919

2020
#ifdef __cplusplus
2121
}

0 commit comments

Comments
 (0)