diff --git a/.DS_Store b/.DS_Store index 05159ae..74a000d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Fall 2024/.DS_Store b/Fall 2024/.DS_Store new file mode 100644 index 0000000..93b49fe Binary files /dev/null and b/Fall 2024/.DS_Store differ diff --git a/Arduino/.DS_Store b/Fall 2024/Arduino/.DS_Store similarity index 100% rename from Arduino/.DS_Store rename to Fall 2024/Arduino/.DS_Store diff --git a/Arduino/test/test.ino b/Fall 2024/Arduino/test/test.ino similarity index 100% rename from Arduino/test/test.ino rename to Fall 2024/Arduino/test/test.ino diff --git a/JPNS 101/.DS_Store b/Fall 2024/JPNS 101/.DS_Store similarity index 100% rename from JPNS 101/.DS_Store rename to Fall 2024/JPNS 101/.DS_Store diff --git a/JPNS 101/Assignments/Haldrup-101-1-pg128-129.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg128-129.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-101-1-pg128-129.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg128-129.pdf diff --git a/JPNS 101/Assignments/Haldrup-101-1-pg13-14.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg13-14.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-101-1-pg13-14.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg13-14.pdf diff --git a/JPNS 101/Assignments/Haldrup-101-1-pg130-131.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg130-131.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-101-1-pg130-131.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg130-131.pdf diff --git a/JPNS 101/Assignments/Haldrup-101-1-pg15-16 2.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg15-16 2.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-101-1-pg15-16 2.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg15-16 2.pdf diff --git a/JPNS 101/Assignments/Haldrup-101-1-pg15-16.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg15-16.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-101-1-pg15-16.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg15-16.pdf diff --git a/JPNS 101/Assignments/Haldrup-101-1-pg17-18.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg17-18.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-101-1-pg17-18.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-101-1-pg17-18.pdf diff --git a/JPNS 101/Assignments/Haldrup-126-127.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup-126-127.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup-126-127.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup-126-127.pdf diff --git a/JPNS 101/Assignments/Haldrup101-1pg122-123.pdf b/Fall 2024/JPNS 101/Assignments/Haldrup101-1pg122-123.pdf similarity index 100% rename from JPNS 101/Assignments/Haldrup101-1pg122-123.pdf rename to Fall 2024/JPNS 101/Assignments/Haldrup101-1pg122-123.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-132ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-132ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-132ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-132ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-134ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-134ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-134ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-134ページ.pdf diff --git a/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-136ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-136ページ.pdf new file mode 100644 index 0000000..c7fbc01 Binary files /dev/null and b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-136ページ.pdf differ diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-25ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-25ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-25ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-25ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-28ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-28ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-28ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-28ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-29ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-29ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-29ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-29ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-32ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-32ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-32ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-32ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-33ぺージ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-33ぺージ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-33ぺージ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-33ぺージ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-34ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-34ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-34ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-34ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-35ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-35ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-35ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-35ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-36-ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-36-ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-36-ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-36-ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-37ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-37ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-37ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-37ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-41ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-41ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-41ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-41ページ.pdf diff --git a/JPNS 101/Assignments/ホールドラップ-101-1-42ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-42ページ.pdf similarity index 100% rename from JPNS 101/Assignments/ホールドラップ-101-1-42ページ.pdf rename to Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-42ページ.pdf diff --git a/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-43ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-43ページ.pdf new file mode 100644 index 0000000..9be54c0 Binary files /dev/null and b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-43ページ.pdf differ diff --git a/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-44と45ページ.pdf b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-44と45ページ.pdf new file mode 100644 index 0000000..8520bef Binary files /dev/null and b/Fall 2024/JPNS 101/Assignments/ホールドラップ-101-1-44と45ページ.pdf differ diff --git a/JPNS 101/genki3rd_workbook1_answer.pdf b/Fall 2024/JPNS 101/genki3rd_workbook1_answer.pdf similarity index 100% rename from JPNS 101/genki3rd_workbook1_answer.pdf rename to Fall 2024/JPNS 101/genki3rd_workbook1_answer.pdf diff --git a/PHYS112/.DS_Store b/Fall 2024/PHYS112/.DS_Store similarity index 100% rename from PHYS112/.DS_Store rename to Fall 2024/PHYS112/.DS_Store diff --git a/PHYS112/GH_CH_KM_Demo-Based Quiz on Mirrors and Lenses.docx b/Fall 2024/PHYS112/GH_CH_KM_Demo-Based Quiz on Mirrors and Lenses.docx similarity index 100% rename from PHYS112/GH_CH_KM_Demo-Based Quiz on Mirrors and Lenses.docx rename to Fall 2024/PHYS112/GH_CH_KM_Demo-Based Quiz on Mirrors and Lenses.docx diff --git a/PHYS112/Garrett Haldrup.docx b/Fall 2024/PHYS112/Garrett Haldrup.docx similarity index 100% rename from PHYS112/Garrett Haldrup.docx rename to Fall 2024/PHYS112/Garrett Haldrup.docx diff --git a/PHYS112/Haldrup Formal Report 1.docx b/Fall 2024/PHYS112/Haldrup Formal Report 1.docx similarity index 100% rename from PHYS112/Haldrup Formal Report 1.docx rename to Fall 2024/PHYS112/Haldrup Formal Report 1.docx diff --git a/PHYS112/HaldrupHW1.pdf b/Fall 2024/PHYS112/HaldrupHW1.pdf similarity index 100% rename from PHYS112/HaldrupHW1.pdf rename to Fall 2024/PHYS112/HaldrupHW1.pdf diff --git a/PHYS112/HaldrupHW2.pdf b/Fall 2024/PHYS112/HaldrupHW2.pdf similarity index 100% rename from PHYS112/HaldrupHW2.pdf rename to Fall 2024/PHYS112/HaldrupHW2.pdf diff --git a/PHYS112/HaldrupHW3.pdf b/Fall 2024/PHYS112/HaldrupHW3.pdf similarity index 100% rename from PHYS112/HaldrupHW3.pdf rename to Fall 2024/PHYS112/HaldrupHW3.pdf diff --git a/PHYS112/HaldrupHW4.pdf b/Fall 2024/PHYS112/HaldrupHW4.pdf similarity index 100% rename from PHYS112/HaldrupHW4.pdf rename to Fall 2024/PHYS112/HaldrupHW4.pdf diff --git a/PHYS112/HaldrupHW5.pdf b/Fall 2024/PHYS112/HaldrupHW5.pdf similarity index 100% rename from PHYS112/HaldrupHW5.pdf rename to Fall 2024/PHYS112/HaldrupHW5.pdf diff --git a/PHYS112/HaldrupHW6.pdf b/Fall 2024/PHYS112/HaldrupHW6.pdf similarity index 100% rename from PHYS112/HaldrupHW6.pdf rename to Fall 2024/PHYS112/HaldrupHW6.pdf diff --git a/PHYS112/HaldrupRQ2.pdf b/Fall 2024/PHYS112/HaldrupRQ2.pdf similarity index 100% rename from PHYS112/HaldrupRQ2.pdf rename to Fall 2024/PHYS112/HaldrupRQ2.pdf diff --git a/PHYS112/Hw7Haldrup.pdf b/Fall 2024/PHYS112/Hw7Haldrup.pdf similarity index 100% rename from PHYS112/Hw7Haldrup.pdf rename to Fall 2024/PHYS112/Hw7Haldrup.pdf diff --git a/PHYS112/Lab 10.pdf b/Fall 2024/PHYS112/Lab 10.pdf similarity index 100% rename from PHYS112/Lab 10.pdf rename to Fall 2024/PHYS112/Lab 10.pdf diff --git a/PHYS112/Lab 10kaitgarrettchristopher.pdf b/Fall 2024/PHYS112/Lab 10kaitgarrettchristopher.pdf similarity index 100% rename from PHYS112/Lab 10kaitgarrettchristopher.pdf rename to Fall 2024/PHYS112/Lab 10kaitgarrettchristopher.pdf diff --git a/Fall 2024/PHYS112/PHYS112_RQ3_F24 2.pdf b/Fall 2024/PHYS112/PHYS112_RQ3_F24 2.pdf new file mode 100644 index 0000000..6f20202 Binary files /dev/null and b/Fall 2024/PHYS112/PHYS112_RQ3_F24 2.pdf differ diff --git a/PHYS112/Reflection and Refraction Lab Report Outline.pdf b/Fall 2024/PHYS112/Reflection and Refraction Lab Report Outline.pdf similarity index 100% rename from PHYS112/Reflection and Refraction Lab Report Outline.pdf rename to Fall 2024/PHYS112/Reflection and Refraction Lab Report Outline.pdf diff --git a/PHYS112/SenatorLetterGarrett.docx b/Fall 2024/PHYS112/SenatorLetterGarrett.docx similarity index 100% rename from PHYS112/SenatorLetterGarrett.docx rename to Fall 2024/PHYS112/SenatorLetterGarrett.docx diff --git a/Research/Haldrup Sprint1.key b/Fall 2024/Research/Haldrup Sprint1.key similarity index 100% rename from Research/Haldrup Sprint1.key rename to Fall 2024/Research/Haldrup Sprint1.key diff --git a/Research/a.out b/Fall 2024/Research/a.out similarity index 100% rename from Research/a.out rename to Fall 2024/Research/a.out diff --git a/Fall 2024/Research/pygameSim/CytoSim/.gitignore b/Fall 2024/Research/pygameSim/CytoSim/.gitignore new file mode 100644 index 0000000..3e3174b --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/.gitignore @@ -0,0 +1,5 @@ +__pycache__/graph.cpython-312.pyc +__pycache__/particle.cpython-312.pyc + +__pycache__/sensor.cpython-312.pyc +__pycache__/slider.cpython-312.pyc diff --git a/Fall 2024/Research/pygameSim/CytoSim/README.md b/Fall 2024/Research/pygameSim/CytoSim/README.md new file mode 100644 index 0000000..e141f72 --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/README.md @@ -0,0 +1,2 @@ +# CytoSim + diff --git a/Fall 2024/Research/pygameSim/CytoSim/graph.py b/Fall 2024/Research/pygameSim/CytoSim/graph.py new file mode 100644 index 0000000..0ada16f --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/graph.py @@ -0,0 +1,26 @@ +import pygame + +class Graph: + def __init__(self, ratio, max_time, center, y_scale): + self.ratio = ratio + self.max_time = max_time + self.center = center + self.y_scale = y_scale + self.data = [] + + def draw(self, screen, x, y, time_scale): + rect = pygame.Rect(0, 0, x, y / self.ratio) + pygame.draw.rect(screen, (0,0,0), rect) + self.draw_data(x, y, screen, time_scale) + + def add_data(self, time, value): + self.data.append([time, value]) + + def get_data(self): + return self.data + + def draw_data(self, x, y, screen, time_scale): + offset = 0 + for i in range(len(self.data) - 1, -1, -1): + pygame.draw.circle(screen, (255,0,0), (x - offset ,(y / (2 * self.ratio)) + self.data[i][1] * 10), 1) + offset += time_scale * 10 \ No newline at end of file diff --git a/Fall 2024/Research/pygameSim/CytoSim/main.py b/Fall 2024/Research/pygameSim/CytoSim/main.py new file mode 100644 index 0000000..5ea5db9 --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/main.py @@ -0,0 +1,181 @@ +import pygame +import numpy as np +import matplotlib.pyplot as plt +import math +from particle import Particle +from sensor import Sensor +from slider import Slider + +pygame.init() +pygame.display.set_caption("CytoSim") + +SCREEN_WIDTH = 800 +SCREEN_HEIGHT = 600 + +SENSOR_DISTANCE = 200 +REST_MEDIUM = 180000 + +y_lim = 40000 +y_lim2 = 0.000000000005 + + +screen = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) + +sensor = Sensor(width = 50, distance = SENSOR_DISTANCE, space = 300) +sensor.inputVoltage(5, -5) + + + +silica = Particle(speed = 1, size = 60, perm = 4, rest = pow(10, 12)) + +time = .1 +time_data = [] +volume_data = [] +sensor_data = [] +rest_data = [] +current1_data = [] +current2_data = [] + + +"""plt.ion() +fig, (ax, ax2) = plt.subplots(2, 1, figsize=(5, 5)) +line, = ax.plot([], [], 'r-') +line2, = ax.plot([], [], 'g-') +line3, = ax2.plot([], [], 'b-') +line4, = ax2.plot([], [], 'g-') +ax.set_xlim(0, 900) +ax.set_ylim(-0.01, y_lim) +ax.set_xlabel('Time (s)', fontsize = 6) +ax.set_ylabel('Volume', fontsize = 6) +ax.set_title('Volume/time', fontsize = 8) + +ax2.set_xlim(0, 900) +ax2.set_ylim(-1 * y_lim2, y_lim2) +ax2.set_xlabel('Time (s)', fontsize = 6) +ax2.set_ylabel('Current', fontsize = 6) +ax2.set_title('Current/time', fontsize = 8) + +plt.subplots_adjust(hspace=0.4) +""" + +slider1 = Slider(20, 20, 100, 20, 20, SENSOR_DISTANCE / 2, 80) +slider2 = Slider(20, 50, 100, 20, .1, 10, 1) +slider3 = Slider(20, 80, 100, 20, 1, 100, 10) + +run = True +while run: + + timeScale = slider2.value + sensor.inputVoltage(slider3.value, -1 * slider3.value) + + max_points = 1000 + if len(time_data) > max_points: + time_data.pop(0) + volume_data.pop(0) + sensor_data.pop(0) + current1_data.pop(0) + current2_data.pop(0) + + distance = silica.move(time) + if distance > SCREEN_WIDTH + (silica.size * 2): + time =.1 + time_data = [] + volume_data = [] + sensor_data = [] + rest_data = [] + current1_data = [] + current2_data = [] + + screen.fill((0,0,0)) + + sensor.generate(SCREEN_WIDTH, SCREEN_HEIGHT, screen) + + pygame.draw.circle(screen, (255, 255, 255), (distance - silica.size, 300), silica.size) + pygame.draw.circle(screen, (0,255,0), (distance - silica.size, 300), 10) + + slider1.draw(screen) + slider2.draw(screen) + slider3.draw(screen) + + silica.updateSize(slider1.value) + + for event in pygame.event.get(): + if event.type == pygame.QUIT: + run = False + slider1.handle_event(event) + slider2.handle_event(event) + slider3.handle_event(event) + + volume = sensor.getParticleVolume(distance, silica) + + sensor_data_volume = sensor.volume - volume + sensor_data.append(sensor_data_volume) + + sensor_resistance = REST_MEDIUM * ((pow(sensor.distance, 2) * pow(10, -18)) / (sensor_data_volume * pow(10, -27))) + nom_sens_res = REST_MEDIUM * ((sensor.distance * pow(10, -9)) / (sensor.width * sensor.distance * pow(10, -18))) + + if volume: + particle_resistance = silica.rest * pow((3/(16 * pow(math.pi, 2) * volume * pow(10, -9))), 1/3) + total_resistance_inv = (1 / particle_resistance) + (1 / sensor_resistance) + else: + particle_resistance = 0 + total_resistance_inv = 1 / sensor_resistance + + total_resistance = 1 / total_resistance_inv + + current1 = 0 + current2 = 0 + + + which_sensor = sensor.whichSensor(distance, silica) + if which_sensor == 1: + current1 = sensor.voltage1 / total_resistance + current2 = sensor.voltage2 / nom_sens_res + elif which_sensor == 2: + current2 = sensor.voltage2 / total_resistance + current1 = sensor.voltage1 / nom_sens_res + else: + current1 = sensor.voltage1 / nom_sens_res + current2 = sensor.voltage2 / nom_sens_res + + current1_data.append(current1) + current2_data.append(current2) + print(f"{current1} = {sensor.voltage1} / {total_resistance}") + rest_data.append(total_resistance) + + if (volume > y_lim): + y_lim = volume + (volume * 1.2) + #ax.set_ylim(-1000, y_lim) + + if (current1 > y_lim2): + y_lim2 = current1 + (current1 * 1.2) + #ax2.set_ylim(-1 * y_lim2, y_lim2) + + + + time_data.append(time) + volume_data.append(volume) + + """line.set_xdata(time_data) + line.set_ydata(volume_data) + line2.set_xdata(time_data) + line2.set_ydata(sensor_data) + line3.set_xdata(time_data) + line3.set_ydata(current1_data) + line4.set_xdata(time_data) + line4.set_ydata(current2_data) + ax.relim() + ax.autoscale_view() + ax2.relim() + ax2.autoscale_view() + plt.draw() + plt.pause(0.01) + """ + + pygame.display.update() + + time = timeScale + time + +pygame.quit() + + diff --git a/Fall 2024/Research/pygameSim/CytoSim/newMain.py b/Fall 2024/Research/pygameSim/CytoSim/newMain.py new file mode 100644 index 0000000..c720e22 --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/newMain.py @@ -0,0 +1,80 @@ + +import pygame +import sys +import math +from sensor import Sensor +from particle import Particle +from slider import Slider +from graph import Graph + +SCREEN_WIDTH = 1352 +SCREEN_HEIGHT = 878 + +scale = 1 * pow(10, -6) +unit_scale = -3 +time = 0 +time_scale = 1 + +sensor = Sensor( 50 * pow(10, -6), 30 * pow(10, -6), 20 * pow(10, -6)) + +particle = Particle(10 * pow(10, -8), 7 * pow(10, -6), 1, 1) + +graph = Graph(4, 10, 0, 10) + +pygame.init() +pygame.display.set_caption("CytoSim") + +screen = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT), pygame.RESIZABLE) + +while True: + # Event handler for pygame + for event in pygame.event.get(): + if event.type == pygame.QUIT: + pygame.quit() + sys.exit() + if event.type == pygame.VIDEORESIZE: + screen = pygame.display.set_mode((event.w, event.h), pygame.RESIZABLE) + if event.type == pygame.MOUSEWHEEL: + print("SCROLL") + if event.y == 1: + scale = scale / 1.1 + elif event.y == -1: + scale = scale * 1.1 + if event.type == pygame.KEYDOWN: + print("Button") + if event.key == pygame.K_UP: + scale = scale / 1.1 + elif event.key == pygame.K_DOWN: + scale = scale * 1.1 + + + x, y = screen.get_size() + + scale_bar_size = abs((x - (x * .1)) - (x - (x * .1)) - (1 * pow(10, unit_scale) / scale)) + + if int(scale_bar_size) < 40: + unit_scale += 1 + elif int(scale_bar_size) > 500: + unit_scale -= 1 + + scale_bar_end_point = (x - (x * .1)) - (1 * pow(10, unit_scale) / scale) + + screen.fill((200,100,5)) + + sensor.display(x, y + (y / graph.ratio), screen, scale) + particle.move(time_scale, scale, sensor.left_limit, sensor.right_limit, screen, y + (y / graph.ratio)) + graph.draw(screen, x, y, time_scale) + + volume = sensor.testSensor1(particle.distance, particle, scale, screen) + print(volume) + + graph.add_data(time, volume) + # pygame.draw.circle(screen, (150,255,10), (x / 2, y /2), 3 * pow(10, -6) / scale) + + pygame.draw.line(screen, (255,255,255), (x - (x * .1), y - (y * .1)), (scale_bar_end_point, y - (y * .1))) + + # print((1 *pow(10, -6)) / scale) + + time += time_scale + + pygame.display.update() diff --git a/Fall 2024/Research/pygameSim/CytoSim/particle.py b/Fall 2024/Research/pygameSim/CytoSim/particle.py new file mode 100644 index 0000000..1e208ca --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/particle.py @@ -0,0 +1,29 @@ +import math +import pygame + +class Particle: + def __init__(self, speed, size, perm, rest): + self.speed = speed + self.size = size + self.radius = size / 2 + self.perm = perm + self.rest = rest + self.volume = (4/3.0) * math.pi * pow(self.radius, 3) + self.distance = 0 + + def move(self, time_interval, scale, left_limit, right_limit, screen, height): + self.distance += (self.speed * time_interval) / scale + self.pixel_distance = self.distance + left_limit + if self.distance + left_limit + (self.size / (2 * scale)) > right_limit: + self.distance = 0 + pygame.draw.circle(screen, (255,225,255), (left_limit + self.distance, height / 2), self.size / (2 * scale)) + + def partialVol(self, height): + partialVol = (1/3) * math.pi * height * height * ((3 * self.size) - height) + return partialVol + + def updateSize(self, size): + self.size = size + self.volume = (4/3) * math.pi * size * size * size + + diff --git a/Research/pygameSim/pics/Figure_1.png b/Fall 2024/Research/pygameSim/CytoSim/pics/Figure_1.png similarity index 100% rename from Research/pygameSim/pics/Figure_1.png rename to Fall 2024/Research/pygameSim/CytoSim/pics/Figure_1.png diff --git a/Fall 2024/Research/pygameSim/CytoSim/sensor.py b/Fall 2024/Research/pygameSim/CytoSim/sensor.py new file mode 100644 index 0000000..41f54cb --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/sensor.py @@ -0,0 +1,129 @@ +import pygame +import math + +class Sensor: + def __init__(self, width, distance, space): + self.width = width + self.distance = distance + self.space = space + self.volume = width * pow(distance, 2) + self.total_width = (4 * width) + space + self.total_height = 100 * pow(10, -6) - distance + + def display(self, screenWidth, screenHeight, screen, scale): + center_x = screenWidth / 2 + center_y = screenHeight / 2 + scaled_half_x = self.total_width / (2 * scale) + scaled_half_y = self.total_height / (2 * scale) + scaled_width = self.width / scale + scaled_distance = self.distance / scale + scaled_space = self.space / scale + self.height = screenHeight + + self.scaled_sensor1_left_limit = center_x - scaled_space - scaled_width + self.scaled_sensor1_right_limit = center_x - scaled_space + self.scaled_sensor2_left_limit = center_x + scaled_space + self.scaled_sensor2_right_limit = center_x + scaled_space + scaled_width + + self.right_limit = center_x + scaled_half_x + self.left_limit = center_x - scaled_half_x + + sensor1_rect_up = pygame.Rect(center_x - scaled_space - scaled_width, center_y - scaled_half_y, scaled_width, scaled_half_y - (scaled_distance / 2)) + sensor1_rect_down = pygame.Rect(center_x - scaled_space - scaled_width, center_y + (scaled_distance / 2), scaled_width, scaled_half_y - (scaled_distance / 2)) + sensor2_rect_up = pygame.Rect(center_x + scaled_space, center_y - scaled_half_y, scaled_width, scaled_half_y - (scaled_distance / 2)) + sensor2_rect_down = pygame.Rect(center_x + scaled_space, center_y + (scaled_distance / 2), scaled_width, scaled_half_y - (scaled_distance / 2)) + + pygame.draw.rect(screen, (0,200,0), sensor1_rect_up) + pygame.draw.rect(screen, (0,200,0), sensor1_rect_down) + pygame.draw.rect(screen, (0,200,0), sensor2_rect_up) + pygame.draw.rect(screen, (0,200,0), sensor2_rect_down) + + pygame.draw.line(screen, (100,100,50), (center_x - scaled_half_x, center_y - (scaled_distance / 2)), (center_x + scaled_half_x, center_y - (scaled_distance / 2))) + pygame.draw.line(screen, (100,100,50), (center_x - scaled_half_x, center_y + (scaled_distance / 2)), (center_x + scaled_half_x, center_y + (scaled_distance / 2))) + + pygame.draw.line(screen, (255,255,255), (center_x - scaled_half_x, center_y - scaled_half_y), (center_x + scaled_half_x, center_y - scaled_half_y), 7) + pygame.draw.line(screen, (255,255,255), (center_x + scaled_half_x, center_y - scaled_half_y), (center_x + scaled_half_x, center_y + scaled_half_y), 7) + pygame.draw.line(screen, (255,255,255), (center_x + scaled_half_x, center_y + scaled_half_y), (center_x - scaled_half_x, center_y + scaled_half_y), 7) + pygame.draw.line(screen, (255,255,255), (center_x - scaled_half_x, center_y + scaled_half_y), (center_x - scaled_half_x, center_y - scaled_half_y), 7) + + + return 0 + + + def testSensor1(self, partCenter, particle, scale, screen): + particle_right_limit = particle.pixel_distance + (particle.radius / scale) + particle_left_limit = particle.pixel_distance - (particle.radius / scale) + + pygame.draw.line(screen, (0,0,0), (particle_left_limit, self.height), (particle_left_limit, 0)) + pygame.draw.line(screen, (0,100,0), (particle_right_limit, self.height), (particle_right_limit, 0)) + + pygame.draw.line(screen, (0,0,0), (self.scaled_sensor1_left_limit, self.height), (self.scaled_sensor1_left_limit, 0)) + pygame.draw.line(screen, (0,100,0), (self.scaled_sensor1_right_limit, self.height), (self.scaled_sensor1_right_limit, 0)) + + if (particle_right_limit >= self.scaled_sensor1_left_limit and particle_left_limit < self.scaled_sensor1_left_limit): + if (particle.pixel_distance < self.scaled_sensor1_left_limit): + height = particle_right_limit - self.scaled_sensor1_left_limit + volume = ((math.pi * height * height) / 3) * ((3 * (particle.radius / scale)) - height) + else: + height = self.scaled_sensor1_left_limit - particle.pixel_distance + volume = ((math.pi * height * height) / 3) * ((3 * (particle.radius / scale)) - height) + elif (particle_right_limit <= self.scaled_sensor1_right_limit and particle_left_limit >= self.scaled_sensor1_left_limit): + volume = particle.volume / scale + elif (particle_right_limit > self.scaled_sensor1_right_limit and particle_left_limit > self.scaled_sensor1_left_limit and particle_left_limit < self.scaled_sensor1_right_limit): + if (particle.pixel_distance > self.scaled_sensor1_right_limit): + height = particle.pixel_distance - self.scaled_sensor1_right_limit + volume = ((math.pi * height * height) / 3) * ((3 * (particle.radius / scale)) - height) + else: + height = self.scaled_sensor1_right_limit - particle_left_limit + volume = ((math.pi * height * height) / 3) * ((3 * (particle.radius / scale)) - height) + else: + volume = 0 + + + return volume * scale + + + + def testSensor2(self, partCenter, particle): + if (particle.size >= abs(self.inner2 - (partCenter - particle.size))) and (particle.size >= abs(self.outer2 - (partCenter - particle.size))): + volume = ((particle.volume / 2) - (particle.partialVol(particle.size - ((partCenter - particle.size) - self.inner2)))) + ((particle.volume / 2) - particle.partialVol(particle.size - (self.outer2 - (partCenter - particle.size)))) + return volume + elif particle.size >= abs(self.inner2 - (partCenter - particle.size)): + volume = particle.partialVol(particle.size - (self.inner2 - (partCenter - particle.size))) + return volume + elif particle.size >= abs(self.outer2 - (partCenter - particle.size)): + volume = particle.volume - particle.partialVol(particle.size - (self.outer2 - (partCenter - particle.size))) + return volume + elif ((partCenter - particle.size) >= self.inner2 and (partCenter - particle.size) <= self.outer2): + volume = particle.volume + return volume + else: + return 0 + + def getParticleVolume(self, partCenter, particle): + volume1 = self.testSensor1(partCenter, particle) + #volume1 = 0 + volume2 = self.testSensor2(partCenter, particle) + + if volume1: + return volume1 + elif volume2: + return volume2 + else: + return 0 + + def whichSensor(self, partCenter, particle): + volume1 = self.testSensor1(partCenter, particle) + #volume1 = 0 + volume2 = self.testSensor2(partCenter, particle) + + if volume1: + return 1 + elif volume2: + return 2 + else: + return 0 + + def inputVoltage(self, voltage1, voltage2): + self.voltage1 = voltage1 + self.voltage2 = voltage2 diff --git a/Fall 2024/Research/pygameSim/CytoSim/slider.py b/Fall 2024/Research/pygameSim/CytoSim/slider.py new file mode 100644 index 0000000..f893525 --- /dev/null +++ b/Fall 2024/Research/pygameSim/CytoSim/slider.py @@ -0,0 +1,36 @@ +import pygame + +WHITE = (255, 255, 255) +GRAY = (200, 200, 200) +BLACK = (0, 0, 0) +RED = (255, 0, 0) + +class Slider: + + def __init__(self, x, y, w, h, min_val, max_val, initial_val): + self.rect = pygame.Rect(x, y, w, h) + self.min_val = min_val + self.max_val = max_val + self.value = initial_val + self.grabbed = False + + def draw(self, screen): + # Draw the background + pygame.draw.rect(screen, GRAY, self.rect) + # Draw the handle (circle) + handle_x = self.rect.x + (self.value - self.min_val) / (self.max_val - self.min_val) * self.rect.width + pygame.draw.circle(screen, RED, (int(handle_x), self.rect.centery), self.rect.height // 2) + + def handle_event(self, event): + print("hi") + if event.type == pygame.MOUSEBUTTONDOWN: + if self.rect.collidepoint(event.pos): + self.grabbed = True + elif event.type == pygame.MOUSEBUTTONUP: + self.grabbed = False + elif event.type == pygame.MOUSEMOTION: + if self.grabbed: + mouse_x = event.pos[0] + # Constrain the handle within the slider + new_value = (mouse_x - self.rect.x) / self.rect.width * (self.max_val - self.min_val) + self.min_val + self.value = max(self.min_val, min(self.max_val, new_value)) diff --git a/Research/pygameSim/__pycache__/particle.cpython-312.pyc b/Fall 2024/Research/pygameSim/__pycache__/particle.cpython-312.pyc similarity index 100% rename from Research/pygameSim/__pycache__/particle.cpython-312.pyc rename to Fall 2024/Research/pygameSim/__pycache__/particle.cpython-312.pyc diff --git a/Research/pygameSim/__pycache__/sensor.cpython-312.pyc b/Fall 2024/Research/pygameSim/__pycache__/sensor.cpython-312.pyc similarity index 100% rename from Research/pygameSim/__pycache__/sensor.cpython-312.pyc rename to Fall 2024/Research/pygameSim/__pycache__/sensor.cpython-312.pyc diff --git a/Research/pygameSim/__pycache__/slider.cpython-312.pyc b/Fall 2024/Research/pygameSim/__pycache__/slider.cpython-312.pyc similarity index 100% rename from Research/pygameSim/__pycache__/slider.cpython-312.pyc rename to Fall 2024/Research/pygameSim/__pycache__/slider.cpython-312.pyc diff --git a/Research/pygameSim/main.py b/Fall 2024/Research/pygameSim/main.py similarity index 100% rename from Research/pygameSim/main.py rename to Fall 2024/Research/pygameSim/main.py diff --git a/Research/pygameSim/particle.py b/Fall 2024/Research/pygameSim/particle.py similarity index 100% rename from Research/pygameSim/particle.py rename to Fall 2024/Research/pygameSim/particle.py diff --git a/Fall 2024/Research/pygameSim/pics/Figure_1.png b/Fall 2024/Research/pygameSim/pics/Figure_1.png new file mode 100644 index 0000000..c6aa4f5 Binary files /dev/null and b/Fall 2024/Research/pygameSim/pics/Figure_1.png differ diff --git a/Research/pygameSim/sensor.py b/Fall 2024/Research/pygameSim/sensor.py similarity index 100% rename from Research/pygameSim/sensor.py rename to Fall 2024/Research/pygameSim/sensor.py diff --git a/Research/pygameSim/slider.py b/Fall 2024/Research/pygameSim/slider.py similarity index 100% rename from Research/pygameSim/slider.py rename to Fall 2024/Research/pygameSim/slider.py diff --git a/Research/test.c b/Fall 2024/Research/test.c similarity index 100% rename from Research/test.c rename to Fall 2024/Research/test.c diff --git a/Research/test.py b/Fall 2024/Research/test.py similarity index 100% rename from Research/test.py rename to Fall 2024/Research/test.py diff --git a/c/a.out b/Fall 2024/c/a.out similarity index 100% rename from c/a.out rename to Fall 2024/c/a.out diff --git a/c/guessing_game/a.out b/Fall 2024/c/guessing_game/a.out similarity index 100% rename from c/guessing_game/a.out rename to Fall 2024/c/guessing_game/a.out diff --git a/c/guessing_game/guessing_game.c b/Fall 2024/c/guessing_game/guessing_game.c similarity index 100% rename from c/guessing_game/guessing_game.c rename to Fall 2024/c/guessing_game/guessing_game.c diff --git a/c/test.c b/Fall 2024/c/test.c similarity index 100% rename from c/test.c rename to Fall 2024/c/test.c diff --git a/csci218/.DS_Store b/Fall 2024/csci218/.DS_Store similarity index 100% rename from csci218/.DS_Store rename to Fall 2024/csci218/.DS_Store diff --git a/csci218/Assignments/BMI.c b/Fall 2024/csci218/Assignments/BMI.c similarity index 100% rename from csci218/Assignments/BMI.c rename to Fall 2024/csci218/Assignments/BMI.c diff --git a/csci218/Assignments/a.out b/Fall 2024/csci218/Assignments/a.out similarity index 100% rename from csci218/Assignments/a.out rename to Fall 2024/csci218/Assignments/a.out diff --git a/csci218/Assignments/bmi.out b/Fall 2024/csci218/Assignments/bmi.out similarity index 100% rename from csci218/Assignments/bmi.out rename to Fall 2024/csci218/Assignments/bmi.out diff --git a/csci218/Assignments/mac.out b/Fall 2024/csci218/Assignments/mac.out similarity index 100% rename from csci218/Assignments/mac.out rename to Fall 2024/csci218/Assignments/mac.out diff --git a/csci218/Assignments/ohmsLaw.c b/Fall 2024/csci218/Assignments/ohmsLaw.c similarity index 100% rename from csci218/Assignments/ohmsLaw.c rename to Fall 2024/csci218/Assignments/ohmsLaw.c diff --git a/csci218/Assignments/output/pi.out b/Fall 2024/csci218/Assignments/output/pi.out similarity index 100% rename from csci218/Assignments/output/pi.out rename to Fall 2024/csci218/Assignments/output/pi.out diff --git a/csci218/Assignments/pi.c b/Fall 2024/csci218/Assignments/pi.c similarity index 100% rename from csci218/Assignments/pi.c rename to Fall 2024/csci218/Assignments/pi.c diff --git a/csci218/Labs/.DS_Store b/Fall 2024/csci218/Labs/.DS_Store similarity index 91% rename from csci218/Labs/.DS_Store rename to Fall 2024/csci218/Labs/.DS_Store index 81388cf..56f833f 100644 Binary files a/csci218/Labs/.DS_Store and b/Fall 2024/csci218/Labs/.DS_Store differ diff --git a/csci218/Labs/Final Project/.DS_Store b/Fall 2024/csci218/Labs/Final Project/.DS_Store similarity index 100% rename from csci218/Labs/Final Project/.DS_Store rename to Fall 2024/csci218/Labs/Final Project/.DS_Store diff --git a/Fall 2024/csci218/Labs/Final Project/MenuTest/.DS_Store b/Fall 2024/csci218/Labs/Final Project/MenuTest/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/Fall 2024/csci218/Labs/Final Project/MenuTest/.DS_Store differ diff --git a/Fall 2024/csci218/Labs/Final Project/MenuTest/MenuTest.ino b/Fall 2024/csci218/Labs/Final Project/MenuTest/MenuTest.ino new file mode 100644 index 0000000..c364656 --- /dev/null +++ b/Fall 2024/csci218/Labs/Final Project/MenuTest/MenuTest.ino @@ -0,0 +1,542 @@ +#define outputA 6 +#define outputB 7 +#define buttonPin 8 +#define lightPin 13 +#define waterLPin 10 + +#include + +int waterPin = A0; +int pinValue, pinValueVolt; +float waterPer; + +int counter = 0; +int aState; +int aLastState; +int bState; +int bLastState; +int buttonState; +int lastButtonState; + +int hourTen = 0; +int hourOne = 0; +int minTen = 0; +int minOne = 0; + +int hourTenL = 1; +int hourOneL = 0; +int minTenL = 0; +int minOneL = 0; + +int minWaterTen = 8; +int minWaterOne = 2; +int minWater = (minWaterTen * 10) + minWaterOne; + +int timeScale = 1; +int timePassed = 0; + + +long unsigned int hourSec = ((hourTenL * 10) + hourOneL) * 60; +long unsigned int lightOnSec = (hourSec + ((minTenL * 10) + minOneL)) * 60; +long unsigned int scaledLightOnSec; +long unsigned int scaledLightOffSec; + +unsigned long secDay; +unsigned long secLeft; + +long unsigned int preTime; +long unsigned int currTime; + +bool flipOn = true; + +char menuList[][10] = {"View", "Water", "Light", "Flip"}; + +const int rs = 12, en = 11, d4 = 5, d5 = 4, d6 = 3, d7 = 2; +LiquidCrystal lcd(rs, en, d4, d5, d6, d7); + +int subTimeMenu(int pos, int val, int condVal = 0); +int adjustHourTen(int val); +int adjustHourOne(int val, int condVal); +int adjustMinTen(int val); +int adjustMinOne(int val); + +void setup() { + // put your setup code here, to run once: + pinMode(outputA, INPUT_PULLUP); + pinMode(outputB, INPUT_PULLUP); + pinMode(buttonPin, INPUT_PULLUP); + pinMode(lightPin, OUTPUT); + pinMode(waterLPin, OUTPUT); + hourSec = ((hourTenL * 10) + hourOneL) * 60; + lightOnSec = (hourSec + ((minTenL * 10) + minOneL)) * 60; + + Serial.begin(9600); + aLastState = digitalRead(outputA); + lcd.begin(16, 2); + lcd.clear(); + lcd.setCursor(0, 0); + lcd.print(menuList[0]); + +} + +void loop() { + // put your main code here, to run repeatedly: + + updateInputVals(); + delay(50); + + secDay = 86400 / timeScale; + scaledLightOnSec = lightOnSec / timeScale; + scaledLightOffSec = secDay - scaledLightOnSec; + + pinValue = analogRead(waterPin); + pinValueVolt = (5.0 / 1023) * pinValue; + waterPer = 100 - (((pinValue - 200) / (float)(700)) * 100); + + Serial.print("Water Per: "); + Serial.print(waterPer); + + currTime = millis(); + + if (currTime - preTime >= 1000) { + preTime = currTime; + timePassed++; + } + + if (waterPer < minWater) { + digitalWrite(waterLPin, HIGH); + + } else { + digitalWrite(waterLPin, LOW); + } + + + if (!secLeft) { + flipOn =!flipOn; + toggleLight(); + timePassed = 0; + } + + if (flipOn) { + Serial.print(" Light off "); + secLeft = secDay - scaledLightOffSec - timePassed; + } else { + Serial.print(" Light on "); + secLeft = secDay - scaledLightOnSec - timePassed; + } + + + if (!counter) { + lcd.setCursor(0, 0); + lcd.print("Moisture: "); + lcd.print(waterPer); + lcd.setCursor(0, 1); + lcd.print("Time: "); + float hours = secLeft / (float)3600; + Serial.print("Hours left: "); + Serial.println(hours); + if (hours <= 9) { + lcd.print("0"); + } + lcd.print(hours); + if (flipOn) { + lcd.print(" on "); + } else { + lcd.print(" off"); + } + + } + + + + + + if (!aState && aState != aLastState) { + counter++; + if (counter > 3) { + counter = 0; + } + lcd.clear(); + lcd.setCursor(0, 0); + lcd.print(menuList[counter]); + } + + if (!bState && bState != bLastState) { + counter--; + if (counter < 0) { + counter = 3; + } + lcd.clear(); + lcd.setCursor(0, 0); + lcd.print(menuList[counter]); + } + + if (!buttonState && buttonState != lastButtonState) { + switch (counter) { + case 0: + toggleLight(); + break; + case 1: + buttonState = 2; + lastButtonState = 0; + waterMenu(); + lcd.print(menuList[counter]); + break; + case 2: + buttonState = 2; + lastButtonState = 0; + timeMenu(); + lcd.print(menuList[counter]); + break; + case 3: + toggleLight(); + flipOn = !flipOn; + timePassed = 0; + counter = 0; + break; + } + } + + updatePreInputVals(); + +} + +void waterMenu() { + + lcd.clear(); + lcd.setCursor(0, 0); + lcd.blink(); + lcd.print("Min Per: "); + lcd.print(minWaterTen); + lcd.print(minWaterOne); + lcd.print(" x"); + + int posI[] = {9, 10, 12}; + int pos = 0; + + int loop = 1; + + while (loop) { + updateInputVals(); + + bool a = checkInput(aState, aLastState); + bool b = checkInput(bState, bLastState); + bool button = checkInput(buttonState, lastButtonState); + + + lcd.setCursor(9, 0); + lcd.print(minWaterTen); + lcd.print(minWaterOne); + lcd.print(" x"); + lcd.setCursor(posI[pos], 0); + delay(50); + + if (a) { + pos++; + if (pos > 2) { + pos = 0; + } + } + + if (b) { + pos--; + if (pos < 0) { + pos = 2; + } + } + + if (button) { + switch (pos) { + case 0: + buttonState = 2; + lastButtonState = 0; + minWaterTen = adjustMinOne(minWaterTen, posI[pos]); + pos++; + break; + case 1: + buttonState = 2; + lastButtonState = 0; + minWaterOne = adjustMinOne(minWaterOne, posI[pos]); + pos++; + break; + case 2: + loop = 0; + minWater = (minWaterTen * 10) + minWaterOne; + delay(150); + lcd.noBlink(); + lcd.clear(); + break; + + + } + } + updatePreInputVals(); + } + +} + +void toggleLight() { + digitalWrite(lightPin, LOW); + delay(50); + digitalWrite(lightPin, HIGH); + delay(50); + digitalWrite(lightPin, LOW); +} + +void timeMenu() { + lcd.setCursor(0, 0); + lcd.print("Time On: "); + lcd.blink(); + int loop = 1; + int posI[] = {9, 10, 12, 13, 15}; + int pos = 0; + while (loop) { + updateInputVals(); + + bool a = checkInput(aState, aLastState); + bool b = checkInput(bState, bLastState); + bool button = checkInput(buttonState, lastButtonState); + + + lcd.setCursor(9, 0); + lcd.print(hourTenL); + lcd.print(hourOneL); + lcd.print(":"); + lcd.print(minTenL); + lcd.print(minOneL); + lcd.print(" x"); + lcd.setCursor(posI[pos], 0); + delay(50); + + if (a) { + pos++; + if (pos > 4) { + pos = 0; + } + } + + if (b) { + pos--; + if (pos < 0) { + pos = 4; + } + } + + if (button) { + switch (pos) { + case 0: + buttonState = 2; + lastButtonState = 0; + hourTenL = adjustHourTen(hourTenL, posI[pos]); + pos++; + break; + case 1: + buttonState = 2; + lastButtonState = 0; + hourOneL = adjustHourOne(hourOneL, hourTenL, posI[pos]); + pos++; + break; + case 2: + buttonState = 2; + lastButtonState = 0; + minTenL = adjustMinTen(minTenL, posI[pos]); + pos++; + break; + case 3: + buttonState = 2; + lastButtonState = 0; + minOneL = adjustMinOne(minOneL, posI[pos]); + pos++; + break; + case 4: + loop = 0; + hourSec = ((hourTenL * 10) + hourOneL) * 60; + lightOnSec = (hourSec + ((minTenL * 10) + minOneL)) * 60; + timePassed =0; + if (!lightOnSec) { + lightOnSec = 1; + } + delay(50); + lcd.noBlink(); + lcd.clear(); + break; + + + } + } + updatePreInputVals(); + } +}\ + +int adjustHourTen(int val, int col) { + + while(1) { + updateInputVals(); + delay(20); + bool a = checkInput(aState, aLastState); + bool b = checkInput(bState, bLastState); + bool button = checkInput(buttonState, lastButtonState); + + if (a) { + val++; + if (val > 2) { + val = 0; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (b) { + val--; + if (val < 0) { + val = 2; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (button) { + return val; + } + + updatePreInputVals(); + } +} + +int adjustHourOne(int val, int hr, int col) { + while(1) { + updateInputVals(); + delay(20); + bool a = checkInput(aState, aLastState); + bool b = checkInput(bState, bLastState); + bool button = checkInput(buttonState, lastButtonState); + + int max = 9; + + if (hr == 2) { + max = 3; + } + + if (a) { + val++; + if (val > max) { + val = 0; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (b) { + val--; + if (val < 0) { + val = max; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (button) { + return val; + } + + updatePreInputVals(); + } +} + +int adjustMinTen(int val, int col) { + while(1) { + updateInputVals(); + delay(20); + bool a = checkInput(aState, aLastState); + bool b = checkInput(bState, bLastState); + bool button = checkInput(buttonState, lastButtonState); + + if (a) { + val++; + if (val > 5) { + val = 0; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (b) { + val--; + if (val < 0) { + val = 5; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (button) { + return val; + } + + updatePreInputVals(); + } +} + +int adjustMinOne(int val, int col) { + while(1) { + updateInputVals(); + + delay(20); + bool a = checkInput(aState, aLastState); + bool b = checkInput(bState, bLastState); + bool button = checkInput(buttonState, lastButtonState); + + if (a) { + val++; + + if (val > 9) { + val = 0; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (b) { + val--; + if (val < 0) { + val = 9; + } + lcd.setCursor(col, 0); + lcd.print(val); + lcd.setCursor(col, 0); + } + + if (button) { + return val; + } + + updatePreInputVals(); + } +} + +void updateInputVals() { + buttonState = digitalRead(buttonPin); + aState = digitalRead(outputA); + bState = digitalRead(outputB); +} + +void updatePreInputVals() { + lastButtonState = buttonState; + aLastState = aState; + bLastState = bState; +} + +bool checkInput(int currVal, int preVal) { + if (!currVal && currVal != preVal) { + return true; + } else { + return false; + } +} diff --git a/Fall 2024/csci218/Labs/Final Project/Resouces.txt b/Fall 2024/csci218/Labs/Final Project/Resouces.txt new file mode 100644 index 0000000..207ad72 --- /dev/null +++ b/Fall 2024/csci218/Labs/Final Project/Resouces.txt @@ -0,0 +1,12 @@ +Software used: +Fusion 360: https://www.autodesk.com/education/edu-software/overview# +Tinkercad: https://www.tinkercad.com + +Guide: +You'll have to make a education account with your school email, then go to the Autodesk website. From there select the products tab then under discover select educational access. Once on that page click on get products and that should bring you to the download page of both tinkercad and fusion. + +Resources: +I learned how to model from Dr. Shi's ENGR 111 class, but also https://youtube.com/playlist?list=PLrZ2zKOtC_-C4rWfapgngoe9o2-ng8ZBr&si=t8OCywQ_BrDHN1RU is good resource. +For tinkercad i just messed around to figure it our so I cant help much there. + +Garrett Haldrup \ No newline at end of file diff --git a/csci218/Labs/Final Project/RotaryEncoder/RotaryEncoder.ino b/Fall 2024/csci218/Labs/Final Project/RotaryEncoder/RotaryEncoder.ino similarity index 99% rename from csci218/Labs/Final Project/RotaryEncoder/RotaryEncoder.ino rename to Fall 2024/csci218/Labs/Final Project/RotaryEncoder/RotaryEncoder.ino index 2222f31..93d6481 100644 --- a/csci218/Labs/Final Project/RotaryEncoder/RotaryEncoder.ino +++ b/Fall 2024/csci218/Labs/Final Project/RotaryEncoder/RotaryEncoder.ino @@ -45,4 +45,5 @@ void loop() { lastButtonState = buttonState; aLastState = aState; + } diff --git a/csci218/Labs/Lab1/test/test.ino b/Fall 2024/csci218/Labs/Lab1/test/test.ino similarity index 100% rename from csci218/Labs/Lab1/test/test.ino rename to Fall 2024/csci218/Labs/Lab1/test/test.ino diff --git a/csci218/Labs/Lab10/Pull Down.heic b/Fall 2024/csci218/Labs/Lab10/Pull Down.heic similarity index 100% rename from csci218/Labs/Lab10/Pull Down.heic rename to Fall 2024/csci218/Labs/Lab10/Pull Down.heic diff --git a/csci218/Labs/Lab10/Pull Down.png b/Fall 2024/csci218/Labs/Lab10/Pull Down.png similarity index 100% rename from csci218/Labs/Lab10/Pull Down.png rename to Fall 2024/csci218/Labs/Lab10/Pull Down.png diff --git a/csci218/Labs/Lab10/RGB_LED/RGB_LED.ino b/Fall 2024/csci218/Labs/Lab10/RGB_LED/RGB_LED.ino similarity index 100% rename from csci218/Labs/Lab10/RGB_LED/RGB_LED.ino rename to Fall 2024/csci218/Labs/Lab10/RGB_LED/RGB_LED.ino diff --git a/csci218/Labs/Lab10/a.out b/Fall 2024/csci218/Labs/Lab10/a.out similarity index 100% rename from csci218/Labs/Lab10/a.out rename to Fall 2024/csci218/Labs/Lab10/a.out diff --git a/csci218/Labs/Lab10/halfAdder/halfAdder.ino b/Fall 2024/csci218/Labs/Lab10/halfAdder/halfAdder.ino similarity index 100% rename from csci218/Labs/Lab10/halfAdder/halfAdder.ino rename to Fall 2024/csci218/Labs/Lab10/halfAdder/halfAdder.ino diff --git a/csci218/Labs/Lab10/lab10.c b/Fall 2024/csci218/Labs/Lab10/lab10.c similarity index 100% rename from csci218/Labs/Lab10/lab10.c rename to Fall 2024/csci218/Labs/Lab10/lab10.c diff --git a/csci218/Labs/Lab10/pushButton/pushButton.ino b/Fall 2024/csci218/Labs/Lab10/pushButton/pushButton.ino similarity index 100% rename from csci218/Labs/Lab10/pushButton/pushButton.ino rename to Fall 2024/csci218/Labs/Lab10/pushButton/pushButton.ino diff --git a/csci218/Labs/Lab11/RGB_LED2/RGB_LED2.ino b/Fall 2024/csci218/Labs/Lab11/RGB_LED2/RGB_LED2.ino similarity index 100% rename from csci218/Labs/Lab11/RGB_LED2/RGB_LED2.ino rename to Fall 2024/csci218/Labs/Lab11/RGB_LED2/RGB_LED2.ino diff --git a/csci218/Labs/Lab11/a.out b/Fall 2024/csci218/Labs/Lab11/a.out similarity index 100% rename from csci218/Labs/Lab11/a.out rename to Fall 2024/csci218/Labs/Lab11/a.out diff --git a/csci218/Labs/Lab11/lab11.c b/Fall 2024/csci218/Labs/Lab11/lab11.c similarity index 100% rename from csci218/Labs/Lab11/lab11.c rename to Fall 2024/csci218/Labs/Lab11/lab11.c diff --git a/Fall 2024/csci218/Labs/Lab12/a.out b/Fall 2024/csci218/Labs/Lab12/a.out new file mode 100755 index 0000000..2110c16 Binary files /dev/null and b/Fall 2024/csci218/Labs/Lab12/a.out differ diff --git a/Fall 2024/csci218/Labs/Lab12/lab12.c b/Fall 2024/csci218/Labs/Lab12/lab12.c new file mode 100644 index 0000000..89e8908 --- /dev/null +++ b/Fall 2024/csci218/Labs/Lab12/lab12.c @@ -0,0 +1,119 @@ +/* Name: Garrett Haldrup +# lab12.c +# Purpose: Solves problems assigned in Lab 12 + +*/ + +#include +#include +#include +#include +#include + +int goodLogin(); +int createExpression(char expr[]); + +/* add your function declaration here... */ +int main() { + + srand((int)time(0)); + + char expr[15] = ""; + int try = 0; + + printf("\nTest goodInput().....\n"); + //int try = goodLogin(); + if (try == 1) { + printf("\nTest Good\n"); + } else { + printf("\nTest Failed\n"); + } + /* put your test cases here...*/ + + + + printf("\nTest createExpression().....\n"); + /* put your test cases here...*/ + int key = createExpression(expr); + printf("%s = %d\n", expr, key); + + + return 0; +} + +/* add your function definition here... */ +int goodLogin() { + int tries = 5; + char user[] = "csci218"; + char userEnter[50]; + char pass[] = "grace2023F"; + char passEnter[50]; + + printf("Please enter username then password, only 5 attempts\n\n"); + while(1) { + if (tries < 5) { + printf("Incorrect username or password\n"); + printf("%d attempts left\n", tries); + } + printf("Please enter username: "); + scanf("%s", userEnter); + printf("Please enter password: "); + scanf("%s", passEnter); + + if (!strcmp(user, userEnter) && !strcmp(pass, passEnter)) { + return 1; + } + tries--; + if (!tries) { + printf("Login failed, used all atempts\n"); + return -1; + } + } +} + +int createExpression(char expr[]) { + char operators[][3] = {"+", "-", "/", "%", ">", "<", "=="}; + + int num1 = (rand() % 31) + 20; + int num2 = (rand() % 31) + 20; + + int indexer = rand() % 7; + sprintf(expr, "%d %s %d", num1, operators[indexer], num2); + + int sol; + + switch (indexer) { + case 0: + sol = num1 + num2; + break; + case 1: + sol = num1 - num2; + break; + case 2: + if (!num2) { + sol = 999999; + } else { + sol = num1 / num2; + } + break; + case 3: + if (!num2) { + sol = 999999; + } else { + sol = num1 % num2; + } + break; + case 4: + sol = num1 > num2; + break; + case 5: + sol = num1 < num2; + break; + case 6: + sol = num1 == num2; + break; + } + + return sol; + +} diff --git a/csci218/Labs/Lab2/Lab2_Part1.c b/Fall 2024/csci218/Labs/Lab2/Lab2_Part1.c similarity index 100% rename from csci218/Labs/Lab2/Lab2_Part1.c rename to Fall 2024/csci218/Labs/Lab2/Lab2_Part1.c diff --git a/csci218/Labs/Lab2/circleArea.c b/Fall 2024/csci218/Labs/Lab2/circleArea.c similarity index 100% rename from csci218/Labs/Lab2/circleArea.c rename to Fall 2024/csci218/Labs/Lab2/circleArea.c diff --git a/csci218/Labs/Lab2/circleArea.out b/Fall 2024/csci218/Labs/Lab2/circleArea.out similarity index 100% rename from csci218/Labs/Lab2/circleArea.out rename to Fall 2024/csci218/Labs/Lab2/circleArea.out diff --git a/csci218/Labs/Lab2/countPennies.c b/Fall 2024/csci218/Labs/Lab2/countPennies.c similarity index 100% rename from csci218/Labs/Lab2/countPennies.c rename to Fall 2024/csci218/Labs/Lab2/countPennies.c diff --git a/csci218/Labs/Lab2/countPennies.out b/Fall 2024/csci218/Labs/Lab2/countPennies.out similarity index 100% rename from csci218/Labs/Lab2/countPennies.out rename to Fall 2024/csci218/Labs/Lab2/countPennies.out diff --git a/csci218/Labs/Lab2/myBlink/Blink.txt b/Fall 2024/csci218/Labs/Lab2/myBlink/Blink.txt similarity index 100% rename from csci218/Labs/Lab2/myBlink/Blink.txt rename to Fall 2024/csci218/Labs/Lab2/myBlink/Blink.txt diff --git a/csci218/Labs/Lab2/myBlink/myBlink.ino b/Fall 2024/csci218/Labs/Lab2/myBlink/myBlink.ino similarity index 100% rename from csci218/Labs/Lab2/myBlink/myBlink.ino rename to Fall 2024/csci218/Labs/Lab2/myBlink/myBlink.ino diff --git a/csci218/Labs/Lab2/nameAge.c b/Fall 2024/csci218/Labs/Lab2/nameAge.c similarity index 100% rename from csci218/Labs/Lab2/nameAge.c rename to Fall 2024/csci218/Labs/Lab2/nameAge.c diff --git a/csci218/Labs/Lab2/nameAge.out b/Fall 2024/csci218/Labs/Lab2/nameAge.out similarity index 100% rename from csci218/Labs/Lab2/nameAge.out rename to Fall 2024/csci218/Labs/Lab2/nameAge.out diff --git a/csci218/Labs/Lab2/part1.o b/Fall 2024/csci218/Labs/Lab2/part1.o similarity index 100% rename from csci218/Labs/Lab2/part1.o rename to Fall 2024/csci218/Labs/Lab2/part1.o diff --git a/csci218/Labs/Lab2/part1.out b/Fall 2024/csci218/Labs/Lab2/part1.out similarity index 100% rename from csci218/Labs/Lab2/part1.out rename to Fall 2024/csci218/Labs/Lab2/part1.out diff --git a/csci218/Labs/Lab3/GarrettHaldrupB2D.txt b/Fall 2024/csci218/Labs/Lab3/GarrettHaldrupB2D.txt similarity index 100% rename from csci218/Labs/Lab3/GarrettHaldrupB2D.txt rename to Fall 2024/csci218/Labs/Lab3/GarrettHaldrupB2D.txt diff --git a/csci218/Labs/Lab3/GarrettHaldrupD2B.txt b/Fall 2024/csci218/Labs/Lab3/GarrettHaldrupD2B.txt similarity index 100% rename from csci218/Labs/Lab3/GarrettHaldrupD2B.txt rename to Fall 2024/csci218/Labs/Lab3/GarrettHaldrupD2B.txt diff --git a/csci218/Labs/Lab3/a.out b/Fall 2024/csci218/Labs/Lab3/a.out similarity index 100% rename from csci218/Labs/Lab3/a.out rename to Fall 2024/csci218/Labs/Lab3/a.out diff --git a/csci218/Labs/Lab3/lab3.c b/Fall 2024/csci218/Labs/Lab3/lab3.c similarity index 100% rename from csci218/Labs/Lab3/lab3.c rename to Fall 2024/csci218/Labs/Lab3/lab3.c diff --git a/csci218/Labs/Lab4/dataRepresentation/dataRepresentation.ino b/Fall 2024/csci218/Labs/Lab4/dataRepresentation/dataRepresentation.ino similarity index 100% rename from csci218/Labs/Lab4/dataRepresentation/dataRepresentation.ino rename to Fall 2024/csci218/Labs/Lab4/dataRepresentation/dataRepresentation.ino diff --git a/csci218/Labs/Lab4/displayLetter/displayLetter.ino b/Fall 2024/csci218/Labs/Lab4/displayLetter/displayLetter.ino similarity index 100% rename from csci218/Labs/Lab4/displayLetter/displayLetter.ino rename to Fall 2024/csci218/Labs/Lab4/displayLetter/displayLetter.ino diff --git a/csci218/Labs/Lab4/example1/example1.ino b/Fall 2024/csci218/Labs/Lab4/example1/example1.ino similarity index 100% rename from csci218/Labs/Lab4/example1/example1.ino rename to Fall 2024/csci218/Labs/Lab4/example1/example1.ino diff --git a/csci218/Labs/Lab4/triangleArea/triangleArea.ino b/Fall 2024/csci218/Labs/Lab4/triangleArea/triangleArea.ino similarity index 100% rename from csci218/Labs/Lab4/triangleArea/triangleArea.ino rename to Fall 2024/csci218/Labs/Lab4/triangleArea/triangleArea.ino diff --git a/csci218/Labs/Lab5/AlternatingLEDs/AlternatingLEDs.ino b/Fall 2024/csci218/Labs/Lab5/AlternatingLEDs/AlternatingLEDs.ino similarity index 100% rename from csci218/Labs/Lab5/AlternatingLEDs/AlternatingLEDs.ino rename to Fall 2024/csci218/Labs/Lab5/AlternatingLEDs/AlternatingLEDs.ino diff --git a/csci218/Labs/Lab5/CustomBinayLED/CustomBinayLED.ino b/Fall 2024/csci218/Labs/Lab5/CustomBinayLED/CustomBinayLED.ino similarity index 100% rename from csci218/Labs/Lab5/CustomBinayLED/CustomBinayLED.ino rename to Fall 2024/csci218/Labs/Lab5/CustomBinayLED/CustomBinayLED.ino diff --git a/csci218/Labs/Lab5/FIzzBuzz/FIzzBuzz.ino b/Fall 2024/csci218/Labs/Lab5/FIzzBuzz/FIzzBuzz.ino similarity index 100% rename from csci218/Labs/Lab5/FIzzBuzz/FIzzBuzz.ino rename to Fall 2024/csci218/Labs/Lab5/FIzzBuzz/FIzzBuzz.ino diff --git a/csci218/Labs/Lab5/LEDsForLoop/LEDsForLoop.ino b/Fall 2024/csci218/Labs/Lab5/LEDsForLoop/LEDsForLoop.ino similarity index 100% rename from csci218/Labs/Lab5/LEDsForLoop/LEDsForLoop.ino rename to Fall 2024/csci218/Labs/Lab5/LEDsForLoop/LEDsForLoop.ino diff --git a/csci218/Labs/Lab5/LEDsOddEven/LEDsOddEven.ino b/Fall 2024/csci218/Labs/Lab5/LEDsOddEven/LEDsOddEven.ino similarity index 100% rename from csci218/Labs/Lab5/LEDsOddEven/LEDsOddEven.ino rename to Fall 2024/csci218/Labs/Lab5/LEDsOddEven/LEDsOddEven.ino diff --git a/csci218/Labs/Lab5/a.out b/Fall 2024/csci218/Labs/Lab5/a.out similarity index 100% rename from csci218/Labs/Lab5/a.out rename to Fall 2024/csci218/Labs/Lab5/a.out diff --git a/csci218/Labs/Lab5/lab5.c b/Fall 2024/csci218/Labs/Lab5/lab5.c similarity index 100% rename from csci218/Labs/Lab5/lab5.c rename to Fall 2024/csci218/Labs/Lab5/lab5.c diff --git a/Fall 2024/csci218/Labs/Lab6/.DS_Store b/Fall 2024/csci218/Labs/Lab6/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/Fall 2024/csci218/Labs/Lab6/.DS_Store differ diff --git a/csci218/Labs/lab6/GarrettHaldrupLab6.txt b/Fall 2024/csci218/Labs/Lab6/GarrettHaldrupLab6.txt similarity index 100% rename from csci218/Labs/lab6/GarrettHaldrupLab6.txt rename to Fall 2024/csci218/Labs/Lab6/GarrettHaldrupLab6.txt diff --git a/csci218/Labs/lab6/GarrettHaldruplab6.c b/Fall 2024/csci218/Labs/Lab6/GarrettHaldruplab6.c similarity index 100% rename from csci218/Labs/lab6/GarrettHaldruplab6.c rename to Fall 2024/csci218/Labs/Lab6/GarrettHaldruplab6.c diff --git a/csci218/Labs/lab6/lab6.o b/Fall 2024/csci218/Labs/Lab6/lab6.o similarity index 100% rename from csci218/Labs/lab6/lab6.o rename to Fall 2024/csci218/Labs/Lab6/lab6.o diff --git a/csci218/Labs/Lab7/Lab 7 Tables.pdf b/Fall 2024/csci218/Labs/Lab7/Lab 7 Tables.pdf similarity index 100% rename from csci218/Labs/Lab7/Lab 7 Tables.pdf rename to Fall 2024/csci218/Labs/Lab7/Lab 7 Tables.pdf diff --git a/csci218/Labs/Lab7/autoNightlight/autoNightlight.ino b/Fall 2024/csci218/Labs/Lab7/autoNightlight/autoNightlight.ino similarity index 100% rename from csci218/Labs/Lab7/autoNightlight/autoNightlight.ino rename to Fall 2024/csci218/Labs/Lab7/autoNightlight/autoNightlight.ino diff --git a/csci218/Labs/Lab7/interfacingLightSensorVolt/interfacingLightSensorVolt.ino b/Fall 2024/csci218/Labs/Lab7/interfacingLightSensorVolt/interfacingLightSensorVolt.ino similarity index 100% rename from csci218/Labs/Lab7/interfacingLightSensorVolt/interfacingLightSensorVolt.ino rename to Fall 2024/csci218/Labs/Lab7/interfacingLightSensorVolt/interfacingLightSensorVolt.ino diff --git a/csci218/Labs/Lab8/lab8.c b/Fall 2024/csci218/Labs/Lab8/lab8.c similarity index 100% rename from csci218/Labs/Lab8/lab8.c rename to Fall 2024/csci218/Labs/Lab8/lab8.c diff --git a/csci218/Labs/Lab8/output/lab8.out b/Fall 2024/csci218/Labs/Lab8/output/lab8.out similarity index 100% rename from csci218/Labs/Lab8/output/lab8.out rename to Fall 2024/csci218/Labs/Lab8/output/lab8.out diff --git a/csci218/Labs/Lab9/lab9.c b/Fall 2024/csci218/Labs/Lab9/lab9.c similarity index 100% rename from csci218/Labs/Lab9/lab9.c rename to Fall 2024/csci218/Labs/Lab9/lab9.c diff --git a/csci218/Labs/Lab9/lab9.out b/Fall 2024/csci218/Labs/Lab9/lab9.out similarity index 100% rename from csci218/Labs/Lab9/lab9.out rename to Fall 2024/csci218/Labs/Lab9/lab9.out diff --git a/csci218/Labs/Textbook/.DS_Store b/Fall 2024/csci218/Labs/Textbook/.DS_Store similarity index 88% rename from csci218/Labs/Textbook/.DS_Store rename to Fall 2024/csci218/Labs/Textbook/.DS_Store index c7cb848..5edc141 100644 Binary files a/csci218/Labs/Textbook/.DS_Store and b/Fall 2024/csci218/Labs/Textbook/.DS_Store differ diff --git a/csci218/Labs/Textbook/Ultimate_Starter_Kit_for_Arduino_V2.pdf b/Fall 2024/csci218/Labs/Textbook/Ultimate_Starter_Kit_for_Arduino_V2.pdf similarity index 100% rename from csci218/Labs/Textbook/Ultimate_Starter_Kit_for_Arduino_V2.pdf rename to Fall 2024/csci218/Labs/Textbook/Ultimate_Starter_Kit_for_Arduino_V2.pdf diff --git a/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/.DS_Store b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/.DS_Store new file mode 100644 index 0000000..d945bb4 Binary files /dev/null and b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/.DS_Store differ diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/App/UCTRONICS_ESP8266.apk b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/App/UCTRONICS_ESP8266.apk similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/App/UCTRONICS_ESP8266.apk rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/App/UCTRONICS_ESP8266.apk diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/.DS_Store b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/.DS_Store similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/.DS_Store rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/.DS_Store diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Blink/Blink.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Blink/Blink.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Blink/Blink.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Blink/Blink.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/DS1302/DS1302.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/DS1302/DS1302.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/DS1302/DS1302.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/DS1302/DS1302.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_10_Controlling_Relay/Lesson_10_Controlling_Relay.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_10_Controlling_Relay/Lesson_10_Controlling_Relay.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_10_Controlling_Relay/Lesson_10_Controlling_Relay.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_10_Controlling_Relay/Lesson_10_Controlling_Relay.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_11_four_digital_seven_segment_display/Lesson_11_four_digital_seven_segment_display.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_11_four_digital_seven_segment_display/Lesson_11_four_digital_seven_segment_display.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_11_four_digital_seven_segment_display/Lesson_11_four_digital_seven_segment_display.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_11_four_digital_seven_segment_display/Lesson_11_four_digital_seven_segment_display.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_12_Controlling_Serve_motor/Lesson_12_Controlling_Serve_motor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_12_Controlling_Serve_motor/Lesson_12_Controlling_Serve_motor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_12_Controlling_Serve_motor/Lesson_12_Controlling_Serve_motor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_12_Controlling_Serve_motor/Lesson_12_Controlling_Serve_motor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_13_Controlling_DC_motor/Lesson_13_Controlling_DC_motor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_13_Controlling_DC_motor/Lesson_13_Controlling_DC_motor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_13_Controlling_DC_motor/Lesson_13_Controlling_DC_motor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_13_Controlling_DC_motor/Lesson_13_Controlling_DC_motor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_14_Controlling_Stepper_Motor/Lesson_14_Controlling_Stepper_Motor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_14_Controlling_Stepper_Motor/Lesson_14_Controlling_Stepper_Motor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_14_Controlling_Stepper_Motor/Lesson_14_Controlling_Stepper_Motor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_14_Controlling_Stepper_Motor/Lesson_14_Controlling_Stepper_Motor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_15_Intrusion_Detection_based_on_the_PIR/Lesson_15_Intrusion_Detection_based_on_the_PIR.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_15_Intrusion_Detection_based_on_the_PIR/Lesson_15_Intrusion_Detection_based_on_the_PIR.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_15_Intrusion_Detection_based_on_the_PIR/Lesson_15_Intrusion_Detection_based_on_the_PIR.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_15_Intrusion_Detection_based_on_the_PIR/Lesson_15_Intrusion_Detection_based_on_the_PIR.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_16_LCD1602_display/Lesson_16_LCD1602_display.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_16_LCD1602_display/Lesson_16_LCD1602_display.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_16_LCD1602_display/Lesson_16_LCD1602_display.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_16_LCD1602_display/Lesson_16_LCD1602_display.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_17_Thermometer/Lesson_17_Thermometer.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_17_Thermometer/Lesson_17_Thermometer.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_17_Thermometer/Lesson_17_Thermometer.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_17_Thermometer/Lesson_17_Thermometer.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_18_Temperature_humidity_sensor_DHT-11/Lesson_18_Temperature_humidity_sensor_DHT-11.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_18_Temperature_humidity_sensor_DHT-11/Lesson_18_Temperature_humidity_sensor_DHT-11.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_18_Temperature_humidity_sensor_DHT-11/Lesson_18_Temperature_humidity_sensor_DHT-11.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_18_Temperature_humidity_sensor_DHT-11/Lesson_18_Temperature_humidity_sensor_DHT-11.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_19_Joy_stick/Lesson_19_Joy_stick.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_19_Joy_stick/Lesson_19_Joy_stick.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_19_Joy_stick/Lesson_19_Joy_stick.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_19_Joy_stick/Lesson_19_Joy_stick.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_1_Breathe_light/Lesson_1_Breathe_light.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_1_Breathe_light/Lesson_1_Breathe_light.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_1_Breathe_light/Lesson_1_Breathe_light.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_1_Breathe_light/Lesson_1_Breathe_light.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_20_Ultrasonic_distance_sensor/Lesson_20_Ultrasonic_distance_sensor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_20_Ultrasonic_distance_sensor/Lesson_20_Ultrasonic_distance_sensor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_20_Ultrasonic_distance_sensor/Lesson_20_Ultrasonic_distance_sensor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_20_Ultrasonic_distance_sensor/Lesson_20_Ultrasonic_distance_sensor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_21_IR_receiver_remote/Lesson_21_IR_receiver_remote.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_21_IR_receiver_remote/Lesson_21_IR_receiver_remote.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_21_IR_receiver_remote/Lesson_21_IR_receiver_remote.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_21_IR_receiver_remote/Lesson_21_IR_receiver_remote.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_22_LED_bar_graph_display/Lesson_22_LED_bar_graph_display.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_22_LED_bar_graph_display/Lesson_22_LED_bar_graph_display.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_22_LED_bar_graph_display/Lesson_22_LED_bar_graph_display.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_22_LED_bar_graph_display/Lesson_22_LED_bar_graph_display.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_23_4x4_matrix_keyboard/Lesson_23_4x4_matrix_keyboard.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_23_4x4_matrix_keyboard/Lesson_23_4x4_matrix_keyboard.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_23_4x4_matrix_keyboard/Lesson_23_4x4_matrix_keyboard.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_23_4x4_matrix_keyboard/Lesson_23_4x4_matrix_keyboard.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_24_real_time_clock_module/Lesson_24_real_time_clock_module.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_24_real_time_clock_module/Lesson_24_real_time_clock_module.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_24_real_time_clock_module/Lesson_24_real_time_clock_module.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_24_real_time_clock_module/Lesson_24_real_time_clock_module.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_25_water_level_detection_sensor_module/Lesson_25_water_level_detection_sensor_module.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_25_water_level_detection_sensor_module/Lesson_25_water_level_detection_sensor_module.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_25_water_level_detection_sensor_module/Lesson_25_water_level_detection_sensor_module.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_25_water_level_detection_sensor_module/Lesson_25_water_level_detection_sensor_module.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_26_Sound_Sensor_Module/Lesson_26_Sound_Sensor_Module.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_26_Sound_Sensor_Module/Lesson_26_Sound_Sensor_Module.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_26_Sound_Sensor_Module/Lesson_26_Sound_Sensor_Module.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_26_Sound_Sensor_Module/Lesson_26_Sound_Sensor_Module.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_27_max7219_led_dot_matrix_module/Lesson_27_max7219_led_dot_matrix_module.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_27_max7219_led_dot_matrix_module/Lesson_27_max7219_led_dot_matrix_module.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_27_max7219_led_dot_matrix_module/Lesson_27_max7219_led_dot_matrix_module.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_27_max7219_led_dot_matrix_module/Lesson_27_max7219_led_dot_matrix_module.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_28_Frequency_meter/Lesson_28_Frequency_meter.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_28_Frequency_meter/Lesson_28_Frequency_meter.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_28_Frequency_meter/Lesson_28_Frequency_meter.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_28_Frequency_meter/Lesson_28_Frequency_meter.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_29_mpu6050_module/Lesson_29_mpu6050_module.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_29_mpu6050_module/Lesson_29_mpu6050_module.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_29_mpu6050_module/Lesson_29_mpu6050_module.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_29_mpu6050_module/Lesson_29_mpu6050_module.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_2_LED_Flowing_Lights/Lesson_2_LED_Flowing_Lights.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_2_LED_Flowing_Lights/Lesson_2_LED_Flowing_Lights.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_2_LED_Flowing_Lights/Lesson_2_LED_Flowing_Lights.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_2_LED_Flowing_Lights/Lesson_2_LED_Flowing_Lights.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_30_controlling_stepper_motor_with_remote/Lesson_30_controlling_stepper_motor_with_remote.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_30_controlling_stepper_motor_with_remote/Lesson_30_controlling_stepper_motor_with_remote.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_30_controlling_stepper_motor_with_remote/Lesson_30_controlling_stepper_motor_with_remote.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_30_controlling_stepper_motor_with_remote/Lesson_30_controlling_stepper_motor_with_remote.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_31_controlling_stepper_motor_with_rotary_encoder/Lesson_31_controlling_stepper_motor_with_rotary_encoder.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_31_controlling_stepper_motor_with_rotary_encoder/Lesson_31_controlling_stepper_motor_with_rotary_encoder.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_31_controlling_stepper_motor_with_rotary_encoder/Lesson_31_controlling_stepper_motor_with_rotary_encoder.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_31_controlling_stepper_motor_with_rotary_encoder/Lesson_31_controlling_stepper_motor_with_rotary_encoder.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_32_ESP8266/Lesson_32_ESP8266.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_32_ESP8266/Lesson_32_ESP8266.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_32_ESP8266/Lesson_32_ESP8266.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_32_ESP8266/Lesson_32_ESP8266.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Calibration_clock/Calibration_clock.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Calibration_clock/Calibration_clock.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Calibration_clock/Calibration_clock.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Calibration_clock/Calibration_clock.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Lesson_33_Build_a_Smart_Home_System.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Lesson_33_Build_a_Smart_Home_System.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Lesson_33_Build_a_Smart_Home_System.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_33_Build_a_Smart_Home_System/Lesson_33_Build_a_Smart_Home_System.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_3_digital_inputs/Lesson_3_digital_inputs.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_3_digital_inputs/Lesson_3_digital_inputs.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_3_digital_inputs/Lesson_3_digital_inputs.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_3_digital_inputs/Lesson_3_digital_inputs.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_4_Controlling_a_RGB_LED_by_PWM/Lesson_4_Controlling_a_RGB_LED_by_PWM.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_4_Controlling_a_RGB_LED_by_PWM/Lesson_4_Controlling_a_RGB_LED_by_PWM.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_4_Controlling_a_RGB_LED_by_PWM/Lesson_4_Controlling_a_RGB_LED_by_PWM.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_4_Controlling_a_RGB_LED_by_PWM/Lesson_4_Controlling_a_RGB_LED_by_PWM.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_5_Active_Buzzer/Lesson_5_Active_Buzzer.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_5_Active_Buzzer/Lesson_5_Active_Buzzer.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_5_Active_Buzzer/Lesson_5_Active_Buzzer.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_5_Active_Buzzer/Lesson_5_Active_Buzzer.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_6_Play_the_Music/Lesson_6_Play_the_Music.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_6_Play_the_Music/Lesson_6_Play_the_Music.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_6_Play_the_Music/Lesson_6_Play_the_Music.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_6_Play_the_Music/Lesson_6_Play_the_Music.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_7_tilt_ball_switch/Lesson_7_tilt_ball_switch.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_7_tilt_ball_switch/Lesson_7_tilt_ball_switch.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_7_tilt_ball_switch/Lesson_7_tilt_ball_switch.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_7_tilt_ball_switch/Lesson_7_tilt_ball_switch.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_8_7-segement_display/Lesson_8_7-segement_display.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_8_7-segement_display/Lesson_8_7-segement_display.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_8_7-segement_display/Lesson_8_7-segement_display.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_8_7-segement_display/Lesson_8_7-segement_display.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_9_Photoresistor/Lesson_9_Photoresistor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_9_Photoresistor/Lesson_9_Photoresistor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_9_Photoresistor/Lesson_9_Photoresistor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/Code/Lesson_9_Photoresistor/Lesson_9_Photoresistor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/README.md b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/README.md similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/README.md rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/README.md diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/CHANGELOG b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/CHANGELOG similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/CHANGELOG rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/CHANGELOG diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/LICENSE b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/LICENSE similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/LICENSE rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/LICENSE diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/README.md b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/README.md similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/README.md rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/README.md diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDS1302.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDS1302.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDS1302.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDS1302.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcDateTime.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/RtcUtility.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/ThreeWire.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/ThreeWire.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/ThreeWire.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/ThreeWire.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_dateformat/DS1302_dateformat.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_dateformat/DS1302_dateformat.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_dateformat/DS1302_dateformat.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_dateformat/DS1302_dateformat.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_simple/DS1302_simple.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_simple/DS1302_simple.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_simple/DS1302_simple.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/DS1302/examples/DS1302_simple/DS1302_simple.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/dht11.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/examples/dht11/dht11.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/examples/dht11/dht11.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/examples/dht11/dht11.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Dht11/examples/dht11/dht11.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/README.md b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/README.md similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/README.md rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/README.md diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/chatServer/chatServer.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/chatServer/chatServer.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/chatServer/chatServer.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/chatServer/chatServer.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/udpSendReceivingString/udpSendReceivingString.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/udpSendReceivingString/udpSendReceivingString.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/udpSendReceivingString/udpSendReceivingString.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/udpSendReceivingString/udpSendReceivingString.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webclientRepeating/webclientRepeating.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webclientRepeating/webclientRepeating.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webclientRepeating/webclientRepeating.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webclientRepeating/webclientRepeating.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webserver/webserver.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webserver/webserver.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webserver/webserver.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/webserver/webserver.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/wifiTest/wifiTest.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/wifiTest/wifiTest.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/wifiTest/wifiTest.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/examples/wifiTest/wifiTest.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/keywords.txt b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/keywords.txt similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/keywords.txt rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/keywords.txt diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/ITEADLIB_Arduino_ESP8266-master/uartWIFI.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/Keypad.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/examples/CustomKeypad/CustomKeypad.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/examples/CustomKeypad/CustomKeypad.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/examples/CustomKeypad/CustomKeypad.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/examples/CustomKeypad/CustomKeypad.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/keywords.txt b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/keywords.txt similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/keywords.txt rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/keywords.txt diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Keypad/utility/Key.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/LedControl.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemo7Segment/LCDemo7Segment.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemo7Segment/LCDemo7Segment.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemo7Segment/LCDemo7Segment.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemo7Segment/LCDemo7Segment.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoCascadedDevices/LCDemoCascadedDevices.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoCascadedDevices/LCDemoCascadedDevices.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoCascadedDevices/LCDemoCascadedDevices.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoCascadedDevices/LCDemoCascadedDevices.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoMatrix/LCDemoMatrix.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoMatrix/LCDemoMatrix.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoMatrix/LCDemoMatrix.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/examples/LCDemoMatrix/LCDemoMatrix.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/keywords.txt b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/keywords.txt similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/keywords.txt rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LedControl/keywords.txt diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/README.adoc b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/README.adoc similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/README.adoc rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/README.adoc diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Autoscroll/Autoscroll.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Blink/Blink.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Blink/Blink.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Blink/Blink.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Blink/Blink.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Cursor/Cursor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Cursor/Cursor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Cursor/Cursor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Cursor/Cursor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Display/Display.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Display/Display.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Display/Display.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Display/Display.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Scroll/Scroll.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Scroll/Scroll.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Scroll/Scroll.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/Scroll/Scroll.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/SerialDisplay/SerialDisplay.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/TextDirection/TextDirection.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/TextDirection/TextDirection.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/TextDirection/TextDirection.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/TextDirection/TextDirection.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/setCursor/setCursor.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/setCursor/setCursor.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/setCursor/setCursor.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/examples/setCursor/setCursor.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/keywords.txt b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/keywords.txt similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/keywords.txt rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/keywords.txt diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/library.properties b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/library.properties similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/library.properties rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/library.properties diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/LiquidCrystal/src/LiquidCrystal.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/CHANGELOG b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/CHANGELOG similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/CHANGELOG rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/CHANGELOG diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/LICENSE b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/LICENSE similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/LICENSE rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/LICENSE diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/MPU6050.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/README.md b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/README.md similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/README.md rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/README.md diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_pitch_roll/MPU6050_accel_pitch_roll.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_pitch_roll/MPU6050_accel_pitch_roll.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_pitch_roll/MPU6050_accel_pitch_roll.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_pitch_roll/MPU6050_accel_pitch_roll.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_simple/MPU6050_accel_simple.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_simple/MPU6050_accel_simple.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_simple/MPU6050_accel_simple.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_accel_simple/MPU6050_accel_simple.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_free_fall/MPU6050_free_fall.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_free_fall/MPU6050_free_fall.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_free_fall/MPU6050_free_fall.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_free_fall/MPU6050_free_fall.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_pitch_roll_yaw/MPU6050_gyro_pitch_roll_yaw.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_pitch_roll_yaw/MPU6050_gyro_pitch_roll_yaw.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_pitch_roll_yaw/MPU6050_gyro_pitch_roll_yaw.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_pitch_roll_yaw/MPU6050_gyro_pitch_roll_yaw.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_simple/MPU6050_gyro_simple.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_simple/MPU6050_gyro_simple.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_simple/MPU6050_gyro_simple.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_gyro_simple/MPU6050_gyro_simple.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_motion/MPU6050_motion.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_motion/MPU6050_motion.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_motion/MPU6050_motion.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_motion/MPU6050_motion.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_temperature/MPU6050_temperature.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_temperature/MPU6050_temperature.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_temperature/MPU6050_temperature.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/MPU6050/examples/MPU6050_temperature/MPU6050_temperature.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/NECIRrcv.h diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/examples/myIR_test/myIR_test.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/examples/myIR_test/myIR_test.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/examples/myIR_test/myIR_test.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/NECIRrcv/examples/myIR_test/myIR_test.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/README.adoc b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/README.adoc similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/README.adoc rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/README.adoc diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/MotorKnob/MotorKnob.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/MotorKnob/MotorKnob.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/MotorKnob/MotorKnob.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/MotorKnob/MotorKnob.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneRevolution/stepper_oneRevolution.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_oneStepAtATime/stepper_oneStepAtATime.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/examples/stepper_speedControl/stepper_speedControl.ino diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/keywords.txt b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/keywords.txt similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/keywords.txt rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/keywords.txt diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/library.properties b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/library.properties similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/library.properties rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/library.properties diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.cpp b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.cpp similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.cpp rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.cpp diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.h b/Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.h similarity index 100% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.h rename to Fall 2024/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/libraries/Stepper/src/Stepper.h diff --git a/csci218/Lect/101.c b/Fall 2024/csci218/Lect/101.c similarity index 100% rename from csci218/Lect/101.c rename to Fall 2024/csci218/Lect/101.c diff --git a/csci218/Lect/108.c b/Fall 2024/csci218/Lect/108.c similarity index 100% rename from csci218/Lect/108.c rename to Fall 2024/csci218/Lect/108.c diff --git a/csci218/Lect/910.out b/Fall 2024/csci218/Lect/910.out similarity index 100% rename from csci218/Lect/910.out rename to Fall 2024/csci218/Lect/910.out diff --git a/csci218/Lect/910class.c b/Fall 2024/csci218/Lect/910class.c similarity index 100% rename from csci218/Lect/910class.c rename to Fall 2024/csci218/Lect/910class.c diff --git a/csci218/Lect/912class.c b/Fall 2024/csci218/Lect/912class.c similarity index 100% rename from csci218/Lect/912class.c rename to Fall 2024/csci218/Lect/912class.c diff --git a/csci218/Lect/912class.out b/Fall 2024/csci218/Lect/912class.out similarity index 100% rename from csci218/Lect/912class.out rename to Fall 2024/csci218/Lect/912class.out diff --git a/csci218/Lect/919class.c b/Fall 2024/csci218/Lect/919class.c similarity index 100% rename from csci218/Lect/919class.c rename to Fall 2024/csci218/Lect/919class.c diff --git a/csci218/Lect/926.c b/Fall 2024/csci218/Lect/926.c similarity index 100% rename from csci218/Lect/926.c rename to Fall 2024/csci218/Lect/926.c diff --git a/csci218/Lect/a.out b/Fall 2024/csci218/Lect/a.out similarity index 100% rename from csci218/Lect/a.out rename to Fall 2024/csci218/Lect/a.out diff --git a/csci218/Lect/ex3InClass.c b/Fall 2024/csci218/Lect/ex3InClass.c similarity index 100% rename from csci218/Lect/ex3InClass.c rename to Fall 2024/csci218/Lect/ex3InClass.c diff --git a/csci218/Lect/ex3InClass.out b/Fall 2024/csci218/Lect/ex3InClass.out similarity index 100% rename from csci218/Lect/ex3InClass.out rename to Fall 2024/csci218/Lect/ex3InClass.out diff --git a/csci218/Lect/ex5InClass.c b/Fall 2024/csci218/Lect/ex5InClass.c similarity index 100% rename from csci218/Lect/ex5InClass.c rename to Fall 2024/csci218/Lect/ex5InClass.c diff --git a/csci218/Lect/ex5InClass.out b/Fall 2024/csci218/Lect/ex5InClass.out similarity index 100% rename from csci218/Lect/ex5InClass.out rename to Fall 2024/csci218/Lect/ex5InClass.out diff --git a/csci218/Lect/ex6inClass.c b/Fall 2024/csci218/Lect/ex6inClass.c similarity index 100% rename from csci218/Lect/ex6inClass.c rename to Fall 2024/csci218/Lect/ex6inClass.c diff --git a/csci218/Lect/ex6inClass.out b/Fall 2024/csci218/Lect/ex6inClass.out similarity index 100% rename from csci218/Lect/ex6inClass.out rename to Fall 2024/csci218/Lect/ex6inClass.out diff --git a/csci218/Lect/output/101.o b/Fall 2024/csci218/Lect/output/101.o similarity index 100% rename from csci218/Lect/output/101.o rename to Fall 2024/csci218/Lect/output/101.o diff --git a/csci218/Lect/output/108.o b/Fall 2024/csci218/Lect/output/108.o similarity index 100% rename from csci218/Lect/output/108.o rename to Fall 2024/csci218/Lect/output/108.o diff --git a/csci218/Lect/output/926.o b/Fall 2024/csci218/Lect/output/926.o similarity index 100% rename from csci218/Lect/output/926.o rename to Fall 2024/csci218/Lect/output/926.o diff --git a/csci218/Lect/tempClass.c b/Fall 2024/csci218/Lect/tempClass.c similarity index 100% rename from csci218/Lect/tempClass.c rename to Fall 2024/csci218/Lect/tempClass.c diff --git a/csci218/Lect/tempClass.out b/Fall 2024/csci218/Lect/tempClass.out similarity index 100% rename from csci218/Lect/tempClass.out rename to Fall 2024/csci218/Lect/tempClass.out diff --git a/csci218/Lect/welcome.c b/Fall 2024/csci218/Lect/welcome.c similarity index 100% rename from csci218/Lect/welcome.c rename to Fall 2024/csci218/Lect/welcome.c diff --git a/csci218/Lect/welcome.out b/Fall 2024/csci218/Lect/welcome.out similarity index 100% rename from csci218/Lect/welcome.out rename to Fall 2024/csci218/Lect/welcome.out diff --git a/csci218/a.out b/Fall 2024/csci218/a.out similarity index 100% rename from csci218/a.out rename to Fall 2024/csci218/a.out diff --git a/csci218/header.c b/Fall 2024/csci218/header.c similarity index 100% rename from csci218/header.c rename to Fall 2024/csci218/header.c diff --git a/csci218/header2.c b/Fall 2024/csci218/header2.c similarity index 100% rename from csci218/header2.c rename to Fall 2024/csci218/header2.c diff --git a/Research/pygameSim/CytoSim b/Research/pygameSim/CytoSim deleted file mode 160000 index a63285a..0000000 --- a/Research/pygameSim/CytoSim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a63285a8b51d61877433cc18100fbd584eb91bee diff --git a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/.DS_Store b/Spring 2025/.DS_Store similarity index 83% rename from csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/.DS_Store rename to Spring 2025/.DS_Store index 31cd782..2b6f135 100644 Binary files a/csci218/Labs/Textbook/uctronics_arduino_kits_v2-main/.DS_Store and b/Spring 2025/.DS_Store differ diff --git a/Spring 2025/ARTH 105/Haldrup Descriptive Essay.docx b/Spring 2025/ARTH 105/Haldrup Descriptive Essay.docx new file mode 100644 index 0000000..01162ff Binary files /dev/null and b/Spring 2025/ARTH 105/Haldrup Descriptive Essay.docx differ diff --git a/Spring 2025/ARTH 105/Haldrup Descriptive Essay.pdf b/Spring 2025/ARTH 105/Haldrup Descriptive Essay.pdf new file mode 100644 index 0000000..cef55b0 Binary files /dev/null and b/Spring 2025/ARTH 105/Haldrup Descriptive Essay.pdf differ diff --git a/Spring 2025/ARTH 105/Notes 1:10:25.md b/Spring 2025/ARTH 105/Notes 1:10:25.md new file mode 100644 index 0000000..785a8ad --- /dev/null +++ b/Spring 2025/ARTH 105/Notes 1:10:25.md @@ -0,0 +1,117 @@ +Slide 2: + Shows the spread of agriculture +Slide 3: + Town called carnac + Monolithich sstones set upright + words to describe + monolith: single stone + megalith: big stone + menhir: individual standing stone + Found on every contentint + 4000-1000 BCE + Intintial Modification of the landscape + Stronger connection to the landscape. + Prehistoric: Pre-History + before the advent of writing +Slide 4: + The stones are weathered granite + Dragged from outcroping because they are so big + All we have left + Stone left in natural condition + Maybe left that way out of reverence to nature? +Slide 5: + What is the function? + Maybe commermorative? + diffuclty of moving the rocks is part of the meaning + We call them monuments ^ + They are perpinductar to the earth and are similar to the human figure + For posterarity +Slide 6: + Placed in long parallel lines + go for over a mile + Collective +Slide 7: + How? + Most likely used the use of ropes, log leavers, and ramps of earth + Collective effort +Slide 8: + Other Pre-Historic stone structures + Dolmen: + stone tomb + Trilithon: + three-stone assembly + Post and Lintel: + two uprights holding up a horizontal beam + Trabeation: + The us of beams in architectural construction +Slide 9: + Beam or lintal on two upright posts + the distance between posts is the span +Slide 10: + Vocab + Structure: + How loads are carried + Tectonics: + The art of assembly + In this basic era hard to differenciate, but as time goes on they get more different +Slide 11: + Passgage Grave in Nwegrange Ireland +Slide 12: + Builder defined the outer circle with megaliths + then marked the stone passage way +Slide 13: + Small stones to hold earth +Slide 14: + The passageway gently rises and leads to a vaulted central chamber + Vaulted: Fully enclosed space + use corbaling +Slide 15: + Corbeled: + Succesive stone courses projecting outward from those below, reducing unsupported loads + More effecient way to build in stone +Slide 16: + Now we have decrotave patterns carved into the stone + Ornamented surfaces + Way to emblish structure +Slide 17: + Window over the entrance + beam of light hits back of chamber + Is it more than a tomb? + maybe a way to mark astronomical cycles +Slide 18: + The passage grave has lots of ties to other geography + Later structures in places like northern italy build similar structures + Then find them in the aegean then syria +Slide 19: + Etruscan chamber tombs + Domos: + Entrance walkway + Tholos: + Circular burial + Tumulus: + Mound of earth over a tomb +Slide 20 / 21: + Also used corboled vaulting +Slide 22: + Last place Stonehenge in Salisbury, England + 3000-1500BCE +Slide 24: + Also shaped earth mounds surronding it +Slide 25: + Trilithons use lotsof post and lintel system + Shaped and smoothed into unifor heights +Slide 26: + Uses Mortise and tenon joints to join the trilithons +Slide 27: + How? + Posts were mostlikely dragged and levered into place + Lintels were lifted with temporaty structures of wood then removed once ontop +Slide 28: + Why? + Was likely used as a astronomical observatory + Has collective importance + Wasnt a tomb + Stones came from 300 miles away + The healstone came from scotland +Slide 29: + Still attracts lots of visitors \ No newline at end of file diff --git a/Spring 2025/ARTH 105/~$ldrup Descriptive Essay.docx b/Spring 2025/ARTH 105/~$ldrup Descriptive Essay.docx new file mode 100644 index 0000000..d26aa73 Binary files /dev/null and b/Spring 2025/ARTH 105/~$ldrup Descriptive Essay.docx differ diff --git a/Spring 2025/ENGR 490/A3 Practice.docx b/Spring 2025/ENGR 490/A3 Practice.docx new file mode 100644 index 0000000..6f4a5a4 Binary files /dev/null and b/Spring 2025/ENGR 490/A3 Practice.docx differ diff --git a/Spring 2025/ENGR 490/A3 Practice.pdf b/Spring 2025/ENGR 490/A3 Practice.pdf new file mode 100644 index 0000000..cfdf934 Binary files /dev/null and b/Spring 2025/ENGR 490/A3 Practice.pdf differ diff --git a/Spring 2025/ENGR 490/A4/guess_number.py b/Spring 2025/ENGR 490/A4/guess_number.py new file mode 100644 index 0000000..e8a61c1 --- /dev/null +++ b/Spring 2025/ENGR 490/A4/guess_number.py @@ -0,0 +1,23 @@ +# Import time and random modules +import random +import time + +# Set the Seed based off time +random.seed(time.time()) + +# Generate Random number 1 - 10 +ans = random.randint(1,10) + + +while(1): + guess = int(input("Enter your guess: ")) + + if (guess == ans): + print(f"Correct! The answer is {ans}!") + break + elif (guess > ans): + print(f"{guess} is too high! Try Again!") + elif (guess < ans): + print(f"{guess} is too low! Try Again!") + else: + print(f"{guess} is invalid answer! Try Again!") diff --git a/Spring 2025/ENGR 490/A4/math_quiz.py b/Spring 2025/ENGR 490/A4/math_quiz.py new file mode 100644 index 0000000..ef98bf3 --- /dev/null +++ b/Spring 2025/ENGR 490/A4/math_quiz.py @@ -0,0 +1,83 @@ +# Import Modules +import random +import time + +# Set the seed based on time +random.seed(time.time()) + +# Set Variables count and correct +count = 1 +correct = 0 + +# Function that genrates a random equation and returns the answer with numbers from range x to y +def gen_function(x,y): + operand = gen_operand() + num1 = gen_number(x,y) + num2 = gen_number(x,y) + + ans = gen_answer(operand, num1, num2) + return ans + +# Displays the equation to the user and calculates and returns the answer +def gen_answer(operand, num1, num2): + match(operand): + case 1: + print(f"{num1} + {num2} = ?") + return num1 + num2 + case 2: + print(f"{num1} - {num2} = ?") + return num1 - num2 + case 3: + print(f"{num1} * {num2} = ?") + return num1 * num2 + case 4: + print(f"{num1} / {num2} = ?") + return num1 / num2 + case 5: + print(f"{num1} % {num2} = ?") + return num1 % num2 + +# Generates a random number 1 to 5 that corresponds to the operand +def gen_operand(): + return random.randint(1,5) + +# Generates a random number for range x to y +def gen_number(x,y): + return random.randint(x,y) +# Intro text +print("Welcome to the Math Quiz!\nAll questions use \033[94mints\033[0m so give your answer as an \033[94mint\033[0m!") +print("Type \033[91mexit\033[0m to exit the program") + + +# While loop that runs for 5 iterations generating a new equation each time keeping track of answers +while(count <= 5): + + # Shows current question and generates a new function with answer + print(f"Question {count}:\n") + ans = gen_function(1,100) + + # Takes user input for the answer + user_ans = input("Answer: ") + + # Check if user wants to exit else makes input an int + if(user_ans.lower() == "exit"): + break + else: + user_ans = int(user_ans) + + # If the answer equals what the user put correct goes up 1 else just increse count + if(user_ans == int(ans)): + print(f"\033[92mCorrect!\nGood Job!\033[0m\n") + count += 1 + correct += 1 + print(f"You have \033[96m{correct}\033[0m so far!\n") + else: + print(f"\033[31mWrong!\nCorrect Answer: {int(ans)}\nNext Question!\033[0m\n") + count += 1 + print(f"You have \033[96m{correct}\033[0m so far!\n") + +# Displays final message showing how many correct +print(f"You got \033[96m{correct}\033[0m out of {count} correct!\nThanks for Playing!") + + + diff --git a/Spring 2025/ENGR 490/A4/shopping_list.py b/Spring 2025/ENGR 490/A4/shopping_list.py new file mode 100644 index 0000000..5bcc6e7 --- /dev/null +++ b/Spring 2025/ENGR 490/A4/shopping_list.py @@ -0,0 +1,25 @@ +# Declare list variable +list = [] + +# Function adds value (String) to list +def add_item(item): + list.append(item) + +# Function prints the list out with amount of items +def view_list(): + print(f"You have {len(list)} items in your shopping list") + print(list) + +# While loop that ends when n is inputed and breaks the loop +while(1): + # Get user input to continue or not + ans = input("Add item to list?(y/n): ") + + # Checks if user wants to add new item to list + if (ans.lower() == "y"): + user_item = input("Enter item name: ") + add_item(user_item) + else: + view_list() + break + diff --git a/Spring 2025/ENGR 490/Assignment 2.docx b/Spring 2025/ENGR 490/Assignment 2.docx new file mode 100644 index 0000000..f100f2d Binary files /dev/null and b/Spring 2025/ENGR 490/Assignment 2.docx differ diff --git a/Spring 2025/ENGR 490/Assignment 2.pdf b/Spring 2025/ENGR 490/Assignment 2.pdf new file mode 100644 index 0000000..3cd471f Binary files /dev/null and b/Spring 2025/ENGR 490/Assignment 2.pdf differ diff --git a/Spring 2025/ENGR 490/Assignment 3.docx b/Spring 2025/ENGR 490/Assignment 3.docx new file mode 100644 index 0000000..5222c11 Binary files /dev/null and b/Spring 2025/ENGR 490/Assignment 3.docx differ diff --git a/Spring 2025/ENGR 490/Assignment 3.pdf b/Spring 2025/ENGR 490/Assignment 3.pdf new file mode 100644 index 0000000..7565446 Binary files /dev/null and b/Spring 2025/ENGR 490/Assignment 3.pdf differ diff --git a/Spring 2025/ENGR 490/Assignment 4.docx b/Spring 2025/ENGR 490/Assignment 4.docx new file mode 100644 index 0000000..371bf41 Binary files /dev/null and b/Spring 2025/ENGR 490/Assignment 4.docx differ diff --git a/Spring 2025/ENGR 490/Haldrup-Assignment-1.docx b/Spring 2025/ENGR 490/Haldrup-Assignment-1.docx new file mode 100644 index 0000000..cf67a52 Binary files /dev/null and b/Spring 2025/ENGR 490/Haldrup-Assignment-1.docx differ diff --git a/Spring 2025/ENGR 490/Haldrup-Assignment-1.pdf b/Spring 2025/ENGR 490/Haldrup-Assignment-1.pdf new file mode 100644 index 0000000..a548cc5 Binary files /dev/null and b/Spring 2025/ENGR 490/Haldrup-Assignment-1.pdf differ diff --git a/Spring 2025/ENGR 490/Inclass Practice.docx b/Spring 2025/ENGR 490/Inclass Practice.docx new file mode 100644 index 0000000..70d6826 Binary files /dev/null and b/Spring 2025/ENGR 490/Inclass Practice.docx differ diff --git a/Spring 2025/ENGR 490/Inclass Practice.pdf b/Spring 2025/ENGR 490/Inclass Practice.pdf new file mode 100644 index 0000000..f03db9f Binary files /dev/null and b/Spring 2025/ENGR 490/Inclass Practice.pdf differ diff --git a/Spring 2025/ENGR 490/~$signment 4.docx b/Spring 2025/ENGR 490/~$signment 4.docx new file mode 100644 index 0000000..5c72063 Binary files /dev/null and b/Spring 2025/ENGR 490/~$signment 4.docx differ diff --git a/Spring 2025/HIST 117/Haldrup - Comprehension Assigment Reading Guide_Backman and Perry Introductions.docx b/Spring 2025/HIST 117/Haldrup - Comprehension Assigment Reading Guide_Backman and Perry Introductions.docx new file mode 100644 index 0000000..d6c607c Binary files /dev/null and b/Spring 2025/HIST 117/Haldrup - Comprehension Assigment Reading Guide_Backman and Perry Introductions.docx differ diff --git a/Spring 2025/HIST 117/Haldrup Reading 2.docx b/Spring 2025/HIST 117/Haldrup Reading 2.docx new file mode 100644 index 0000000..9390e24 Binary files /dev/null and b/Spring 2025/HIST 117/Haldrup Reading 2.docx differ diff --git a/Spring 2025/HIST 117/Haldrup Reading 2.pdf b/Spring 2025/HIST 117/Haldrup Reading 2.pdf new file mode 100644 index 0000000..ab84805 Binary files /dev/null and b/Spring 2025/HIST 117/Haldrup Reading 2.pdf differ diff --git a/Spring 2025/HIST 117/Haldrup Reading 3.docx b/Spring 2025/HIST 117/Haldrup Reading 3.docx new file mode 100644 index 0000000..2a9e1fb Binary files /dev/null and b/Spring 2025/HIST 117/Haldrup Reading 3.docx differ diff --git a/Spring 2025/HIST 117/~$ldrup Reading 3.docx b/Spring 2025/HIST 117/~$ldrup Reading 3.docx new file mode 100644 index 0000000..fbde5db Binary files /dev/null and b/Spring 2025/HIST 117/~$ldrup Reading 3.docx differ diff --git a/Spring 2025/JPNS 102/.DS_Store b/Spring 2025/JPNS 102/.DS_Store new file mode 100644 index 0000000..a2b914b Binary files /dev/null and b/Spring 2025/JPNS 102/.DS_Store differ diff --git a/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-138ページ.pdf b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-138ページ.pdf new file mode 100644 index 0000000..6ac7a47 Binary files /dev/null and b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-138ページ.pdf differ diff --git a/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-50と51ページ.pdf b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-50と51ページ.pdf new file mode 100644 index 0000000..18272e0 Binary files /dev/null and b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-50と51ページ.pdf differ diff --git a/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-52と53ページ.pdf b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-52と53ページ.pdf new file mode 100644 index 0000000..e7e0818 Binary files /dev/null and b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-52と53ページ.pdf differ diff --git a/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-54と55ページ.pdf b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-54と55ページ.pdf new file mode 100644 index 0000000..65c2a29 Binary files /dev/null and b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-54と55ページ.pdf differ diff --git a/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-56ページ.pdf b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-56ページ.pdf new file mode 100644 index 0000000..42e4aa8 Binary files /dev/null and b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-56ページ.pdf differ diff --git a/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-59と60ページ.pdf b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-59と60ページ.pdf new file mode 100644 index 0000000..862ba7e Binary files /dev/null and b/Spring 2025/JPNS 102/宿題/ホールドラップ-102-2-59と60ページ.pdf differ