git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github:szmoore/MCTX3420
[matches/MCTX3420.git]
/
server
/
actuator.c
diff --git
a/server/actuator.c
b/server/actuator.c
index
f2ab4fe
..
1c105db
100644
(file)
--- a/
server/actuator.c
+++ b/
server/actuator.c
@@
-8,9
+8,6
@@
// Files containing GPIO and PWM definitions
#include "bbb_pin.h"
// Files containing GPIO and PWM definitions
#include "bbb_pin.h"
-
-
-
/** Number of actuators **/
int g_num_actuators = 0;
/** Number of actuators **/
int g_num_actuators = 0;
@@
-79,12
+76,17
@@
void Actuator_SetMode(Actuator * a, ControlModes mode, void *arg)
{
case CONTROL_START:
{
{
case CONTROL_START:
{
+ // Set filename
char filename[BUFSIZ];
char filename[BUFSIZ];
- const char *experiment_name = (const char*) arg;
+ const char *experiment_path = (const char*) arg;
+ int ret;
+
+ ret = snprintf(filename, BUFSIZ, "%s/actuator_%d", experiment_path, a->id);
- if (
snprintf(filename, BUFSIZ, "%s_a%d", experiment_name, a->id) >= BUFSIZ)
+ if (
ret >= BUFSIZ)
{
{
- Fatal("Experiment name \"%s\" too long (>%d)", experiment_name, BUFSIZ);
+ Fatal("Experiment path \"%s\" too long (%d, limit %d)",
+ experiment_path, ret, BUFSIZ);
}
Log(LOGDEBUG, "Actuator %d with DataFile \"%s\"", a->id, filename);
}
Log(LOGDEBUG, "Actuator %d with DataFile \"%s\"", a->id, filename);
@@
-141,7
+143,7
@@
void Actuator_SetMode(Actuator * a, ControlModes mode, void *arg)
*/
void Actuator_SetModeAll(ControlModes mode, void * arg)
{
*/
void Actuator_SetModeAll(ControlModes mode, void * arg)
{
- for (int i = 0; i <
ACTUATORS_MAX
; i++)
+ for (int i = 0; i <
g_num_actuators
; i++)
Actuator_SetMode(&g_actuators[i], mode, arg);
}
Actuator_SetMode(&g_actuators[i], mode, arg);
}
UCC
git Repository :: git.ucc.asn.au