diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-08-28 13:08:50 (GMT) |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-08-28 13:08:50 (GMT) |
| commit | 45e7638fc23c260fa743a04e78873b22189e0597 (patch) | |
| tree | da7aeddc1188e6a6b96be01c7b19552c54659988 /src/main.cpp | |
| parent | 969de9a8bccfa97da29de2eac61be9325dd2fdaa (diff) | |
| parent | 40392d7b9199c87de9784cacb1dee5476e5a5b6f (diff) | |
Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime into Riksu9000-twimaster_rework
# Conflicts:
# src/systemtask/SystemTask.cpp
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 768389e..79e2ad8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -84,8 +84,7 @@ Pinetime::Drivers::SpiNorFlash spiNorFlash {flashSpi}; // respecting correct timings. According to erratas heet, this magic value makes it run // at ~390Khz with correct timings. static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000}; -Pinetime::Drivers::TwiMaster twiMaster {Pinetime::Drivers::TwiMaster::Modules::TWIM1, - Pinetime::Drivers::TwiMaster::Parameters {MaxTwiFrequencyWithoutHardwareBug, pinTwiSda, pinTwiScl}}; +Pinetime::Drivers::TwiMaster twiMaster {NRF_TWIM1, MaxTwiFrequencyWithoutHardwareBug, pinTwiSda, pinTwiScl}; Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress}; #ifdef PINETIME_IS_RECOVERY static constexpr bool isFactory = true; |