rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 22 Wiki Activity

Implementation of scheduler in pus and tmtc handler #29

Merged
muellerr merged 13 commits from pus_schedule_implementation into main 2023-02-01 13:40:49 +01:00
Conversation 1 Commits 13 Files Changed 5 +11 -9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d25f4aad87 - Show all commits

20
satrs-example/src/tmtc.rs
View File

@ -193,14 +193,15 @@ pub fn core_tmtc_task(args: OtherArgs, mut tc_args: TcArgs, tm_args: TmArgs) {
tm_store: tm_args.tm_store.pool.clone(), tm_store: tm_args.tm_store.pool.clone(),
}; };
let (mut tc_source, mut tc_receiver) = tc_args.split(); //let (mut tc_source, mut tc_receiver) = tc_args.split();
loop { loop {
let mut tmtc_sched = scheduler.clone(); let mut tmtc_sched = scheduler.clone();
core_tmtc_loop( core_tmtc_loop(
&mut udp_tmtc_server, &mut udp_tmtc_server,
&mut tc_source, &mut tc_args,
&mut tc_receiver, //&mut tc_source,
//&mut tc_receiver,
&mut pus_receiver, &mut pus_receiver,
lkoester marked this conversation as resolved Outdated
muellerr commented 2023-01-30 16:19:34 +01:00
Outdated
Review
Copy Link

old code can be deleted

old code can be deleted
tmtc_sched, tmtc_sched,
); );
@ -210,28 +211,29 @@ pub fn core_tmtc_task(args: OtherArgs, mut tc_args: TcArgs, tm_args: TmArgs) {
fn core_tmtc_loop( fn core_tmtc_loop(
udp_tmtc_server: &mut UdpTmtcServer, udp_tmtc_server: &mut UdpTmtcServer,
tc_source: &mut PusTcSource, tc_args: &mut TcArgs,
tc_receiver: &mut Receiver<StoreAddr>, //tc_source: &mut PusTcSource,
//tc_receiver: &mut Receiver<StoreAddr>,
pus_receiver: &mut PusReceiver, pus_receiver: &mut PusReceiver,
scheduler: Rc<RefCell<PusScheduler>>, scheduler: Rc<RefCell<PusScheduler>>,
lkoester marked this conversation as resolved Outdated
muellerr commented 2023-01-30 16:19:03 +01:00
Outdated
Review
Copy Link

unused code can be deleted

unused code can be deleted
) { ) {
let releaser = |enabled: bool, addr: &StoreAddr| -> bool { let releaser = |enabled: bool, addr: &StoreAddr| -> bool {
match tc_source.tc_source.send(*addr) { match tc_args.tc_source.tc_source.send(*addr) {
Ok(_) => true, Ok(_) => true,
Err(_) => false, Err(_) => false,
} }
}; };
let mut scheduler = scheduler.borrow_mut(); let mut scheduler = scheduler.borrow_mut();
let mut pool = tc_source.tc_store.pool.write().expect("error locking pool"); let mut pool = tc_args.tc_source.tc_store.pool.write().expect("error locking pool");
scheduler scheduler
.release_telecommands(releaser, pool.as_mut()) .release_telecommands(releaser, pool.as_mut())
.expect("error releasing tc"); .expect("error releasing tc");
while poll_tc_server(udp_tmtc_server) {} while poll_tc_server(udp_tmtc_server) {}
match tc_receiver.try_recv() { match tc_args.tc_receiver.try_recv() {
Ok(addr) => { Ok(addr) => {
let pool = tc_source let pool = tc_args.tc_source
.tc_store .tc_store
.pool .pool
.read() .read()