Skip to content

Commit

Permalink
Merge pull request #126 from cabbagecreek/develop
Browse files Browse the repository at this point in the history 
Fixed verbatim strings In Frm3DprinterTool.cs
  • Loading branch information
@cabbagecreek
cabbagecreek authored Apr 4, 2017
2 parents af69f62 + 16ba333 commit d1802d2
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 68 deletions.
0 ...olConfiguration/obj/x86/Debug/build.force → ...e_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
View file
File renamed without changes.
0 ...tlConfiguration/obj/x86/Debug/build.force → ...e_5937a670-0e60-4077-877b-f7221da3dda1.cs
View file
File renamed without changes.
0 ...umbnailProvider/obj/x86/Debug/build.force → ...e_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Marlin3DprinterTool/Marlin3DprinterStlViewer/Marlin3DprinterStlViewer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
Expand Down
93 changes: 26 additions & 67 deletions Marlin3DprinterTool/Marlin3DprinterTool/Frm3DprinterTool.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private void UpdateFrameHeader()
{
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
string version = fvi.ProductVersion;
Text = $"Marlin3DprinterTool Version: {version}";
Text = $@"Marlin3DprinterTool Version: {version}";
}
}

Expand Down Expand Up @@ -310,8 +310,7 @@ private void ScanSurface(List<Position> probePointsList, int numberOfRepetitions

string gcodeSpeed = "F6000";

var commands = new List<string> {"G28 Y", "G28 X"};
commands.Add(@"G28 Z");
var commands = new List<string> {@"G28 Y", @"G28 X", @"G28 Z"};

_probePoints.Clear();

Expand Down Expand Up @@ -404,7 +403,7 @@ private void UpdateZmaintDescription()
{
txtBxZmaintenanceDescription.Text = "";
txtBxZmaintenanceDescription.Text +=
$"Z max is {trackBarZmaintenanceMax.Value} and Z low is {trackBarZmaintenanceMin.Value}" +
$@"Z max is {trackBarZmaintenanceMax.Value} and Z low is {trackBarZmaintenanceMin.Value}" +
Environment.NewLine;
}

Expand Down Expand Up @@ -1195,7 +1194,7 @@ private void _com_CommandSequenceeDone(object sender, EventArgs e)
{
if (zMin == null) zMin = probePoint.Zstring;
if (_numberConversion.ConvertStringToDecimal(zMin) <= probePoint.Z) zMin = probePoint.Zstring;
if (zMax == null) zMax = probePoint.Z.ToString();
if (zMax == null) zMax = probePoint.Zstring;
if (_numberConversion.ConvertStringToDecimal(zMax) >= probePoint.Z) zMax = probePoint.Zstring;

if (zMin == null) zMin = probePoint.Xstring;
Expand Down Expand Up @@ -1785,36 +1784,8 @@ private void btnUpdateBedPid_Click(object sender, EventArgs e)
_com.SendCommand(commands);
}

private void btnTransferExtruderPid_Click(object sender, EventArgs e)
{
_com.Port = cmbBxComPort.Text;
_com.DisConnect();


btnConnect.Text = @"Connect";

// Update Firmware)

FrmMarlinEditor marlinEditor = new FrmMarlinEditor();
marlinEditor.UpdateAndSavePidExtruder(txtBxKpExtruder.Text, txtBxKiExtruder.Text, txtBxKdExtruder.Text);
marlinEditor.ShowDialog();

}

private void btnTransferBedPid_Click(object sender, EventArgs e)
{
_com.Port = cmbBxComPort.Text;
_com.DisConnect();


btnConnect.Text = @"Connect";

FrmMarlinEditor marlinEditor = new FrmMarlinEditor();
marlinEditor.UpdateAndSavePidBed(txtBxKpBed.Text, txtBxKiBed.Text, txtBxKdBed.Text);


marlinEditor = new FrmMarlinEditor();
marlinEditor.ShowDialog();
}



Expand Down Expand Up @@ -1996,9 +1967,9 @@ private void CalculateLeadScrew()
}


var stepsPerMM = (int) (stepsPerRevolution*(microStep/pitch)*gear);
var stepsPerMilliMeter = (int) (stepsPerRevolution*(microStep/pitch)*gear);

fastColoredTextBoxLeadScrewStepsPerMM.Text = $"{stepsPerMM} steps/mm";
fastColoredTextBoxLeadScrewStepsPerMM.Text = $@"{stepsPerMilliMeter} steps/mm";

}

Expand Down Expand Up @@ -2076,10 +2047,10 @@ private void CalculateBelt()
}


var stepsPerMM =
var stepsPerMilliMeter =
(int) (stepsPerRevolution*(microStep/(pitch*(double) numUpDnBeltPulleyTeethCount.Value)))*gear;

fastColoredTextBoxBeltStepsPerMM.Text = $"{stepsPerMM} steps/mm";
fastColoredTextBoxBeltStepsPerMM.Text = $@"{stepsPerMilliMeter} steps/mm";
}

private void numUpDnExtruderExpectedValue_ValueChanged(object sender, EventArgs e)
Expand All @@ -2093,30 +2064,19 @@ private void CalculateExtruder()
// Extruder steps/mm = ( extrude button clicks * extruded length per click * old extruder steps/mm ) / marked length on filament

decimal extrudedLength = numUpDnExtruderExpectedValue.Value;
decimal oldStepsPerMM = numUpDnExtruderOldFirmware.Value;
decimal oldStepsPerMilliMeter = numUpDnExtruderOldFirmware.Value;
decimal meassuredExtrudedLength = numUpDnExtruderMeassuredExtrusion.Value;

decimal stepsPerMM = extrudedLength*oldStepsPerMM/meassuredExtrudedLength;
decimal stepsPerMilliMeter = extrudedLength*oldStepsPerMilliMeter/meassuredExtrudedLength;


fastColoredTextBoxExtruderStepsPerMM.Text = $"{stepsPerMM} steps/mm";
fastColoredTextBoxExtruderStepsPerMM.Tag = _numberConversion.ConvertDecimalToString(stepsPerMM);
fastColoredTextBoxExtruderStepsPerMM.Text = $@"{stepsPerMilliMeter} steps/mm";
fastColoredTextBoxExtruderStepsPerMM.Tag = _numberConversion.ConvertDecimalToString(stepsPerMilliMeter);
}

private void btnExtruderOldFirmware_Click(object sender, EventArgs e)
{
// TODO: Get extruder Steps Per MM from EEPROM
// get the OldFirmware settings from EEPROM
// M501 without a Responce shown
// Only Parse responce

}


private void btnExtruderUpdateStepsPerMMinFirmware_Click(object sender, EventArgs e)
{
//TODO: Update current Firmware
MessageBox.Show(@"Not implemented (yet)");
}


private void btnExtruderUpdateStepsPerMMinEEPROM_Click(object sender, EventArgs e)
{
Expand Down Expand Up @@ -2290,10 +2250,9 @@ private void ParseInit()
{
foreach (string line in fctbInit.Lines)
{
string linePattern = "";
Match rowMatch = null;
Match rowMatch;

linePattern = @"M92\s*X[0-9]*\.[0-9]*\s*Y[0-9]*\.[0-9]*\s*Z[0-9]*\.[0-9]*\sE[0-9]*\.[0-9]*";
var linePattern = @"M92\s*X[0-9]*\.[0-9]*\s*Y[0-9]*\.[0-9]*\s*Z[0-9]*\.[0-9]*\sE[0-9]*\.[0-9]*";
rowMatch = Regex.Match(line, linePattern);
if (rowMatch.Success)
{
Expand Down Expand Up @@ -2672,9 +2631,9 @@ private void btnNozzleIsTouchingBed_Click(object sender, EventArgs e)
zProbeOffset = zProbeOffset - (zProbeOffset * (decimal) 2.0);

DialogResult result = MessageBox.Show
($"The probe is detecting the bed at {txtBxDockZprobe.Text}" + Environment.NewLine +
$"and the nozzle is touching the bed at {txtBxZprobePosition.Text}." + Environment.NewLine + Environment.NewLine +
$"The Z_PROBE_OFFSET is {zProbeOffset}." + Environment.NewLine + Environment.NewLine +
($@"The probe is detecting the bed at {txtBxDockZprobe.Text}" + Environment.NewLine +
$@"and the nozzle is touching the bed at {txtBxZprobePosition.Text}." + Environment.NewLine + Environment.NewLine +
$@"The Z_PROBE_OFFSET is {zProbeOffset}." + Environment.NewLine + Environment.NewLine +
@"Do you want to update EEPROM with this value?", @"Z Probe offset", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1


Expand Down Expand Up @@ -2757,7 +2716,7 @@ private void btnResetFactorySettings_Click(object sender, EventArgs e)

private void trackBarNumberOfM48Test_Scroll(object sender, EventArgs e)
{
lblNumberOfM48Test.Text = $"Perform {trackBarNumberOfM48Test.Value} test(s)";
lblNumberOfM48Test.Text = $@"Perform {trackBarNumberOfM48Test.Value} test(s)";
}

private void btnM48Test_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -2905,20 +2864,20 @@ public class FileAssociation
///
/// </summary>
/// <param name="extension"></param>
/// <param name="progID"></param>
/// <param name="progId"></param>
/// <param name="description"></param>
/// <param name="icon"></param>
/// <param name="application"></param>
// Associate file extension with progID, description, icon and application
public static void Associate(string extension,
string progID, string description, string icon, string application)
string progId, string description, string icon, string application)
{
RegistryKey registryKey = Registry.ClassesRoot.CreateSubKey(extension);
registryKey?.SetValue("", progID);
registryKey?.SetValue("", progId);


if (string.IsNullOrEmpty(progID)) return;
using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(progID))
if (string.IsNullOrEmpty(progId)) return;
using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(progId))
{
if (description != null)
{
Expand Down

0 comments on commit d1802d2

Please sign in to comment.