Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
rnd-ash committed Jan 18, 2024
1 parent 485d6e2 commit 3f8b7bb
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 19 deletions.
2 changes: 2 additions & 0 deletions backend/src/diag/device_modes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ impl Nag52Diag {
Err(DiagError::InvalidResponseLength)
} else {
let x: u16 = u16::from_be_bytes(res[3..].try_into().unwrap());
//self.set_device_mode(TcuDeviceMode::SLAVE, true)?;
//Ok(TcuDeviceMode::NORMAL)
Ok(TcuDeviceMode::from_bits_retain(x))
}
}
Expand Down
12 changes: 6 additions & 6 deletions config_app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ serde = { version = "1.0.148", features = ["derive"] }
backend={path="../backend/"}
config_app_macros={path="../config_app_macros/"}
image = "0.24.5"
rfd="0.12.1"
rfd="0.13.0"
pollster = "0.3.0"
eframe = {default-features=false, version="0.24.1", features=["wgpu", "x11", "default_fonts"]}
egui_extras = {default-features=false, version="0.24.2", features=["image"]}
eframe = {default-features=false, version="0.25.0", features=["wgpu", "x11", "default_fonts"]}
egui_extras = {default-features=false, version="0.25.0", features=["image"]}
static_assertions = "1.1.0"
env_logger="0.10.0"
egui-toast="0.10.1"
egui-toast="0.11.0"
chrono = "0.4.23"
nom="7.1.1"
plotters-backend="0.3.4"
plotters={version="0.3.4", default_features = false, features=["surface_series"]}
packed_struct="0.10.0"
ehttp="0.3.1"
ehttp="0.4.0"
octocrab = {git = "https://github.com/XAMPPRocky/octocrab", commit="7061b48c9bb799cb7effa0ecb8fd366a23f13de2"}
tokio = { version = "1.17.0", features = ["full"] }
zip="0.6.6"
curl = "0.4.43"
egui_plot = "0.24.1"
egui_plot = "0.25.0"

[patch.crates-io]
winit = { git = "https://github.com/PolyMeilex/winit ", branch = "master" }
Expand Down
6 changes: 3 additions & 3 deletions config_app/src/plot_backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ impl DrawingBackend for EguiPlotBackend {
&[self.backend_coord_to_pos2(point), self.backend_coord_to_pos2(point)]
);
let c = into_egui_color(color);
self.painter.rect_filled(rect, Rounding::none(), c);
self.painter.rect_filled(rect, 0.0, c);
Ok(())
}

Expand Down Expand Up @@ -155,9 +155,9 @@ impl DrawingBackend for EguiPlotBackend {
);

if fill {
self.painter.rect(rect, Rounding::none(), egui_c, stroke)
self.painter.rect(rect, 0.0, egui_c, stroke)
} else {
self.painter.rect_stroke(rect, Rounding::none(), stroke)
self.painter.rect_stroke(rect, 0.0, stroke)
}

Ok(())
Expand Down
1 change: 1 addition & 0 deletions config_app/src/ui/diagnostics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ impl crate::window::InterfacePage for DiagnosticsPage {
.allow_drag(false)
.include_x(std::cmp::max(20000, now) as f64)
.auto_bounds_x()
.auto_bounds_y()
.legend(legend.clone())
.x_axis_formatter(|f, _nc, r| {
let seconds = f / 1000.0;
Expand Down
9 changes: 5 additions & 4 deletions config_app/src/ui/map_editor/map_widget.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use eframe::{
egui::{self, Label, Response, Sense, Visuals},
epaint::{text::LayoutJob, FontId, Fonts, Pos2, Rect, Rounding, Shape, Stroke, TextShape},
epaint::{text::LayoutJob, FontId, Fonts, Pos2, Rect, Rounding, Shape, Stroke, TextShape, Color32},
};

pub struct MapWidget<'a>(&'a super::Map);
Expand Down Expand Up @@ -54,9 +54,9 @@ impl<'a> egui::Widget for MapWidget<'a> {
Pos2::new(rect.left(), rect.top() + (idx * row_height)),
Pos2::new(rect.right(), rect.top() + ((idx + 1.0) * row_height)),
),
Rounding::none(),
0.0,
c,
Stroke::none(),
Stroke::NONE,
);

b = !b;
Expand Down Expand Up @@ -87,8 +87,9 @@ impl<'a> egui::Widget for MapWidget<'a> {
let idx = ui.painter().add(TextShape {
pos: (rect.left(), rect.bottom()).into(),
galley: galley_y,
underline: Stroke::none(),
underline: Stroke::NONE,
override_text_color: None,
fallback_color: Color32::PLACEHOLDER,
angle: -1.5708,
});

Expand Down
4 changes: 2 additions & 2 deletions config_app/src/ui/map_editor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ impl Map {
let resp = raw_ui.push_id(&hash, |ui| {
let mut table_builder = egui_extras::TableBuilder::new(ui)
.striped(true)
.scroll(false)
.cell_layout(
Layout::left_to_right(egui::Align::Center)
.with_cross_align(egui::Align::Center),
Expand All @@ -376,7 +375,8 @@ impl Map {
}
})
.body(|body| {
body.rows(15.0, copy.y_values.len(), |row_id, mut row| {
body.rows(15.0, copy.y_values.len(), |mut row| {
let row_id = row.index();
// Header column
row.col(|c| {
c.label(
Expand Down
4 changes: 2 additions & 2 deletions config_app/src/ui/widgets/range_display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ pub fn range_display<T: Into<f32> + Copy + Display>(
);
painter.rect(
ok_region_rect,
Rounding::none(),
0.0,
Color32::GREEN,
visuals.fg_stroke,
);
painter.rect(
value_region,
Rounding::none(),
0.0,
Color32::BLACK,
visuals.fg_stroke,
);
Expand Down
4 changes: 2 additions & 2 deletions config_app/src/window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ impl eframe::App for MainWindow {
ui.strong("Message");
});
}).body(|mut body| {
body.rows(10.0, self.logs.len(), |row_index, mut row| {
let msg = &self.logs[row_index];
body.rows(10.0, self.logs.len(), |mut row| {
let msg = &self.logs[row.index()];
let c = match msg.lvl {
EspLogLevel::Debug => Color32::DEBUG_COLOR,
EspLogLevel::Info => if is_dark { Color32::GREEN } else { Color32::DARK_GREEN },
Expand Down

0 comments on commit 3f8b7bb

Please sign in to comment.