Skip to content

Commit

Permalink
Merge pull request #13 from CofinCup/master
Browse files Browse the repository at this point in the history
[project] Fix compilation issues in Linux env: filename case sensitivity in Linux.
  • Loading branch information
SmallPond authored May 22, 2023
2 parents 8594074 + 83e928c commit 6f8c02f
Show file tree
Hide file tree
Showing 59 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Accounts/ACT_Motor.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Account_Master.h"
#include "HAL/HAL.h"
#include "hal/hal.h"
#include "app/Configs/Config.h"

using namespace AccountSystem;
Expand Down
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Accounts/ACT_SysConfig.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Account_Master.h"
#include "HAL/HAL.h"
#include "hal/hal.h"
#include "app/Configs/Config.h"

using namespace AccountSystem;
Expand Down
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Accounts/Account_Master.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "Account_Master.h"
#include "HAL/HAL.h"
#include "hal/hal.h"

static AccountBroker dataCenter("MASTER");

Expand Down
4 changes: 2 additions & 2 deletions 1.Firmware/src/app/Pages/StartUp/StartUp.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef __STARTUP_PRESENTER_H
#define __STARTUP_PRESENTER_H

#include "StartupView.h"
#include "StartupModel.h"
#include "StartUpView.h"
#include "StartUpModel.h"

namespace Page
{
Expand Down
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Pages/StartUp/StartUpModel.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "StartupModel.h"
#include "StartUpModel.h"

using namespace Page;

Expand Down
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Pages/StartUp/StartUpModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define __STARTUP_MODEL_H

#include "app/Accounts/Account_Master.h"
#include "HAL/HAL.h"
#include "hal/hal.h"

namespace Page
{
Expand Down
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Pages/StartUp/StartUpView.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "StartupView.h"
#include "StartUpView.h"

using namespace Page;

Expand Down
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/Pages/StatusBar/StatusBar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/
#include "StatusBar.h"
#include "app/Accounts/Account_Master.h"
#include "HAL/HAL.h"
#include "hal/hal.h"

#define BATT_USAGE_HEIGHT (lv_obj_get_style_height(ui.battery.img, 0) - 6)
#define BATT_USAGE_WIDTH (lv_obj_get_style_width(ui.battery.img, 0) - 4)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion 1.Firmware/src/app/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "App.h"
#include "app.h"
#include "hal/hal.h"
#include "Utils/PageManager/PageManager.h"
#include "Accounts/Account_Master.h"
Expand Down

0 comments on commit 6f8c02f

Please sign in to comment.