gatt-services: remove printf

This commit is contained in:
Milanka Ringwald 2019-12-05 14:39:36 +01:00
parent 85dc67fcd5
commit 04f45ea11b
4 changed files with 33 additions and 37 deletions

View File

@ -1232,7 +1232,7 @@ void cycling_power_service_server_packet_handler(btstack_packet_handler_t callba
void cycling_power_server_calibration_done(cycling_power_sensor_measurement_context_t measurement_type, uint16_t calibrated_value){
cycling_power_t * instance = &cycling_power;
if (instance->response_value != CP_RESPONSE_VALUE_W4_VALUE_AVAILABLE){
printf("cycling_power_server_calibration_done : CP_RESPONSE_VALUE_W4_VALUE_AVAILABLE con_handle 0x%02x\n", instance->con_handle);
// printf("cycling_power_server_calibration_done : CP_RESPONSE_VALUE_W4_VALUE_AVAILABLE con_handle 0x%02x\n", instance->con_handle);
return;
}
instance->response_value = CP_RESPONSE_VALUE_SUCCESS;

View File

@ -138,7 +138,7 @@ static uint16_t cycling_speed_and_cadence_service_read_callback(hci_con_handle_t
static void cycling_speed_and_cadence_service_csc_measurement_can_send_now(void * context){
cycling_speed_and_cadence_t * instance = (cycling_speed_and_cadence_t *) context;
if (!instance){
printf("instance is null (cycling_speed_and_cadence_service_csc_measurement_can_send_now)\n");
// printf("instance is null (cycling_speed_and_cadence_service_csc_measurement_can_send_now)\n");
return;
}
uint8_t flags = (instance->wheel_revolution_data_supported << CSC_FLAG_WHEEL_REVOLUTION_DATA_SUPPORTED);
@ -153,7 +153,7 @@ static void cycling_speed_and_cadence_service_csc_measurement_can_send_now(void
pos += 4;
little_endian_store_16(value, pos, instance->last_wheel_event_time);
pos += 2;
printf("send cumulative 0x%04x\n", instance->cumulative_wheel_revolutions);
// printf("send cumulative 0x%04x\n", instance->cumulative_wheel_revolutions);
}
if (instance->crank_revolution_data_supported){
@ -169,7 +169,7 @@ static void cycling_speed_and_cadence_service_csc_measurement_can_send_now(void
static void cycling_speed_and_cadence_service_response_can_send_now(void * context){
cycling_speed_and_cadence_t * instance = (cycling_speed_and_cadence_t *) context;
if (!instance){
printf("instance is null (cycling_speed_and_cadence_service_response_can_send_now)\n");
// printf("instance is null (cycling_speed_and_cadence_service_response_can_send_now)\n");
return;
}
@ -194,9 +194,7 @@ static void cycling_speed_and_cadence_service_response_can_send_now(void * conte
csc_opcode_t temp_request_opcode = instance->request_opcode;
instance->request_opcode = CSC_OPCODE_IDLE;
printf_hexdump(value, pos);
uint8_t status = att_server_indicate(instance->con_handle, instance->control_point_value_handle, &value[0], pos);
printf("att_server_indicate status 0x%02x\n", status);
switch (temp_request_opcode){
case CSC_OPCODE_SET_CUMULATIVE_VALUE:
if (instance->response_value != CSC_RESPONSE_VALUE_SUCCESS) break;
@ -225,9 +223,9 @@ static int cycling_speed_and_cadence_service_write_callback(hci_con_handle_t con
}
instance->measurement_client_configuration_descriptor_notify = little_endian_read_16(buffer, 0);
instance->con_handle = con_handle;
if (instance->measurement_client_configuration_descriptor_notify){
printf("enable notification\n");
}
// if (instance->measurement_client_configuration_descriptor_notify){
// printf("enable notification\n");
// }
return 0;
}
@ -237,9 +235,9 @@ static int cycling_speed_and_cadence_service_write_callback(hci_con_handle_t con
}
instance->control_point_client_configuration_descriptor_indicate = little_endian_read_16(buffer, 0);
instance->con_handle = con_handle;
if (instance->control_point_client_configuration_descriptor_indicate){
printf("enable indication\n");
}
// if (instance->control_point_client_configuration_descriptor_indicate){
// printf("enable indication\n");
// }
return 0;
}
@ -278,7 +276,7 @@ static int cycling_speed_and_cadence_service_write_callback(hci_con_handle_t con
instance->response_value = CSC_RESPONSE_VALUE_OP_CODE_NOT_SUPPORTED;
break;
}
printf("control point, opcode %02x, response %02x\n", instance->request_opcode, instance->response_value);
// printf("control point, opcode %02x, response %02x\n", instance->request_opcode, instance->response_value);
if (instance->control_point_client_configuration_descriptor_indicate){
instance->control_point_callback.callback = &cycling_speed_and_cadence_service_response_can_send_now;
@ -288,7 +286,7 @@ static int cycling_speed_and_cadence_service_write_callback(hci_con_handle_t con
return 0;
}
printf("heart_rate_service_read_callback, not handeled read on handle 0x%02x\n", attribute_handle);
// printf("heart_rate_service_read_callback, not handeled read on handle 0x%02x\n", attribute_handle);
return 0;
}
@ -308,7 +306,7 @@ void cycling_speed_and_cadence_service_server_init(uint32_t supported_sensor_loc
uint16_t end_handle = 0xffff;
int service_found = gatt_server_get_get_handle_range_for_service_with_uuid16(ORG_BLUETOOTH_SERVICE_CYCLING_SPEED_AND_CADENCE, &start_handle, &end_handle);
if (!service_found){
printf("no service found\n");
// printf("no service found\n");
return;
}
// // get CSC Mesurement characteristic value handle and client configuration handle
@ -324,12 +322,12 @@ void cycling_speed_and_cadence_service_server_init(uint32_t supported_sensor_loc
// get SC Control Point characteristic value handle and client configuration handle
instance->control_point_value_handle = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_SC_CONTROL_POINT);
instance->control_point_client_configuration_descriptor_handle = gatt_server_get_client_configuration_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_SC_CONTROL_POINT);
printf("Measurement value handle 0x%02x\n", instance->measurement_value_handle);
printf("Measurement Cfg value handle 0x%02x\n", instance->measurement_client_configuration_descriptor_handle);
printf("Feature value handle 0x%02x\n", instance->feature_handle);
printf("Sensor location value handle 0x%02x\n", instance->sensor_location_value_handle);
printf("Control Point value handle 0x%02x\n", instance->control_point_value_handle);
printf("Control P. Cfg. value handle 0x%02x\n", instance->control_point_client_configuration_descriptor_handle);
log_info("Measurement value handle 0x%02x", instance->measurement_value_handle);
log_info("Measurement Cfg value handle 0x%02x", instance->measurement_client_configuration_descriptor_handle);
log_info("Feature value handle 0x%02x", instance->feature_handle);
log_info("Sensor location value handle 0x%02x", instance->sensor_location_value_handle);
log_info("Control Point value handle 0x%02x", instance->control_point_value_handle);
log_info("Control P. Cfg. value handle 0x%02x", instance->control_point_client_configuration_descriptor_handle);
cycling_speed_and_cadence_service.start_handle = start_handle;
cycling_speed_and_cadence_service.end_handle = end_handle;
@ -354,7 +352,7 @@ static void cycling_speed_and_cadence_service_calculate_cumulative_wheel_revolut
instance->cumulative_wheel_revolutions = 0xffffffff;
}
}
printf("cumulative 0x%04x, wheel revolution change %d\n", instance->cumulative_wheel_revolutions, revolutions_change);
// printf("cumulative 0x%04x, wheel revolution change %d\n", instance->cumulative_wheel_revolutions, revolutions_change);
}
static void cycling_speed_and_cadence_service_calculate_cumulative_crank_revolutions(uint16_t revolutions_change){

View File

@ -107,7 +107,7 @@ static uint16_t heart_rate_service_read_callback(hci_con_handle_t con_handle, ui
}
return 1;
}
printf("heart_rate_service_read_callback, not handeled read on handle 0x%02x\n", attribute_handle);
// printf("heart_rate_service_read_callback, not handeled read on handle 0x%02x\n", attribute_handle);
return 0;
}
@ -122,11 +122,11 @@ static int heart_rate_service_write_callback(hci_con_handle_t con_handle, uint16
}
heart_rate.measurement_client_configuration_descriptor_notify = little_endian_read_16(buffer, 0);
heart_rate.con_handle = con_handle;
if (heart_rate.measurement_client_configuration_descriptor_notify){
printf("notify enabled\n");
} else {
printf("notify disabled\n");
}
// if (heart_rate.measurement_client_configuration_descriptor_notify){
// printf("notify enabled\n");
// } else {
// printf("notify disabled\n");
// }
return 0;
}
@ -143,7 +143,7 @@ static int heart_rate_service_write_callback(hci_con_handle_t con_handle, uint16
return 0;
}
printf("heart_rate_service_write_callback, not handeled write on handle 0x%02x\n", attribute_handle);
// printf("heart_rate_service_write_callback, not handeled write on handle 0x%02x\n", attribute_handle);
return 0;
}
@ -168,10 +168,10 @@ void heart_rate_service_server_init(heart_rate_service_body_sensor_location_t lo
// get Hear Rate Control Point characteristic value handle and client configuration handle
instance->control_point_value_handle = gatt_server_get_value_handle_for_characteristic_with_uuid16(start_handle, end_handle, ORG_BLUETOOTH_CHARACTERISTIC_HEART_RATE_CONTROL_POINT);
// printf("Measurement value handle 0x%02x\n", instance->measurement_value_handle);
// printf("Client Config value handle 0x%02x\n", instance->measurement_client_configuration_descriptor_handle);
// printf("Sensor location value handle 0x%02x\n", instance->sensor_location_value_handle);
// printf("Control Point value handle 0x%02x\n", instance->control_point_value_handle);
log_info("Measurement value handle 0x%02x", instance->measurement_value_handle);
log_info("Client Config value handle 0x%02x", instance->measurement_client_configuration_descriptor_handle);
log_info("Sensor location value handle 0x%02x", instance->sensor_location_value_handle);
log_info("Control Point value handle 0x%02x", instance->control_point_value_handle);
// register service with ATT Server
heart_rate_service.start_handle = start_handle;
heart_rate_service.end_handle = end_handle;
@ -192,7 +192,7 @@ static void heart_rate_service_can_send_now(void * context){
if (instance->rr_interval_count){
flags |= (1 << HEART_RATE_SERVICE_RR_INTERVAL);
}
printf("heart_rate_service_can_send_now: flags 0%2x\n", flags);
// printf("heart_rate_service_can_send_now: flags 0%2x\n", flags);
uint8_t value[100];
int pos = 0;
@ -216,7 +216,6 @@ static void heart_rate_service_can_send_now(void * context){
instance->rr_interval_count--;
}
printf_hexdump(value, pos);
att_server_notify(instance->con_handle, instance->measurement_value_handle, &value[0], pos);
if (instance->rr_interval_count){
@ -240,7 +239,7 @@ void heart_rate_service_server_update_heart_rate_values(uint16_t heart_rate_bpm,
heart_rate_service_sensor_contact_status_t sensor_contact, int rr_interval_count, uint16_t * rr_intervals){
heart_rate_t * instance = &heart_rate;
printf("update_heart_rate_values, notify %u con_handle %04x\n", instance->measurement_client_configuration_descriptor_notify, instance->con_handle);
// printf("update_heart_rate_values, notify %u con_handle %04x\n", instance->measurement_client_configuration_descriptor_notify, instance->con_handle);
instance->measurement_bpm = heart_rate_bpm;
instance->sensor_contact = sensor_contact;

View File

@ -91,7 +91,6 @@ static int nordic_spp_service_write_callback(hci_con_handle_t con_handle, uint16
UNUSED(buffer_size);
if (attribute_handle == nordic_spp_rx_value_handle){
printf_hexdump(buffer, buffer_size);
client_callback(con_handle, &buffer[0], buffer_size);
}
if (attribute_handle == nordic_spp_tx_client_configuration_handle){