Mikrokontrollersystemer-gruppe-4/mikrokontrollersystemer-prosjekt

Fork 0

combine-all #23

Open

sebgab wants to merge 0 commits from combine-all into main

sebgab commented

2024-04-30 09:25:04 +00:00

Owner

Everything should be combined and working now.

sebgab added 4 commits

2024-04-30 09:25:04 +00:00

Fan data is now saved in the array dd53b4dbf2

Closes #9

Current fan speed now returns the last fan speed measured bcd631001b

Move index incrementation over storage 1671476f41

This avoids the problem where the current index has outdated data.
It does however mean the first piece of stored data is empty, but it is
a worthwile tradeoff.

Make read bulk fan speed read correctly from the array b858d29ce8

sebgab added 2 commits

2024-04-30 09:37:42 +00:00

Rename fanspeeeed to fanspeed 458ae00f24

Rename files & re-factor to pretty up project d215e204d4

sebgab requested reviews from Athamantis, Inamr

2024-04-30 09:37:54 +00:00

sebgab added 1 commit

2024-04-30 10:00:56 +00:00

Update the sample rate when the config is changed bc9e3f6885

Inamr approved these changes

2024-04-30 10:41:25 +00:00

sebgab added 1 commit

2024-04-30 14:21:22 +00:00

Lots of bug fixes, everything works cd65b8fd1f

sebgab added 1 commit

2024-04-30 14:43:26 +00:00

Add alarm code 25d27c1e1b

Athamantis approved these changes

2024-05-03 17:36:09 +00:00

Athamantis left a comment

Owner

lgtm

This pull request has changes conflicting with the target branch.

prosjekt.X/fan_speeeed.h
prosjekt.X/themistor-temp.h

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin combine-all:combine-all

git switch combine-all

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff combine-all

git switch combine-all

git rebase main

git switch main

git merge --ff-only combine-all

git switch combine-all

git rebase main

git switch main

git merge --no-ff combine-all

git switch main

git merge --squash combine-all