Add newest shellmatta and include missing syscalls

measurement-data/Analog_Measurement_Analysis.ipynb

@@ -351,7 +351,8 @@
     "                    (kilo_ohm_sampling1_ht, 'Day 1 Sampling -- Stable circuit -- HT'),\n",
     "                    (kilo_ohm_sampling2, 'Day 2 Sampling -- Stable circuit'),\n",
     "                    (pd.read_csv(r'1000OhmSamplingFixedStableCircuitDay3.csv'), 'Day 3 Sampling -- Stable Circuit (improved)'),\n",
-    "                    (pd.read_csv(r'1000OhmSamplingFixedStableCircuitDay4.csv'), 'Day 4 Sampling -- Stable Circuit (improved)')\n",
+    "                    (pd.read_csv(r'1000OhmSamplingFixedStableCircuitDay4.csv'), 'Day 4 Sampling -- Stable Circuit (improved)'),\n",
+    "                    (pd.read_csv(r'1000OhmSampling-v1.2.csv'), 'Day 1 Sampling v1.2')\n",
     "                   ]\n"
    ]
   },
@@ -410,7 +411,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.1"
+   "version": "3.8.2"
   }
  },
  "nbformat": 4,

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
 

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;
 }

stm-firmware/shellmatta

@@ -1 +1 @@
-Subproject commit 2921f9791b69e2026331e14a2f77f5e88c995321
+Subproject commit 6c76dfc7aed2594579f09d0b797d6a51cffff343

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;
+}
+