diff --git a/.sessions/Rust_Learning.vim b/.sessions/Rust_Learning.vim index f7dadacc..1336149c 100644 --- a/.sessions/Rust_Learning.vim +++ b/.sessions/Rust_Learning.vim @@ -15,74 +15,29 @@ else endif badd +22 Chapter\ 2\ -\ Guessing\ Game.md badd +6 guessing_game/Cargo.toml -badd +35 guessing_game/src/main.rs -badd +38 Chapter\ 3\ -\ Common\ Programming\ Concepts.md +badd +34 guessing_game/src/main.rs +badd +80 Chapter\ 3\ -\ Common\ Programming\ Concepts.md argglobal %argdel -edit guessing_game/src/main.rs -let s:save_splitbelow = &splitbelow -let s:save_splitright = &splitright -set splitbelow splitright -wincmd _ | wincmd | -vsplit -1wincmd h -wincmd w -let &splitbelow = s:save_splitbelow -let &splitright = s:save_splitright -wincmd t -let s:save_winminheight = &winminheight -let s:save_winminwidth = &winminwidth -set winminheight=0 -set winheight=1 -set winminwidth=0 -set winwidth=1 -exe 'vert 1resize ' . ((&columns * 92 + 93) / 186) -exe 'vert 2resize ' . ((&columns * 93 + 93) / 186) +edit Chapter\ 3\ -\ Common\ Programming\ Concepts.md argglobal -balt guessing_game/Cargo.toml -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -silent! normal! zE -let &fdl = &fdl -let s:l = 34 - ((33 * winheight(0) + 32) / 64) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 34 -normal! 02| -wincmd w -argglobal -if bufexists(fnamemodify("Chapter\ 3\ -\ Common\ Programming\ Concepts.md", ":p")) | buffer Chapter\ 3\ -\ Common\ Programming\ Concepts.md | else | edit Chapter\ 3\ -\ Common\ Programming\ Concepts.md | endif -if &buftype ==# 'terminal' - silent file Chapter\ 3\ -\ Common\ Programming\ Concepts.md -endif balt Chapter\ 2\ -\ Guessing\ Game.md -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen +setlocal foldmethod=manual +setlocal foldexpr=0 +setlocal foldmarker={{{,}}} +setlocal foldignore=# +setlocal foldlevel=0 +setlocal foldminlines=1 +setlocal foldnestmax=20 +setlocal foldenable silent! normal! zE let &fdl = &fdl -let s:l = 38 - ((32 * winheight(0) + 32) / 64) +let s:l = 87 - ((27 * winheight(0) + 23) / 47) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 38 -normal! 075| -wincmd w -2wincmd w -exe 'vert 1resize ' . ((&columns * 92 + 93) / 186) -exe 'vert 2resize ' . ((&columns * 93 + 93) / 186) +keepjumps 87 +normal! 049| tabnext 1 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' silent exe 'bwipe ' . s:wipebuf @@ -90,8 +45,6 @@ endif unlet! s:wipebuf set winheight=1 winwidth=20 let &shortmess = s:shortmess_save -let &winminheight = s:save_winminheight -let &winminwidth = s:save_winminwidth let s:sx = expand(":p:r")."x.vim" if filereadable(s:sx) exe "source " . fnameescape(s:sx) diff --git a/.sessions/Thesis_Notes.vim b/.sessions/Thesis_Notes.vim deleted file mode 100644 index 1c4a85e6..00000000 --- a/.sessions/Thesis_Notes.vim +++ /dev/null @@ -1,77 +0,0 @@ -let SessionLoad = 1 -let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1 -let v:this_session=expand(":p") -silent only -silent tabonly -<<<<<<< HEAD -cd ~/Documents/Dane\'s\ Vault/5\ Thesis -======= -cd ~/Documents/Dane\'s\ Vault ->>>>>>> origin/master -if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == '' - let s:wipebuf = bufnr('%') -endif -let s:shortmess_save = &shortmess -if &shortmess =~ 'A' - set shortmess=aoOA -else - set shortmess=aoO -endif -<<<<<<< HEAD -badd +16 4\ Meetings/DGC_DAS_328.md -badd +32 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md -argglobal -%argdel -edit 5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md -argglobal -balt 4\ Meetings/DGC_DAS_328.md -======= -badd +16 5\ Thesis/4\ Meetings/DGC_DAS_328.md -badd +4 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md -argglobal -%argdel -edit 5\ Thesis/5\ Resources/Literature_Reviews/A\ Review\ of\ Formal\ Methods\ applied\ to\ Machine\ Learning.md -argglobal -balt 5\ Thesis/4\ Meetings/DGC_DAS_328.md ->>>>>>> origin/master -setlocal fdm=manual -setlocal fde=0 -setlocal fmr={{{,}}} -setlocal fdi=# -setlocal fdl=0 -setlocal fml=1 -setlocal fdn=20 -setlocal fen -silent! normal! zE -let &fdl = &fdl -<<<<<<< HEAD -let s:l = 11 - ((10 * winheight(0) + 27) / 55) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 11 -normal! 058| -======= -let s:l = 13 - ((12 * winheight(0) + 36) / 73) -if s:l < 1 | let s:l = 1 | endif -keepjumps exe s:l -normal! zt -keepjumps 13 -normal! 0 ->>>>>>> origin/master -tabnext 1 -if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' - silent exe 'bwipe ' . s:wipebuf -endif -unlet! s:wipebuf -set winheight=1 winwidth=20 -let &shortmess = s:shortmess_save -let s:sx = expand(":p:r")."x.vim" -if filereadable(s:sx) - exe "source " . fnameescape(s:sx) -endif -let &g:so = s:so_save | let &g:siso = s:siso_save -set hlsearch -doautoall SessionLoadPost -unlet SessionLoad -" vim: set ft=vim : diff --git a/.sessions/nvim_config.vim b/.sessions/nvim_config.vim index 2a605e4f..32e96d68 100644 --- a/.sessions/nvim_config.vim +++ b/.sessions/nvim_config.vim @@ -15,10 +15,11 @@ else endif badd +16 ~/.config/nvim/lua/custom/plugins.lua badd +8 ~/.config/nvim/lua/custom/configs/lspconfig.lua -badd +0 custom/init.lua +badd +6 custom/init.lua +badd +14 custom/language_specific_commands/markdown.lua argglobal %argdel -edit custom/init.lua +edit custom/language_specific_commands/markdown.lua argglobal balt ~/.config/nvim/lua/custom/plugins.lua setlocal foldmethod=manual @@ -31,12 +32,12 @@ setlocal foldnestmax=20 setlocal foldenable silent! normal! zE let &fdl = &fdl -let s:l = 6 - ((5 * winheight(0) + 31) / 62) +let s:l = 14 - ((13 * winheight(0) + 31) / 62) if s:l < 1 | let s:l = 1 | endif keepjumps exe s:l normal! zt -keepjumps 6 -normal! 034| +keepjumps 14 +normal! 0 tabnext 1 if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal' silent exe 'bwipe ' . s:wipebuf diff --git a/3-99 Research/3 ARCADE/I2C/.cache/clangd/index/main.c.62CB3D9DB404E9BF.idx b/3-99 Research/3 ARCADE/I2C/.cache/clangd/index/main.c.62CB3D9DB404E9BF.idx new file mode 100644 index 00000000..7e670c21 Binary files /dev/null and b/3-99 Research/3 ARCADE/I2C/.cache/clangd/index/main.c.62CB3D9DB404E9BF.idx differ diff --git a/3-99 Research/3 ARCADE/I2C/compile_commands.json b/3-99 Research/3 ARCADE/I2C/compile_commands.json new file mode 100644 index 00000000..d0432726 --- /dev/null +++ b/3-99 Research/3 ARCADE/I2C/compile_commands.json @@ -0,0 +1,17 @@ +[ + { + "arguments": [ + "/usr/bin/avr-gcc", + "-c", + "-mmcu=atmega328p", + "-DF_CPU=16000000UL", + "-Os", + "-o", + "main.elf", + "main.c" + ], + "directory": "/home/danesabo/Documents/Dane's Vault/3-99 Research/3 ARCADE/I2C", + "file": "/home/danesabo/Documents/Dane's Vault/3-99 Research/3 ARCADE/I2C/main.c", + "output": "/home/danesabo/Documents/Dane's Vault/3-99 Research/3 ARCADE/I2C/main.elf" + } +] diff --git a/3-99 Research/3 ARCADE/I2C/main.c b/3-99 Research/3 ARCADE/I2C/main.c index 8bc0530f..971ef56d 100644 --- a/3-99 Research/3 ARCADE/I2C/main.c +++ b/3-99 Research/3 ARCADE/I2C/main.c @@ -1,22 +1,23 @@ -#include +#include #include // The main function: our program entry point int main(void) { // Set PB5 as output. DDRB is the data direction register for port B. // (1 << PB5) shifts 1 over by PB5 bits creating a bitmask. - DDRB |= (1 << DDB5); + DDRB |= (1 << PB5); + int delay = 100; // Infinite loop to blink the LED while (1) { // Set PB5 high: LED ON - PORTB |= (1 << PORTB5B5); - _delay_ms(100); // Delay 1000 milliseconds (1 second) + PORTB |= (1 << PB5); + _delay_ms(delay); // Delay 1000 milliseconds (1 second) // Clear PB5: LED OFF PORTB &= ~(1 << PB5); - _delay_ms(100); // Delay 1000 milliseconds (1 second) } - - return 0; // Though this line is never reached because of the infinite loop + _delay_ms(delay); // Delay 1000 milliseconds (1 second) } + + return 0; // Though this line is never reached because of the infinite loop } diff --git a/3-99 Research/3 ARCADE/I2C/main.elf b/3-99 Research/3 ARCADE/I2C/main.elf index f72a2e6a..3e9df15b 100755 Binary files a/3-99 Research/3 ARCADE/I2C/main.elf and b/3-99 Research/3 ARCADE/I2C/main.elf differ diff --git a/3-99 Research/3 ARCADE/I2C/main.hex b/3-99 Research/3 ARCADE/I2C/main.hex index 539117f6..06da2b9a 100644 --- a/3-99 Research/3 ARCADE/I2C/main.hex +++ b/3-99 Research/3 ARCADE/I2C/main.hex @@ -5,9 +5,8 @@ :100040000C943E000C943E000C943E000C943E0038 :100050000C943E000C943E000C943E000C943E0028 :100060000C943E000C943E0011241FBECFEFD8E04C -:10007000DEBFCDBF0E9440000C9458000C940000DD +:10007000DEBFCDBF0E9440000C9456000C940000DF :10008000259A2D9A2FEF81EE94E0215080409040E8 :10009000E1F700C000002D982FEF81EE94E0215091 -:1000A00080409040E1F700C0000090E080E00895BB -:0400B000F894FFCFF2 +:1000A00080409040E1F700C00000EBCFF894FFCF14 :00000001FF diff --git a/3-99 Research/3 ARCADE/I2C/makefile b/3-99 Research/3 ARCADE/I2C/makefile index 335a70f5..94efefd6 100644 --- a/3-99 Research/3 ARCADE/I2C/makefile +++ b/3-99 Research/3 ARCADE/I2C/makefile @@ -9,7 +9,7 @@ SRC = $(TARGET).c # Compiler and tools for AVR CC = avr-gcc -CFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU) -Os +CFLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU) LDFLAGS = -mmcu=$(MCU) OBJCOPY = avr-objcopy @@ -26,7 +26,7 @@ all: $(HEX) # Compile source file to an ELF executable $(ELF): $(SRC) - $(CC) $(CFLAGS) $(SRC) -o $(ELF) + $(CC) $(CFLAGS) $(SRC) -Os -o $(ELF) # Convert the ELF file to an Intel HEX file $(HEX): $(ELF) diff --git a/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md b/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md index a8ac34a0..59445856 100644 --- a/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md +++ b/5 Thesis/5 Resources/Literature_Reviews/A Review of Formal Methods applied to Machine Learning.md @@ -11,7 +11,6 @@ This review seems to talk a good bit about that. than other types of programming. Things such as computer vision and decision making are very difficult to program manually relative to their ML counterpart. -<<<<<<< HEAD - Abstract interpretation can connect different formal methods that otherwise would seem disjoint, according to these authors. diff --git a/5 Thesis/5 Resources/Literature_Reviews/Applications_of_Cyber-Physical_System.md b/5 Thesis/5 Resources/Literature_Reviews/Applications_of_Cyber-Physical_System.md new file mode 100644 index 00000000..bec6ebd4 --- /dev/null +++ b/5 Thesis/5 Resources/Literature_Reviews/Applications_of_Cyber-Physical_System.md @@ -0,0 +1,8 @@ +The quick brown fox jumps over the lazy dog. The dog stays blissfully asleep. :) + +# First Pass +## What is a cyber-physical system? +Basically, a CPS is a mix of computers doing digital control and observation +that interact with physical processes. + +