projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Compute igniter good/bad thresholds using 3.5V value
[fw/altos]
/
src
/
micropeak
/
ao_pins.h
diff --git
a/src/micropeak/ao_pins.h
b/src/micropeak/ao_pins.h
index de9fc7f29c2b3848e7d56afb333b7a9a4e3d9f00..2c02f3a3acb34b997d79b5b733741ef30fb91e28 100644
(file)
--- a/
src/micropeak/ao_pins.h
+++ b/
src/micropeak/ao_pins.h
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,20
+20,22
@@
#define _AO_PINS_H_
#include <avr/pgmspace.h>
#define _AO_PINS_H_
#include <avr/pgmspace.h>
-#define AO_LED_
BLUE
(1<<4)
+#define AO_LED_
ORANGE
(1<<4)
#define AO_LED_SERIAL 4
#define AO_LED_SERIAL 4
-#define AO_LED_PANIC AO_LED_BLUE
-#define LEDS_AVAILABLE (AO_LED_BLUE)
+#define AO_LED_PANIC AO_LED_ORANGE
+#define AO_LED_REPORT AO_LED_ORANGE
+#define LEDS_AVAILABLE (AO_LED_ORANGE)
#define USE_SERIAL_1_STDIN 0
#define HAS_USB 0
#define PACKET_HAS_SLAVE 0
#define HAS_SERIAL_1 0
#define HAS_TASK 0
#define HAS_MS5607 1
#define USE_SERIAL_1_STDIN 0
#define HAS_USB 0
#define PACKET_HAS_SLAVE 0
#define HAS_SERIAL_1 0
#define HAS_TASK 0
#define HAS_MS5607 1
-#define HAS_MS5611 1
+#define HAS_MS5611 0
+#define HAS_SENSOR_ERRORS 0
#define HAS_EEPROM 0
#define HAS_BEEP 0
#define HAS_EEPROM 0
#define HAS_BEEP 0
-#define AVR_CLOCK
800
0000UL
+#define AVR_CLOCK
25
0000UL
/* SPI */
#define SPI_PORT PORTB
/* SPI */
#define SPI_PORT PORTB
@@
-41,9
+44,12
@@
#define AO_MS5607_CS_PORT PORTB
#define AO_MS5607_CS_PIN 3
#define AO_MS5607_CS_PORT PORTB
#define AO_MS5607_CS_PIN 3
+/* MS5607 */
#define AO_MS5607_SPI_INDEX 0
#define AO_MS5607_MISO_PORT PORTB
#define AO_MS5607_MISO_PIN 0
#define AO_MS5607_SPI_INDEX 0
#define AO_MS5607_MISO_PORT PORTB
#define AO_MS5607_MISO_PIN 0
+#define AO_MS5607_BARO_OVERSAMPLE 4096
+#define AO_MS5607_TEMP_OVERSAMPLE 1024
/* I2C */
#define I2C_PORT PORTB
/* I2C */
#define I2C_PORT PORTB
@@
-53,8
+59,9
@@
#define I2C_PIN_SDA PINB0
#define AO_CONST_ATTRIB PROGMEM
#define I2C_PIN_SDA PINB0
#define AO_CONST_ATTRIB PROGMEM
+typedef int32_t alt_t;
#define FETCH_ALT(o) ((alt_t) pgm_read_dword(&altitude_table[o]))
#define FETCH_ALT(o) ((alt_t) pgm_read_dword(&altitude_table[o]))
-#define AO_ALT_VALUE(x) ((x) * 10)
+#define AO_ALT_VALUE(x) ((x) *
(alt_t)
10)
#endif /* _AO_PINS_H_ */
#endif /* _AO_PINS_H_ */