From efd1e11475088284803f5db0f554f6ef2d0268f5 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Tue, 27 Mar 2018 12:00:57 -0400
Subject: [PATCH] functional keypad, va_arg bug discovery

---
 include/gpio.h   |  12 ++++----
 initrd/init      |  12 ++++----
 libinterp.a      | Bin 47938 -> 71812 bytes
 link.ld          |  12 ++++----
 src/gpio.c       |  12 ++++----
 src/keypad.c     |  66 +++++++++++++++++++++----------------------
 src/keypad.c.bak |  72 -----------------------------------------------
 src/script.c     |  26 ++++++++++++++---
 8 files changed, 79 insertions(+), 133 deletions(-)
 delete mode 100644 src/keypad.c.bak

diff --git a/include/gpio.h b/include/gpio.h
index 58ebaa7..08feb86 100644
--- a/include/gpio.h
+++ b/include/gpio.h
@@ -83,7 +83,7 @@ void gpio_init(void);
  * @param pupd pullup/pulldown enable
  * @see GPIO_PUPD
  */
-void gpio_pupd(GPIO_TypeDef *port, uint8_t pin, uint8_t pupd);
+void gpio_pupd(GPIO_TypeDef *port, uint32_t pin, uint32_t pupd);
 
 /**
  * Sets whether to use push-pull or open drain for the given pin.
@@ -92,7 +92,7 @@ void gpio_pupd(GPIO_TypeDef *port, uint8_t pin, uint8_t pupd);
  * @param type what to use
  * @see GPIO_TYPE
  */
-void gpio_type(GPIO_TypeDef *port, uint8_t pin, uint8_t type);
+void gpio_type(GPIO_TypeDef *port, uint32_t pin, uint32_t type);
 
 /**
  * Sets the pin's speed.
@@ -101,7 +101,7 @@ void gpio_type(GPIO_TypeDef *port, uint8_t pin, uint8_t type);
  * @param speed the speed to use
  * @see GPIO_SPEED
  */
-void gpio_speed(GPIO_TypeDef *port, uint8_t pin, uint8_t speed);
+void gpio_speed(GPIO_TypeDef *port, uint32_t pin, uint32_t speed);
 
 /**
  * Sets the pin's i/o mode.
@@ -110,7 +110,7 @@ void gpio_speed(GPIO_TypeDef *port, uint8_t pin, uint8_t speed);
  * @param mode the mode to use
  * @see GPIO_MODE
  */
-void gpio_mode(GPIO_TypeDef *port, uint8_t pin, uint8_t mode);
+void gpio_mode(GPIO_TypeDef *port, uint32_t pin, uint32_t mode);
 
 /**
  * Sets the state of a digital output pin.
@@ -118,7 +118,7 @@ void gpio_mode(GPIO_TypeDef *port, uint8_t pin, uint8_t mode);
  * @param pin the pin
  * @param val non-zero for high, zero for low
  */
-void gpio_dout(GPIO_TypeDef *port, uint8_t pin, uint8_t val);
+void gpio_dout(GPIO_TypeDef *port, uint32_t pin, uint32_t val);
 
 /**
  * Reads a digital input pin.
@@ -126,6 +126,6 @@ void gpio_dout(GPIO_TypeDef *port, uint8_t pin, uint8_t val);
  * @param pin the pin
  * @return non-zero for high, zero for low
  */
-uint8_t gpio_din(GPIO_TypeDef *port, uint8_t pin);
+uint32_t gpio_din(GPIO_TypeDef *port, uint32_t pin);
 
 #endif // GPIO_H_
diff --git a/initrd/init b/initrd/init
index 17eb48d..7359f16 100644
--- a/initrd/init
+++ b/initrd/init
@@ -1,8 +1,8 @@
-input = 0
 while (1) {
-	while (input == 0) {
-		input = getkey
-	}
-	print(input)
-	input = 0
+	print("> ")
+	input = gets()
+	answer = solve(input)
+	print("\n")
+	print(answer)
+	print("\n")
 }
diff --git a/libinterp.a b/libinterp.a
index f00993242e5414ac266362cd0e4f61c02760a9bc..a485352ff9c5eb2672f03a312ff0e174cb2487a4 100644
GIT binary patch
delta 24141
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
UrW_-WV3hk>{~0K>sx#342g*0qp8x;=

delta 6507
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

diff --git a/link.ld b/link.ld
index b7adb78..231269a 100644
--- a/link.ld
+++ b/link.ld
@@ -41,8 +41,8 @@ SECTIONS {
 		*(.text)
 		*(.text*)
 
-		*(.init)
-		*(.fini)
+		KEEP(*(.init))
+		KEEP(*(.fini))
 		. = ALIGN(8);
 	} > FLASH
 
@@ -64,14 +64,14 @@ SECTIONS {
 	/* init_array/fini_array (TODO understand this) */
 	.init_array : {
 		__init_array_start = .;
-		KEEP(*(SORT(.init_array.*)))
+		KEEP(*(.init_array.*))
 		KEEP(*(.init_array*))
 		__init_array_end = .;
 	} > FLASH
 
 	.fini_array : {
 		__fini_array_start = .;
-		KEEP(*(SORT(.fini_array.*)))
+		KEEP(*(.fini_array.*))
 		KEEP(*(.fini_array*))
 		__fini_array_end = .;
 	} > FLASH
@@ -88,10 +88,10 @@ SECTIONS {
 
 	/* uninitialized data */
 	.bss : {
-		. = ALIGN(4);
+		. = ALIGN(8);
 		__bss_start__ = .;
 		*(.bss)
-		. = ALIGN(4);
+		. = ALIGN(8);
 		__bss_end__ = .;
 	} > RAM
 }
diff --git a/src/gpio.c b/src/gpio.c
index 2e50e88..db67465 100644
--- a/src/gpio.c
+++ b/src/gpio.c
@@ -26,36 +26,36 @@ void gpio_init(void)
 	RCC->AHB2ENR |= 0xFF;
 }
 
-void gpio_pupd(GPIO_TypeDef *port, uint8_t pin, uint8_t pupd)
+void gpio_pupd(GPIO_TypeDef *port, uint32_t pin, uint32_t pupd)
 {
 	port->PUPDR &= ~(0x03 << (2 * pin));
 	port->PUPDR |= pupd << (2 * pin);
 }
 
-void gpio_speed(GPIO_TypeDef *port, uint8_t pin, uint8_t speed)
+void gpio_speed(GPIO_TypeDef *port, uint32_t pin, uint32_t speed)
 {
 	port->OSPEEDR &= ~(0x03 << (2 * pin));
 	port->OSPEEDR |= speed << (2 * pin);
 }
 
-void gpio_type(GPIO_TypeDef *port, uint8_t pin, uint8_t type)
+void gpio_type(GPIO_TypeDef *port, uint32_t pin, uint32_t type)
 {
 	port->OTYPER &= ~(1 << pin);
 	port->OTYPER |= type << pin;
 }
 
-void gpio_mode(GPIO_TypeDef *port, uint8_t pin, uint8_t mode)
+void gpio_mode(GPIO_TypeDef *port, uint32_t pin, uint32_t mode)
 {
 	port->MODER &= ~(0x03 << (2 * pin));
 	port->MODER |= mode << (2 * pin);
 }
 
-void gpio_dout(GPIO_TypeDef *port, uint8_t pin, uint8_t val)
+void gpio_dout(GPIO_TypeDef *port, uint32_t pin, uint32_t val)
 {
 	port->BSRR |= (1 << (val ? pin : pin + 16));
 }
 
-uint8_t gpio_din(GPIO_TypeDef *port, uint8_t pin)
+uint32_t gpio_din(GPIO_TypeDef *port, uint32_t pin)
 {
 	return port->IDR & (1 << pin);
 }
diff --git a/src/keypad.c b/src/keypad.c
index 20a67c2..f76271c 100644
--- a/src/keypad.c
+++ b/src/keypad.c
@@ -23,15 +23,15 @@
 #include <gpio.h>
 #include <task.h>
 
-#define ROW_0 GPIO_PORT(B, 15)
-#define ROW_1 GPIO_PORT(B, 14)
-#define ROW_2 GPIO_PORT(B, 13)
+#define ROW_0 GPIO_PORT(A, 12)
+#define ROW_1 GPIO_PORT(B, 12)
+#define ROW_2 GPIO_PORT(B, 11)
 #define ROW_3 GPIO_PORT(C, 4)
-#define COL_0 GPIO_PORT(B, 1)
-#define COL_1 GPIO_PORT(B, 2)
-#define COL_2 GPIO_PORT(B, 11)
-#define COL_3 GPIO_PORT(B, 12)
-#define COL_4 GPIO_PORT(A, 11)
+#define COL_0 GPIO_PORT(B, 13)
+#define COL_1 GPIO_PORT(B, 14)
+#define COL_2 GPIO_PORT(B, 15)
+#define COL_3 GPIO_PORT(B, 1)
+#define COL_4 GPIO_PORT(B, 2)
 
 #define ROWS 4
 #define COLS 5
@@ -49,43 +49,43 @@ static const port_t keypad_cols[COLS] = {
 	{ COL_0 }, { COL_1 }, { COL_2 }, { COL_3 }, { COL_4 }
 };
 
-//static const int keypad_map[ROWS][COLS] = {
-//	{ '7', '8', '9',  'x',  '/' },
-//	{ '4', '5', '6',  'y',  '*' },
-//	{ '3', '2', '1',  'z',  '-' },
-//	{ '.', '0', '\b', '\n', '+' }
-//};
+static const int keypad_map[ROWS][COLS] = {
+	{ '7', '8', '9',  'x',  '/' },
+	{ '4', '5', '6',  'y',  '*' },
+	{ '1', '2', '3',  '=',  '-' },
+	{ '.', '0', '\b', '\n', '+' }
+};
 
 #define BUFFER_SIZE 8
-static char keypad_buffer = 'A';//[BUFFER_SIZE];
+static char keypad_buffer = 0;//[BUFFER_SIZE];
 //static int keypad_buffer_pos = -1;
 
 void keypad_task(void)
 {
-	//unsigned int col = 0;
+	unsigned int col = 0;
 	while (1) {
-	//	gpio_dout(keypad_cols[col].port, keypad_cols[col].pin, 1);
-	//	for (unsigned int row = 0; row < ROWS; row++) {
-	//		if (gpio_din(keypad_rows[row].port, keypad_rows[row].pin)) {
-	//			//if (keypad_buffer_pos < BUFFER_SIZE)
-	//				keypad_buffer/*[++keypad_buffer_pos]*/ = keypad_map[row][col];
-	//			while (gpio_din(keypad_rows[row].port, keypad_rows[row].pin))
-	//				delay(1);
-	//			break;
-	//		}
-	//	}
-	//	gpio_dout(keypad_cols[col].port, keypad_cols[col].pin, 0);
-	//	col++;
-	//	if (col == COLS)
-	//		col = 0;
-
+		gpio_dout(keypad_cols[col].port, keypad_cols[col].pin, 1);
 		delay(10);
+		for (unsigned int row = 0; row < ROWS; row++) {
+			if (gpio_din(keypad_rows[row].port, keypad_rows[row].pin)) {
+				//if (keypad_buffer_pos < BUFFER_SIZE)
+					keypad_buffer/*[++keypad_buffer_pos]*/ = keypad_map[row][col];
+				while (gpio_din(keypad_rows[row].port, keypad_rows[row].pin))
+					delay(1);
+				break;
+			}
+		}
+
+		gpio_dout(keypad_cols[col].port, keypad_cols[col].pin, 0);
+		col++;
+		if (col == COLS)
+			col = 0;
 	}
 }
 
 void keypad_init(void)
 {
-	for (uint8_t i = 0; i < ROWS; i++) {
+	for (int i = 0; i < ROWS; i++) {
 		GPIO_TypeDef *p = keypad_rows[i].port;
 		uint16_t pin = keypad_rows[i].pin;
 		gpio_mode(p, pin, OUTPUT);
@@ -95,7 +95,7 @@ void keypad_init(void)
 		gpio_pupd(p, pin, PULLDOWN);
 	}
 
-	for (uint8_t i = 0; i < COLS; i++) {
+	for (int i = 0; i < COLS; i++) {
 		GPIO_TypeDef *p = keypad_cols[i].port;
 		uint16_t pin = keypad_cols[i].pin;
 		gpio_mode(p, pin, OUTPUT);
diff --git a/src/keypad.c.bak b/src/keypad.c.bak
deleted file mode 100644
index 2fbefff..0000000
--- a/src/keypad.c.bak
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file keypad.c
- * Manages the GPIO keypad using IO expanders
- *
- * Copyright (C) 2018 Clyne Sullivan
- *
- * 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, either version 3 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <stm32l476xx.h>
-#include <gpio.h>
-
-#define ADDR 0x20
-
-#define CONTROL 0x41
-#define ADDRESS 0x12
-
-void keypad_init(void)
-{
-	// clock init
-	RCC->CCIPR &= ~(RCC_CCIPR_I2C1SEL_Msk);
-	RCC->CCIPR |= 2 << RCC_CCIPR_I2C1SEL_Pos; 
-	RCC->APB1ENR1 |= RCC_APB1ENR1_I2C1EN;
-
-	// set times
-	// PRESC, SCLDEL, SDADEL, SCLH, SCLL
-	I2C1->TIMINGR = (0 << 28) | (2 << 20) | (0 << 16) | (2 << 8) | 4;
-
-	// gpio init
-	gpio_mode(GPIOB, 8, ALTERNATE);
-	gpio_mode(GPIOB, 9, ALTERNATE);
-	GPIOB->AFR[1] &= ~(0xFF);
-	GPIOB->AFR[1] |= 0x44;
-
-	// go go go
-	I2C1->CR1 |= I2C_CR1_PE;
-
-	I2C1->CR2 |= ADDR << 1;
-	//I2C1->CR2 |= I2C_CR2_RD_WRN;
-	I2C1->CR2 &= ~(I2C_CR2_NBYTES);
-	I2C1->CR2 |= 1 << I2C_CR2_NBYTES_Pos;
-	I2C1->CR2 |= I2C_CR2_RELOAD;
-	I2C1->CR2 |= I2C_CR2_START;
-
-	while (!(I2C1->ISR & I2C_ISR_TXE));
-
-	I2C1->TXDR = ADDRESS;
-
-	while (I2C1->ISR & I2C_ISR_BUSY);
-
-	I2C1->ICR |= 0x30;
-	I2C1->CR2 |= I2C_CR2_RD_WRN;
-	I2C1->CR2 |= I2C_CR2_RELOAD;
-	I2C1->CR2 |= I2C_CR2_START;
-	
-	while (1) {
-		while (!(I2C1->ISR & I2C_ISR_RXNE));
-		uint32_t v = I2C1->RXDR;
-		(void)v;
-	}
-}
diff --git a/src/script.c b/src/script.c
index be0fa37..0ce5509 100644
--- a/src/script.c
+++ b/src/script.c
@@ -35,6 +35,7 @@
 #define igetarg_integer(it, n) ((int)igetarg(it, n)->value.f)
 
 int script_puts(instance *it);
+int script_putchar(instance *it);
 int script_gets(instance *it);
 int script_delay(instance *it);
 int script_rect(instance *it);
@@ -49,6 +50,7 @@ int script_menu(instance *it);
 void script_loadlib(instance *it)
 {
 	inew_cfunc(it, "print", script_puts);
+	inew_cfunc(it, "putchar", script_putchar);
 	inew_cfunc(it, "gets", script_gets);
 	inew_cfunc(it, "getkey", script_getkey);
 	inew_cfunc(it, "ppos", script_ppos);
@@ -86,7 +88,7 @@ int script_puts(instance *it)
 	variable *v = igetarg(it, 0);
 	if (v->type == NUMBER) {
 		char buf[33];
-		snprintf(buf, 33, "%f", v->value.f);
+		snprintf(buf, 33, "%d", (int)v->value.f); // TODO
 		dsp_puts(buf);
 	} else if (v->type == STRING) {
 		dsp_puts((const char *)v->value.p);
@@ -94,6 +96,18 @@ int script_puts(instance *it)
 	return 0;
 }
 
+int script_putchar(instance *it)
+{
+	variable *v = igetarg(it, 0);
+	char buf[2];
+	
+	buf[0] = (int)v->value.f;
+	buf[1] = '\0';
+	dsp_puts(buf);
+
+	return 0;
+}
+
 int script_gets(instance *it)
 {
 	char *s = malloc(64);
@@ -101,7 +115,11 @@ int script_gets(instance *it)
 	int index = 0;
 
 	do {
-		c[0] = serial_get();
+		do {
+			c[0] = keypad_get();
+			delay(1);
+		} while (c[0] == 0);
+		//c[0] = serial_get();
 		s[index] = c[0];
 		if (c[0] == '\b' || c[0] == 127) {
 			index--;
@@ -109,10 +127,10 @@ int script_gets(instance *it)
 				dsp_puts("\b");
 				index--;
 			}
-		} else if (c[0] != '\r') {
+		} else if (c[0] != '\n'/*'\r'*/) {
 			dsp_puts(c);
 		}
-	} while (s[index] != '\r' && index++ < 63);
+	} while (s[index] != '\n'/*'\r'*/ && index++ < 63);
 	s[index] = '\0';
 
 	variable *r = make_vars(0, s);