bad rebase - duplicate pthread_mutex_init in main()

ballle98 / AqualinkD

Daemon to control Jandy Aqualink RS pool equipment from any home automation hub (Alexa, Homekit & Siri, Home Assistant, smartthings, domoticz etc) or web browser.

Other

6 stars 2 forks source link

bad rebase - duplicate pthread_mutex_init in main() #43

Open ballle98 opened 5 years ago

ballle98 commented 5 years ago

@@ -1047,9 +1055,6 @@ void main_loop() _aqualink_data.battery = OK; _aqualink_data.open_websockets = 0;

pthread_mutex_init(&_aqualink_data.active_thread.thread_mutex, NULL);
pthread_cond_init(&_aqualink_data.active_thread.thread_cond, NULL);
for (i=0; i < MAX_PUMPS; i++) { _aqualink_data.pumps[i].rpm = TEMP_UNKNOWN; _aqualink_data.pumps[i].gph = TEMP_UNKNOWN;

ballle98 commented 5 years ago

Commit fee1ac7b8b227554c9592825be08a4fe324d09a8

ballle98/AqualinkD#31: mutex init and cond init called multiple times