me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #2048 from Ralim/pinecilv2-i2c-rework"
Some checks failed
Docs / deploy-docs (push) Has been cancelled
Details
CI / build (MHP30) (push) Has been cancelled
Details
CI / tests (push) Has been cancelled
Details
CI / build (Pinecil) (push) Has been cancelled
Details
CI / build (Pinecilv2) (push) Has been cancelled
Details
CI / build (S60) (push) Has been cancelled
Details
CI / build (S60P) (push) Has been cancelled
Details
CI / build (T55) (push) Has been cancelled
Details
CI / build (TS100) (push) Has been cancelled
Details
CI / check_c-cpp (push) Has been cancelled
Details
CI / build (TS101) (push) Has been cancelled
Details
CI / build (TS80) (push) Has been cancelled
Details
CI / build (TS80P) (push) Has been cancelled
Details
CI / build_multi-lang (Pinecil) (push) Has been cancelled
Details
CI / build_multi-lang (Pinecilv2) (push) Has been cancelled
Details
CI / check_python (push) Has been cancelled
Details
CI / check_shell (push) Has been cancelled
Details
CI / check_docs (push) Has been cancelled
Details
CI / upload_metadata (push) Has been cancelled
Details

Browse Source 
This reverts commit b401dc8264, reversing
changes made to 42fb9e1105.
This commit is contained in:
Ben V. Brown
2025-01-11 12:46:32 +11:00
parent b401dc8264
commit fd91cf9f35
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Core/BSP/Pinecilv2/I2C_Wrapper.cpp
View File

@@ -40,7 +40,10 @@ bool FRToSI2C::Mem_Read(uint16_t DevAddress, uint16_t read_address, uint8_t *p_b
i2cCfg.data = p_buffer;
i2cCfg.subAddrSize = 1; // one byte address
taskENTER_CRITICAL();
/* --------------- */
err = I2C_MasterReceiveBlocking(I2C0_ID, &i2cCfg);
taskEXIT_CRITICAL();
bool res = err == SUCCESS;
if (!res) {
I2C_Unstick();
@@ -62,7 +65,10 @@ bool FRToSI2C::Mem_Write(uint16_t DevAddress, uint16_t MemAddress, uint8_t *p_bu
i2cCfg.data = p_buffer;
i2cCfg.subAddrSize = 1; // one byte address
taskENTER_CRITICAL();
/* --------------- */
err = I2C_MasterSendBlocking(I2C0_ID, &i2cCfg);
taskEXIT_CRITICAL();
bool res = err == SUCCESS;
if (!res) {
I2C_Unstick();

2
source/Core/Threads/UI/logic/utils/SolderingCommon.cpp
View File

@@ -39,6 +39,8 @@ bool checkExitSoldering(void) {
}
#endif
// If we have tripped thermal runaway, turn off heater and show warning
return false;
}