Temperature Measurement & MODBUS Integration #17

Merged

rahix merged 13 commits from more-temps into main 2024-11-10 06:58:09 +00:00

Conversation 1 Commits 13 Files changed 7 +321 -74

rahix commented 2024-11-10 00:55:39 +00:00

Owner

Copy link

I take no responsibility, code was written by @hugo

I take no responsibility, code was written by @hugo

rahix added the

succd

label 2024-11-10 00:55:39 +00:00

q3k was assigned by rahix 2024-11-10 00:55:39 +00:00

rahix added 4 commits 2024-11-10 00:55:40 +00:00

Add temperature and humidity stuff 5bf20711d6

Add modbus integration 0da94f7161

succd: Improve styling of temperature values ... 5f5c653a5d

HMI design goes brrrr...

succd: Add highlight colors for temperatures ... 260f77a2a8

Highlight out-of-range temperatures for the user.  The limits are
currently by intuition and should be reconsidered.

rahix force-pushed more-temps from 260f77a2a8 to 4ac1b5eb32 2024-11-10 00:59:19 +00:00 Compare

rahix added 1 commit 2024-11-10 01:05:00 +00:00

succd: Export temperature values to prometheus ... edb9051708

Also add metrics for all the temperature and humidity measurements.

rahix added 1 commit 2024-11-10 01:19:52 +00:00

succd: Render temperature unit in template as well 0e45650972

hugo added 1 commit 2024-11-10 04:11:59 +00:00

succd: Migrate to KEC1 MODBUS relay board 606d470577

hugo added 1 commit 2024-11-10 04:20:34 +00:00

succd: KFA{1,6,7} are normally closed e7fd2dd7d7

hugo added 1 commit 2024-11-10 04:45:42 +00:00

succd: Split scope lock into multiple blocks aad5c5f77e

rahix force-pushed more-temps from aad5c5f77e to d8a467a0c4 2024-11-10 05:00:33 +00:00 Compare

hugo added 3 commits 2024-11-10 05:19:11 +00:00

succd: Split scope lock into multiple blocks aad5c5f77e

Merge branch 'more-temps' of ssh://git.fa-fo.de/fafo/jeol-t330a into more-temps 302015e80c

succd: do not early return on error in modbusUpdate 679680fe15

rahix force-pushed more-temps from 679680fe15 to 2056a3592e 2024-11-10 05:20:50 +00:00 Compare

hugo added 1 commit 2024-11-10 05:22:47 +00:00

succd: Improve error messages cd823a75d6

rahix force-pushed more-temps from cd823a75d6 to 152290f5a3 2024-11-10 05:36:55 +00:00 Compare

hugo added 1 commit 2024-11-10 05:51:30 +00:00

succd: implement auto-restarting of MODBUS connection in case of network loss 9ec580c26f

hugo added 1 commit 2024-11-10 06:07:06 +00:00

succd: MODBUS library does not differentiate between TCP socket time outs and RTU time outs 3b9c1ba912

hugo approved these changes 2024-11-10 06:55:39 +00:00

hugo left a comment

Owner

Copy link

Shared implementation by the two of us, LGTM

Shared implementation by the two of us, LGTM

rahix commented 2024-11-10 06:58:00 +00:00

Author

Owner

Copy link

Merging this so main reflects the deployed state.

@q3k, please review retrospectively anyway, if you have time and comments, so we can fix any crimes in a follow-up

Merging this so `main` reflects the deployed state. @q3k, please review retrospectively anyway, if you have time and comments, so we can fix any crimes in a follow-up

rahix merged commit 3b9c1ba912 into main 2024-11-10 06:58:09 +00:00

rahix deleted branch more-temps 2024-11-10 06:58:09 +00:00

Sign in to join this conversation.

Reviewers

No reviewers

hugo

Labels

Clear labels   

evac-controller

Related to the JEOL evacuation controller

  

succbone

Related to the hardware side of succbone

  

succd

Related to the succbone control daemon

No labels

evac-controller

succbone

succd

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

q3k

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: fafo/jeol-t330a#17

No description provided.