nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 'MACHINE_TYPE' instead of 'PROTOCOL_VERSION' to determine firmware version.

Browse source
This commit is contained in:
Kevin Pope 2014-03-12 14:57:25 -07:00
parent 26d2730516
commit 9e8bdc995f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AboutPage.cs
View file

@ -118,7 +118,7 @@ namespace MatterHackers.MatterControl
DataStorage.ApplicationSession firstSession; DataStorage.ApplicationSession firstSession;
firstSession = DataStorage.Datastore.Instance.dbSQLite.Table<DataStorage.ApplicationSession>().OrderBy(v => v.SessionStart).Take(1).FirstOrDefault(); firstSession = DataStorage.Datastore.Instance.dbSQLite.Table<DataStorage.ApplicationSession>().OrderBy(v => v.SessionStart).Take(1).FirstOrDefault();
if (firstSession != null if (firstSession != null
&& DateTime.Compare(firstSession.SessionStart.AddDays(14), DateTime.Now) < 0) && DateTime.Compare(firstSession.SessionStart.AddDays(7), DateTime.Now) < 0)
{ {
NeedToCheckForUpdateFirstTimeEver = true; NeedToCheckForUpdateFirstTimeEver = true;
} }

2
PrinterCommunication.cs
View file

@ -973,7 +973,7 @@ namespace MatterHackers.MatterControl
} }
} }
string firmwareVersionReported = ""; 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 //Firmware version was detected and is different
if (firmwareVersionReported != "" && firmwareVersion != firmwareVersionReported) if (firmwareVersionReported != "" && firmwareVersion != firmwareVersionReported)