From f8a967959b2f5ca3486ab3422f30fe4ad4ba17a8 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 7 Jan 2018 23:06:51 -0800 Subject: [PATCH] altos/lambdakey-v1.0: Add LED function back in We've made things smaller, so there's (barely) space for this now. Signed-off-by: Keith Packard --- src/lambdakey-v1.0/Makefile | 5 +++-- src/lambdakey-v1.0/ao_pins.h | 6 +++--- src/lambdakey-v1.0/ao_scheme_os.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lambdakey-v1.0/Makefile b/src/lambdakey-v1.0/Makefile index cfa009bb..9d30c521 100644 --- a/src/lambdakey-v1.0/Makefile +++ b/src/lambdakey-v1.0/Makefile @@ -32,6 +32,7 @@ ALTOS_SRC = \ ao_interrupt.c \ ao_product.c \ ao_cmd.c \ + ao_led.c \ ao_notask.c \ ao_stdio.c \ ao_stdio_newlib.c \ @@ -72,8 +73,8 @@ $(OBJ): $(INC) ao_product.h: ao-make-product.5c ../Version $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@ -ao_scheme_const.h: ao_scheme_make_const ao_scheme_basic_syntax.scheme ao_scheme_finish.scheme - $^ -o $@ -d GPIO,FLOAT,VECTOR,QUASI,BIGINT,POSIX,PORT,SAVE,UNDEF +ao_scheme_const.h: ao_scheme_make_const ao_scheme_basic_syntax.scheme + $^ -o $@ -d FLOAT,VECTOR,QUASI,BIGINT,POSIX,PORT,SAVE,UNDEF load: $(PROG) stm-load $(PROG) diff --git a/src/lambdakey-v1.0/ao_pins.h b/src/lambdakey-v1.0/ao_pins.h index f330213d..58a75080 100644 --- a/src/lambdakey-v1.0/ao_pins.h +++ b/src/lambdakey-v1.0/ao_pins.h @@ -22,15 +22,15 @@ #define fprintf(file, ...) ({ (void) (file); printf(__VA_ARGS__); }) #undef putc #define putc(c,file) ({ (void) (file); putchar(c); }) -#define fputs(s,file) ({ (void) (file); printf("%s", s); }) -#define puts(s) ({ printf("%s\n", s); }) +#define fputs(s,file) ({ (void) (file); ao_put_string(s); }) #undef getc #define getc(file) ({ (void) (file); getchar(); }) +#define fflush(file) ({ (void) (file); flush(); }) #define HAS_TASK 0 #define HAS_AO_DELAY 1 -#if 0 +#if 1 #define LED_PORT_ENABLE STM_RCC_AHBENR_IOPBEN #define LED_PORT (&stm_gpiob) #define LED_PIN_RED 4 diff --git a/src/lambdakey-v1.0/ao_scheme_os.h b/src/lambdakey-v1.0/ao_scheme_os.h index 6a2ab819..8af199c2 100644 --- a/src/lambdakey-v1.0/ao_scheme_os.h +++ b/src/lambdakey-v1.0/ao_scheme_os.h @@ -20,7 +20,7 @@ #include "ao.h" -#define AO_SCHEME_POOL 3584 +#define AO_SCHEME_POOL 3792 #define AO_SCHEME_TOKEN_MAX 64 #ifndef __BYTE_ORDER -- 2.30.2