Merge branch 'master' into renovate/anyhow-1.x
Some checks failed
Gavania Merge Build / Arduino (pull_request) Failing after 11m30s
Gavania Merge Build / Pico (pull_request) Failing after 5m24s
Gavania Merge Build / Serial Reader (pull_request) Successful in 12m15s

This commit is contained in:
hodasemi 2023-08-25 10:57:31 +02:00
commit 1e55282b2e

View file

@ -11,7 +11,7 @@ use gtk::{Application, ApplicationWindow};
use gtk::{Button, Entry, Orientation, ScrolledWindow};
use glib;
use glib::{self, source::Priority, ControlFlow};
mod port;
use port::*;
@ -54,7 +54,7 @@ fn main() {
master_box.pack_end(&scrolled_window, true, true, 3);
master_box.pack_end(&top_bar_box, false, true, 3);
let (tx, rx) = glib::MainContext::channel(glib::PRIORITY_DEFAULT);
let (tx, rx) = glib::MainContext::channel(Priority::DEFAULT);
std::thread::spawn(move || {
// loop forever
@ -147,7 +147,7 @@ fn main() {
serial_info.scroll_to_iter(&mut buffer.end_iter(), 0.0, true, 0.0, 0.0);
}
glib::Continue(true)
ControlFlow::Continue
});
window.add(&master_box);