stv0g/libfn
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed structure alignment (cannot start programs in fnweb)

Browse source
This commit is contained in:
Steffen Vogel 2012-02-02 19:28:51 +01:00
parent 211e43950e
commit 9814d87126
3 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/fnweb.c
View file

@ -177,46 +177,41 @@ int handle_request(void *cls, struct MHD_Connection *connection, const char *url
}
else if (strcmp(url+1, "start") == 0) { // TODO not working: padding bytes in program_params_t?
const char *script = MHD_lookup_connection_value(connection, MHD_GET_ARGUMENT_KIND, "script");
union program_params_t params;
msg.cmd = REMOTE_CMD_START_PROGRAM;
msg.start_program.script = (uint8_t) atoi(script);
switch (atoi(script)) {
case 0:
printf("Start program: colorwheel\n");
params.colorwheel.hue_start = 0;
params.colorwheel.hue_step = 60;
params.colorwheel.add_addr = 0;
params.colorwheel.saturation = 255;
params.colorwheel.value = 255;
msg.start_program.params.colorwheel.hue_start = 0;
msg.start_program.params.colorwheel.hue_step = 60;
msg.start_program.params.colorwheel.add_addr = 0;
msg.start_program.params.colorwheel.saturation = 255;
msg.start_program.params.colorwheel.value = 255;
params.colorwheel.fade_step = 1;
params.colorwheel.fade_delay = 2;
params.colorwheel.fade_sleep = 0;
msg.start_program.params.colorwheel.fade_step = 1;
msg.start_program.params.colorwheel.fade_delay = 2;
msg.start_program.params.colorwheel.fade_sleep = 0;
break;
case 1:
printf("Start program: random\n");
params.random.seed = (uint16_t) (rand() % 0xffff);
params.random.use_address = 0;
params.random.wait_for_fade = 1;
params.random.min_distance = 60;
msg.start_program.params.random.seed = (uint16_t) (rand() % 0xffff);
msg.start_program.params.random.use_address = 0;
msg.start_program.params.random.wait_for_fade = 1;
msg.start_program.params.random.min_distance = 60;
params.random.saturation = 255;
params.random.value = 255;
msg.start_program.params.random.saturation = 255;
msg.start_program.params.random.value = 255;
params.random.fade_step = 1;
params.random.fade_delay = 3;
params.random.fade_sleep = 100;
msg.start_program.params.random.fade_step = 1;
msg.start_program.params.random.fade_delay = 2;
msg.start_program.params.random.fade_sleep = 3;
break;
default:
return MHD_NO;
}
msg.cmd = REMOTE_CMD_START_PROGRAM;
msg.start_program.script = atoi(script);
msg.start_program.params = params;
memset(&msg.start_program.params, 0xff, 3);
}
else if (strcmp(url+1, "stop") == 0) {
msg.cmd = REMOTE_CMD_STOP;

2
src/remote-proto.h
View file

@ -119,7 +119,7 @@ struct remote_msg_config_offsets_t {
struct remote_msg_start_program_t {
uint8_t script;
union program_params_t params;
};
} __attribute__ ((__packed__));
struct remote_msg_stop_t {
uint8_t fade;

4
src/static-programs.h
View file

@ -41,7 +41,7 @@ struct colorwheel_params_t {
int8_t add_addr;
uint8_t saturation;
uint8_t value;
};
} __attribute__ ((__packed__));
struct random_params_t {
uint16_t seed;
@ -54,7 +54,7 @@ struct random_params_t {
uint8_t saturation;
uint8_t value;
uint8_t min_distance;
};
} __attribute__ ((__packed__));
struct replay_params_t {
uint8_t start;