diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:24:13 +0800 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-08-05 11:24:13 +0800 |
| commit | a3b4f0d33e9d13fb5294397304ec0eb44ecaf1fc (patch) | |
| tree | 69c563070ea7ca4a127f2ac925f18a36acb888bb /src/chaoskey-v1.0 | |
| parent | 67da03d1382228a95d0414294703371cf32e666e (diff) | |
| parent | 3a2a5a05bb6372d9003905cee7afdfcd6d38ae7e (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'src/chaoskey-v1.0')
| -rw-r--r-- | src/chaoskey-v1.0/Makefile | 4 | ||||
| -rw-r--r-- | src/chaoskey-v1.0/ao_chaoskey.c | 2 | ||||
| -rw-r--r-- | src/chaoskey-v1.0/ao_pins.h | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/chaoskey-v1.0/Makefile b/src/chaoskey-v1.0/Makefile index dea5b483..c6cf45bd 100644 --- a/src/chaoskey-v1.0/Makefile +++ b/src/chaoskey-v1.0/Makefile @@ -14,6 +14,7 @@ INC = \ ao_task.h \ ao_adc_fast.h \ ao_power.h \ + ao_flash_readout.h \ ao_crc.h \ stm32f0.h @@ -34,6 +35,7 @@ ALTOS_SRC = \ ao_boot_chain.c \ ao_usb_stm.c \ ao_trng_send.c \ + ao_flash_readout.c \ ao_task.c \ ao_power.c \ ao_gpio.c \ @@ -84,7 +86,7 @@ check: $(METAINFO) distclean: clean clean: - rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx + rm -f *.o $(PROGNAME)-*.elf $(PROGNAME)-*.ihx *.bin rm -f ao_product.h rm -f *.cab diff --git a/src/chaoskey-v1.0/ao_chaoskey.c b/src/chaoskey-v1.0/ao_chaoskey.c index c3acd441..1165e454 100644 --- a/src/chaoskey-v1.0/ao_chaoskey.c +++ b/src/chaoskey-v1.0/ao_chaoskey.c @@ -20,6 +20,7 @@ #include <ao_adc_fast.h> #include <ao_crc.h> #include <ao_trng_send.h> +#include <ao_flash_readout.h> void main(void) { @@ -30,6 +31,7 @@ void main(void) ao_dma_init(); ao_adc_init(); ao_crc_init(); + ao_flash_readout_init(); ao_usb_init(); diff --git a/src/chaoskey-v1.0/ao_pins.h b/src/chaoskey-v1.0/ao_pins.h index f2c46d8b..22861d9d 100644 --- a/src/chaoskey-v1.0/ao_pins.h +++ b/src/chaoskey-v1.0/ao_pins.h @@ -50,6 +50,7 @@ #define AO_USB_HAS_OUT 0 #define AO_USB_HAS_IN 1 #define AO_USB_HAS_IN2 1 +#define AO_USB_HAS_IN3 1 #define AO_USB_HAS_INT 0 #define AO_USB_SELF_POWER 0 #define AO_USB_DEVICE_ID_SERIAL 1 @@ -58,6 +59,9 @@ #define IS_FLASH_LOADER 0 +#define AO_FLASH_READOUT 1 +#define ao_flash_readout_putchar(c) ao_usb_putchar3(c) + /* ADC */ #define AO_ADC_PIN0_PORT (&stm_gpioa) |