Merge remote-tracking branch 'origin/master'

This commit is contained in:
Vadim Furman
2021-03-17 10:49:04 -07:00
41 changed files with 2467 additions and 156 deletions

View File

@@ -225,7 +225,8 @@ void NRF52Bluetooth::setup()
// Configure and Start the Device Information Service
DEBUG_MSG("Configuring the Device Information Service\n");
bledis.setManufacturer(HW_VENDOR);
// FIXME, we should set a mfg string based on our HW_VENDOR enum
// bledis.setManufacturer(HW_VENDOR);
bledis.setModel(optstr(HW_VERSION));
bledis.setFirmwareRev(optstr(APP_VERSION));
bledis.begin();