Urgent fix

henyxia
1 parent 717e403d
Showing 4 changed files with 6 additions and 4 deletions Show diff stats
heat.c
hvc.c
main.c
pump.c
@@ -61,7 +61,8 @@ void resetHeatOk(void)
  
 bool isHeatOk(void)
 {
-	return (tAct > T_STEP_THRESH && tAct < T_HOLD_THRESH);
+	heat_ok = (tAct > T_HOLD_THRESH);
+	return heat_ok;
 }
  
 void* processHeat(void* arg)
@@ -51,12 +51,12 @@ int		tempCons;
  
 void setPumpOn()
 {
-	pumped = 0;
 	setPumpWantedState(true);
 }
  
 void setPumpOff()
 {
+	pumped = 0;
 	setPumpWantedState(false);
 }
  
@@ -142,7 +142,7 @@ void* processHVC(void* we)
  
 	while(!hvcStop)
 	{
-		printx(DEBUG, HVC, "Querying data\n");
+		printx(DEBUG, HVC, "Querying data, with prev PUMP %d\n", pumped);
 		sendData(&hvc_fd, GET_TEMP);
 		data = getData(&hvc_fd);
 		setTemp(data);
@@ -52,6 +52,7 @@ int main(void)
 	pthread_create(&tHeat, NULL, processHeat, NULL);
 	pthread_create(&tPump, NULL, processPump, NULL);
  
+	sleep(20);
 	setVolWanted(1);
 	setCoffeeWanted();
  
@@ -173,7 +173,7 @@ void* processPump(void* arg)
 			}	
 		}	
  
-		usleep(20000);
+		sleep(1);
 	}
  
 	return NULL;