2016-07-07 18:26:59 +00:00
|
|
|
#include "Configuration.h"
|
|
|
|
|
|
|
|
#include "ultralcd.h"
|
|
|
|
#include "language.h"
|
2016-07-07 20:01:51 +00:00
|
|
|
#include "util.h"
|
2016-07-07 18:26:59 +00:00
|
|
|
|
|
|
|
// Allocate the version string in the program memory. Otherwise the string lands either on the stack or in the global RAM.
|
|
|
|
const char FW_VERSION_STR[] PROGMEM = FW_version;
|
|
|
|
|
|
|
|
const char* FW_VERSION_STR_P()
|
|
|
|
{
|
|
|
|
return FW_VERSION_STR;
|
|
|
|
}
|
|
|
|
|
2016-07-08 07:49:15 +00:00
|
|
|
const char FW_PRUSA3D_MAGIC_STR[] PROGMEM = FW_PRUSA3D_MAGIC;
|
|
|
|
|
|
|
|
const char* FW_PRUSA3D_MAGIC_STR_P()
|
|
|
|
{
|
|
|
|
return FW_PRUSA3D_MAGIC_STR;
|
|
|
|
}
|
|
|
|
|
2016-07-07 18:26:59 +00:00
|
|
|
const char STR_REVISION_DEV [] PROGMEM = "dev";
|
|
|
|
const char STR_REVISION_ALPHA[] PROGMEM = "alpha";
|
|
|
|
const char STR_REVISION_BETA [] PROGMEM = "beta";
|
|
|
|
const char STR_REVISION_RC [] PROGMEM = "rc";
|
|
|
|
|
|
|
|
inline bool is_whitespace_or_nl(char c)
|
|
|
|
{
|
|
|
|
return c == ' ' || c == '\t' || c == '\n' || c == 'r';
|
|
|
|
}
|
|
|
|
|
|
|
|
inline bool is_whitespace_or_nl_or_eol(char c)
|
|
|
|
{
|
|
|
|
return c == 0 || c == ' ' || c == '\t' || c == '\n' || c == '\r';
|
|
|
|
}
|
|
|
|
|
|
|
|
inline bool is_digit(char c)
|
|
|
|
{
|
|
|
|
return c >= '0' && c <= '9';
|
|
|
|
}
|
|
|
|
|
|
|
|
// Parse a major.minor.revision version number.
|
|
|
|
// Return true if valid.
|
|
|
|
inline bool parse_version(const char *str, uint16_t version[4])
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
SERIAL_ECHOPGM("Parsing version string ");
|
|
|
|
SERIAL_ECHO(str);
|
|
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
const char *major = str;
|
|
|
|
const char *p = str;
|
|
|
|
while (is_digit(*p)) ++ p;
|
|
|
|
if (*p != '.')
|
|
|
|
return false;
|
|
|
|
const char *minor = ++ p;
|
|
|
|
while (is_digit(*p)) ++ p;
|
|
|
|
if (*p != '.')
|
|
|
|
return false;
|
|
|
|
const char *rev = ++ p;
|
|
|
|
while (is_digit(*p)) ++ p;
|
|
|
|
if (! is_whitespace_or_nl_or_eol(*p) && *p != '-')
|
|
|
|
return false;
|
|
|
|
|
|
|
|
char *endptr = NULL;
|
|
|
|
version[0] = strtol(major, &endptr, 10);
|
|
|
|
if (endptr != minor - 1)
|
|
|
|
return false;
|
|
|
|
version[1] = strtol(minor, &endptr, 10);
|
|
|
|
if (endptr != rev - 1)
|
|
|
|
return false;
|
|
|
|
version[2] = strtol(rev, &endptr, 10);
|
|
|
|
if (endptr != p)
|
|
|
|
return false;
|
|
|
|
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_RELEASED;
|
2016-07-07 18:26:59 +00:00
|
|
|
if (*p ++ == '-') {
|
|
|
|
const char *q = p;
|
|
|
|
while (! is_whitespace_or_nl_or_eol(*q))
|
|
|
|
++ q;
|
|
|
|
uint8_t n = q - p;
|
|
|
|
if (n == strlen_P(STR_REVISION_DEV) && strncmp_P(p, STR_REVISION_DEV, n) == 0)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_DEV;
|
2016-07-07 18:26:59 +00:00
|
|
|
else if (n == strlen_P(STR_REVISION_ALPHA) && strncmp_P(p, STR_REVISION_ALPHA, n) == 0)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_ALPHA;
|
2016-07-07 18:26:59 +00:00
|
|
|
else if (n == strlen_P(STR_REVISION_BETA) && strncmp_P(p, STR_REVISION_BETA, n) == 0)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_BETA;
|
2016-07-07 18:26:59 +00:00
|
|
|
else if ((n == 2 || n == 3) && p[0] == 'r' && p[1] == 'c') {
|
|
|
|
if (n == 2)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_RC;
|
2016-07-07 18:26:59 +00:00
|
|
|
else {
|
|
|
|
if (is_digit(p[2]))
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_RC + p[2] - '1';
|
2016-07-07 18:26:59 +00:00
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
SERIAL_ECHOPGM("Version parsed, major: ");
|
|
|
|
SERIAL_ECHO(version[0]);
|
|
|
|
SERIAL_ECHOPGM(", minor: ");
|
|
|
|
SERIAL_ECHO(version[1]);
|
|
|
|
SERIAL_ECHOPGM(", revision: ");
|
|
|
|
SERIAL_ECHO(version[2]);
|
|
|
|
SERIAL_ECHOPGM(", flavor: ");
|
|
|
|
SERIAL_ECHO(version[3]);
|
|
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
#endif
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
inline bool strncmp_PP(const char *p1, const char *p2, uint8_t n)
|
|
|
|
{
|
|
|
|
for (; n > 0; -- n, ++ p1, ++ p2) {
|
|
|
|
if (pgm_read_byte(p1) < pgm_read_byte(p2))
|
|
|
|
return -1;
|
|
|
|
if (pgm_read_byte(p1) > pgm_read_byte(p2))
|
|
|
|
return 1;
|
|
|
|
if (pgm_read_byte(p1) == 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Parse a major.minor.revision version number.
|
|
|
|
// Return true if valid.
|
|
|
|
inline bool parse_version_P(const char *str, uint16_t version[4])
|
|
|
|
{
|
|
|
|
#if 0
|
|
|
|
SERIAL_ECHOPGM("Parsing version string ");
|
|
|
|
SERIAL_ECHORPGM(str);
|
|
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
const char *major = str;
|
|
|
|
const char *p = str;
|
|
|
|
while (is_digit(char(pgm_read_byte(p)))) ++ p;
|
|
|
|
if (pgm_read_byte(p) != '.')
|
|
|
|
return false;
|
|
|
|
const char *minor = ++ p;
|
|
|
|
while (is_digit(char(pgm_read_byte(p)))) ++ p;
|
|
|
|
if (pgm_read_byte(p) != '.')
|
|
|
|
return false;
|
|
|
|
const char *rev = ++ p;
|
|
|
|
while (is_digit(char(pgm_read_byte(p)))) ++ p;
|
|
|
|
if (! is_whitespace_or_nl_or_eol(char(pgm_read_byte(p))) && pgm_read_byte(p) != '-')
|
|
|
|
return false;
|
|
|
|
|
|
|
|
char buf[5];
|
|
|
|
uint8_t n = minor - major - 1;
|
|
|
|
if (n > 4)
|
|
|
|
return false;
|
|
|
|
memcpy_P(buf, major, n); buf[n] = 0;
|
|
|
|
char *endptr = NULL;
|
|
|
|
version[0] = strtol(buf, &endptr, 10);
|
|
|
|
if (*endptr != 0)
|
|
|
|
return false;
|
|
|
|
n = rev - minor - 1;
|
|
|
|
if (n > 4)
|
|
|
|
return false;
|
|
|
|
memcpy_P(buf, minor, n); buf[n] = 0;
|
|
|
|
version[1] = strtol(buf, &endptr, 10);
|
|
|
|
if (*endptr != 0)
|
|
|
|
return false;
|
|
|
|
n = p - rev;
|
|
|
|
if (n > 4)
|
|
|
|
return false;
|
|
|
|
memcpy_P(buf, rev, n);
|
|
|
|
buf[n] = 0;
|
|
|
|
version[2] = strtol(buf, &endptr, 10);
|
|
|
|
if (*endptr != 0)
|
|
|
|
return false;
|
|
|
|
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_RELEASED;
|
2016-07-07 18:26:59 +00:00
|
|
|
if (pgm_read_byte(p ++) == '-') {
|
|
|
|
const char *q = p;
|
|
|
|
while (! is_whitespace_or_nl_or_eol(char(pgm_read_byte(q))))
|
|
|
|
++ q;
|
|
|
|
n = q - p;
|
|
|
|
if (n == strlen_P(STR_REVISION_DEV) && strncmp_PP(p, STR_REVISION_DEV, n) == 0)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_DEV;
|
2016-07-07 18:26:59 +00:00
|
|
|
else if (n == strlen_P(STR_REVISION_ALPHA) && strncmp_PP(p, STR_REVISION_ALPHA, n) == 0)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_ALPHA;
|
2016-07-07 18:26:59 +00:00
|
|
|
else if (n == strlen_P(STR_REVISION_BETA) && strncmp_PP(p, STR_REVISION_BETA, n) == 0)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_BETA;
|
2016-07-07 18:26:59 +00:00
|
|
|
else if ((n == 2 || n == 3) && strncmp_PP(p, STR_REVISION_RC, 2) == 0) {
|
|
|
|
if (n == 2)
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_RC;
|
2016-07-07 18:26:59 +00:00
|
|
|
else {
|
|
|
|
p += 2;
|
|
|
|
if (is_digit(pgm_read_byte(p)))
|
2016-07-07 20:01:51 +00:00
|
|
|
version[3] = FIRMWARE_REVISION_RC + pgm_read_byte(p) - '1';
|
2016-07-07 18:26:59 +00:00
|
|
|
else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
SERIAL_ECHOPGM("Version parsed, major: ");
|
|
|
|
SERIAL_ECHO(version[0]);
|
|
|
|
SERIAL_ECHOPGM(", minor: ");
|
|
|
|
SERIAL_ECHO(version[1]);
|
|
|
|
SERIAL_ECHOPGM(", revision: ");
|
|
|
|
SERIAL_ECHO(version[2]);
|
|
|
|
SERIAL_ECHOPGM(", flavor: ");
|
|
|
|
SERIAL_ECHO(version[3]);
|
|
|
|
SERIAL_ECHOLNPGM("");
|
|
|
|
#endif
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// 1 - yes, 0 - false, -1 - error;
|
|
|
|
inline int8_t is_provided_version_newer(const char *version_string)
|
|
|
|
{
|
|
|
|
uint16_t ver_gcode[3], ver_current[3];
|
|
|
|
if (! parse_version(version_string, ver_gcode))
|
|
|
|
return -1;
|
|
|
|
if (! parse_version_P(FW_VERSION_STR, ver_current))
|
|
|
|
return 0; // this shall not happen
|
|
|
|
for (uint8_t i = 0; i < 3; ++ i)
|
|
|
|
if (ver_gcode[i] > ver_current[i])
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool show_upgrade_dialog_if_version_newer(const char *version_string)
|
|
|
|
{
|
|
|
|
uint16_t ver_gcode[4], ver_current[4];
|
|
|
|
if (! parse_version(version_string, ver_gcode)) {
|
|
|
|
// SERIAL_PROTOCOLLNPGM("parse_version failed");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (! parse_version_P(FW_VERSION_STR, ver_current)) {
|
|
|
|
// SERIAL_PROTOCOLLNPGM("parse_version_P failed");
|
|
|
|
return false; // this shall not happen
|
|
|
|
}
|
|
|
|
// SERIAL_PROTOCOLLNPGM("versions parsed");
|
|
|
|
bool upgrade = false;
|
|
|
|
for (uint8_t i = 0; i < 4; ++ i) {
|
|
|
|
if (ver_gcode[i] > ver_current[i]) {
|
|
|
|
upgrade = true;
|
|
|
|
break;
|
|
|
|
} else if (ver_gcode[i] < ver_current[i])
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (upgrade) {
|
|
|
|
lcd_display_message_fullscreen_P(MSG_NEW_FIRMWARE_AVAILABLE);
|
|
|
|
lcd_print_at_PGM(0, 2, PSTR(""));
|
|
|
|
for (const char *c = version_string; ! is_whitespace_or_nl_or_eol(*c); ++ c)
|
|
|
|
lcd_implementation_write(*c);
|
|
|
|
lcd_print_at_PGM(0, 3, MSG_NEW_FIRMWARE_PLEASE_UPGRADE);
|
|
|
|
tone(BEEPER, 1000);
|
|
|
|
delay_keep_alive(50);
|
|
|
|
noTone(BEEPER);
|
|
|
|
delay_keep_alive(500);
|
|
|
|
tone(BEEPER, 1000);
|
|
|
|
delay_keep_alive(50);
|
|
|
|
noTone(BEEPER);
|
|
|
|
lcd_wait_for_click();
|
|
|
|
lcd_update_enable(true);
|
|
|
|
lcd_implementation_clear();
|
|
|
|
lcd_update();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Succeeded.
|
|
|
|
return true;
|
|
|
|
}
|
2016-07-07 20:01:51 +00:00
|
|
|
|
|
|
|
void update_current_firmware_version_to_eeprom()
|
|
|
|
{
|
2016-07-08 07:49:15 +00:00
|
|
|
for (int8_t i = 0; i < FW_PRUSA3D_MAGIC_LEN; ++ i)
|
|
|
|
eeprom_update_byte((uint8_t*)(EEPROM_FIRMWARE_PRUSA_MAGIC+i), pgm_read_byte(FW_PRUSA3D_MAGIC_STR+i));
|
2016-07-07 20:01:51 +00:00
|
|
|
uint16_t ver_current[4];
|
|
|
|
if (parse_version_P(FW_VERSION_STR, ver_current)) {
|
|
|
|
eeprom_update_word((uint16_t*)EEPROM_FIRMWARE_VERSION_MAJOR, ver_current[0]);
|
|
|
|
eeprom_update_word((uint16_t*)EEPROM_FIRMWARE_VERSION_MINOR, ver_current[1]);
|
|
|
|
eeprom_update_word((uint16_t*)EEPROM_FIRMWARE_VERSION_REVISION, ver_current[2]);
|
|
|
|
// See FirmwareRevisionFlavorType for the definition of firmware flavors.
|
|
|
|
eeprom_update_word((uint16_t*)EEPROM_FIRMWARE_VERSION_FLAVOR, ver_current[3]);
|
|
|
|
}
|
|
|
|
}
|