ao_data_get(&packet);
);
- value = (AO_IGNITER_CLOSED>>1);
value = AO_SENSE_PYRO(&packet, p);
- if (value < AO_IGNITER_OPEN)
- return ao_igniter_open;
- else if (value > AO_IGNITER_CLOSED)
- return ao_igniter_ready;
- else
- return ao_igniter_unknown;
+ return ao_igniter_check(value, AO_SENSE_PBATT(&packet));
}
void
* of the requirements
*/
static uint8_t
-ao_pyro_ready(struct ao_pyro *pyro)
+ao_pyro_ready(const struct ao_pyro *pyro)
{
enum ao_pyro_flag flag, flags;
#if HAS_GYRO
#endif
case ao_pyro_time_less:
- if ((int32_t) (ao_time() - ao_launch_tick) <= pyro->time_less)
+ if ((AO_TICK_SIGNED) (ao_time() - ao_launch_tick) <= pyro->time_less)
continue;
- DBG("time %d > %d\n", (int32_t)(ao_time() - ao_launch_tick), pyro->time_less);
+ DBG("time %d > %d\n", (AO_TICK_SIGNED)(ao_time() - ao_launch_tick), pyro->time_less);
break;
case ao_pyro_time_greater:
- if ((int32_t) (ao_time() - ao_launch_tick) >= pyro->time_greater)
+ if ((AO_TICK_SIGNED) (ao_time() - ao_launch_tick) >= pyro->time_greater)
continue;
- DBG("time %d < %d\n", (int32_t)(ao_time() - ao_launch_tick), pyro->time_greater);
+ DBG("time %d < %d\n", (AO_TICK_SIGNED)(ao_time() - ao_launch_tick), pyro->time_greater);
break;
case ao_pyro_ascending:
ao_delay(AO_MS_TO_TICKS(50));
}
+static AO_TICK_TYPE pyro_delay_done[AO_PYRO_NUM];
+
static uint8_t
ao_pyro_check(void)
{
- struct ao_pyro *pyro;
+ const struct ao_pyro *pyro;
uint8_t p, any_waiting;
uint16_t fire = 0;
any_waiting = 1;
/* Check pyro state to see if it should fire
*/
- if (!pyro->delay_done) {
+ if (!pyro_delay_done[p]) {
if (!ao_pyro_ready(pyro))
continue;
* it expires
*/
if (pyro->flags & ao_pyro_delay) {
- pyro->delay_done = ao_time() + pyro->delay;
- if (!pyro->delay_done)
- pyro->delay_done = 1;
+ AO_TICK_TYPE delay_done;
+ AO_TICK_SIGNED delay = pyro->delay;
+ if (delay < 0)
+ delay = 0;
+ delay_done = ao_time() + (AO_TICK_TYPE) delay;
+
+ /*
+ * delay_done is the time at which the
+ * delay ends, but it is also used as
+ * an indication that a delay is
+ * active -- non-zero values indicate
+ * an active delay. This code ensures
+ * the value is non-zero, which might
+ * introduce an additional tick
+ * of delay.
+ */
+ if (delay_done == 0)
+ delay_done = 1;
+ pyro_delay_done[p] = delay_done;
}
}
/* Check to see if we're just waiting for
* the delay to expire
*/
- if (pyro->delay_done) {
+ if (pyro_delay_done[p] != 0) {
/* Check to make sure the required conditions
* remain valid. If not, inhibit the channel
* by setting the inhibited bit
*/
if (!ao_pyro_ready(pyro)) {
- ao_pyro_inhibited |= (1 << p);
+ ao_pyro_inhibited |= (uint16_t) (1 << p);
continue;
}
- if ((int32_t) (ao_time() - pyro->delay_done) < 0)
+ if ((AO_TICK_SIGNED) (ao_time() - pyro_delay_done[p]) < 0)
continue;
}
- fire |= (1 << p);
+ fire |= (uint16_t) (1U << p);
}
if (fire) {
case 8:
if (value < 0)
return false;
- *((uint8_t *) ((char *) base + offset)) = value;
+ *((uint8_t *) ((char *) base + offset)) = (uint8_t) value;
break;
case 16:
default:
- *((int16_t *) (void *) ((char *) base + offset)) = value;
+ *((int16_t *) (void *) ((char *) base + offset)) = (int16_t) value;
break;
case 32:
*((int32_t *) (void *) ((char *) base + offset)) = value;
void
ao_pyro_set(void)
{
- uint8_t p;
+ uint32_t p;
struct ao_pyro pyro_tmp;
char name[AO_PYRO_NAME_LEN];
uint8_t c;
if (ao_cmd_status != ao_cmd_success)
return;
if (AO_PYRO_NUM <= p) {
- printf ("invalid pyro channel %d\n", p);
+ printf ("invalid pyro channel %lu\n", p);
return;
}
memset(&pyro_tmp, '\0', sizeof (pyro_tmp));
r = -1;
ao_cmd_lex();
}
- r *= ao_cmd_decimal();
+ r *= (int32_t) ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
if (!ao_pyro_put(&pyro_tmp, ao_pyro_values[v].offset,
/* First, move all of the config bits that follow the pyro data */
- char *pyro_base = (void *) &ao_config.pyro;
- char *after_pyro_new = pyro_base + AO_PYRO_NUM * sizeof (struct ao_pyro);
- char *after_pyro_1_24 = pyro_base + AO_PYRO_NUM * sizeof (struct ao_pyro_1_24);
- char *config_end = (void *) (&ao_config + 1);
- size_t to_move = config_end - after_pyro_new;
+ struct ao_config_1_24 *ao_config_1_24 = (void *) &ao_config;
+ struct ao_pyro *pyro_1_25 = &ao_config.pyro[0];
+ struct ao_pyro_1_24 *pyro_1_24 = &(ao_config_1_24->pyro)[0];
- memmove(after_pyro_new, after_pyro_1_24, to_move);
- /* Now, adjust all of the pyro entries */
+ char *pyro_base_1_25 = (void *) pyro_1_25;
+ char *pyro_base_1_24 = (void *) pyro_1_24;
+ char *after_pyro_1_25 = pyro_base_1_25 + AO_PYRO_NUM * sizeof (struct ao_pyro);
+ char *after_pyro_1_24 = pyro_base_1_24 + AO_PYRO_NUM * sizeof (struct ao_pyro_1_24);
- struct ao_pyro *pyro_new = ao_config.pyro;
- struct ao_pyro_1_24 *pyro_old = (void *) ao_config.pyro;
+ char *config_end_1_25 = (void *) (&ao_config + 1);
+ size_t to_move = (size_t) (config_end_1_25 - after_pyro_1_25);
+
+ memmove(after_pyro_1_25, after_pyro_1_24, to_move);
+
+ /* Now, adjust all of the pyro entries */
int p = AO_PYRO_NUM;
struct ao_pyro tmp;
memset(&tmp, '\0', sizeof(tmp));
- tmp.flags = pyro_old[p].flags;
+ tmp.flags = pyro_1_24[p].flags;
for (v = 0; v < NUM_PYRO_VALUES; v++)
{
- value = ao_pyro_get_1_24(&pyro_old[v], ao_pyro_values[v].flag);
- ao_pyro_put(&tmp, ao_pyro_values[v].offset,
- ao_pyro_size(ao_pyro_values[v].flag), value);
+ if (ao_pyro_values[v].offset != NO_VALUE) {
+ value = ao_pyro_get_1_24(&pyro_1_24[p], ao_pyro_values[v].flag);
+ ao_pyro_put(&tmp, ao_pyro_values[v].offset,
+ ao_pyro_size(ao_pyro_values[v].flag), value);
+ }
}
- memcpy(&pyro_new[p], &tmp, sizeof(tmp));
+ memcpy(&pyro_1_25[p], &tmp, sizeof(tmp));
}
}
}
projects / fw / altos / blobdiff