From cd23e938252727533e7f3537e62d6fa6409fa84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20H=C3=BCttel?= <mario.huettel@gmx.net>
Date: Sat, 11 Apr 2020 00:54:17 +0200
Subject: [PATCH] Add newest shellmatta and include missing syscalls

---
 stm-firmware/Makefile   |  2 +-
 stm-firmware/shell.c    |  4 ++--
 stm-firmware/shellmatta |  2 +-
 stm-firmware/syscalls.c | 11 +++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile
index a43cf79..c464e84 100644
--- a/stm-firmware/Makefile
+++ b/stm-firmware/Makefile
@@ -28,7 +28,7 @@ endif
 CFILES += adc-meas.c
 
 # Shellmatta
-CFILES += shellmatta/src/shellmatta.c shellmatta/src/shellmatta_autocomplete.c shellmatta/src/shellmatta_escape.c shellmatta/src/shellmatta_history.c shellmatta/src/shellmatta_utils.c shell.c
+CFILES += shellmatta/src/shellmatta.c shellmatta/src/shellmatta_autocomplete.c shellmatta/src/shellmatta_escape.c shellmatta/src/shellmatta_history.c shellmatta/src/shellmatta_utils.c shellmatta/src/shellmatta_opt.c shell.c
 INCLUDEPATH += -Ishellmatta/api
 # DEFINES += -DSHELLMATTA_STRIP_PRINTF
 
diff --git a/stm-firmware/shell.c b/stm-firmware/shell.c
index 95e145e..e5c9b81 100644
--- a/stm-firmware/shell.c
+++ b/stm-firmware/shell.c
@@ -54,8 +54,8 @@ static shellmatta_retCode_t shell_cmd_ver(const shellmatta_handle_t   handle,
 	unique_id_get(&high_id, &mid_id, &low_id);
 
 	shellmatta_printf(handle, "Reflow Oven Controller Firmware " xstr(GIT_VER) "\r\n"
-										   "Compiled: " __DATE__ " at " __TIME__ "\r\n"
-															 "Serial: %08X-%08X-%08X", high_id, mid_id, low_id);
+					"Compiled: " __DATE__ " at " __TIME__ "\r\n"
+					"Serial: %08X-%08X-%08X", high_id, mid_id, low_id);
 
 	return SHELLMATTA_OK;
 }
diff --git a/stm-firmware/shellmatta b/stm-firmware/shellmatta
index 2921f97..6c76dfc 160000
--- a/stm-firmware/shellmatta
+++ b/stm-firmware/shellmatta
@@ -1 +1 @@
-Subproject commit 2921f9791b69e2026331e14a2f77f5e88c995321
+Subproject commit 6c76dfc7aed2594579f09d0b797d6a51cffff343
diff --git a/stm-firmware/syscalls.c b/stm-firmware/syscalls.c
index 42c63b3..052ffaa 100644
--- a/stm-firmware/syscalls.c
+++ b/stm-firmware/syscalls.c
@@ -91,3 +91,14 @@ int _write(int fd, const void *buf, int count)
 		uart_send_array_with_dma(&shell_uart, (char *)buf, count);
 	return count;
 }
+
+int _getpid()
+{
+	return 0;
+}
+
+int _kill(int pid)
+{
+	return -1;
+}
+