BMP reading, gcode changes

Author: Peter Brier

README

@@ -13,7 +13,7 @@ a circular shape, with the contour you have drawn in the bitmap.
 The bitmap should have a WHITE BACKGROUND and the contour of the shape should 
 be drawn in BLACK.
 
-LUA (www.lua.org) is used to convert the contour into a shape. Download the right
+lua (www.lua.org) is used to convert the contour into a shape. Download the right
 lua version (at least version 5.1.4) for your platform, and extract all the files in 
 the same folder as the revolver scripts. Some versions of linux ship with an older
 version of lua (5.1) this may not work. Download the right version (in source

gcode.lua

@@ -29,18 +29,19 @@ gcode =
 -- create gcode file writer class, return instance of the gcode class
 function new(name)
   o = 
-	{ 
-	  x=0; y=0; z=0; e=0, f=0;	 -- current position	
+  { 
+    x=0; y=0; z=0; e=0, f=0;	 -- current position	
     lx=0, ly=0, lz=0, le=0, lf=0; -- last emitted position
     decimals = 2;     -- nr of decimal places in output coordinates
     edecimals = 3;    -- nr of decimal places E axis output
     epermm = 0.1;     -- extrusion per mm of travel
     mspeed = 60*60;   -- move speed (between extrusions)
-    espeed = 60*30;   -- Extrusion speed};   -- create object   		
+    espeed = 60*30;   -- Extrusion speed};   -- create object   	
+    totale = 0;       -- total extruded length    
   };
-	o.filename = name;
-	o.file = io.open(name, "wb"); 	
-	setmetatable(o, gcode)
+  o.filename = name;
+  o.file = io.open(name, "wb"); 	
+  setmetatable(o, gcode)
   gcode.__index = gcode;
   return o
 end
@@ -49,29 +50,29 @@ end
 function gcode.close(self)  
   self:emit();
   io.close(self.file); 	
-	self.file = nil;
+  self.file = nil;
 end;
 
 -- copy the contect of a file into the current gcode file
 function gcode.copyfile(self,name)
   self:emit();
-	self:comment("<-- Including file: " .. name .. " -->");
+  self:comment("<-- Including file: " .. name .. " -->");
   local fh = io.open(name, "r");
-	if  fh ~= nil  then 
-		for l in fh:lines() do 
-			gc:write(l); 
-		end;
-		fh:close();
-	end;
-	self:comment("<-- End of include file: " .. name .. " -->");
+  if  fh ~= nil  then 
+    for l in fh:lines() do 
+      gc:write(l); 
+    end;
+    fh:close();
+  end;
+  self:comment("<-- End of include file: " .. name .. " -->");
 end;
 
 -- Calculate the feedrate factor, based on layer width,height and filament diameter, assume square profile
 function gcode.escale(self,w,h,d,speed)
   self.epermm = w*h / ((math.pi*d*d)/4);	
-	if speed ~= nil then
-	  self.espeed = speed;
-	end;
+  if speed ~= nil then
+    self.espeed = speed;
+  end;
 end
 
 -- write data to file
@@ -83,39 +84,39 @@ end;
 local function dumptable(t)
   local s = " {";
   for i,v in pairs(t) do 	
-	  if type(v) == "table" then
-		  s = s .. " " .. dumptable(v);
-		elseif type(v) == "function" then s = s .. " (function) ";
-		else
+    if type(v) == "table" then
+      s = s .. " " .. dumptable(v);
+    elseif type(v) == "function" then s = s .. " (function) ";
+    else
       s = s .. " " ..i .. "=" .. v .. " ";
-		end;		
-	end;
-	return s .. "} ";
+    end;		
+  end;
+  return s .. "} ";
 end;
 
 
 -- write comment to file
 function gcode.comment(self,s,t)
   self:emit();
   self:write("( " .. s .. " )" );
-	if t == nil then return; end;	
+  if t == nil then return; end;	
   for i,v in pairs(t) do 	
-	  if type(v) == "function" then s = " (function) ";
-		elseif type(v) == "table" then s = dumptable(v);
-		else 
-		  s = v;
-		end;
-	  self:write("(   " .. i .. " = " .. s .. " )" ) 
-	end;
+    if type(v) == "function" then s = " (function) ";
+    elseif type(v) == "table" then s = dumptable(v);
+    else 
+      s = v;
+    end;
+    self:write("(   " .. i .. " = " .. s .. " )" ) 
+  end;
 end;
 
 
 -- move current position, pass nil values to axis values to -not- change this field
 function gcode.move(self,x,y,z,e,f)
-	self.x = x or self.x;
-	self.y = y or self.y;
+  self.x = x or self.x;
+  self.y = y or self.y;
   self.z = z or self.z;
-	self.e = e or self.e;
+  self.e = e or self.e;
   self.f = f or self.mspeed;	-- default is move-speed
 end;
 
@@ -124,37 +125,39 @@ end;
 function gcode.setpos(self, x, y, z, e)
   self:emit();
   s = "";
-	if x ~= nil then self.x = x; s = s .. " X" .. x; end;
-	if y ~= nil then self.y = y; s = s .. " Y" .. y; end;
-	if z ~= nil then self.z = z; s = s .. " Z" .. z; end;	
+  if x ~= nil then self.x = x; s = s .. " X" .. x; end;
+  if y ~= nil then self.y = y; s = s .. " Y" .. y; end;
+  if z ~= nil then self.z = z; s = s .. " Z" .. z; end;	
   if e ~= nil then self.e = e; s = s .. " E" .. e; end;		
-	if s ~= ""  then  self:write("G92 " .. s .. " (set current position)"); end;
+  if s ~= ""  then  self:write("G92 " .. s .. " (set current position)"); end;
 end;
 
 -- move home, and set units to mm abs
 function gcode.home(self, x, y, z)
   self:emit();
   s = "";
   if x ~= nil then s = s .. " X"; end;
-	if y ~= nil then s = s .. " Y"; end;
-	if z ~= nil then s = s .. " Z"; end;
-	self:write("G28" .. s .. " (home)");
+  if y ~= nil then s = s .. " Y"; end;
+  if z ~= nil then s = s .. " Z"; end;
+  self:write("G28" .. s .. " (home)");
   self:write("G21 (units mm)");
-	self:write("G90 (abs pos)");	
-	self:setpos(x,y,z,0);
+  self:write("G90 (abs pos)");	
+  self:setpos(x,y,z,0);
 end;
 
 -- move to a position, while extruding
 function gcode.extrude(self, x, y, z)
   self:emit(); -- emit any moves or previous extrude commands
-  dx = (x or self.x) - self.x;
-	dy = (y or self.y) - self.y;
-	dz = (z or self.z) - self.z;
-	self.f = self.espeed;
+  local dx = (x or self.x) - self.x;
+  local dy = (y or self.y) - self.y;
+  local dz = (z or self.z) - self.z;
+  local de = self.epermm  * math.sqrt( dx*dx + dy*dy + dz*dz );
+  self.f = self.espeed;
   self.x = self.x + dx;
-	self.y = self.y + dy;
-	self.z = self.z + dz;
-  self.e = self.e + self.epermm  * math.sqrt( dx*dx + dy*dy + dz*dz );	
+  self.y = self.y + dy;
+  self.z = self.z + dz;
+  self.e = self.e + de;	
+  self.totale = self.totale + de;
   self:emit();
 end;
 
@@ -174,39 +177,39 @@ function gcode.fan(self,fan)
   self:emit();
   fan = fan or 0; -- default is off
   if fan < 0 then fan = 0; end;
-	if fan > 100 then fan = 100; end;
+  if fan > 100 then fan = 100; end;
   if fan == 0 then
-	  self:write("M107 (fan off)");
-	else	  
-	  self:write("M106 S" .. fan * 2.55 .. " (set fan on S=0..255)" );
-	end;
+    self:write("M107 (fan off)");
+  else	  
+    self:write("M106 S" .. fan * 2.55 .. " (set fan on S=0..255)" );
+  end;
 end;
 
 -- emit the current position to the file, emit nothing if no value has changed (or if only F has changed)
 function gcode.emit(self, extra)
   s = "";
-	if self.lx - self.x ~= 0 then s = s .. " X" .. round(self.x,self.decimals); end;
-	if self.ly - self.y ~= 0 then s = s .. " Y" .. round(self.y,self.decimals); end;
-	if self.lz - self.z ~= 0 then s = s .. " Z" .. round(self.z,self.decimals); end;
-	if self.le - self.e ~= 0 then s = s .. " E" .. round(self.e,self.edecimals); end;	
-	self.lx = self.x;
-	self.ly = self.y;
-	self.lz = self.z;
-	self.le = self.e;	
-	if  s ~= "" then
-	  if self.lf - self.f ~= 0 then s = s .. " F" .. round(self.f,1); self.lf = self.f; end;
-	  s = "G1" .. s .. (extra or "");
-	  self:write(s);
-	end;
+  if self.lx - self.x ~= 0 then s = s .. " X" .. round(self.x,self.decimals); end;
+  if self.ly - self.y ~= 0 then s = s .. " Y" .. round(self.y,self.decimals); end;
+  if self.lz - self.z ~= 0 then s = s .. " Z" .. round(self.z,self.decimals); end;
+  if self.le - self.e ~= 0 then s = s .. " E" .. round(self.e,self.edecimals); end;	
+  self.lx = self.x;
+  self.ly = self.y;
+  self.lz = self.z;
+  self.le = self.e;	
+  if  s ~= "" then
+    if self.lf - self.f ~= 0 then s = s .. " F" .. round(self.f,1); self.lf = self.f; end;
+    s = "G1" .. s .. (extra or "");
+    self:write(s);
+  end;
 end;
 
 -- Hop to new location, this causes z to raise, xy to move and z to lower again (to original z, or new z if supplied)
 function gcode.hop(self, x, y, dz, z)
   dz = dz or 1.0; -- default is 1 mm
   cz = self.z;
   self:move(nil,nil,self.z+dz); 	self:emit();
-	self:move(x,y); self:emit();
-	self:move(nil,nil,z or cz); self:emit();
+  self:move(x,y); self:emit();
+  self:move(nil,nil,z or cz); self:emit();
 end;
 
 -- round to nearest decimal places

rendervase.lua

@@ -117,8 +117,8 @@ end;
 
 function render(self,gc)
 
-  self.image = pgm.load(self.contour);
-	self.timage = pgm.load(self.texture);
+  self.image = image.load(self.contour);
+	self.timage = image.load(self.texture);
 	local img = self.image;
   local pos = self.pos;
 	local w = self.size.width;

revolver.lua

@@ -24,7 +24,7 @@
  -- use: lua revolver.lua [config file]
  --
  --
-require "pgm"        -- PGM bitmap file reader
+require "image"      -- bitmap file reader
 require "gcode"      -- gcode file writer
 require "materials"  -- material definitions
 require "styles"     -- material definitions
@@ -68,7 +68,7 @@ gc:move(0,0);
 gc:fan(0);
 gc:temperature(shape.material.tstandby);
 gc:copyfile("end.gcode");
-print("\nDone.\n");
+print("\nDone, " .. gcode.round(gc.totale,1) .. "mm extruded.\n");
 
 -- Conversion for visualisation
 -- os.execute("../gcode2vtk/gcode2vtk.exe " .. oname);

s-helloworld.lua

@@ -31,7 +31,7 @@ shape =
 	min_thickness = 1.0;                       -- [mm] minimal wall thickness (default is 1 shell) Whem specified, no wall will be made thinner than this thickness, even
                                              -- if the bitmap specifies otherwise
   contour = "square.pgm";  -- the image for the shape use "BINARY PGM" image with white background, and black line that defines the shape
-	texture = "hello.pgm";   -- the image for the surface. Use "BINARY PGM" image. BLACK is "0.0" and White is "1.0" modulation of the radius. Use "modulation" parameter to scale this
+	texture = "hello.bmp";   -- the image for the surface. Use "BINARY PGM" image. BLACK is "0.0" and White is "1.0" modulation of the radius. Use "modulation" parameter to scale this
 	modulation = -1;      -- [mm] depth of the surface  modulation for the texture (0..255 pixel intensity is 0..modulation mm radius change)
 	-- modulator = function(r,a,z)  return 0.1*z* math.sin(7*a); end; -- Specify a function to modulate the surface
 	-- frequency = 3.0;      -- Use default "sine wave" modulation of the radius, with specified frequenty, and "modulation" amplitude