Commit graph

79 commits

Author SHA1 Message Date
QuentinPerret 14107f0301 correct conflit left for Data branch merge , double function definition 2023-05-09 13:46:39 +02:00
QuentinPerret 118504546e merge Data 2023-05-09 13:41:59 +02:00
QuentinPerret 4be1462614 Merge branch 'Data' 2023-05-09 13:41:44 +02:00
QuentinPerret 5be8eaa7c9 change cmake params 2023-05-09 13:37:36 +02:00
quentin.perret bf4f35ca29 move .h in include 2022-12-01 17:29:47 +01:00
quentin.perret 011eecc81b beginning code to write json file 2022-09-06 17:33:54 +02:00
quentin.perret 83a308bb96 update gitignore + solve printArrayData issue 2022-09-06 16:44:13 +02:00
Aurélien Gauthier 6b9de5f457 rebase merge 2022-06-27 16:39:21 +02:00
Aurélien Gauthier 70e01e558f create readme.md and fix issue on recovery data array from file and adaptative array size frome the number of captors 2022-06-27 16:35:30 +02:00
quentin.perret 1c7d7edaae ad comment for next time fix 2022-06-24 18:30:58 +02:00
Aurélien Gauthier a8c235bc65 first try after first fix strsep 2022-06-24 17:50:54 +02:00
Aurélien Gauthier fecd2124d7 fix strsep 2022-06-24 17:22:33 +02:00
quentin.perret b464ff1541 try to fix getArray 2022-06-24 17:17:28 +02:00
quentin.perret 1eb7ec26b3 create code py for testing calcul 2022-06-24 15:45:25 +02:00
Aurélien Gauthier ee3d1315c0 modif on frequency in simulflux and fix average 2022-06-24 15:42:25 +02:00
Aurélien Gauthier 5e57356f85 add test and modification on queue 2022-06-23 16:24:47 +02:00
Aurélien Gauthier 8bd977ba62 fix some warnings 2022-06-21 17:47:27 +02:00
Aurélien Gauthier ade5b4378f CMakelists add few test queue 2022-06-21 15:13:10 +02:00
Aurélien Gauthier f4fd64e63c forget to save main.c 2022-06-17 17:46:53 +02:00
Aurélien Gauthier e1c631229d merge 2022-06-17 17:45:03 +02:00
Aurélien Gauthier 2d58ef1ec3 cmake and begin test 2022-06-17 17:42:09 +02:00
quentin.perret e06c7602e0 add timeFile + ignore last values 2022-06-17 17:38:53 +02:00
quentin.perret 8ecdd37619 growth ok 2022-06-16 17:05:12 +02:00
quentin.perret efc3110b2d power debug (column = 0) 2022-06-16 15:19:07 +02:00
quentin.perret 479289a365 vide 2022-06-16 14:44:31 +02:00
quentin.perret e23d744cdc beginning change power 2022-06-16 14:35:02 +02:00
quentin.perret 7af7366247 fix threadboth 2022-06-15 17:50:47 +02:00
quentin.perret c39dcdee1f Merge branch 'master' of https://git.cohabit.fr/pgp/Traitement-signal-plantes 2022-06-15 16:57:53 +02:00
quentin.perret 9030c3df0e go back to : threads clean , captors choice ok 2022-06-15 16:56:58 +02:00
quentin.perret d6f1fc5cfa threads clean , captors choice ok 2022-06-15 16:29:55 +02:00
Aurélien Gauthier 9cf444c47e osef test error 2022-06-15 16:27:56 +02:00
theo.canaud 7cc7533214 RawDataFiles changed, start of tab 2022-06-15 16:25:43 +02:00
Aurélien Gauthier 21cb319b25 growthRate thread implémentation 2022-06-15 15:45:14 +02:00
Aurélien Gauthier 3435430c02 Merge branch 'Data' of ssh://git.cohabit.fr:22222/pgp/Traitement-signal-plantes into Data 2022-06-15 14:02:10 +02:00
Aurélien Gauthier 0c63639454 add in main.c 2022-06-15 14:01:55 +02:00
quentin.perret a6c0e54756 add comment for work in main 2022-06-15 13:59:27 +02:00
Aurélien Gauthier c66535111d merge add thread growth rate 2022-06-15 12:03:46 +02:00
Aurélien Gauthier 7d024ff384 first part and skeletton of growthrate thread 2022-06-15 12:01:51 +02:00
quentin.perret 9cd8d2bc7e add new thread growth rate 2022-06-15 11:57:15 +02:00
quentin.perret 33115049f6 threads clean , captors choice ok 2022-06-15 10:49:21 +02:00
quentin.perret f9a6f00972 trying to debug power 2022-06-14 18:01:52 +02:00
quentin.perret 64a50327e7 comment c code 2022-06-14 10:46:12 +02:00
quentin.perret 2080c37eef comment c code 2022-06-14 10:46:04 +02:00
quentin.perret 05a9142c7e add average thread 2022-06-14 10:24:59 +02:00
quentin.perret 6cd7513501 remove file during traitment 2022-06-13 17:35:00 +02:00
quentin.perret ce37306f65 thread calcul ok 2022-06-13 17:24:53 +02:00
quentin.perret 52bded6534 almost debug second thread 2022-06-13 17:11:16 +02:00
quentin.perret bfe730e0ba debug rawdatafile close 2022-06-13 15:19:05 +02:00
quentin.perret 75639d3c4a maj queue debug simul 2022-06-13 15:03:51 +02:00
quentin.perret b0fa82b06e finalize merge 2022-06-10 17:25:33 +02:00