Browse Source

更改cmakelists

master
zwsd 3 years ago
parent
commit
63d8d89780
  1. 2
      main/CMakeLists.txt
  2. 6
      main/gatts_demo.c
  3. 2
      main/motor_drive.c

2
main/CMakeLists.txt

@ -1,2 +1,2 @@
idf_component_register(SRCS "gatts_demo.c"
idf_component_register(SRCS "gatts_demo.c" "motor_drive.c"
INCLUDE_DIRS ".") INCLUDE_DIRS ".")

6
main/gatts_demo.c

@ -821,8 +821,8 @@ void app_main(void)
{ {
esp_err_t ret; esp_err_t ret;
// motor_init();
// motor_encoder_init();
motor_init();
motor_encoder_init();
// timer_group_init(TIMER_GROUP_0, TIMER_0, false, timer_interval_num, timer_interval_ms); // timer_group_init(TIMER_GROUP_0, TIMER_0, false, timer_interval_num, timer_interval_ms);
timer_group_init(TIMER_GROUP_0, TIMER_0, false, timer_group0_interval_num, timer_interval_ms); timer_group_init(TIMER_GROUP_0, TIMER_0, false, timer_group0_interval_num, timer_interval_ms);
@ -972,7 +972,7 @@ void bluetooth_gatts_try_process_data()
if (strcmp(s_bluetooth_processer.order, set_position) == 0) if (strcmp(s_bluetooth_processer.order, set_position) == 0)
{ {
ESP_LOGI(GATTS_TAG, set_position); ESP_LOGI(GATTS_TAG, set_position);
// motor_cmd_set_position(s_bluetooth_processer.speed_level, s_bluetooth_processer.position, s_bluetooth_processer.direction);
motor_cmd_set_position(s_bluetooth_processer.speed_level, s_bluetooth_processer.position, s_bluetooth_processer.direction);
receipt_json_set_position(); receipt_json_set_position();
} }
if (strcmp(s_bluetooth_processer.order, get_status) == 0) if (strcmp(s_bluetooth_processer.order, get_status) == 0)

2
main/motor_drive.c

@ -46,7 +46,7 @@ int motor_find_short_path_direction(double position)
{ {
return 1; return 1;
} }
return;
return -1;
} }
double motor_read_encoder() double motor_read_encoder()

Loading…
Cancel
Save