microtherion/AVRSack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert dispatch functionality

Browse Source
This commit is contained in:
Matthias Neeracher 2016-11-13 13:27:19 +01:00 committed by Matthias Neeracher
parent 58015d3e78
commit 88d18d1209
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AVRsack/ASBuilder.swift
View File

@ -155,8 +155,8 @@ class ASBuilder {
} }
args += ["-U", "flash:w:build/"+board+"/"+dir.lastPathComponent!+".hex:i"] args += ["-U", "flash:w:build/"+board+"/"+dir.lastPathComponent!+".hex:i"]
continuation = { continuation = {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(2*NSEC_PER_SEC)), dispatch_get_main_queue(), { DispatchQueue.main.asyncAfter(deadline: .now() + 2.0, execute: {
ASSerialWin.portAvailableAfterUpload(port) ASSerialWin.portAvailableAfterUpload(port: port)
}) })
} }
case .BurnBootloader: case .BurnBootloader:
@ -193,8 +193,8 @@ class ASBuilder {
logOut.write(cmdLine.data(using: String.Encoding.utf8, allowLossyConversion: true)!) logOut.write(cmdLine.data(using: String.Encoding.utf8, allowLossyConversion: true)!)
task2.launch() task2.launch()
self.continuation = { self.continuation = {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(2*NSEC_PER_SEC)), dispatch_get_main_queue(), { DispatchQueue.main.asyncAfter(deadline: .now() + 2.0, execute: {
ASSerialWin.portAvailableAfterUpload(port) ASSerialWin.portAvailableAfterUpload(port: port)
}) })
} }
} }

2
AVRsack/ASProjDoc.swift
View File

@ -920,7 +920,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa
@IBAction func uploadProject(sender: AnyObject) { @IBAction func uploadProject(sender: AnyObject) {
builder.continuation = { builder.continuation = {
self.selectNodeInOutline(selection: self.files.uploadLog) self.selectNodeInOutline(selection: self.files.uploadLog)
dispatch_async(dispatch_get_main_queue(), { DispatchQueue.main.async(execute: {
self.builder.uploadProject(board: self.board, programmer:self.programmer, port:self.port) self.builder.uploadProject(board: self.board, programmer:self.programmer, port:self.port)
}) })
} }

4
AVRsack/ASSerial.mm
View File

@ -37,14 +37,14 @@ NSString * kASSerialPortsChanged = @"PortsChanged";
watchSlashDev = watchSlashDev =
dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fd, DISPATCH_VNODE_WRITE, dispatch_get_main_queue()); dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, fd, DISPATCH_VNODE_WRITE, dispatch_get_main_queue());
dispatch_source_set_event_handler(watchSlashDev, ^{ dispatch_source_set_event_handler(watchSlashDev, ^{
[[NotificationCenter defaultCenter] postNotificationName:kASSerialPortsChanged object: nil]; [[NSNotificationCenter defaultCenter] postNotificationName:kASSerialPortsChanged object: nil];
}); });
dispatch_resume(watchSlashDev); dispatch_resume(watchSlashDev);
} }
+ (NSArray<NSString *> *)ports { + (NSArray<NSString *> *)ports {
NSMutableArray * cuPorts = [NSMutableArray array]; NSMutableArray * cuPorts = [NSMutableArray array];
for (NSString * port in [[FileManager defaultManager] contentsOfDirectoryAtPath:@"/dev" error: nil]) { for (NSString * port in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/dev" error: nil]) {
if ([[port substringToIndex:2] isEqualToString:@"cu"]) if ([[port substringToIndex:2] isEqualToString:@"cu"])
[cuPorts addObject:[port substringFromIndex:3]]; [cuPorts addObject:[port substringFromIndex:3]];
} }

8
AVRsack/ASSerialWin.swift
View File

@ -161,10 +161,11 @@ class ASSerialWin: NSWindowController {
serialData = "" serialData = ""
logView.setString(serialData) logView.setString(serialData)
readHandle.readabilityHandler = {(handle) in readHandle.readabilityHandler = {(handle) in
let newData = handle.availableDataIgnoringExceptions() if let newData = handle.availableDataIgnoringExceptions(),
let newString = NSString(data: newData, encoding: String.Encoding.ascii) as! String let newString = String(data: newData, encoding: String.Encoding.ascii)
{
self.serialData += newString self.serialData += newString
DispatchQueue.main.async(execute: { () -> Void in DispatchQueue.main.async(execute: {
self.logView.setString(self.serialData) self.logView.setString(self.serialData)
if self.scrollToBottom { if self.scrollToBottom {
self.logView.gotoLine(1000000000, column: 0, animated: true) self.logView.gotoLine(1000000000, column: 0, animated: true)
@ -173,6 +174,7 @@ class ASSerialWin: NSWindowController {
} }
} }
} }
}
@IBAction func sendInput(_: AnyObject) { @IBAction func sendInput(_: AnyObject) {
let line = inputLine.stringValue + (sendCR ? "\r" : "") + (sendLF ? "\n" : "") let line = inputLine.stringValue + (sendCR ? "\r" : "") + (sendLF ? "\n" : "")