Refactor

Author: sh123

include/audio/audio_codec.h

@@ -4,12 +4,14 @@
 #include <memory>
 #include "settings/config.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class AudioCodec {
 
 public:
-  virtual bool start(std::shared_ptr<const Config> config) = 0;
+  virtual bool start(shared_ptr<const Config> config) = 0;
   virtual void stop() = 0;
 
   virtual int encode(uint8_t *encodedOut, int16_t *pcmIn) = 0;

include/audio/audio_codec_opus.h

@@ -4,14 +4,16 @@
 #include <opus.h>
 #include "audio/audio_codec.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class AudioCodecOpus : public AudioCodec {
 
 public:
   AudioCodecOpus();
 
-  virtual bool start(std::shared_ptr<const Config> config) override;
+  virtual bool start(shared_ptr<const Config> config) override;
   virtual void stop() override;
 
   virtual int encode(uint8_t *encodedOut, int16_t *pcmIn) override;

include/audio/audio_task.h

@@ -11,16 +11,18 @@
 #include "audio/audio_codec.h"
 #include "utils/dsp.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class RadioTask;
 
 class AudioTask {
 
 public:
-  explicit AudioTask(std::shared_ptr<const Config> config, std::shared_ptr<PmService> pmService);
+  explicit AudioTask(shared_ptr<const Config> config, shared_ptr<PmService> pmService);
 
-  void start(std::shared_ptr<RadioTask> radioTask);
+  void start(shared_ptr<RadioTask> radioTask);
   inline void stop() { isRunning_ = false; }
   bool loop();
 
@@ -64,17 +66,17 @@ class AudioTask {
   void playTimer();
 
 private:
-  std::shared_ptr<const Config> config_;
+  shared_ptr<const Config> config_;
   TaskHandle_t audioTaskHandle_;
 
-  std::shared_ptr<RadioTask> radioTask_;
-  std::shared_ptr<PmService> pmService_;
+  shared_ptr<RadioTask> radioTask_;
+  shared_ptr<PmService> pmService_;
 
   Timer<1> playTimer_;
   Timer<1>::Task playTimerTask_;
 
-  std::shared_ptr<Dsp> dsp_;
-  std::shared_ptr<AudioCodec> audioCodec_;
+  shared_ptr<Dsp> dsp_;
+  shared_ptr<AudioCodec> audioCodec_;
 
   int16_t *pcmFrameBuffer_;
   int16_t *pcmResampleBuffer_;

include/hal/hw_monitor.h

@@ -5,17 +5,19 @@
 #include <memory>
 #include "settings/config.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class HwMonitor {
 
 public:
-  HwMonitor(std::shared_ptr<const Config> config);
+  HwMonitor(shared_ptr<const Config> config);
 
   float getBatteryVoltage() const;
 
 private:
-  std::shared_ptr<const Config> config_;
+  shared_ptr<const Config> config_;
 
 };
 

include/hal/pm_service.h

@@ -8,12 +8,14 @@
 
 #include "settings/config.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class PmService {
 
 public:
-  PmService(std::shared_ptr<const Config> config, std::shared_ptr<Adafruit_SSD1306> display);
+  PmService(shared_ptr<const Config> config, shared_ptr<Adafruit_SSD1306> display);
 
   void setup();
   bool loop();
@@ -26,8 +28,8 @@ class PmService {
   esp_sleep_wakeup_cause_t lightSleepWait(uint64_t sleepTimeUs) const;
 
 private:
-  std::shared_ptr<const Config> config_;
-  std::shared_ptr<Adafruit_SSD1306> display_;
+  shared_ptr<const Config> config_;
+  shared_ptr<Adafruit_SSD1306> display_;
 
   Timer<1> lightSleepTimer_;
   Timer<1>::Task lightSleepTimerTask_;

include/hal/radio_task.h

@@ -13,16 +13,18 @@
 #include "utils/utils.h"
 #include "settings/settings_menu.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class AudioTask;
 
 class RadioTask {
 
 public:
-  explicit RadioTask(std::shared_ptr<const Config> config);
+  explicit RadioTask(shared_ptr<const Config> config);
 
-  void start(std::shared_ptr<AudioTask> audioTask);
+  void start(shared_ptr<AudioTask> audioTask);
   inline void stop() { isRunning_ = false; }
   bool loop();
 
@@ -68,13 +70,13 @@ class RadioTask {
   void rigTaskStartTransmit();
 
 private:
-  std::shared_ptr<const Config> config_;
+  shared_ptr<const Config> config_;
 
-  std::shared_ptr<MODULE_NAME> radioModule_;
-  std::shared_ptr<AudioTask> audioTask_;
+  shared_ptr<MODULE_NAME> radioModule_;
+  shared_ptr<AudioTask> audioTask_;
 
   uint8_t iv_[CfgIvSize];
-  std::shared_ptr<ChaCha> cipher_;
+  shared_ptr<ChaCha> cipher_;
 
   static TaskHandle_t loraTaskHandle_;
 

include/service.h

@@ -22,12 +22,14 @@
 #include "hal/hw_monitor.h"
 #include "settings/settings_menu.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class Service {
 
 public:
-  Service(std::shared_ptr<Config> conf);
+  Service(shared_ptr<Config> conf);
 
   void setup();
   void loop();
@@ -51,18 +53,18 @@ class Service {
   bool processRotaryEncoder();
 
 private:
-  std::shared_ptr<Config> config_;
+  shared_ptr<Config> config_;
 
-  std::shared_ptr<Adafruit_SSD1306> display_;
-  static std::shared_ptr<AiEsp32RotaryEncoder> rotaryEncoder_;
+  shared_ptr<Adafruit_SSD1306> display_;
+  static shared_ptr<AiEsp32RotaryEncoder> rotaryEncoder_;
 
-  std::shared_ptr<PmService> pmService_;
-  std::shared_ptr<HwMonitor> hwMonitor_;
+  shared_ptr<PmService> pmService_;
+  shared_ptr<HwMonitor> hwMonitor_;
 
-  std::shared_ptr<RadioTask> radioTask_;
-  std::shared_ptr<AudioTask> audioTask_;
+  shared_ptr<RadioTask> radioTask_;
+  shared_ptr<AudioTask> audioTask_;
 
-  std::shared_ptr<SettingsMenu> settingsMenu_;
+  shared_ptr<SettingsMenu> settingsMenu_;
 
   // other
   volatile bool btnPressed_;

include/settings/settings_menu.h

@@ -14,22 +14,24 @@
 #include "hal/radio_task.h"
 #include "utils/utils.h"
 
+using namespace std;
+
 namespace LoraDv {
 
 class SettingsMenu {
 public:
-  SettingsMenu(std::shared_ptr<Config> config);
+  SettingsMenu(shared_ptr<Config> config);
 
-  void draw(std::shared_ptr<Adafruit_SSD1306> display);
+  void draw(shared_ptr<Adafruit_SSD1306> display);
 
   void onEncoderPositionChanged(int delta);
   void onEncoderButtonClicked();
 
 private:
   bool isValueSelected_;
   int selectedMenuItemIndex_;
-  std::shared_ptr<Config> config_;
-  std::vector<std::shared_ptr<SettingsMenuItem>> items_; // Updated type
+  shared_ptr<Config> config_;
+  vector<shared_ptr<SettingsMenuItem>> items_; // Updated type
 };
 
 } // LoraDv