From 9e8bdc995f157699893071f4e57adc121d8e89a5 Mon Sep 17 00:00:00 2001 From: Kevin Pope Date: Wed, 12 Mar 2014 14:57:25 -0700 Subject: [PATCH] Use 'MACHINE_TYPE' instead of 'PROTOCOL_VERSION' to determine firmware version. --- AboutPage.cs | 2 +- PrinterCommunication.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AboutPage.cs b/AboutPage.cs index 927bf8747..f31a0dd45 100644 --- a/AboutPage.cs +++ b/AboutPage.cs @@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl DataStorage.ApplicationSession firstSession; firstSession = DataStorage.Datastore.Instance.dbSQLite.Table().OrderBy(v => v.SessionStart).Take(1).FirstOrDefault(); if (firstSession != null - && DateTime.Compare(firstSession.SessionStart.AddDays(14), DateTime.Now) < 0) + && DateTime.Compare(firstSession.SessionStart.AddDays(7), DateTime.Now) < 0) { NeedToCheckForUpdateFirstTimeEver = true; } diff --git a/PrinterCommunication.cs b/PrinterCommunication.cs index c32762163..833311cdd 100644 --- a/PrinterCommunication.cs +++ b/PrinterCommunication.cs @@ -973,7 +973,7 @@ namespace MatterHackers.MatterControl } } string firmwareVersionReported = ""; - if (GCodeFile.GetFirstStringAfter("PROTOCOL_VERSION:", foundStringEventArgs.LineToCheck, " ", ref firmwareVersionReported)) + if (GCodeFile.GetFirstStringAfter("MACHINE_TYPE:", foundStringEventArgs.LineToCheck, " EXTRUDER_COUNT", ref firmwareVersionReported)) { //Firmware version was detected and is different if (firmwareVersionReported != "" && firmwareVersion != firmwareVersionReported)