updates soft proton current to functions with updated nicos device
Example Action / Lint (push) Successful in 2s
Example Action / BuildAndTest (push) Successful in 38s

This commit is contained in:
2026-06-09 13:14:16 +02:00
parent d6f0dd54eb
commit 7e795504aa
2 changed files with 50 additions and 11 deletions
+2 -7
View File
@@ -220,12 +220,6 @@ static long processEmulatedCounter(struct aSubRecord *psub) {
if (softProtonDebug)
printf("%s: Starting Count! (time <= %f, count <= %d)\n",
funcstr, spc->t_preset, spc->ch1_preset);
/* Sanity check that count type is properly stored */
// if (spc->command_trig != spc->count_type) {
// if (softProtonDebug)
// printf("%s: Count type not stored!\n", funcstr);
// return -1;
// }
/* Starting a new count
* Reset counter and time */
*monitor_count_out = 0;
@@ -283,7 +277,8 @@ static long processEmulatedCounter(struct aSubRecord *psub) {
/* Check if count is finished normally.
* Higher priority than low rate */
if (
(spc->t_preset > 0 && *elapsed_time_out >= spc->t_preset) ||
// The time only has precision 0.1 so we could make this somewhat less precise
(spc->t_preset > 0 && *elapsed_time_out >= spc->t_preset - 1e-6) ||
(spc->ch1_preset > 0 && *monitor_count_out >= spc->ch1_preset)
) {
if (softProtonDebug)