tschwery/reprapfirmware-dc42
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/dc42/RepRapFirmware

Browse source
This commit is contained in:
David Crocker 2016-04-03 17:56:31 +01:00
commit 954fe6d3b8
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
GCodes.cpp
View file

@ -1344,7 +1344,7 @@ void GCodes::SetMACAddress(GCodeBuffer *gb)
{
if(ipString[sp] == ':')
{
mac[ipp] = strtol(&ipString[spp], NULL, 0);
mac[ipp] = strtol(&ipString[spp], NULL, 16);
ipp++;
if(ipp > 5)
{
@ -1358,7 +1358,7 @@ void GCodes::SetMACAddress(GCodeBuffer *gb)
}else
sp++;
}
mac[ipp] = strtol(&ipString[spp], NULL, 0);
mac[ipp] = strtol(&ipString[spp], NULL, 16);
if(ipp == 5)
{
platform->SetMACAddress(mac);

1
Release/README Normal file
View file

@ -0,0 +1 @@
PLEASE NOTE: the firmware binaries in this master branch are very old now. Please switch to the dev branch to find stable binaries, or to the delta branch for development ones.