diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-11-28 13:53:03 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-11-28 13:53:03 +0100 |
commit | 298f0f43357c5fd12c4498d74a35d71a0501ae1a (patch) | |
tree | bdc0d80d48c215d395a7ee69bdd80c66cc8e2159 /src/drivers/Bma421.cpp | |
parent | d5e8e3ca44e998511907d1ec74c98c06c2e542b8 (diff) | |
parent | 3a41bff9eaf9cbae6d3864664ad08859ec2d2c44 (diff) |
Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes
# Conflicts:
# doc/contribute.md
# src/displayapp/screens/BatteryInfo.h
Diffstat (limited to 'src/drivers/Bma421.cpp')
-rw-r--r-- | src/drivers/Bma421.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/Bma421.cpp b/src/drivers/Bma421.cpp index dd284000..2f60f42f 100644 --- a/src/drivers/Bma421.cpp +++ b/src/drivers/Bma421.cpp @@ -1,7 +1,7 @@ +#include "drivers/Bma421.h" #include <libraries/delay/nrf_delay.h> #include <libraries/log/nrf_log.h> -#include "Bma421.h" -#include "TwiMaster.h" +#include "drivers/TwiMaster.h" #include <drivers/Bma421_C/bma423.h> using namespace Pinetime::Drivers; |