Project

General

Profile

Bug #266

nhfc-genom3 servo should probably interrupt itself... and mk_main_stop better be called nhfc_main_stop

Added by Félix Ingrand 27 days ago. Updated 23 days ago.

Status:
Closed
Priority:
Normal
Assignee:
-

Description

for mk_main_stop, it is to avoid a codel name conflict when all the modules are in the same exec.

git diff
diff --git a/codels/nhfc_main_codels.c b/codels/nhfc_main_codels.c
index 86ac5dd..9edc772 100644
--- a/codels/nhfc_main_codels.c
++ b/codels/nhfc_main_codels.c
@ -1,5 +1,5 @
/*
- * Copyright (c) 2015-2019 LAAS/CNRS
* Copyright (c) 2015-2020 LAAS/CNRS * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@ -269,13 +269,13 @ output:
}

-/** Codel mk_main_stop of task main.
+/** Codel nhfc_main_stop of task main. * * Triggered by nhfc_stop. * Yields to nhfc_ether.
*/
genom_event
-mk_main_stop(const nhfc_rotor_input *rotor_input,
+nhfc_main_stop(const nhfc_rotor_input *rotor_input,
const genom_context self) {
or_rotorcraft_input input_data;
diff --git a/nhfc.gen b/nhfc.gen
index e5ed488..684c088 100644
--- a/nhfc.gen
++ b/nhfc.gen
@ -1,5 +1,5 @
/
/
- * Copyright (c) 2015-2019 LAAS/CNRS
* Copyright (c) 2015-2020 LAAS/CNRS * All rights reserved. * * Redistribution and use in source and binary forms, with or without
@ -148,7 +148,7 @ component nhfc {
ids inout reference, inout desired,
inout log, out rotor_input)
yield pause::control;
- codel<stop> mk_main_stop(out rotor_input)
+ codel<stop> nhfc_main_stop(out rotor_input)
yield ether;
};

@ -162,6 +162,8 @ component nhfc {
codel<start> nhfc_servo_main(port in reference::in, ids out reference)
yield pause::start, ether;

+ interrupt servo;
+
throw e_input;
};


Felix


Files

smime.p7s (3.42 KB) smime.p7s Félix Ingrand, 2020-07-16 09:39
#1

Updated by Anthony Mallet 27 days ago

  • Project changed from robots-admin to nhfc-genom3
#2

Updated by Anthony Mallet 23 days ago

  • Status changed from New to Closed

Also available in: Atom PDF