Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

small try with Haustür #131

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
444e5bb
small try with Haustür
Dec 12, 2023
3da4c5f
reformat
Dec 12, 2023
1de728e
slower for debugging
Dec 12, 2023
f53d2cf
remove dev setup
Dec 12, 2023
2cdbfd9
4 pins
Dec 12, 2023
c59e5a5
fix formatting
Dec 12, 2023
00933bd
add comments, remove not needed relays
Dec 12, 2023
825321d
first implementation of new Haustür module
Dec 14, 2023
ac18db1
small modifications in texts
Dec 14, 2023
c8243fe
do_reset now in PWR module
Dec 14, 2023
22daf94
various docu updates
Dec 14, 2023
0b65b5f
small translation fixes+updates
Dec 14, 2023
d0ac4c6
add haustür+pwr module
Dec 14, 2023
b895bce
change start/end msg at startup
Dec 14, 2023
08499d8
fix clippy error
Dec 14, 2023
b8eb711
fix to production time
Dec 14, 2023
1339bd4
add set_hook to readd later
Dec 14, 2023
2190e2c
small changes in msg
Dec 14, 2023
5008d84
reduce interval
Dec 14, 2023
8a2cc3b
check if sleep helps from recovering from error
Dec 14, 2023
7b3fd8f
switch lights (should be out instead of in)
Dec 14, 2023
e7df939
different ringing
Dec 14, 2023
18719c7
TEST: don't do anything when press indoor
Dec 14, 2023
644f880
NC msg on error
Dec 15, 2023
543bb7d
continue/start translation
Dec 15, 2023
2741ea6
reinclude
Dec 15, 2023
e4cecee
implement Rst Logic
Dec 15, 2023
7cb5d9c
reformat
Dec 15, 2023
c1ca877
fix some clippy warnings
Dec 15, 2023
d9eb3c9
fix fmt of code changed by clippy
Dec 15, 2023
267a0a7
add a few comments
Dec 15, 2023
ca5bbd3
use correct chats
Dec 15, 2023
e53ac5f
update translations
Dec 15, 2023
1eadc28
try longer rst time
Dec 16, 2023
8e0d908
unhandled panic+working threads
Dec 16, 2023
2c1b8ba
use lower value, see
Dec 16, 2023
341c428
add 15 init value
Dec 16, 2023
0190857
also add policy
Dec 16, 2023
87b8078
try Priority 20
Dec 16, 2023
e7ddbc7
start buttons earlier
Dec 17, 2023
63bdd67
reorder steps
Dec 17, 2023
2b797e7
reallow debug/backtrace
Dec 17, 2023
bf48b5f
increase to a second
Dec 17, 2023
9a519f8
unhandled_panic later
Dec 17, 2023
b3f67d4
avoid massive spam in NC
Dec 22, 2023
eb54fa6
hook to exit process on panics
Dec 22, 2023
9b7697a
try to send ping msg on panics
Dec 22, 2023
cb9ba37
debugging panic hook
Dec 23, 2023
0b24670
minor fix in translation
Dec 23, 2023
fccc2d0
try to exit within block_on
Dec 23, 2023
3b46f55
add even more debug
Dec 23, 2023
3d42edd
do proper sync implementation of try_ping
Dec 23, 2023
6eee7ff
remove debug
Dec 23, 2023
45a1a7a
implement multi-press for indoor schalter
Dec 24, 2023
25992c0
improve permanent logic
Dec 24, 2023
66ba3ba
fix that outside lights actually work
Dec 24, 2023
7563f70
longer time for double presses
Dec 24, 2023
3c1fcf2
Merge branch 'master' into haustuer
Jan 9, 2024
913d7eb
wait longer for MOD-IO to settle
Mar 26, 2024
86744e2
RestartSec
Mar 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ linker = "arm-linux-gnueabihf-gcc"

[env]
GETTEXT_SYSTEM = "1"

[build]
rustflags = ["--cfg", "tokio_unstable"]

89 changes: 71 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "opensesame"
version = "0.8.3"
version = "0.8.4"
authors = ["Opensesame Contributors"]
edition = "2021"
readme = "README.md"
Expand Down Expand Up @@ -36,15 +36,14 @@ assets = [
["doc/*", "usr/share/doc/opensesame/", "644"],
]


[dependencies]
gpio-cdev = { version = "0.5.1", features = ["async-tokio"]}

i2cdev = "0.5.1"

elektra = { version = "0.11.0", features = ["pkg-config"] }

reqwest = { version = "0.11", features = ["json"] }
reqwest = { version = "0.11", features = ["json", "blocking"] }

bme280 = "0.3.0"
mlx9061x = "0.2.1"
Expand All @@ -59,7 +58,7 @@ chrono = "0.4.19"
signal-hook = "0.3.14"
signal-hook-tokio = "0.3.1"

tokio = { version = "1.15.0", features = ["full"] }
tokio = { version = "1.35.0", features = ["full"] }
tokio-util = "0.6.9"
async-ssh2-tokio = "0.7.1"
futures = "0.3.19"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ For what is missing, see [TODO.md](TODO.md).

## Disclaimer

Currently there is no full beginner-friendly documentation on how to setup the system.
Currently there is no complete beginner-friendly documentation on how to setup the system.
If you are interested, please open an issue.
[Installation](/doc/Install.md) is not difficult, though.

As hardware hacking is involved I cannot guarantee that anything will work for you.
It works for me, though.
It works for me and worked for someone else, too.

## Quality Goals

Expand All @@ -46,7 +46,7 @@ On each Olimex, the same software runs but differently configured using Elektra.

E.g. to set a new PIN 1234 for "us":

kdb set user:/sw/libelektra/opensesame/#0/current/validator/us "[14, 15, 13, 15, 11, 15, 7, 15]"
`kdb set user:/sw/libelektra/opensesame/#0/current/validator/us "[14, 15, 13, 15, 11, 15, 7, 15]"`

Deployment is done via Ansible, see [an example](/ansible/playbook.yaml).

Expand Down
8 changes: 0 additions & 8 deletions ansible/dev-setup/opensesame_dev_setup_inv.yaml

This file was deleted.

82 changes: 0 additions & 82 deletions ansible/dev-setup/opensesame_dev_setup_pb.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions ansible/dev-setup/run.sh

This file was deleted.

5 changes: 4 additions & 1 deletion debian/service
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=opensesame
Wants=network-online.target nss-lookup.target
After=network.target network-online.target nss-lookup.target
StartLimitIntervalSec=0

[Service]
Type=simple
Expand All @@ -12,11 +13,13 @@ NoNewPrivileges=true
ProtectSystem=full

Nice=-20
CPUSchedulingPriority=80
CPUSchedulingPriority=20
CPUSchedulingPolicy=fifo
IOSchedulingClass=realtime
IOSchedulingPriority=0

Restart=always
RestartSec=1s
ExecStart=/usr/bin/opensesame

[Install]
Expand Down
3 changes: 2 additions & 1 deletion doc/Audio.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Audio Module

This module handles audio output for playing fire alarms and bell sounds.
This module can receive commands from the Module Buttons (Bell), Environment (FireAlarm), Nextcloud (FireAlarm, Bell), and Signals (FireAlarm, Bell).
This module can receive commands from the Module Buttons (Bell), Environment (FireAlarm), Nextcloud (FireAlarm, Bell), and Signals (FireAlarm, Bell).
Loading