rusefi
/
ultimate_nag52
mirror of https://github.com/rusefi/ultimate_nag52.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cargo conflicts

This commit is contained in:
Ashcon Mohseninia 2022-08-03 22:12:06 +01:00
parent 015b30b78d
commit 83f7ecce11
6 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config_app/Cargo.toml
View File

@ -13,13 +13,13 @@ ecu_diagnostics="0.90.51"
image = "0.24.1"
serial-rs = {git="https://github.com/rnd-ash/serial-rs"}
nfd="0.0.4"
egui_winit_platform = "0.14.0"
#egui_winit_platform = "0.14.0"
pollster = "0.2.5"
eframe = {git = "https://github.com/emilk/egui", features=["wgpu"] }
wgpu = "0.12"
winit = "0.26.1"
egui-wgpu = "0.18.0"
egui-winit = "0.18.0"
eframe = {git = "https://github.com/emilk/egui", features=["wgpu"], rev="cf591da1a0bdb57c9495a3dcf0448b3c0d8e64e0" }
#wgpu = "0.12"
#winit = "0.26.1"
#egui-wgpu = "0.18.0"
#egui-winit = "0.18.0"
modular-bitfield = "0.11.2"
static_assertions = "1.1.0"
env_logger="0.9.0"

4
config_app/src/main.rs
View File

@ -5,10 +5,6 @@ use std::iter;
use eframe::{NativeOptions, Renderer};
use ui::launcher::Launcher;
use window::MainWindow;
use egui_wgpu::renderer::{RenderPass, ScreenDescriptor};
use egui_winit_platform::{Platform, PlatformDescriptor};
use winit::event::Event::*;
use winit::event_loop::ControlFlow;
mod ui;
mod usb_hw;

2
config_app/src/ui/diagnostics/mod.rs
View File

@ -4,7 +4,7 @@ use std::hash::{Hash, Hasher};
use std::sync::{Arc, Mutex};
use std::time::Instant;
use ecu_diagnostics::kwp2000::Kwp2000DiagnosticServer;
use eframe::egui::plot::{Plot, Value, Line, Values, Legend};
use eframe::egui::plot::{Plot, Line, Legend, Values, Value};
use eframe::egui::{Ui, RichText, Color32};
use crate::ui::status_bar::MainStatusBar;
use crate::window::{PageAction, StatusBar};

2
config_app/src/ui/diagnostics/shift_reporter.rs
View File

@ -1,7 +1,7 @@
use std::{sync::{Arc, atomic::{AtomicBool, Ordering}, RwLock, Mutex}, thread, time::Duration};
use ecu_diagnostics::{kwp2000::{Kwp2000DiagnosticServer, SessionType, KWP2000Error}, DiagnosticServer};
use eframe::{egui::{plot::{Plot, Points, Value, Line, Values, LinkedAxisGroup, VLine, Text, LineStyle, PlotUi, Corner}, RichText}, epaint::{Stroke, Color32}};
use eframe::{egui::{plot::{Plot, Points, Line, LinkedAxisGroup, VLine, Text, LineStyle, PlotUi, Corner, Value, Values}, RichText}, epaint::{Stroke, Color32}};
use modular_bitfield::bitfield;
use serde::{Serialize, Deserialize};

2
config_app/src/ui/io_maipulator.rs
View File

@ -1,7 +1,7 @@
use std::{sync::{Arc, Mutex, atomic::{AtomicBool, Ordering, AtomicU64}, RwLock}, thread, time::{Duration, Instant}, char::MAX};
use ecu_diagnostics::kwp2000::{Kwp2000DiagnosticServer, SessionType};
use eframe::egui::plot::{Plot, Legend, Line, Values, Value};
use eframe::egui::plot::{Plot, Legend, Line};
use crate::{ui::status_bar::MainStatusBar, window::PageAction};

2
config_app/src/ui/routine_tests/solenoid_test.rs
View File

@ -1,7 +1,7 @@
use std::{sync::{Arc, Mutex, atomic::{AtomicBool, Ordering, AtomicU64, AtomicU8}, RwLock}, thread, time::{Duration, Instant}, char::MAX, collections::btree_map::Range, ops::RangeInclusive};
use ecu_diagnostics::{kwp2000::{Kwp2000DiagnosticServer, SessionType}, DiagServerResult, DiagnosticServer, DiagError};
use eframe::egui::{plot::{Plot, Legend, Line, Values, Value}, widgets, Color32, RichText, self};
use eframe::egui::{plot::{Plot, Legend, Line}, widgets, Color32, RichText, self};
use crate::{ui::status_bar::MainStatusBar, window::PageAction};