@@ -9,38 +9,38 @@ SettingsMenu::SettingsMenu(shared_ptr<Config> config)
99{
1010 int i = 0 ;
1111 // frequency
12- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraFreqStepItem ( config, ++i) ));
13- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraFreqRxItem ( config, ++i) ));
14- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraFreqTxItem ( config, ++i) ));
15- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraPowerItem ( config, ++i) ));
12+ items_.push_back (make_shared<SettingsLoraFreqStepItem>( config, ++i));
13+ items_.push_back (make_shared<SettingsLoraFreqRxItem>( config, ++i));
14+ items_.push_back (make_shared<SettingsLoraFreqTxItem>( config, ++i));
15+ items_.push_back (make_shared<SettingsLoraPowerItem>( config, ++i));
1616 // modulation, codec
17- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsModType ( config, ++i) ));
18- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioCodec ( config, ++i) ));
17+ items_.push_back (make_shared<SettingsModType>( config, ++i));
18+ items_.push_back (make_shared<SettingsAudioCodec>( config, ++i));
1919 // codec2
20- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioCodec2ModeItem ( config, ++i) ));
21- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioMaxPktSizeItem ( config, ++i) ));
20+ items_.push_back (make_shared<SettingsAudioCodec2ModeItem>( config, ++i));
21+ items_.push_back (make_shared<SettingsAudioMaxPktSizeItem>( config, ++i));
2222 // opus
23- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioOpusRate ( config, ++i) ));
24- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioOpusPcmLen ( config, ++i) ));
23+ items_.push_back (make_shared<SettingsAudioOpusRate>( config, ++i));
24+ items_.push_back (make_shared<SettingsAudioOpusPcmLen>( config, ++i));
2525 // audio
26- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioVolItem ( config, ++i) ));
27- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsAudioEnablePrivacy ( config, ++i) ));
26+ items_.push_back (make_shared<SettingsAudioVolItem>( config, ++i));
27+ items_.push_back (make_shared<SettingsAudioEnablePrivacy>( config, ++i));
2828 // lora
29- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraBwItem ( config, ++i) ));
30- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraSfItem ( config, ++i) ));
31- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsLoraCrItem ( config, ++i) ));
29+ items_.push_back (make_shared<SettingsLoraBwItem>( config, ++i));
30+ items_.push_back (make_shared<SettingsLoraSfItem>( config, ++i));
31+ items_.push_back (make_shared<SettingsLoraCrItem>( config, ++i));
3232 // fsk
33- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsFskBitRate ( config, ++i) ));
34- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsFskFreqDev ( config, ++i) ));
35- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsFskRxBw ( config, ++i) ));
36- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsFskShaping ( config, ++i) ));
33+ items_.push_back (make_shared<SettingsFskBitRate>( config, ++i));
34+ items_.push_back (make_shared<SettingsFskFreqDev>( config, ++i));
35+ items_.push_back (make_shared<SettingsFskRxBw>( config, ++i));
36+ items_.push_back (make_shared<SettingsFskShaping>( config, ++i));
3737 // other
38- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsBatteryMonCalItem ( config, ++i) ));
39- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsPmLightSleepAfterMsItem ( config, ++i) ));
40- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsSaveItem ( config, ++i) ));
41- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsResetItem ( config, ++i) ));
42- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsRebootItem ( config, ++i) ));
43- items_.push_back (shared_ptr<SettingsMenuItem>( new SettingsInfoItem ( config, ++i) ));
38+ items_.push_back (make_shared<SettingsBatteryMonCalItem>( config, ++i));
39+ items_.push_back (make_shared<SettingsPmLightSleepAfterMsItem>( config, ++i));
40+ items_.push_back (make_shared<SettingsSaveItem>( config, ++i));
41+ items_.push_back (make_shared<SettingsResetItem>( config, ++i));
42+ items_.push_back (make_shared<SettingsRebootItem>( config, ++i));
43+ items_.push_back (make_shared<SettingsInfoItem>( config, ++i));
4444}
4545
4646void SettingsMenu::draw (shared_ptr<Adafruit_SSD1306> display)
0 commit comments