mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Compare commits

base: mhu:f2c596a67004b93e1aaae4fab5556464d1fe3062
Branches Tags
mhu:dev
mhu:temp-profile-checker
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5-1
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test
..
compare: mhu:cd23e938252727533e7f3537e62d6fa6409fa84b
Branches Tags
mhu:temp-profile-checker
mhu:dev
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5-1
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test

2 Commits
f2c596a670 ... cd23e93825

Author SHA1 Message Date
Mario Hüttel
cd23e93825 Add newest shellmatta and include missing syscalls 2020-04-11 00:54:17 +02:00
Mario Hüttel
cd892e1d5c Add new measurement data 2020-04-11 00:53:56 +02:00
6 changed files with 26645 additions and 6 deletions
Show Stats Expand all files Collapse all files

26627
measurement-data/1000OhmSampling-v1.2.csv Normal file
View File

File diff suppressed because it is too large Load Diff

5
measurement-data/Analog_Measurement_Analysis.ipynb
View File

@ -351,7 +351,8 @@
" (kilo_ohm_sampling1_ht, 'Day 1 Sampling -- Stable circuit -- HT'),\n", " (kilo_ohm_sampling1_ht, 'Day 1 Sampling -- Stable circuit -- HT'),\n",
" (kilo_ohm_sampling2, 'Day 2 Sampling -- Stable circuit'),\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'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" " ]\n"
] ]
}, },
@ -410,7 +411,7 @@
"name": "python", "name": "python",
"nbconvert_exporter": "python", "nbconvert_exporter": "python",
"pygments_lexer": "ipython3", "pygments_lexer": "ipython3",
"version": "3.8.1" "version": "3.8.2"
} }
}, },
"nbformat": 4, "nbformat": 4,

2
stm-firmware/Makefile
View File

@ -28,7 +28,7 @@ endif
CFILES += adc-meas.c CFILES += adc-meas.c
# Shellmatta # 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 INCLUDEPATH += -Ishellmatta/api
# DEFINES += -DSHELLMATTA_STRIP_PRINTF # DEFINES += -DSHELLMATTA_STRIP_PRINTF

4
stm-firmware/shell.c
View File

@ -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); unique_id_get(&high_id, &mid_id, &low_id);
shellmatta_printf(handle, "Reflow Oven Controller Firmware " xstr(GIT_VER) "\r\n" shellmatta_printf(handle, "Reflow Oven Controller Firmware " xstr(GIT_VER) "\r\n"
"Compiled: " __DATE__ " at " __TIME__ "\r\n" "Compiled: " __DATE__ " at " __TIME__ "\r\n"
"Serial: %08X-%08X-%08X", high_id, mid_id, low_id); "Serial: %08X-%08X-%08X", high_id, mid_id, low_id);
return SHELLMATTA_OK; return SHELLMATTA_OK;
} }

2
stm-firmware/shellmatta

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

11
stm-firmware/syscalls.c
View File

@ -91,3 +91,14 @@ int _write(int fd, const void *buf, int count)
uart_send_array_with_dma(&shell_uart, (char *)buf, count); uart_send_array_with_dma(&shell_uart, (char *)buf, count);
return count; return count;
} }
int _getpid()
{
return 0;
}
int _kill(int pid)
{
return -1;
}