2017-02-25 11:15:18 +01:00
|
|
|
/**
|
2016-04-27 03:12:08 +02:00
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
|
|
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program 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 General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2017-09-09 07:18:43 +02:00
|
|
|
#include "../inc/MarlinConfig.h"
|
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
#if DISABLED(PRINTCOUNTER)
|
2017-09-09 07:18:43 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
#include "../libs/stopwatch.h"
|
|
|
|
Stopwatch print_job_timer; // Global Print Job Timer instance
|
2017-09-06 13:28:32 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
#else // PRINTCOUNTER
|
|
|
|
|
|
|
|
#include "printcounter.h"
|
2017-09-06 13:28:32 +02:00
|
|
|
#include "../Marlin.h"
|
2018-08-12 09:50:39 +02:00
|
|
|
#include "../HAL/persistent_store_api.h"
|
2016-04-27 03:12:08 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
PrintCounter print_job_timer; // Global Print Job Timer instance
|
|
|
|
|
|
|
|
printStatistics PrintCounter::data;
|
|
|
|
|
|
|
|
const PrintCounter::promdress PrintCounter::address = STATS_EEPROM_ADDRESS;
|
|
|
|
|
|
|
|
const uint16_t PrintCounter::updateInterval = 10;
|
|
|
|
const uint16_t PrintCounter::saveInterval = 3600;
|
|
|
|
millis_t PrintCounter::lastDuration;
|
|
|
|
bool PrintCounter::loaded = false;
|
|
|
|
|
2016-07-13 04:03:42 +02:00
|
|
|
millis_t PrintCounter::deltaDuration() {
|
2016-04-28 03:30:07 +02:00
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("deltaDuration"));
|
2016-04-28 03:30:07 +02:00
|
|
|
#endif
|
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
millis_t tmp = lastDuration;
|
|
|
|
lastDuration = duration();
|
|
|
|
return lastDuration - tmp;
|
2016-04-27 03:12:46 +02:00
|
|
|
}
|
|
|
|
|
2018-07-01 22:20:28 +02:00
|
|
|
void PrintCounter::incFilamentUsed(float const &amount) {
|
2016-07-14 03:18:59 +02:00
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("incFilamentUsed"));
|
2016-07-14 03:18:59 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
// Refuses to update data if object is not loaded
|
2018-03-05 04:23:43 +01:00
|
|
|
if (!isLoaded()) return;
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
data.filamentUsed += amount; // mm
|
2016-07-14 03:18:59 +02:00
|
|
|
}
|
|
|
|
|
2016-04-27 03:12:46 +02:00
|
|
|
void PrintCounter::initStats() {
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("initStats"));
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
loaded = true;
|
|
|
|
data = { 0, 0, 0, 0, 0.0 };
|
2016-04-27 03:12:46 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
saveStats();
|
2018-08-14 07:55:22 +02:00
|
|
|
|
2018-08-12 09:50:39 +02:00
|
|
|
uint16_t crc = 0;
|
|
|
|
int a = address;
|
|
|
|
persistentStore.access_start();
|
|
|
|
persistentStore.write_data(a, (uint8_t*)0x16, sizeof(uint8_t), &crc);
|
|
|
|
persistentStore.access_finish();
|
2016-04-27 03:12:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void PrintCounter::loadStats() {
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("loadStats"));
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
|
|
|
|
2018-08-12 09:50:39 +02:00
|
|
|
// Check if the EEPROM block is initialized
|
|
|
|
uint16_t crc = 0;
|
|
|
|
int a = address;
|
|
|
|
uint8_t value;
|
|
|
|
persistentStore.access_start();
|
|
|
|
persistentStore.read_data(a, &value, sizeof(uint8_t), &crc);
|
|
|
|
if (value != 0x16) initStats();
|
|
|
|
else {
|
|
|
|
a = address + sizeof(uint8_t);
|
|
|
|
persistentStore.read_data(a, (uint8_t*)&data, sizeof(printStatistics), &crc);
|
|
|
|
}
|
|
|
|
persistentStore.access_finish();
|
2018-03-05 04:23:43 +01:00
|
|
|
loaded = true;
|
2016-04-27 03:12:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void PrintCounter::saveStats() {
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("saveStats"));
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
|
|
|
|
2016-07-14 03:18:59 +02:00
|
|
|
// Refuses to save data if object is not loaded
|
2018-03-05 04:23:43 +01:00
|
|
|
if (!isLoaded()) return;
|
2016-04-27 03:12:46 +02:00
|
|
|
|
2016-05-22 02:59:59 +02:00
|
|
|
// Saves the struct to EEPROM
|
2018-08-12 09:50:39 +02:00
|
|
|
uint16_t crc = 0;
|
|
|
|
int a = (address + sizeof(uint8_t));
|
|
|
|
persistentStore.access_start();
|
|
|
|
persistentStore.write_data(a, (uint8_t*)&data, sizeof(printStatistics), &crc);
|
|
|
|
persistentStore.access_finish();
|
2016-04-27 03:12:46 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void PrintCounter::showStats() {
|
2016-07-22 16:47:56 +02:00
|
|
|
char buffer[21];
|
|
|
|
|
2016-07-14 03:18:59 +02:00
|
|
|
SERIAL_PROTOCOLPGM(MSG_STATS);
|
|
|
|
|
|
|
|
SERIAL_ECHOPGM("Prints: ");
|
2018-03-05 04:23:43 +01:00
|
|
|
SERIAL_ECHO(data.totalPrints);
|
2016-04-27 03:12:46 +02:00
|
|
|
|
|
|
|
SERIAL_ECHOPGM(", Finished: ");
|
2018-03-05 04:23:43 +01:00
|
|
|
SERIAL_ECHO(data.finishedPrints);
|
2016-04-27 03:12:46 +02:00
|
|
|
|
2016-07-14 03:18:59 +02:00
|
|
|
SERIAL_ECHOPGM(", Failed: "); // Note: Removes 1 from failures with an active counter
|
2018-03-05 04:23:43 +01:00
|
|
|
SERIAL_ECHO(data.totalPrints - data.finishedPrints
|
|
|
|
- ((isRunning() || isPaused()) ? 1 : 0));
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2016-07-14 03:18:59 +02:00
|
|
|
SERIAL_PROTOCOLPGM(MSG_STATS);
|
2016-04-27 03:12:46 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
duration_t elapsed = data.printTime;
|
2016-07-24 04:13:35 +02:00
|
|
|
elapsed.toString(buffer);
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2016-07-22 16:47:56 +02:00
|
|
|
SERIAL_ECHOPGM("Total time: ");
|
|
|
|
SERIAL_ECHO(buffer);
|
2016-04-27 03:12:46 +02:00
|
|
|
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
|
|
|
SERIAL_ECHOPGM(" (");
|
2018-03-05 04:23:43 +01:00
|
|
|
SERIAL_ECHO(data.printTime);
|
2017-03-18 16:17:00 +01:00
|
|
|
SERIAL_CHAR(')');
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
elapsed = data.longestPrint;
|
2016-07-24 04:13:35 +02:00
|
|
|
elapsed.toString(buffer);
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2016-07-22 16:47:56 +02:00
|
|
|
SERIAL_ECHOPGM(", Longest job: ");
|
|
|
|
SERIAL_ECHO(buffer);
|
2016-07-14 03:18:59 +02:00
|
|
|
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
|
|
|
SERIAL_ECHOPGM(" (");
|
2018-03-05 04:23:43 +01:00
|
|
|
SERIAL_ECHO(data.longestPrint);
|
2017-03-18 16:17:00 +01:00
|
|
|
SERIAL_CHAR(')');
|
2016-07-14 03:18:59 +02:00
|
|
|
#endif
|
|
|
|
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2016-07-14 03:18:59 +02:00
|
|
|
SERIAL_PROTOCOLPGM(MSG_STATS);
|
|
|
|
|
|
|
|
SERIAL_ECHOPGM("Filament used: ");
|
2018-03-05 04:23:43 +01:00
|
|
|
SERIAL_ECHO(data.filamentUsed / 1000);
|
2018-01-24 02:09:40 +01:00
|
|
|
SERIAL_CHAR('m');
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2017-06-09 17:51:23 +02:00
|
|
|
SERIAL_EOL();
|
2016-04-27 03:12:46 +02:00
|
|
|
}
|
2016-04-27 03:12:08 +02:00
|
|
|
|
|
|
|
void PrintCounter::tick() {
|
2018-03-05 04:23:43 +01:00
|
|
|
if (!isRunning()) return;
|
2016-04-27 03:12:08 +02:00
|
|
|
|
2016-07-14 03:18:59 +02:00
|
|
|
static uint32_t update_last = millis(),
|
|
|
|
eeprom_last = millis();
|
2016-04-27 03:12:08 +02:00
|
|
|
|
2016-07-13 04:03:42 +02:00
|
|
|
millis_t now = millis();
|
2016-04-27 03:12:08 +02:00
|
|
|
|
|
|
|
// Trying to get the amount of calculations down to the bare min
|
2018-03-05 04:23:43 +01:00
|
|
|
const static uint16_t i = updateInterval * 1000;
|
2016-04-27 03:12:08 +02:00
|
|
|
|
2016-07-14 03:18:59 +02:00
|
|
|
if (now - update_last >= i) {
|
2016-04-27 03:12:46 +02:00
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("tick"));
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
data.printTime += deltaDuration();
|
2016-07-14 03:18:59 +02:00
|
|
|
update_last = now;
|
2016-04-27 03:12:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Trying to get the amount of calculations down to the bare min
|
2018-03-05 04:23:43 +01:00
|
|
|
const static millis_t j = saveInterval * 1000;
|
2016-07-14 03:18:59 +02:00
|
|
|
if (now - eeprom_last >= j) {
|
|
|
|
eeprom_last = now;
|
2018-03-05 04:23:43 +01:00
|
|
|
saveStats();
|
2016-04-27 03:12:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-22 02:59:59 +02:00
|
|
|
// @Override
|
|
|
|
bool PrintCounter::start() {
|
2016-04-27 03:12:46 +02:00
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("start"));
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
2016-04-27 03:12:08 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
bool paused = isPaused();
|
2016-05-22 02:59:59 +02:00
|
|
|
|
|
|
|
if (super::start()) {
|
|
|
|
if (!paused) {
|
2018-03-05 04:23:43 +01:00
|
|
|
data.totalPrints++;
|
|
|
|
lastDuration = 0;
|
2016-05-22 02:59:59 +02:00
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2017-04-26 09:43:11 +02:00
|
|
|
|
|
|
|
return false;
|
2016-04-27 03:12:08 +02:00
|
|
|
}
|
|
|
|
|
2016-05-22 02:59:59 +02:00
|
|
|
// @Override
|
|
|
|
bool PrintCounter::stop() {
|
2016-04-27 03:12:08 +02:00
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("stop"));
|
2016-04-27 03:12:08 +02:00
|
|
|
#endif
|
|
|
|
|
2016-05-22 02:59:59 +02:00
|
|
|
if (super::stop()) {
|
2018-03-05 04:23:43 +01:00
|
|
|
data.finishedPrints++;
|
|
|
|
data.printTime += deltaDuration();
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
if (duration() > data.longestPrint)
|
|
|
|
data.longestPrint = duration();
|
2016-07-14 03:18:59 +02:00
|
|
|
|
2018-03-05 04:23:43 +01:00
|
|
|
saveStats();
|
2016-05-22 14:14:58 +02:00
|
|
|
return true;
|
2016-05-22 02:59:59 +02:00
|
|
|
}
|
|
|
|
else return false;
|
2016-04-27 03:12:08 +02:00
|
|
|
}
|
|
|
|
|
2016-05-22 02:59:59 +02:00
|
|
|
// @Override
|
2016-04-27 03:12:46 +02:00
|
|
|
void PrintCounter::reset() {
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
2018-03-05 04:23:43 +01:00
|
|
|
debug(PSTR("stop"));
|
2016-04-27 03:12:46 +02:00
|
|
|
#endif
|
2016-04-27 03:12:08 +02:00
|
|
|
|
2016-04-27 03:12:46 +02:00
|
|
|
super::reset();
|
2018-03-05 04:23:43 +01:00
|
|
|
lastDuration = 0;
|
2016-04-27 03:12:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#if ENABLED(DEBUG_PRINTCOUNTER)
|
|
|
|
|
|
|
|
void PrintCounter::debug(const char func[]) {
|
|
|
|
if (DEBUGGING(INFO)) {
|
|
|
|
SERIAL_ECHOPGM("PrintCounter::");
|
|
|
|
serialprintPGM(func);
|
|
|
|
SERIAL_ECHOLNPGM("()");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2017-09-09 07:18:43 +02:00
|
|
|
|
|
|
|
#endif // PRINTCOUNTER
|