diff options
| author | Bdale Garbee <bdale@gag.com> | 2012-10-23 09:38:36 -0600 | 
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2012-10-23 09:38:36 -0600 | 
| commit | 055f3232decc07e064d596469b81cf9869411c2d (patch) | |
| tree | cc5ebf8283ca00cbe1344f6ed808feaf7e9575ad /src/core/ao_pyro.h | |
| parent | 8ca58e20208495ce63b8256a8ffa43932867e8d5 (diff) | |
| parent | 9e60fa214ad2c48fbe8f7e5c437681aa35d249fa (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/core/ao_pyro.h')
| -rw-r--r-- | src/core/ao_pyro.h | 4 | 
1 files changed, 4 insertions, 0 deletions
| diff --git a/src/core/ao_pyro.h b/src/core/ao_pyro.h index 5deb69d0..cde850ad 100644 --- a/src/core/ao_pyro.h +++ b/src/core/ao_pyro.h @@ -42,6 +42,9 @@ enum ao_pyro_flag {  	ao_pyro_after_motor		= 0x00001000,  	ao_pyro_delay			= 0x00002000, + +	ao_pyro_state_less		= 0x00004000, +	ao_pyro_state_greater_or_equal  = 0x00008000,  };  struct ao_pyro { @@ -52,6 +55,7 @@ struct ao_pyro {  	int16_t			orient_less, orient_greater;  	int16_t			time_less, time_greater;  	int16_t			delay; +	uint8_t			state_less, state_greater_or_equal;  	int16_t			motor;  	uint16_t		delay_done;  	uint8_t			fired; | 
