Skip to content

Commit

Permalink
New nodes, code formatted
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdede
jdede committed Jul 25, 2023
1 parent 1f292ca commit 2663074
Showing 1 changed file with 74 additions and 30 deletions.
104 changes: 74 additions & 30 deletions wolfnet/lib/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@

app_config = {
"ACK_RETRIES": 3,
"ACK_TIMEOUT": 400, #ms (RTT was in tests aroun 270 - 290 ms -> little bit of margin)
"DEBOUNCE_TIME" : 100, #ms
"SHUTDOWN_DISPLAY_AFTER" : 120, #s
# ms (RTT was in tests aroun 270 - 290 ms -> little bit of margin)
"ACK_TIMEOUT": 400,
"DEBOUNCE_TIME": 100, # ms
"SHUTDOWN_DISPLAY_AFTER": 120, # s
}

lora_parameters = {
Expand Down Expand Up @@ -103,7 +104,7 @@
"4172078668": { # PIR sensor 1, 07.2023
"is_sender": True,
"actor_node": 106440645, # Either address or none to Broadcast
"action_cancel_previous" : False,
"action_cancel_previous": False,
"protection_time": 1000, # 1000 ms = 1 sec
"beacon_interval": 120, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
Expand All @@ -114,7 +115,7 @@
"2583535806": { # PIR sensor 2, 07.2023, schwarz
"is_sender": True,
"actor_node": 106440645, # Either address or none to Broadcast
"action_cancel_previous" : False,
"action_cancel_previous": False,
"protection_time": 1000, # 1000 ms = 1 sec
"beacon_interval": 120, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
Expand All @@ -134,11 +135,13 @@

# END SET 1

# Start Test Set 1
"2308316059": { # Flash Actor 2, 2023-04

# START SET 2

"2308316059": { # General actor, 2023-04
"is_sender": False,
"receiver_type": NodeTypes.ULTRASOUND_CANNON,
#"receiver_type": NodeTypes.FLASH,
# "receiver_type": NodeTypes.FLASH,
"beacon_interval": 120, # 120 seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "analog", # Read battery from Pin 36
Expand All @@ -147,7 +150,7 @@
"2424541685": { # PIR sensor 3, 07.2023, schwarz
"is_sender": True,
"actor_node": 2308316059, # Either address or none to Broadcast
"action_cancel_previous" : False,
"action_cancel_previous": False,
"protection_time": 1000, # 1000 ms = 1 sec
"beacon_interval": 120, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
Expand All @@ -156,36 +159,87 @@
"use_ack": True, # Use acks
},

# End Test Set 1
"3282280225": { # PIR sensor 4, 07.2023, schwarz
"is_sender": True,
"actor_node": 2308316059, # Either address or none to Broadcast
"action_cancel_previous": False,
"protection_time": 1000, # 1000 ms = 1 sec
"beacon_interval": 120, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "max17043",
"gpio_button_irq": 13, # IRQ on pin 13
"use_ack": True, # Use acks
},

# END SET 2

"2276286798": { # PIR sensor
# START SET 3

"951712297": { # Universal Actor
"is_sender": False,
"receiver_type": NodeTypes.ULTRASOUND_CANNON,
# "receiver_type": NodeTypes.FLASH,
"beacon_interval": 120, # 120 seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "analog", # Read battery from Pin 36
"gpio_led_status": 13, # Status LED on pin 13
},
"3902023872": { # PIR sensor 5, 07.2023, schwarz, new type
"is_sender": True,
"actor_node": None, # Either address or none to Broadcast
"msg_type": NodeTypes.FLASH,
"action_frequency": 20, # Hz
"action_duration": 4000, # 4000 ms = 4 sec
"actor_node": 951712297, # Either address or none to Broadcast
"action_cancel_previous": False,
"protection_time": 60000, # 60000 ms = 60 sec
"beacon_interval": 240, # seconds
"protection_time": 1000, # 1000 ms = 1 sec
"beacon_interval": 120, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "max17043",
"gpio_button_irq": 13, # IRQ on pin 13
"use_ack": True, # Use acks
},
"3454793720": { # PIR sensor 6, 07.2023, schwarz, new type
"is_sender": True,
"actor_node": 951712297, # Either address or none to Broadcast
"action_cancel_previous": False,
"protection_time": 1000, # 1000 ms = 1 sec
"beacon_interval": 120, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "max17043",
"gpio_button_irq": 13, # IRQ on pin 13
"use_ack": True, # Use acks
},


"320270687": { # Ultrasonic actor, 2023-07-05

# END SET 3


"320270687": { # General Actor, problem?
"is_sender": False,
"receiver_type": NodeTypes.ULTRASOUND_CANNON,
# "receiver_type": NodeTypes.FLASH,
"beacon_interval": 120, # 120 seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "analog", # Read battery from Pin 36
"action_cancel_previous": True,
"action_duration": 10000, # 10000 ms = 10 sec
"gpio_led_status": 13, # Status LED on pin 13
},


"2276286798": { # PIR sensor
"is_sender": True,
"actor_node": None, # Either address or none to Broadcast
"msg_type": NodeTypes.FLASH,
"action_frequency": 20, # Hz
"action_duration": 4000, # 4000 ms = 4 sec
"action_cancel_previous": False,
"protection_time": 60000, # 60000 ms = 60 sec
"beacon_interval": 240, # seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "max17043",
"gpio_button_irq": 13, # IRQ on pin 13
},




"4291548233": { # Flash actor
"is_sender": False,
"receiver_type": NodeTypes.FLASH,
Expand Down Expand Up @@ -235,16 +289,6 @@
"action_cancel_previous": True,
"action_duration": 10000, # 10000 ms = 10 sec
},
"951712297": { # Flash Actor
"is_sender": False,
"receiver_type": NodeTypes.FLASH,
"beacon_interval": 120, # 120 seconds
"beacon_jitter": 10, # seconds, will vary the above value by +- 10 seconds
"battery_type": "analog", # Read battery from Pin 36
"action_cancel_previous": True,
"action_duration": 10000, # 10000 ms = 10 sec
"gpio_led_status": 13, # Status LED on pin 13
},
"3567154165": { # Ultrasonic actor, 2023-04
"is_sender": False,
"receiver_type": NodeTypes.ULTRASOUND_CANNON,
Expand Down

0 comments on commit 2663074

Please sign in to comment.