Skip to content

Commit 7a92115

Browse files
mark9064JF002
authored andcommitted
Rename to pre-transaction hook
1 parent 24e6a2f commit 7a92115

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

src/drivers/Spi.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Spi::Spi(SpiMaster& spiMaster, uint8_t pinCsn) : spiMaster {spiMaster}, pinCsn {
99
nrf_gpio_pin_set(pinCsn);
1010
}
1111

12-
bool Spi::Write(const uint8_t* data, size_t size, const std::function<void()>& transactionHook) {
13-
return spiMaster.Write(pinCsn, data, size, transactionHook);
12+
bool Spi::Write(const uint8_t* data, size_t size, const std::function<void()>& preTransactionHook) {
13+
return spiMaster.Write(pinCsn, data, size, preTransactionHook);
1414
}
1515

1616
bool Spi::Read(uint8_t* cmd, size_t cmdSize, uint8_t* data, size_t dataSize) {

src/drivers/Spi.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace Pinetime {
1515
Spi& operator=(Spi&&) = delete;
1616

1717
bool Init();
18-
bool Write(const uint8_t* data, size_t size, const std::function<void()>& transactionHook);
18+
bool Write(const uint8_t* data, size_t size, const std::function<void()>& preTransactionHook);
1919
bool Read(uint8_t* cmd, size_t cmdSize, uint8_t* data, size_t dataSize);
2020
bool WriteCmdAndBuffer(const uint8_t* cmd, size_t cmdSize, const uint8_t* data, size_t dataSize);
2121
void Sleep();

src/drivers/SpiMaster.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void SpiMaster::PrepareRx(const uint32_t bufferAddress, const size_t size) {
167167
spiBaseAddress->EVENTS_END = 0;
168168
}
169169

170-
bool SpiMaster::Write(uint8_t pinCsn, const uint8_t* data, size_t size, const std::function<void()>& transactionHook) {
170+
bool SpiMaster::Write(uint8_t pinCsn, const uint8_t* data, size_t size, const std::function<void()>& preTransactionHook) {
171171
if (data == nullptr)
172172
return false;
173173
auto ok = xSemaphoreTake(mutex, portMAX_DELAY);
@@ -181,8 +181,8 @@ bool SpiMaster::Write(uint8_t pinCsn, const uint8_t* data, size_t size, const st
181181
DisableWorkaroundForFtpan58(spiBaseAddress, 0, 0);
182182
}
183183

184-
if (transactionHook != nullptr) {
185-
transactionHook();
184+
if (preTransactionHook != nullptr) {
185+
preTransactionHook();
186186
}
187187
nrf_gpio_pin_clear(this->pinCsn);
188188

src/drivers/SpiMaster.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Pinetime {
3232
SpiMaster& operator=(SpiMaster&&) = delete;
3333

3434
bool Init();
35-
bool Write(uint8_t pinCsn, const uint8_t* data, size_t size, const std::function<void()>& transactionHook);
35+
bool Write(uint8_t pinCsn, const uint8_t* data, size_t size, const std::function<void()>& preTransactionHook);
3636
bool Read(uint8_t pinCsn, uint8_t* cmd, size_t cmdSize, uint8_t* data, size_t dataSize);
3737

3838
bool WriteCmdAndBuffer(uint8_t pinCsn, const uint8_t* cmd, size_t cmdSize, const uint8_t* data, size_t dataSize);

src/drivers/St7789.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ void St7789::WriteCommand(const uint8_t* data, size_t size) {
4949
});
5050
}
5151

52-
void St7789::WriteSpi(const uint8_t* data, size_t size, const std::function<void()>& transactionHook) {
53-
spi.Write(data, size, transactionHook);
52+
void St7789::WriteSpi(const uint8_t* data, size_t size, const std::function<void()>& preTransactionHook) {
53+
spi.Write(data, size, preTransactionHook);
5454
}
5555

5656
void St7789::SoftwareReset() {

src/drivers/St7789.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ namespace Pinetime {
4747
void SetVdv();
4848
void WriteCommand(uint8_t cmd);
4949
void WriteCommand(const uint8_t* data, size_t size);
50-
void WriteSpi(const uint8_t* data, size_t size, const std::function<void()>& transactionHook);
50+
void WriteSpi(const uint8_t* data, size_t size, const std::function<void()>& preTransactionHook);
5151

5252
enum class Commands : uint8_t {
5353
SoftwareReset = 0x01,

0 commit comments

Comments
 (0)