Merge branch 'dev' into ui
This commit is contained in:
commit
1acce563c1
26627
measurement-data/1000OhmSampling-v1.2.csv
Normal file
26627
measurement-data/1000OhmSampling-v1.2.csv
Normal file
File diff suppressed because it is too large
Load Diff
@ -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,
|
||||
|
@ -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
|
||||
|
||||
@ -111,10 +111,11 @@ disassemble: $(target).elf
|
||||
objcopy: $(target).bin $(target).hex
|
||||
|
||||
mrproper: clean
|
||||
rm -f $(target).pro
|
||||
$(QUIET)rm -f $(target).pro
|
||||
|
||||
clean:
|
||||
rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
|
||||
@echo "Cleaning up derived files..."
|
||||
$(QUIET)rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
|
||||
qtproject:
|
||||
echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
|
||||
echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 4dc6cd1e79be4fed928443b91de70699773f7084
|
||||
Subproject commit 6c76dfc7aed2594579f09d0b797d6a51cffff343
|
@ -91,3 +91,16 @@ 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)
|
||||
{
|
||||
(void)pid;
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user