projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update load cell channel based on repaired board and 1T load cell
[fw/altos]
/
src
/
cortexelf-v1
/
ao_pins.h
diff --git
a/src/cortexelf-v1/ao_pins.h
b/src/cortexelf-v1/ao_pins.h
index d580ce3d2f4efcdab7eb79c5c6a81dceedeb6e1f..c2bbf2d2f2a1b4dd00d9ba766e450a4f7a95f275 100644
(file)
--- a/
src/cortexelf-v1/ao_pins.h
+++ b/
src/cortexelf-v1/ao_pins.h
@@
-62,6
+62,8
@@
#define USE_SERIAL_2_STDIN 1
#define SERIAL_2_PA2_PA3 0
#define SERIAL_2_PD5_PD6 1
#define USE_SERIAL_2_STDIN 1
#define SERIAL_2_PA2_PA3 0
#define SERIAL_2_PD5_PD6 1
+#define USE_SERIAL_2_FLOW 0
+#define USE_SERIAL_2_SW_FLOW 0
#define HAS_SERIAL_3 0
#define USE_SERIAL_3_STDIN 0
#define HAS_SERIAL_3 0
#define USE_SERIAL_3_STDIN 0
@@
-90,12
+92,12
@@
#define HAS_SPI_2 1
#define SPI_2_PB13_PB14_PB15 0
#define SPI_2_PD1_PD3_PD4 1 /* LED displays, microSD */
#define HAS_SPI_2 1
#define SPI_2_PB13_PB14_PB15 0
#define SPI_2_PD1_PD3_PD4 1 /* LED displays, microSD */
-#define SPI_2_OSPEEDR STM_OSPEEDR_
1
0MHz
+#define SPI_2_OSPEEDR STM_OSPEEDR_
4
0MHz
#define SPI_2_PORT (&stm_gpiod)
#define SPI_2_PORT (&stm_gpiod)
-
#define SPI_2_SCK_PIN
1
-
#define SPI_2_MISO_PIN
3
-
#define SPI_2_MOSI_PIN
4
+
//#define SPI_2_SCK_PIN
1
+
//#define SPI_2_MISO_PIN
3
+
//#define SPI_2_MOSI_PIN
4
#define HAS_I2C_1 0
#define I2C_1_PB8_PB9 0
#define HAS_I2C_1 0
#define I2C_1_PB8_PB9 0
@@
-125,6
+127,8
@@
#define AO_SDCARD_SPI_MISO_PIN 3
#define AO_SDCARD_SPI_MOSI_PIN 4
#define AO_SDCARD_SPI_MISO_PIN 3
#define AO_SDCARD_SPI_MOSI_PIN 4
+/* VGA */
+#define STM_DMA1_3_STOLEN 1
/* Buttons */
#define AO_EVENT 1
/* Buttons */
#define AO_EVENT 1
@@
-207,12
+211,6
@@
#define AO_MATRIX_COL_3_PIN 6
/* 1802 connections */
#define AO_MATRIX_COL_3_PIN 6
/* 1802 connections */
-#define MA_PORT (&stm_gpioe)
-#define MA_SHIFT 0
-
-#define DATA_PORT (&stm_gpioe)
-#define DATA_SHIFT 8
-
#define MRD_PORT (&stm_gpiob)
#define MRD_BIT 15
#define MRD_PORT (&stm_gpiob)
#define MRD_BIT 15
@@
-225,34
+223,45
@@
#define TPA_PORT (&stm_gpioa)
#define TPA_BIT 6
#define TPA_PORT (&stm_gpioa)
#define TPA_BIT 6
-#define MUX_PORT (&stm_gpiob)
-#define MUX_BIT 1
+#define MA_PORT (&stm_gpioe)
+#define MA_SHIFT 0
+#define MA_MASK 0xff
-#define WAIT_PORT (&stm_gpioa)
-#define WAIT_PIN 4
+#define BUS_PORT (&stm_gpioe)
+#define BUS_SHIFT 8
+#define BUS_MASK 0xff
-#define CLEAR_PORT (&stm_gpioa)
-#define CLEAR_PIN 10
+#define SC_PORT (&stm_gpiob)
+#define SC_SHIFT 13
+#define SC_MASK 3
#define Q_PORT (&stm_gpiob)
#define Q_BIT 12
#define Q_PORT (&stm_gpiob)
#define Q_BIT 12
-#define SC_PORT (&stm_gpiob)
-#define SC_SHIFT 13
-
#define N_PORT (&stm_gpiod)
#define N_SHIFT 13
#define N_PORT (&stm_gpiod)
#define N_SHIFT 13
+#define N_MASK 7
+
+#define EF_PORT (&stm_gpiob)
+#define EF_SHIFT 8
+#define EF_MASK 0xf
#define DMA_IN_PORT (&stm_gpioa)
#define DMA_IN_PORT (&stm_gpioa)
-#define DMA_IN_
PIN
0
+#define DMA_IN_
BIT
0
#define DMA_OUT_PORT (&stm_gpioa)
#define DMA_OUT_PORT (&stm_gpioa)
-#define DMA_OUT_
PIN
9
+#define DMA_OUT_
BIT
9
-#define INT
ERRUPT_PORT
(&stm_gpioa)
-#define INT
ERRUPT_PIN
2
+#define INT
_PORT
(&stm_gpioa)
+#define INT
_BIT
2
-#define EF_PORT (&stm_gpiob)
-#define EF_SHIFT 8
+#define CLEAR_PORT (&stm_gpioa)
+#define CLEAR_BIT 10
+
+#define WAIT_PORT (&stm_gpioa)
+#define WAIT_BIT 4
+
+#define MUX_PORT (&stm_gpiob)
+#define MUX_BIT 1
#endif /* _AO_PINS_H_ */
#endif /* _AO_PINS_H_ */