Project

General

Profile

Actions

Task #58995

closed

Task #49925: WP 6: first level trigger (FLT)

Task #49929: WP 6.4: frontend implementation

Task #58992: Modification du logiciel DU

Ajouter la version logiciel DU

Added by Colley Jean-Marc about 1 year ago. Updated about 2 months ago.

Status:
Closed
Priority:
Normal
Assigned To:
Category:
-
Start date:
10/20/2023
Due date:
% Done:

100%

Estimated time:
Remaining (hours)0.0

Description

Besoin:
  • connaître la version logiciel "dudaq" tournant sur le détecteur
Actions #1

Updated by Colley Jean-Marc about 1 year ago

Solution envisagée

coté dudaq:
  • make all lance un script récupérant le nom de la branche courante et hash git
  • compiler avec ces DEFINE qui seront en dur dans le code
  • créer une requête "VERSION" retournant ces valeurs
coté adaq:
  • au lancement de adaq , lancer une requête "VERSION" sur tous les détecteur connecté
  • utilisé les valeurs des version dans le fichier de données binaire
Actions #2

Updated by Colley Jean-Marc about 1 year ago

Commandes git


/grand-daq-master$ git rev-parse --abbrev-ref HEAD
dev_jmc

/grand-daq-master$ git rev-parse --verify HEAD
6cdfb89883bb4b48b13b55ffd2f2524f777ab7ce

/grand-daq-master$ git rev-parse --short  HEAD
6cdfb89


ou

grand-daq-master$ git describe --all
heads/dev_jmc

grand-daq-master$ git checkout ref_main_230711
Note: checking out 'ref_main_230711'.

You are in 'detached HEAD' state...

grand-daq-master$ git describe --all
tags/ref_main_230711

Actions #3

Updated by Colley Jean-Marc about 2 months ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100
  • Remaining (hours) set to 0.0

git informations are defined at compilation time
https://github.com/grand-mother/grand-daq-master/blob/b41aa78e467c0bc05b496015a55c772443c1cd33/dudaq_1/myfiles/SConstruct.py#L60

and transmit par define in code
https://github.com/grand-mother/grand-daq-master/blob/b41aa78e467c0bc05b496015a55c772443c1cd33/dudaq_1/myfiles/dudaq.c#L46

And define are transformed in string like this

#define STR_IMPL(x) #x
#define STR(x) STR_IMPL(x)

const char g_GIT_BRANCH[] = STR;
const char g_GIT_SHA1[] = STR;

Actions

Also available in: Atom PDF