watering.h

/*#define WATR_MIN 1000
#define WATR_MAX 3000*/
#define BCHECK_INT 10

void blockcheck();

void waterstopper() {
	if(/*!wforcestopped &&*/ !digitalRead(MOT_HLD) && !powerhold) return;

	#ifdef DEBUG
		Serial.println("Pump is now stopping! Motion resuming in FWD direction!");
		/*Serial.print("\tTimeout Expired: ");
		Serial.println(wforcestopped?"1":"0");*/
		Serial.print("\tESP hold released: ");
		Serial.println(digitalRead(MOT_HLD)?"1":"0");
		Serial.print("\tPower hold: ");
		Serial.println(digitalRead(powerhold)?"1":"0");
	#endif

	// Reset motion and pump
	//motion=HLT;	 // Let 'ultracheck' deal with motion while resuming

	digitalWrite(SOL_CTL,0);

	// Restore natural behaviour for 'ultracheck'
	//prevmotion=FWD;
	//shortwaitstart=millis();

	// Restart original timed tasks
	//uchecker=t.every(UCHECK_INT,ultracheck,0);
	t.stop(bchecker);
	bchecker=t.every(BCHECK_INT,blockcheck,0);
}

void blockcheck() {
	if(digitalRead(MOT_HLD) || motion==REV) return;

	#ifdef DEBUG
		Serial.println("Motion hold encountered!");
		//Serial.println("Stopping motion, starting pump...");
		Serial.println("Slowing down motor, starting pump...");
	#endif

	// Start pump, stop motion
	digitalWrite(SOL_CTL,1);
	//motion=HLT;
	analogWrite(RMOT_R,MAX_SPEED-30);
	analogWrite(RMOT_F,0);
	analogWrite(FMOT_R,MAX_SPEED-30);
	analogWrite(FMOT_F,0);

	// Stop motion-related timed tasks
	//t.stop(uchecker);
	t.stop(bchecker);
	bchecker=t.every(BCHECK_INT,waterstopper,0);
}