diff --git a/src/bioloid_dyn_slave.c b/src/bioloid_dyn_slave.c index 3a2c1d8adda938247ea58ab3a010f8bb79ae0206..8ee1a449e95d402f84f2a20e0b76afa6b1afae75 100644 --- a/src/bioloid_dyn_slave.c +++ b/src/bioloid_dyn_slave.c @@ -9,6 +9,7 @@ #include "bioloid_gyro.h" #include "motion_manager.h" #include "action.h" +#include "walking.h" /* external interrupt pin */ #define DYN_SLAVE_EXT_INT_PIN GPIO_PIN_8 diff --git a/src/bioloid_gyro.c b/src/bioloid_gyro.c index f69bf9e36faf3403dcb80bf1e036e9aecbc381c5..d667195bafe3ee251f66ac957b322139e8422cb0 100644 --- a/src/bioloid_gyro.c +++ b/src/bioloid_gyro.c @@ -1,4 +1,5 @@ #include "bioloid_gyro.h" +#include "bioloid_registers.h" #include "ram.h" #define GYRO_MAX_CAL_SAMPLES 256 @@ -21,17 +22,17 @@ void gyro_init(void) inline adc_ch_t gyro_get_fb_adc_channel(void) { - return ram_data[BIOLIOD_GYRO_FB_ADC_CH]; + return ram_data[BIOLOID_GYRO_FB_ADC_CH]; } inline adc_ch_t gyro_get_lr_adc_channel(void) { - return ram_data[BIOLIOD_GYRO_LR_ADC_CH]; + return ram_data[BIOLOID_GYRO_LR_ADC_CH]; } void gyro_calibrate(void) { - adc_ch_t fb_ch=ram_data[BIOLIOD_GYRO_FB_ADC_CH],lr_ch=ram_data[BIOLIOD_GYRO_LR_ADC_CH]; + adc_ch_t fb_ch=ram_data[BIOLOID_GYRO_FB_ADC_CH],lr_ch=ram_data[BIOLOID_GYRO_LR_ADC_CH]; uint16_t i; gyro_fb_offset=0x0000; @@ -73,9 +74,9 @@ void gyro_process_read_cmd(unsigned short int address,unsigned short int length, void gyro_process_write_cmd(unsigned short int address,unsigned short int length,unsigned char *data) { // gyro channels - if(ram_in_range(BIOLIOD_GYRO_FB_ADC_CH,address,length)) - ram_data[BIOLIOD_GYRO_FB_ADC_CH]=data[BIOLIOD_GYRO_FB_ADC_CH-address]; - if(ram_in_range(BIOLIOD_GYRO_LR_ADC_CH,address,length)) - ram_data[BIOLIOD_GYRO_LR_ADC_CH]=data[BIOLIOD_GYRO_LR_ADC_CH-address]; + if(ram_in_range(BIOLOID_GYRO_FB_ADC_CH,address,length)) + ram_data[BIOLOID_GYRO_FB_ADC_CH]=data[BIOLOID_GYRO_FB_ADC_CH-address]; + if(ram_in_range(BIOLOID_GYRO_LR_ADC_CH,address,length)) + ram_data[BIOLOID_GYRO_LR_ADC_CH]=data[BIOLOID_GYRO_LR_ADC_CH-address]; }