external/UNVR-NAS
1
0
Fork 0
mirror of https://github.com/riptidewave93/UNVR-NAS.git synced 2025-03-09 15:40:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: and add data to ubnteeprom (#10)

Browse source 
* Fixup incorrect device serial #
* Add more system info about the NVRs
* Start using ubnteeprom in more spots
* Also do some minor BT house cleaning
This commit is contained in:
Chris Blake 2024-06-15 09:49:11 -05:00 • committed by GitHub
parent 9ef1a72228
commit 8e2262e121
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 163 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

33
overlay/filesystem/usr/lib/init/boot/ubnt-bt.sh
View file

@ -52,9 +52,11 @@ function main(){
# unvr: nothing to do here
;;
ea1a)
# unvr
usb_based_init
;;
ea20|ea50|ea51)
ea20)
# unvr-pro
gpio_num=$(find_gpio_on_expander 0 0020 8)
if [ $gpio_num -lt 0 ]; then
return 5
@ -62,26 +64,6 @@ function main(){
gpio_reset $gpio_num
uart_based_init /dev/ttyS3 "/lib/firmware/csr8x11/csr8x11-a12-bt4.2-patch-2018_uart.psr"
;;
ea2c|ea15|ea11|ea32)
gpio_reset 37
uart_based_init /dev/ttyS1 "/lib/firmware/csr8x11/csr8x11-a12-bt4.2-patch-2018_uart.psr"
;;
ea3d|ea3e)
gpio_num=$(find_gpio_on_expander 3 0029 13)
if [ $gpio_num -lt 0 ]; then
return 5
fi
gpio_reset $gpio_num
uart_based_init /dev/ttyAMA1 "/lib/firmware/csr8x11/pb-207-csr8x11-rev7-flowcontrol.psr" "flow"
;;
a678|a690|a69a)
gpio_reset 490
usb_based_init
;;
e990)
gpio_reset 306
usb_based_init
;;
*)
return 4
;;
@ -166,13 +148,4 @@ function uart_based_init(){
hciconfig ${BT_DEVICE} up
}
function usb_based_init(){
hciconfig ${BT_DEVICE} up; hciconfig ${BT_DEVICE} up
sleep 1
bccmd psset -r 0x$((BT_DEVICE_NUM+1)) 0x${BT_MAC:6:2} 00 0x${BT_MAC:10:2} 0x${BT_MAC:8:2} 0x${BT_MAC:4:2} 00 0x${BT_MAC:2:2} 0x${BT_MAC:0:2}
sleep 2
hciconfig ${BT_DEVICE} down
hciconfig ${BT_DEVICE} up; hciconfig ${BT_DEVICE} up
}
main "$@"

13
overlay/filesystem/usr/lib/python3/dist-packages/ubnthelpers.py
View file

@ -5,17 +5,6 @@ from functools import lru_cache
A handful of Ubiquiti Unifi device specific functions
"""
UBNTHAL_PATH = "/proc/ubnthal/system.info"
@lru_cache(None)
def get_ubnt_shortname() -> str:
try:
with open(UBNTHAL_PATH, "r") as f:
ubnthal_model = [i for i in f.readlines() if i.startswith("shortname=")][0]
return ubnthal_model.lstrip("shortname=").rstrip("\n")
except FileNotFoundError:
print(
f"Error: unable to open {UBNTHAL_PATH}; is the ubnthal kernel module loaded?!"
)
raise
return os.popen("ubnteeprom -systeminfo -key shortname").read().rstrip("\n")