diff options
| author | Keith Packard <keithp@keithp.com> | 2012-06-02 19:59:40 -0700 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-06-02 19:59:40 -0700 | 
| commit | f86dac643081987c8994ab57a96640d5e91b342a (patch) | |
| tree | cc175f18f8930c04be16bb4c12b756782ecff568 /altoslib/AltosEepromIterable.java | |
| parent | dd43a2ae7594f062a8980d1756a07488ee54b447 (diff) | |
altoslib: Clean up random rebase failures
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib/AltosEepromIterable.java')
| -rw-r--r-- | altoslib/AltosEepromIterable.java | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/altoslib/AltosEepromIterable.java b/altoslib/AltosEepromIterable.java index f1397c7b..a923d63b 100644 --- a/altoslib/AltosEepromIterable.java +++ b/altoslib/AltosEepromIterable.java @@ -318,28 +318,28 @@ public class AltosEepromIterable extends AltosRecordIterable {  			case AltosLib.AO_LOG_SOFTWARE_VERSION:  				out.printf ("# Software version: %s\n", record.data);  				break; -			case Altos.AO_LOG_BARO_RESERVED: +			case AltosLib.AO_LOG_BARO_RESERVED:  				out.printf ("# Baro reserved: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_SENS: +			case AltosLib.AO_LOG_BARO_SENS:  				out.printf ("# Baro sens: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_OFF: +			case AltosLib.AO_LOG_BARO_OFF:  				out.printf ("# Baro off: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_TCS: +			case AltosLib.AO_LOG_BARO_TCS:  				out.printf ("# Baro tcs: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_TCO: +			case AltosLib.AO_LOG_BARO_TCO:  				out.printf ("# Baro tco: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_TREF: +			case AltosLib.AO_LOG_BARO_TREF:  				out.printf ("# Baro tref: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_TEMPSENS: +			case AltosLib.AO_LOG_BARO_TEMPSENS:  				out.printf ("# Baro tempsens: %d\n", record.a);  				break; -			case Altos.AO_LOG_BARO_CRC: +			case AltosLib.AO_LOG_BARO_CRC:  				out.printf ("# Baro crc: %d\n", record.a);  				break;  			}  | 
