mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use type SemaphoreHandle_t where TasAutoMutex is used to silence new compiler warnings

This commit is contained in:
Simon Hailes 2021-09-06 18:52:20 +01:00
parent 7f0df0cd4d
commit 0183376555
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasmota/support.ino
View File

@ -136,20 +136,20 @@ class TasAutoMutex {
int maxWait;
const char *name;
public:
TasAutoMutex(void ** mutex, const char *name = "", int maxWait = 40, bool take=true);
TasAutoMutex(SemaphoreHandle_t* mutex, const char *name = "", int maxWait = 40, bool take=true);
~TasAutoMutex();
void give();
void take();
static void init(void ** ptr);
static void init(SemaphoreHandle_t* ptr);
};
//////////////////////////////////////////
TasAutoMutex::TasAutoMutex(void **mutex, const char *name, int maxWait, bool take) {
TasAutoMutex::TasAutoMutex(SemaphoreHandle_t*mutex, const char *name, int maxWait, bool take) {
if (mutex) {
if (!(*mutex)){
TasAutoMutex::init(mutex);
}
this->mutex = (SemaphoreHandle_t)*mutex;
this->mutex = *mutex;
this->maxWait = maxWait;
this->name = name;
if (take) {
@ -172,9 +172,9 @@ TasAutoMutex::~TasAutoMutex() {
}
}
void TasAutoMutex::init(void ** ptr) {
void TasAutoMutex::init(SemaphoreHandle_t* ptr) {
SemaphoreHandle_t mutex = xSemaphoreCreateRecursiveMutex();
(*ptr) = (void *) mutex;
(*ptr) = mutex;
// needed, else for ESP8266 as we will initialis more than once in logging
// (*ptr) = (void *) 1;
}
@ -2327,7 +2327,7 @@ bool NeedLogRefresh(uint32_t req_loglevel, uint32_t index) {
#ifdef ESP32
// this takes the mutex, and will be release when the class is destroyed -
// i.e. when the functon leaves You CAN call mutex.give() to leave early.
TasAutoMutex mutex(&TasmotaGlobal.log_buffer_mutex);
TasAutoMutex mutex((SemaphoreHandle_t *)&TasmotaGlobal.log_buffer_mutex);
#endif // ESP32
// Skip initial buffer fill
@ -2349,7 +2349,7 @@ bool GetLog(uint32_t req_loglevel, uint32_t* index_p, char** entry_pp, size_t* l
#ifdef ESP32
// this takes the mutex, and will be release when the class is destroyed -
// i.e. when the functon leaves You CAN call mutex.give() to leave early.
TasAutoMutex mutex(&TasmotaGlobal.log_buffer_mutex);
TasAutoMutex mutex((SemaphoreHandle_t *)&TasmotaGlobal.log_buffer_mutex);
#endif // ESP32
if (!index) { // Dump all
@ -2396,7 +2396,7 @@ void AddLogData(uint32_t loglevel, const char* log_data, const char* log_data_pa
#ifdef ESP32
// this takes the mutex, and will be release when the class is destroyed -
// i.e. when the functon leaves You CAN call mutex.give() to leave early.
TasAutoMutex mutex(&TasmotaGlobal.log_buffer_mutex);
TasAutoMutex mutex((SemaphoreHandle_t *)&TasmotaGlobal.log_buffer_mutex);
#endif // ESP32
char mxtime[14]; // "13:45:21.999 "

2
tasmota/xsns_62_esp32_mi_ble.ino
View File

@ -343,7 +343,7 @@ std::vector<mi_sensor_t> MIBLEsensors;
std::vector<mi_bindKey_t> MIBLEbindKeys;
std::vector<MAC_t> MIBLEBlockList;
void *slotmutex = nullptr;
SemaphoreHandle_t slotmutex = (SemaphoreHandle_t) nullptr;
/*********************************************************************************************\
* constants