Skip to content

Commit decde55

Browse files
henrygabhenrygab
committed
Use Print class reference
This is in preparation for enabling output to be provided via other, potentially more performant, modes.
1 parent 4565d0c commit decde55

File tree

3 files changed

+68
-62
lines changed

3 files changed

+68
-62
lines changed

‎libraries/BLEAdafruitService/src/services/BLEAdafruitQuaternion.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ void BLEAdafruitQuaternion::_update_timer(int32_t ms)
134134
#if CFG_DEBUG
135135
static void print_quaternion(float quater[4])
136136
{
137-
Serial.printf("Quaternion: %.04f, %.04f, %.04f, %.04f\n", quater[0], quater[1], quater[2], quater[3]);
137+
// prepare for ability to change output, based on compile-time flags
138+
Print& logger = Serial;
139+
logger.printf("Quaternion: %.04f, %.04f, %.04f, %.04f\n", quater[0], quater[1], quater[2], quater[3]);
138140
}
139141
#endif
140142

‎libraries/Bluefruit52Lib/src/BLEPeriph.cpp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,16 @@ void BLEPeriph::_eventHandler(ble_evt_t* evt)
151151
void BLEPeriph::printInfo(void)
152152
{
153153
char const * title_fmt = "%-16s: ";
154+
// prepare for ability to change output, based on compile-time flags
155+
Print& logger = Serial;
154156

155-
Serial.printf(title_fmt, "Conn Intervals");
156-
Serial.printf("min = %.2f ms, ", _ppcp.min_conn_interval*1.25f);
157-
Serial.printf("max = %.2f ms", _ppcp.max_conn_interval*1.25f);
158-
Serial.println();
157+
logger.printf(title_fmt, "Conn Intervals");
158+
logger.printf("min = %.2f ms, ", _ppcp.min_conn_interval*1.25f);
159+
logger.printf("max = %.2f ms", _ppcp.max_conn_interval*1.25f);
160+
logger.println();
159161

160-
Serial.printf(title_fmt, "Conn Timeout");
161-
Serial.printf("%d ms", _ppcp.conn_sup_timeout*10);
162-
Serial.println();
162+
logger.printf(title_fmt, "Conn Timeout");
163+
logger.printf("%d ms", _ppcp.conn_sup_timeout*10);
164+
logger.println();
163165
}
164166

‎libraries/Bluefruit52Lib/src/bluefruit.cpp‎

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -971,120 +971,122 @@ void AdafruitBluefruit::printInfo(void)
971971
{
972972
// Skip if Serial is not initialised
973973
if ( !Serial ) return;
974+
// prepare for ability to change output, based on compile-time flags
975+
Print& logger = Serial;
974976

975977
// Skip if Bluefruit.begin() is not called
976978
if ( _ble_event_sem == NULL ) return;
977979

978-
Serial.println("--------- SoftDevice Config ---------");
980+
logger.println("--------- SoftDevice Config ---------");
979981

980982
char const * title_fmt = "%-16s: ";
981983

982984
/*------------- SoftDevice Config -------------*/
983985
// Max uuid128
984-
Serial.printf(title_fmt, "Max UUID128");
985-
Serial.println(_sd_cfg.uuid128_max);
986+
logger.printf(title_fmt, "Max UUID128");
987+
logger.println(_sd_cfg.uuid128_max);
986988

987989
// ATTR Table Size
988-
Serial.printf(title_fmt, "ATTR Table Size");
989-
Serial.println(_sd_cfg.attr_table_size);
990+
logger.printf(title_fmt, "ATTR Table Size");
991+
logger.println(_sd_cfg.attr_table_size);
990992

991993
// Service Changed
992-
Serial.printf(title_fmt, "Service Changed");
993-
Serial.println(_sd_cfg.service_changed);
994+
logger.printf(title_fmt, "Service Changed");
995+
logger.println(_sd_cfg.service_changed);
994996

995997
if ( _prph_count )
996998
{
997-
Serial.println("Peripheral Connect Setting");
999+
logger.println("Peripheral Connect Setting");
9981000

999-
Serial.print(" - ");
1000-
Serial.printf(title_fmt, "Max MTU");
1001-
Serial.println(_sd_cfg.prph.mtu_max);
1001+
logger.print(" - ");
1002+
logger.printf(title_fmt, "Max MTU");
1003+
logger.println(_sd_cfg.prph.mtu_max);
10021004

1003-
Serial.print(" - ");
1004-
Serial.printf(title_fmt, "Event Length");
1005-
Serial.println(_sd_cfg.prph.event_len);
1005+
logger.print(" - ");
1006+
logger.printf(title_fmt, "Event Length");
1007+
logger.println(_sd_cfg.prph.event_len);
10061008

1007-
Serial.print(" - ");
1008-
Serial.printf(title_fmt, "HVN Queue Size");
1009-
Serial.println(_sd_cfg.prph.hvn_qsize);
1009+
logger.print(" - ");
1010+
logger.printf(title_fmt, "HVN Queue Size");
1011+
logger.println(_sd_cfg.prph.hvn_qsize);
10101012

1011-
Serial.print(" - ");
1012-
Serial.printf(title_fmt, "WrCmd Queue Size");
1013-
Serial.println(_sd_cfg.prph.wrcmd_qsize);
1013+
logger.print(" - ");
1014+
logger.printf(title_fmt, "WrCmd Queue Size");
1015+
logger.println(_sd_cfg.prph.wrcmd_qsize);
10141016
}
10151017

10161018
if ( _central_count )
10171019
{
1018-
Serial.println("Central Connect Setting");
1020+
logger.println("Central Connect Setting");
10191021

1020-
Serial.print(" - ");
1021-
Serial.printf(title_fmt, "Max MTU");
1022-
Serial.println(_sd_cfg.central.mtu_max);
1022+
logger.print(" - ");
1023+
logger.printf(title_fmt, "Max MTU");
1024+
logger.println(_sd_cfg.central.mtu_max);
10231025

1024-
Serial.print(" - ");
1025-
Serial.printf(title_fmt, "Event Length");
1026-
Serial.println(_sd_cfg.central.event_len);
1026+
logger.print(" - ");
1027+
logger.printf(title_fmt, "Event Length");
1028+
logger.println(_sd_cfg.central.event_len);
10271029

1028-
Serial.print(" - ");
1029-
Serial.printf(title_fmt, "HVN Queue Size");
1030-
Serial.println(_sd_cfg.central.hvn_qsize);
1030+
logger.print(" - ");
1031+
logger.printf(title_fmt, "HVN Queue Size");
1032+
logger.println(_sd_cfg.central.hvn_qsize);
10311033

1032-
Serial.print(" - ");
1033-
Serial.printf(title_fmt, "WrCmd Queue Size");
1034-
Serial.println(_sd_cfg.central.wrcmd_qsize);
1034+
logger.print(" - ");
1035+
logger.printf(title_fmt, "WrCmd Queue Size");
1036+
logger.println(_sd_cfg.central.wrcmd_qsize);
10351037
}
10361038

10371039
/*------------- Settings -------------*/
1038-
Serial.println("\n--------- BLE Settings ---------");
1040+
logger.println("\n--------- BLE Settings ---------");
10391041
// Name
1040-
Serial.printf(title_fmt, "Name");
1042+
logger.printf(title_fmt, "Name");
10411043
{
10421044
char name[32];
10431045
memclr(name, sizeof(name));
10441046
getName(name, sizeof(name));
1045-
Serial.printf(name);
1047+
logger.printf(name);
10461048
}
1047-
Serial.println();
1049+
logger.println();
10481050

10491051
// Max Connections
1050-
Serial.printf(title_fmt, "Max Connections");
1051-
Serial.printf("Peripheral = %d, ", _prph_count);
1052-
Serial.printf("Central = %d ", _central_count);
1053-
Serial.println();
1052+
logger.printf(title_fmt, "Max Connections");
1053+
logger.printf("Peripheral = %d, ", _prph_count);
1054+
logger.printf("Central = %d ", _central_count);
1055+
logger.println();
10541056

10551057
// Address
1056-
Serial.printf(title_fmt, "Address");
1058+
logger.printf(title_fmt, "Address");
10571059
{
10581060
char const * type_str[] = { "Public", "Static", "Private Resolvable", "Private Non Resolvable" };
10591061
ble_gap_addr_t gap_addr = this->getAddr();
10601062

10611063
// MAC is in little endian --> print reverse
1062-
Serial.printBufferReverse(gap_addr.addr, 6, ':');
1063-
Serial.printf(" (%s)", type_str[gap_addr.addr_type]);
1064+
logger.printBufferReverse(gap_addr.addr, 6, ':');
1065+
logger.printf(" (%s)", type_str[gap_addr.addr_type]);
10641066
}
1065-
Serial.println();
1067+
logger.println();
10661068

10671069
// Tx Power
1068-
Serial.printf(title_fmt, "TX Power");
1069-
Serial.printf("%d dBm", _tx_power);
1070-
Serial.println();
1070+
logger.printf(title_fmt, "TX Power");
1071+
logger.printf("%d dBm", _tx_power);
1072+
logger.println();
10711073

1072-
Periph.printInfo();
1074+
logger.printInfo();
10731075

10741076
/*------------- List the paried device -------------*/
10751077
if ( _prph_count )
10761078
{
1077-
Serial.printf(title_fmt, "Peripheral Paired Devices");
1078-
Serial.println();
1079+
logger.printf(title_fmt, "Peripheral Paired Devices");
1080+
logger.println();
10791081
bond_print_list(BLE_GAP_ROLE_PERIPH);
10801082
}
10811083

10821084
if ( _central_count )
10831085
{
1084-
Serial.printf(title_fmt, "Central Paired Devices");
1085-
Serial.println();
1086+
logger.printf(title_fmt, "Central Paired Devices");
1087+
logger.println();
10861088
bond_print_list(BLE_GAP_ROLE_CENTRAL);
10871089
}
10881090

1089-
Serial.println();
1091+
logger.println();
10901092
}

0 commit comments

Comments
 (0)