From 218d81fc60128d2f1a581d70cd72e772a3f37149 Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Tue, 8 Dec 2015 15:28:33 -0800 Subject: [PATCH] Rename all the app .cpp/.hpp to have app name first. Larger refactoring of filenames and namespaces imminent! --- firmware/application/Makefile | 10 +++++----- firmware/application/{app_ais.cpp => ais_app.cpp} | 2 +- firmware/application/{app_ais.hpp => ais_app.hpp} | 6 +++--- .../{app_analog_audio.cpp => analog_audio_app.cpp} | 2 +- .../{app_analog_audio.hpp => analog_audio_app.hpp} | 6 +++--- firmware/application/{app_ert.cpp => ert_app.cpp} | 2 +- firmware/application/{app_ert.hpp => ert_app.hpp} | 6 +++--- ...spectrum_analysis.cpp => spectrum_analysis_app.cpp} | 2 +- ...spectrum_analysis.hpp => spectrum_analysis_app.hpp} | 6 +++--- firmware/application/{app_tpms.cpp => tpms_app.cpp} | 2 +- firmware/application/{app_tpms.hpp => tpms_app.hpp} | 6 +++--- firmware/application/ui_receiver.cpp | 10 +++++----- 12 files changed, 30 insertions(+), 30 deletions(-) rename firmware/application/{app_ais.cpp => ais_app.cpp} (99%) rename firmware/application/{app_ais.hpp => ais_app.hpp} (98%) rename firmware/application/{app_analog_audio.cpp => analog_audio_app.cpp} (97%) rename firmware/application/{app_analog_audio.hpp => analog_audio_app.hpp} (92%) rename firmware/application/{app_ert.cpp => ert_app.cpp} (99%) rename firmware/application/{app_ert.hpp => ert_app.hpp} (97%) rename firmware/application/{app_spectrum_analysis.cpp => spectrum_analysis_app.cpp} (96%) rename firmware/application/{app_spectrum_analysis.hpp => spectrum_analysis_app.hpp} (90%) rename firmware/application/{app_tpms.cpp => tpms_app.cpp} (99%) rename firmware/application/{app_tpms.hpp => tpms_app.hpp} (94%) diff --git a/firmware/application/Makefile b/firmware/application/Makefile index 403056dd9..6b75b8a3b 100755 --- a/firmware/application/Makefile +++ b/firmware/application/Makefile @@ -168,12 +168,12 @@ CPPSRC = main.cpp \ ui_spectrum.cpp \ receiver_model.cpp \ spectrum_color_lut.cpp \ - app_analog_audio.cpp \ + analog_audio_app.cpp \ ais_baseband.cpp \ - app_ais.cpp \ - app_tpms.cpp \ - app_ert.cpp \ - app_spectrum_analysis.cpp \ + ais_app.cpp \ + tpms_app.cpp \ + ert_app.cpp \ + spectrum_analysis_app.cpp \ sd_card.cpp \ log_file.cpp \ manchester.cpp \ diff --git a/firmware/application/app_ais.cpp b/firmware/application/ais_app.cpp similarity index 99% rename from firmware/application/app_ais.cpp rename to firmware/application/ais_app.cpp index ca2545e7a..4abeeb60a 100644 --- a/firmware/application/app_ais.cpp +++ b/firmware/application/ais_app.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include "app_ais.hpp" +#include "ais_app.hpp" #include "portapack.hpp" using namespace portapack; diff --git a/firmware/application/app_ais.hpp b/firmware/application/ais_app.hpp similarity index 98% rename from firmware/application/app_ais.hpp rename to firmware/application/ais_app.hpp index 3f2cad3f3..1143366b3 100644 --- a/firmware/application/app_ais.hpp +++ b/firmware/application/ais_app.hpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __APP_AIS_H__ -#define __APP_AIS_H__ +#ifndef __AIS_APP_H__ +#define __AIS_APP_H__ #include "ui_console.hpp" #include "message.hpp" @@ -190,4 +190,4 @@ private: } /* namespace ui */ -#endif/*__APP_AIS_H__*/ +#endif/*__AIS_APP_H__*/ diff --git a/firmware/application/app_analog_audio.cpp b/firmware/application/analog_audio_app.cpp similarity index 97% rename from firmware/application/app_analog_audio.cpp rename to firmware/application/analog_audio_app.cpp index 185ce7807..f5ec76cff 100644 --- a/firmware/application/app_analog_audio.cpp +++ b/firmware/application/analog_audio_app.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include "app_analog_audio.hpp" +#include "analog_audio_app.hpp" #include "portapack.hpp" using namespace portapack; diff --git a/firmware/application/app_analog_audio.hpp b/firmware/application/analog_audio_app.hpp similarity index 92% rename from firmware/application/app_analog_audio.hpp rename to firmware/application/analog_audio_app.hpp index 1303a05e8..20703094e 100644 --- a/firmware/application/app_analog_audio.hpp +++ b/firmware/application/analog_audio_app.hpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __APP_ANALOG_AUDIO_H__ -#define __APP_ANALOG_AUDIO_H__ +#ifndef __ANALOG_AUDIO_APP_H__ +#define __ANALOG_AUDIO_APP_H__ #include "receiver_model.hpp" #include "ui_spectrum.hpp" @@ -46,4 +46,4 @@ private: } /* namespace ui */ -#endif/*__APP_ANALOG_AUDIO_H__*/ +#endif/*__ANALOG_AUDIO_APP_H__*/ diff --git a/firmware/application/app_ert.cpp b/firmware/application/ert_app.cpp similarity index 99% rename from firmware/application/app_ert.cpp rename to firmware/application/ert_app.cpp index 28c17b541..8fb1e9924 100644 --- a/firmware/application/app_ert.cpp +++ b/firmware/application/ert_app.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include "app_ert.hpp" +#include "ert_app.hpp" #include "portapack.hpp" using namespace portapack; diff --git a/firmware/application/app_ert.hpp b/firmware/application/ert_app.hpp similarity index 97% rename from firmware/application/app_ert.hpp rename to firmware/application/ert_app.hpp index e35c7d3aa..301475ea5 100644 --- a/firmware/application/app_ert.hpp +++ b/firmware/application/ert_app.hpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __APP_ERT_H__ -#define __APP_ERT_H__ +#ifndef __ERT_APP_H__ +#define __ERT_APP_H__ #include "ui_console.hpp" #include "message.hpp" @@ -112,4 +112,4 @@ private: } /* namespace ui */ -#endif/*__APP_ERT_H__*/ +#endif/*__ERT_APP_H__*/ diff --git a/firmware/application/app_spectrum_analysis.cpp b/firmware/application/spectrum_analysis_app.cpp similarity index 96% rename from firmware/application/app_spectrum_analysis.cpp rename to firmware/application/spectrum_analysis_app.cpp index 6da566653..de3a14b0c 100644 --- a/firmware/application/app_spectrum_analysis.cpp +++ b/firmware/application/spectrum_analysis_app.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include "app_spectrum_analysis.hpp" +#include "spectrum_analysis_app.hpp" #include "portapack.hpp" using namespace portapack; diff --git a/firmware/application/app_spectrum_analysis.hpp b/firmware/application/spectrum_analysis_app.hpp similarity index 90% rename from firmware/application/app_spectrum_analysis.hpp rename to firmware/application/spectrum_analysis_app.hpp index d725c198c..9e8196af9 100644 --- a/firmware/application/app_spectrum_analysis.hpp +++ b/firmware/application/spectrum_analysis_app.hpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __APP_SPECTRUM_ANALYSIS_H__ -#define __APP_SPECTRUM_ANALYSIS_H__ +#ifndef __SPECTRUM_ANALYSIS_APP_H__ +#define __SPECTRUM_ANALYSIS_APP_H__ #include "receiver_model.hpp" #include "ui_spectrum.hpp" @@ -41,4 +41,4 @@ private: } /* namespace ui */ -#endif/*__APP_SPECTRUM_ANALYSIS_H__*/ +#endif/*__SPECTRUM_ANALYSIS_APP_H__*/ diff --git a/firmware/application/app_tpms.cpp b/firmware/application/tpms_app.cpp similarity index 99% rename from firmware/application/app_tpms.cpp rename to firmware/application/tpms_app.cpp index 25d1cacff..3ac2ba85e 100644 --- a/firmware/application/app_tpms.cpp +++ b/firmware/application/tpms_app.cpp @@ -19,7 +19,7 @@ * Boston, MA 02110-1301, USA. */ -#include "app_tpms.hpp" +#include "tpms_app.hpp" #include "portapack.hpp" using namespace portapack; diff --git a/firmware/application/app_tpms.hpp b/firmware/application/tpms_app.hpp similarity index 94% rename from firmware/application/app_tpms.hpp rename to firmware/application/tpms_app.hpp index 962129f08..37fb2542b 100644 --- a/firmware/application/app_tpms.hpp +++ b/firmware/application/tpms_app.hpp @@ -19,8 +19,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __APP_TPMS_H__ -#define __APP_TPMS_H__ +#ifndef __TPMS_APP_H__ +#define __TPMS_APP_H__ #include "ui_console.hpp" #include "message.hpp" @@ -53,4 +53,4 @@ private: } /* namespace ui */ -#endif/*__APP_TPMS_H__*/ +#endif/*__TPMS_APP_H__*/ diff --git a/firmware/application/ui_receiver.cpp b/firmware/application/ui_receiver.cpp index 78682d142..d540b2103 100644 --- a/firmware/application/ui_receiver.cpp +++ b/firmware/application/ui_receiver.cpp @@ -26,11 +26,11 @@ using namespace portapack; #include "string_format.hpp" -#include "app_analog_audio.hpp" -#include "app_ais.hpp" -#include "app_tpms.hpp" -#include "app_ert.hpp" -#include "app_spectrum_analysis.hpp" +#include "analog_audio_app.hpp" +#include "ais_app.hpp" +#include "tpms_app.hpp" +#include "ert_app.hpp" +#include "spectrum_analysis_app.hpp" namespace ui {