Merge branch 'develop'

ReleaseNotes.md

@@ -1,4 +1,10 @@
 Changelog
+# 0.10.4 (28th may 2014)
+- Pulled  improvements by Ultimaker. 
+- Fixed printing isues with gcode containing whitelines. 
+- Added Builder3D to printer types 
+- iOS captive portal fix
+
 # 0.10.3 (9th apr 2014)
 - Fixed Makerbot issue where printer driver didn't get past connecting state
 

extra/openwrt-build/openwrt-diffconfig-extramini

@@ -3,6 +3,7 @@ CONFIG_TARGET_ar71xx_generic=y
 CONFIG_TARGET_ar71xx_generic_TLMR3020=y
 CONFIG_ATH_USER_REGD=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_IPV6 is not set
+CONFIG_BUSYBOX_CONFIG_INOTIFYD=y
 CONFIG_DOODLE3D_CLIENT_MINIFY_JS=y
 # CONFIG_IPV6 is not set
 # CONFIG_KERNEL_DEBUG_INFO is not set
@@ -15,6 +16,7 @@ CONFIG_PACKAGE_doodle3d-client=y
 # CONFIG_PACKAGE_kmod-ipv6 is not set
 # CONFIG_PACKAGE_kmod-ppp is not set
 CONFIG_PACKAGE_kmod-usb-acm=y
+CONFIG_PACKAGE_kmod-usb-ohci=y
 CONFIG_PACKAGE_kmod-usb-serial=y
 CONFIG_PACKAGE_kmod-usb-serial-ftdi=y
 # CONFIG_PACKAGE_libip6tc is not set

src/FIRMWARE-VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

src/main.lua

@@ -50,7 +50,7 @@ local function setupAutoWifiMode()
 	local netName, netMode = wifiState.ssid, wifiState.mode
 
 	local apSsid = wifi.getSubstitutedSsid(settings.get('network.ap.ssid'))
-	local apMode = (apSsid == netName) and netMode == 'ap'
+	local apMode = (apSsid == netName) and (netMode == 'ap')
 
 	local scanList,msg = wifi.getScanInfo()
 	local knownSsids = wifi.getConfigs()
@@ -80,7 +80,7 @@ local function setupAutoWifiMode()
 	local connectWith = nil
 	for _,kn in ipairs(knownSsids) do
     	if kn.mode == 'ap' and kn.ssid == apSsid then break end
-		if findSsidInList(scanList, kn.ssid) then
+		if findSsidInList(scanList, kn.ssid) and kn.mode == 'sta' then
 			connectWith = kn.ssid
 			break
 		end

src/network/netconfig.lua

@@ -344,9 +344,13 @@ function M.associateSsid(ssid, passphrase, recreate)
 	
 	-- if not, or if newly created configuration is requested, create a new configuration
 	if cfg == nil or recreate ~= nil then
-		local scanResult = wifi.getScanInfo(ssid)
+		local scanResult, msg = wifi.getScanInfo(ssid)
 		if scanResult ~= nil then
 			wifi.createConfigFromScanInfo(scanResult, passphrase)
+		elseif scanResult == false then
+			--check for error
+			M.setStatus(M.CONNECTING_FAILED,msg);
+			return nil,msg
 		else
 			--check for error
 			local msg = "Wireless network "..ssid.." is not available"

src/rest/api/api_config.lua

@@ -54,6 +54,8 @@ function M._global_GET(request, response)
 	end
 end
 
+-- returns substituted_wifiboxid (since version 0.10.2)
+-- returns substituted_ssid (since version 0.9.1)
 function M._global_POST(request, response)
 	--log:info("API:config:set")
 

src/rest/api/api_info.lua

@@ -47,6 +47,7 @@ local M = {
 	isApi = true
 }
 
+-- returns wifiboxid (since version 0.10.2)
 function M._global(request, response)
 	response:setSuccess()
 	

src/util/printer.lua

@@ -45,6 +45,9 @@ local SUPPORTED_PRINTERS = {
 	tantillus = "Tantillus",
 	vision_3d_printer = "Vision 3D Printer",
 	minifactory = "miniFactory",
+	builder3d = "Builder 3D",
+	bigbuilder3d = "Big Builder 3D",
+	mamba3d = "Mamba3D",
 	marlin_generic = "Generic Marlin Printer",
     makerbot_generic = "Generic Makerbot Printer"
 }