diff --git a/AVRsack/ASBuilder.swift b/AVRsack/ASBuilder.swift index 1ded38f..0dd27fc 100644 --- a/AVRsack/ASBuilder.swift +++ b/AVRsack/ASBuilder.swift @@ -108,7 +108,7 @@ class ASBuilder { let progProp = ASHardware.instance().programmers[programmer] let proto = boardProp["upload.protocol"] ?? progProp?["protocol"] let speed = boardProp["upload.speed"] ?? progProp?["speed"] - var args = ["-v", "-v", "-v", "-v", "-D", + var args = ["-v", "-v", "-v", "-C", "/usr/local/CrossPack-AVR/etc/avrdude.conf", "-p", boardProp["build.mcu"]!, "-c", proto!, "-P", port, "-U", "flash:w:build/"+board+"/"+dir.lastPathComponent+".hex:i"] diff --git a/AVRsack/ASProjDoc.swift b/AVRsack/ASProjDoc.swift index fb6a9eb..a7e1709 100644 --- a/AVRsack/ASProjDoc.swift +++ b/AVRsack/ASProjDoc.swift @@ -40,13 +40,9 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate { var fontSize : UInt = 12 var themeObserver : AnyObject? var serialObserver : AnyObject? - var board = "uno" - var programmer = "arduino" - dynamic var port : String = "" { - didSet { - - } - } + dynamic var board = "uno" + dynamic var programmer = "arduino" + dynamic var port : String = "" var recentBoards = [String]() var recentProgrammers = [String]() var logModified = NSDate.distantPast() as NSDate @@ -384,7 +380,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate { set (newBoard) { for (ident, prop) in ASHardware.instance().boards { if prop["name"] == newBoard { - setValue(ident, forKey: "board") + board = ident pushToFront(&recentBoards, board) @@ -414,7 +410,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate { set (newProg) { for (ident, prop) in ASHardware.instance().programmers { if prop["name"] == newProg { - setValue(ident, forKey:"programmer") + programmer = ident pushToFront(&recentProgrammers, programmer) @@ -460,6 +456,9 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate { return (ASSerial.instance().ports() as NSArray).containsObject(port) } } + class func keyPathsForValuesAffectingHasValidPort() -> NSSet { + return NSSet(object: "port") + } var canUpload : Bool { get {