diff --git a/.obsidian/plugins/obsidian-style-settings/data.json b/.obsidian/plugins/obsidian-style-settings/data.json index 2f102968f..efe37b833 100755 --- a/.obsidian/plugins/obsidian-style-settings/data.json +++ b/.obsidian/plugins/obsidian-style-settings/data.json @@ -4,7 +4,7 @@ "anuppuccin-theme-settings-extended@@anp-theme-ext-light": true, "anuppuccin-theme-settings-extended@@anp-theme-ext-dark": true, "anuppuccin-theme-settings-extended@@catppuccin-theme-extended": "ctp-solarized-light", - "anuppuccin-theme-settings-extended@@catppuccin-theme-dark-extended": "ctp-kanagawa-dark", + "anuppuccin-theme-settings-extended@@catppuccin-theme-dark-extended": "ctp-nord-darker", "anuppuccin-theme-settings@@anuppuccin-theme-dark": "ctp-mocha", "anuppuccin-theme-settings@@anp-custom-checkboxes": true, "anuppuccin-theme-settings@@anp-speech-bubble": true, diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index c00a18751..3fec282bd 100755 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -26,9 +26,21 @@ "source": false } } + }, + { + "id": "d9b2c54ab23d25b7", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "conflict-files-obsidian-git.md", + "mode": "source", + "source": false + } + } } ], - "currentTab": 1 + "currentTab": 2 } ], "direction": "vertical" @@ -95,7 +107,7 @@ "state": { "type": "backlink", "state": { - "file": "3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md", + "file": "conflict-files-obsidian-git.md", "collapseAll": true, "extraContext": false, "sortOrder": "alphabetical", @@ -112,7 +124,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md", + "file": "conflict-files-obsidian-git.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -135,7 +147,7 @@ "state": { "type": "outline", "state": { - "file": "3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md" + "file": "conflict-files-obsidian-git.md" } } } @@ -189,11 +201,16 @@ "obsidian-full-calendar:Open Full Calendar": false } }, - "active": "a7f5a9ce2764a9ae", + "active": "d9b2c54ab23d25b7", "lastOpenFiles": [ - "3-99 Research/6. Researching Techniques/Useful VIM commands.md", "4. Qualifying Exam/2. Writing/QE Abstract.md", + "conflict-files-obsidian-git.md", "3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md", + "Weekly Note 2024-09-04.md", + "2024-08-30.md", + "2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md", + "1. Daily Notes/8. August/2024-08-30.md", + "3-99 Research/6. Researching Techniques/Useful VIM commands.md", "4. Qualifying Exam/1. Managing Stuff/QE Tasks and Details.md", "QE Abstract Take 1 Edits.md", "1. Daily Notes/8. August/2024-08-29.md", @@ -212,11 +229,6 @@ "302. NUCE 2100 - Fundamentals of Nuclear Engineering/2024-08-27 Introduction.md", "Zotero Web Sever.md", "900s Calendars/3. Events/stubb!.md", - "900s Calendars/3. Events/2024-09-18 My Birthday!.md", - "900s Calendars/3. Events/2024-09-14 Pitt vs. WVU.md", - "900s Calendars/3. Events/2024-09-08 Steelers Game.md", - "900s Calendars/3. Events/2024-08-27 Fighting Parking Ticket.md", - "900s Calendars/1. Other Work/stubb!.md", "900s Calendars/3. Events", "900s Calendars/2. Research", "900s Calendars/1. Other Work", diff --git a/1. Daily Notes/8. August/2024-08-14.md b/1. Daily Notes/8. August/2024-08-14.md index 4f2b70945..7d1f29390 100755 --- a/1. Daily Notes/8. August/2024-08-14.md +++ b/1. Daily Notes/8. August/2024-08-14.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-13]] | [[2024-08-15]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-14]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-15.md b/1. Daily Notes/8. August/2024-08-15.md index 2fe725c23..4bf03101c 100755 --- a/1. Daily Notes/8. August/2024-08-15.md +++ b/1. Daily Notes/8. August/2024-08-15.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-14]] | [[2024-08-16]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-14]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-16.md b/1. Daily Notes/8. August/2024-08-16.md index 41413a98f..aa7b2ad8b 100755 --- a/1. Daily Notes/8. August/2024-08-16.md +++ b/1. Daily Notes/8. August/2024-08-16.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-15]] | [[2024-08-19]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-14]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-19.md b/1. Daily Notes/8. August/2024-08-19.md index 85e3c1fb8..3459ca008 100755 --- a/1. Daily Notes/8. August/2024-08-19.md +++ b/1. Daily Notes/8. August/2024-08-19.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-18]] | [[2024-08-20]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-14]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-20.md b/1. Daily Notes/8. August/2024-08-20.md index 95e25302c..8d5c84f83 100755 --- a/1. Daily Notes/8. August/2024-08-20.md +++ b/1. Daily Notes/8. August/2024-08-20.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-19]] | [[2024-08-21]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-21.md b/1. Daily Notes/8. August/2024-08-21.md index 1360e03a8..498b73e76 100755 --- a/1. Daily Notes/8. August/2024-08-21.md +++ b/1. Daily Notes/8. August/2024-08-21.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-20]] | [[2024-08-22]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-22.md b/1. Daily Notes/8. August/2024-08-22.md index 5ee4e913c..bacd87a31 100755 --- a/1. Daily Notes/8. August/2024-08-22.md +++ b/1. Daily Notes/8. August/2024-08-22.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-21]] | [[2024-08-23]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-23.md b/1. Daily Notes/8. August/2024-08-23.md index 63f246e20..73b1e9844 100644 --- a/1. Daily Notes/8. August/2024-08-23.md +++ b/1. Daily Notes/8. August/2024-08-23.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-22]] | [[2024-08-26]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-26.md b/1. Daily Notes/8. August/2024-08-26.md index 13b4dd065..d8e0f7762 100644 --- a/1. Daily Notes/8. August/2024-08-26.md +++ b/1. Daily Notes/8. August/2024-08-26.md @@ -7,7 +7,7 @@ tags: #### Yesterday | Tomorrow << [[2024-08-23]] | [[2024-08-27]] >> #### This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] ## Tasks for today ### Big Task diff --git a/1. Daily Notes/8. August/2024-08-27.md b/1. Daily Notes/8. August/2024-08-27.md index a327b079a..d94e0fe51 100644 --- a/1. Daily Notes/8. August/2024-08-27.md +++ b/1. Daily Notes/8. August/2024-08-27.md @@ -7,7 +7,7 @@ tags: # Yesterday | Tomorrow << [[2024-08-26]] | [[2024-08-28]] >> # This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] # Tasks for today ## Big Task diff --git a/1. Daily Notes/8. August/2024-08-28.md b/1. Daily Notes/8. August/2024-08-28.md index 805d3e12e..fb6255bf3 100644 --- a/1. Daily Notes/8. August/2024-08-28.md +++ b/1. Daily Notes/8. August/2024-08-28.md @@ -7,7 +7,7 @@ tags: # Yesterday | Tomorrow << [[2024-08-27]] | [[2024-08-29]] >> # This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] # Tasks for today ## Big Task diff --git a/1. Daily Notes/8. August/2024-08-29.md b/1. Daily Notes/8. August/2024-08-29.md index 139da0b04..4cfda9680 100644 --- a/1. Daily Notes/8. August/2024-08-29.md +++ b/1. Daily Notes/8. August/2024-08-29.md @@ -7,7 +7,7 @@ tags: # Yesterday | Tomorrow << [[2024-08-28]] | [[2024-08-30]] >> # This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[Weekly Note 2024-08-21]] # Tasks for today ## Big Task diff --git a/1. Daily Notes/8. August/2024-08-30.md b/1. Daily Notes/8. August/2024-08-30.md new file mode 100644 index 000000000..dcc49de93 --- /dev/null +++ b/1. Daily Notes/8. August/2024-08-30.md @@ -0,0 +1,29 @@ +--- +creation_date: <% tp.date.now() %> +modification_date: <% tp.file.last_modified_date("dddd Do MMMM YYYY HH:mm:ss") %> +tags: + - DailyNote +--- +# Yesterday | Tomorrow + << [[<% tp.date.now("YYYY-MM-DD", -1) %>]] | [[<% tp.date.now("YYYY-MM-DD", +1) %>]] >> +# This Week's Weekly Note +[[Weekly Note 2024-08-07]] + +# Tasks for today +## Big Task + - [ ] +## Medium Tasks +- [ ] +- [ ] +- [ ] +## Small Tasks +- [ ] +- [ ] +- [ ] +- [ ] +- [ ] + +# Calendar Tasks +- QE Exam [startTime:: 13:00] [endTime:: 15:00] +- Lunch [startTime:: 11:30] [endTime:: 12:30] +- Get ready for weekly meeting [startTime:: 08:30] [endTime:: 09:00] \ No newline at end of file diff --git a/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md b/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md new file mode 100644 index 000000000..a1d7428d0 --- /dev/null +++ b/2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md @@ -0,0 +1,67 @@ +--- +creation_date: 2024-08-30 +modification date: Friday 30th August 2024 08:41:30 +tags: + - WeeklyNote +--- +<< [[Weekly Note 2024-08-21]] | [[Weekly Note 2024-09-04]] >> + +# This Week's Daily Notes +[[2024-08-21]] +[[2024-08-22]] +[[2024-08-23]] +[[2024-08-26]] +[[2024-08-27]] +[[2024-08-28]] +[[2024-08-29]] +# Last Week's Plan +## ARCADE: BAD TO THE BONE +1. Get pymodbus and other necessary packages installed on the BeagleBone. +2. Follow pymodbus tutorial to send information back and forth to the bone. + 1. To do this I need to figure out how to let the BeagleBone share my laptop's internet connection. In progress. + 2. This really should not be so hard. +3. Robert and I joked about completely switching gears and [doing everything in Rust](https://github.com/slowtec/tokio-modbus/tree/main). Only joking. For now. + 1. There's no reason we couldn't have a MODBUS client written in Rust on the Bone while the EndPoint uses Python. Shouldn't be an issue because MODBUS is just the communication. +## Diffusion +Work on that abstract paragraph. +## Zotero Web Server +1. Start installing things. +2. Ideally get a WebDAV server working. This is probably a couple hours of work depending on complexity. +## Rust +Chapter 4! +# Accomplishments +## Tasks and Notes From This Past Week +Deleted because I think it's bugging out +### Papers read this past week +## Remarks +### ARCADE: BAD TO THE BONE +I got a lot done for this this past week. +I did the following: +1. Learned how to use Git and GitHub. Figured this is a good investment of time to do the versioning for me. +2. Learned how to use Python virtual environments. This is important so the code is portable. +3. Learned a whole lot about pymodbus. Made two scripts that have no problem sending a sine wave back and forth using TCP locally. +4. Tried to get this working with one client on the BeagleBone. Getting weird network issues though, I think the computer or the bone is using a default networking route that is screwing things up. +5. But the beaglebone does run the pymodbus server, it just can't be reached by my laptop yet. +### Zotero Web Server +1. I got ssh set up on the web server for Zotero +2. Installed a web and file server "Caddy" +3. Get a WebDAV system working + 1. Web Distributed Authoring and Versioning +4. Got Zotero working with it. This was a PITA but it is operational. +### Qualifying Exam +1. Started working on technical abstract. On v2. +2. Currently 117 words over budget. +3. Know what I can trim though. +4. Feeling good! +### Other things +Still working on monitor recommendations. +Classes started. First week was piece of cake. Didn't know atoms eat electrons and puke out antimatter. +# This Week's Plan +## BAD 2 THE BONE +Get pymodbus server running on the bone. +Start integrating Robert's FHE code. +Asynchronous? +## Zotero Web Server +Write instructions +## Qualifying Exam +Finish abstract like today so Dan can 'consult' diff --git a/2024-08-30.md b/2024-08-30.md new file mode 100644 index 000000000..f5b5d17a0 --- /dev/null +++ b/2024-08-30.md @@ -0,0 +1,26 @@ +--- +creation_date: 2024-08-30 +modification_date: Friday 30th August 2024 08:35:10 +tags: + - DailyNote +--- +# Yesterday | Tomorrow + << [[2024-08-29]] | [[2024-08-31]] >> +# This Week's Weekly Note +[[Weekly Note 2024-08-21]] + +# Tasks for today +## Big Task + - [ ] +## Medium Tasks +- [ ] +- [ ] +- [ ] +## Small Tasks +- [ ] +- [ ] +- [ ] +- [ ] +- [ ] + +# Calendar Tasks \ No newline at end of file diff --git a/Weekly Note 2024-09-04.md b/Weekly Note 2024-09-04.md new file mode 100644 index 000000000..e69de29bb