sync with upstream

MK/module/flowmeter/flowmeter.cpp

-/*
-  flowmeter.cpp - Flowmeter control library for Arduino - Version 1
-  Copyright (c) 2016 Franco (nextime) Lanza.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "../../base.h"
-#include <Arduino.h>
-
-
-#if ENABLED(FLOWMETER_SENSOR)
-
-volatile int flowrate_pulsecount;  
-float flowrate;
-static millis_t flowmeter_timer = 0;
-static millis_t lastflow = 0;
-void flowrate_pulsecounter();
-
-void flow_init() {
-
-   flowrate = 0;
-   flowrate_pulsecount = 0;
-   pinMode(FLOWMETER_PIN, INPUT);
-   
-   attachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN), flowrate_pulsecounter, FALLING);
-}
-
-void flowrate_manage() {
-   millis_t  now;
-   now = millis();
-   if(ELAPSED(now, flowmeter_timer)) {
-      detachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN));
-      flowrate  = (float)(((1000.0 / (float)((float)now - (float)lastflow)) * (float)flowrate_pulsecount) / (float)FLOWMETER_CALIBRATION);
-      #if ENABLED(FLOWMETER_DEBUG)
-         ECHO_M(" FLOWMETER DEBUG ");
-         ECHO_MV(" flowrate:", flowrate);
-         ECHO_MV(" flowrate_pulsecount:", flowrate_pulsecount);
-         ECHO_MV(" CALIBRATION:", FLOWMETER_CALIBRATION);
-         ECHO_E;
-      #endif
-      flowmeter_timer = now + 1000UL;
-      lastflow = now;
-      flowrate_pulsecount = 0;
-      attachInterrupt(digitalPinToInterrupt(FLOWMETER_PIN), flowrate_pulsecounter, FALLING);
-
-   }
-
-}
-
-float get_flowrate() {
-   return flowrate;
-}
-
-void flowrate_pulsecounter()
-{
-  // Increment the pulse counter
-  flowrate_pulsecount++;
-}
-
-#endif // FLOWMETER_SENSOR
-

MK/module/flowmeter/flowmeter.h

-/* 
-  flowmeter.h - Flowmeter control library for Arduino - Version 1
-  Copyright (c) 2016 Franco (nextime) Lanza.  All right reserved.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 3 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-#ifndef FLOWMETER_H
-#define FLOWMETER_H
-
-#define FLOWMETER_CALIBRATION (FLOWMETER_MAXFREQ/FLOWMETER_MAXFLOW)
-
-#if ENABLED(FLOWMETER_SENSOR)
-void flowrate_manage();
-void flow_init();
-float get_flowrate();
-#endif
-
-
-#endif // FLOWMETER_H

MK/module/lcd/dogm_lcd_implementation.h

@@ -484,7 +484,6 @@ static void lcd_implementation_status_screen() {
     #endif
   #endif // !LASERBEAM
 
-  #endif // DISABLED LASER
   // Fan
   u8g.setPrintPos(104, 27);
   #if HAS(FAN)