sundp
/
O7
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

RM2_1 #2

Merged
sundp merged 208 commits from RM2_1 into master 2024-09-13 09:16:14 +08:00
Conversation 0 Commits 208 Files Changed 112 +218267 -3276

208 Commits

Author SHA1 Message Date
Yunhorn 6621c98940 --- revised board name 2024-09-09 13:21:47 +08:00
Yunhorn a4d6497740 Merge pull request 'STS_P2' (#1) from STS_P2 into RM2_1 
Reviewed-on: https://gitea.yunhorn.com/sundp/O7/pulls/1
 2024-08-28 12:48:14 +08:00
Yunhorn 3d80479b6a add i2c drivers, MCU/BOARD NAME changed to YUNHORN-STS-WLE5CC 2024-08-28 12:39:55 +08:00
Yunhorn f8cef94155 --- prepare drivers for vl53l1x 2024-08-28 12:10:00 +08:00
Yunhorn 9e8255599c --- start of STS-P2 2024-08-28 11:34:24 +08:00
Yunhorn d838c5a0c4 ---- start of STS-P2 ---- 
vl53l1x
 2024-08-28 11:00:08 +08:00
Yunhorn 286da0568b --- add bin file 2024-08-27 18:36:20 +08:00
Yunhorn 6b286bfa21 --- revised for shorter interval to 1 sec 2024-08-22 20:28:28 +08:00
Yunhorn 4c68db4475 debug message 2024-08-22 17:20:53 +08:00
Yunhorn 20a553398d -revised for rss cfg update flag 2024-08-21 20:17:29 +08:00
Yunhorn ae0fd3c981 revised threshold 2024-08-20 20:13:09 +08:00
Yunhorn 0e432db748 limit the start range and length to 0.8,2.2 2024-08-20 18:55:46 +08:00
Yunhorn 52e031e54f --- revised for sensitivity, RSS_DEFAULT_THRESHOLD matters (1.2f--1.5f) 2024-08-20 17:29:50 +08:00
Yunhorn 2e26d21e6e --- reduce delay in RSS motion/fall detection cycle 2024-08-20 17:26:16 +08:00
Yunhorn 6f69bd7ab7 ---- revised motion count 2024-08-20 13:31:15 +08:00
Yunhorn 029c3fcda3 --- revised for slow and fast tracking ---- 2024-08-20 11:30:55 +08:00
Yunhorn 1532f4a1f4 ---revised for height output format 2024-08-19 13:50:46 +08:00
Yunhorn ba41fdbc61 --- reduce sleep time for RSS scan 2024-08-19 13:22:51 +08:00
Yunhorn 1c82221611 revised for fall detection rss cfg 2024-08-16 21:03:36 +08:00
Yunhorn 3ef3d81e8f ---minor revise 2024-08-15 19:47:15 +08:00
Yunhorn 88189b79c6 ---- revised following accorneer's proposal 2024-08-15 19:04:38 +08:00
Yunhorn 990e83f58e ---- rss config for default, simple, full and fall detection 2024-08-15 18:40:24 +08:00
Yunhorn e797d0327f --revised decoder 2024-08-15 14:10:28 +08:00
Yunhorn 7d6c0c9bf1 minor change for distance ranging 2024-08-15 14:07:58 +08:00
Yunhorn 8475514ee8 revised for accurate distance by ONLY ONE peak 2024-08-15 13:31:50 +08:00
Yunhorn 872482893f --minor changes for fall state 2024-08-14 19:37:49 +08:00
Yunhorn 3acc23d107 ---update decoder for ALARM MUTE/RESET hall3/4 2024-08-14 17:49:24 +08:00
Yunhorn aeb6fb6415 minor logic change for RSS motion detection 2024-08-14 16:49:00 +08:00
Yunhorn b95c494d6a add good bin for fixing not sending after join issue 2024-08-14 16:13:11 +08:00
Yunhorn 3c25c8f883 ---fixed issue of not sending after join 2024-08-14 16:11:03 +08:00
Yunhorn c800e4522a ---temp fix not sending after join issue... way to go 2024-08-14 15:49:30 +08:00
Yunhorn b1de2c6e20 --revised ...not good after join...x min to resend 2024-08-14 14:12:51 +08:00
Yunhorn f2e9f35d77 *** ADD bin for RTM _NO DEBUG 2024-08-13 20:07:58 +08:00
Yunhorn 3ecb9ce7af *** STABLE *** RTM (NO DEBUG MESSAGE) 20240813 2024-08-13 20:06:25 +08:00
Yunhorn 2f61a61355 -add bin file 2024-08-13 19:49:34 +08:00
Yunhorn 3ed5130aeb *** stable *** for P110/P113/P114/P115-(motion mode) 2024-08-13 19:46:52 +08:00
Yunhorn db022db0c2 --- motion fall detection factor 3 added 2024-08-13 15:39:16 +08:00
Yunhorn c0dd7ed536 fix p cmd full size, simple size parameter bug 2024-08-13 12:58:24 +08:00
Yunhorn 2927574f0d remove unused debug message 2024-08-13 10:48:37 +08:00
Yunhorn d8e444fcbb --- rss mode not sending motion result 2024-08-12 20:00:29 +08:00
Yunhorn 4b46039979 ---fix no flashing bug... 2024-08-12 18:40:02 +08:00
Yunhorn 6a30d6bf18 minor changes.... 2024-08-09 20:18:34 +08:00
Yunhorn 0a49fc5075 --- minor changes. bad lamp bar color, no flash 2024-08-09 19:48:47 +08:00
Yunhorn 31a40d52a8 -- add good bin 2024-08-09 16:35:07 +08:00
Yunhorn 3fde971aeb ### good ### keep this ---20240809 16pm 2024-08-09 16:33:22 +08:00
Yunhorn ae712e0eca --- fall detection demo --- 2024-08-08 19:24:37 +08:00
Yunhorn 80aed3dcaa --- add STS_BAT flag for ADR_ON/OFF, DR_0/DR_5 2024-08-08 18:13:19 +08:00
Yunhorn f068cdeb6d add good bin to fix lamp bar color issue 2024-08-06 19:53:25 +08:00
Yunhorn 676b281450 --- fix lamp bar color issue 2024-08-06 19:52:39 +08:00
Yunhorn d6d0b04ab0 --- revised float/int convertion issue 2024-08-06 17:04:40 +08:00
Yunhorn 85796b3cd4 refine output format 2024-08-06 14:59:35 +08:00
Yunhorn 353d4d5e50 --- start a 2024-08-06 14:18:01 +08:00
Yunhorn b5913ba103 ---- start of fall detection refine 2024-08-06 14:15:56 +08:00
Yunhorn 53b68a810a Merge branch 'RM2_1' of http://gitea.yunhorn.com/sundp/O7 into RM2_1 2024-08-06 13:15:26 +08:00
Yunhorn 07307fbb90 minor changes 2024-08-06 13:11:34 +08:00
Yunhorn f49d4afb24 ---- revised for reboot issue..not yet 2024-08-05 17:05:07 +08:00
Yunhorn be38c056a8 --- minor revise for distance ranging 2024-08-02 19:15:48 +08:00
Yunhorn 1fe94926e5 ---- good heart beat, yet rss unstable for distance detector 2024-08-01 19:47:41 +08:00
Yunhorn aa4214983d --- revised for lamp bar...no good so far 2024-08-01 13:01:38 +08:00
Yunhorn 83b4a0aeda ---no good, freeze after 10 seconds 2024-07-31 18:15:46 +08:00
Yunhorn a5de53a293 change back a little 2024-07-31 17:51:17 +08:00
Yunhorn 19c700ec23 Revert "-- P cmd revised, still no good heart beat timer" 
This reverts commit ac5101e2ca.
 2024-07-31 17:05:05 +08:00
Yunhorn 45a4d6c75f --- revised P cmd and decoder --- 2024-07-31 17:01:06 +08:00
Yunhorn ac5101e2ca -- P cmd revised, still no good heart beat timer 2024-07-31 13:32:06 +08:00
Yunhorn a6617752ff --- revised for hall3/hall4 2024-07-30 19:03:46 +08:00
Yunhorn 9a57efd44b --remove unused code 2024-07-29 13:22:30 +08:00
Yunhorn e990164543 --- remove unused code PME_ON/OFF 2024-07-29 12:36:29 +08:00
Yunhorn 58a894f718 --- remove unused code 2024-07-29 12:35:31 +08:00
Yunhorn 150236d617 --- add STS_O6 for RTM Pixel-network no debug 2024-07-29 12:03:50 +08:00
Yunhorn dd1216ba6c --- RTM pixel-network STS-O6 NO DEBUG MESSAGE 2024-07-29 12:03:06 +08:00
Yunhorn b1fc0a8ef4 add good bin fixed 1st LED color issue 2024-07-29 11:52:49 +08:00
Yunhorn 08d82b724f ---remove unused code ---fixed first LED unstable color 2024-07-29 11:51:21 +08:00
Yunhorn f9820dbfba --- fixed unstable first LED color ISSUE 2024-07-29 11:32:58 +08:00
Yunhorn 6dd59ad942 --- revised for time stamp 2024-07-26 19:08:54 +08:00
Yunhorn 63d42c07eb revised decoder for chirpstack 2024-07-26 14:04:22 +08:00
Yunhorn 6d2522c203 --- RTM pixel-network version 2024-07-26 13:55:04 +08:00
Yunhorn 3f91746f2a --- add O2 for data port 10 STS_RSS_MODE=3 2024-07-26 13:52:09 +08:00
Yunhorn 125c6326d4 --- remove unused code 2024-07-26 12:25:58 +08:00
Yunhorn 9b9e1618ff --- add good bin 2024-07-26 12:19:34 +08:00
Yunhorn 75c207ed73 --- add SOS/Fall timestamp ---- 2024-07-26 12:18:05 +08:00
Yunhorn 47ca6726e7 --- update date/time stamp for fall down event 2024-07-25 20:35:28 +08:00
Yunhorn 2548c1391f --- improved node revive 2024-07-25 18:58:02 +08:00
Yunhorn e50d8b7ab5 ---add good bin 2024-07-25 18:31:57 +08:00
Yunhorn 89a809911d ---minor improve for stable LED color 2024-07-25 18:29:36 +08:00
Yunhorn a67c466012 --- add good bin 2024-07-25 17:04:27 +08:00
Yunhorn 079734e74c --- good RED-DARK for overstay , RED-BLUE for SOS 2024-07-25 17:03:08 +08:00
Yunhorn 5145565632 ---- add overstay = 0 right after door open, SOS release 2024-07-25 15:06:32 +08:00
Yunhorn b0ddf93ed8 --- revise presence normal vs presence staystill threshold 2024-07-25 13:57:14 +08:00
Yunhorn cbe349ddff ---- minor change for unconscious detection --- 2024-07-25 13:07:15 +08:00
Yunhorn 6b2cb5b069 ---- RTM 2025 07 25 11 05 AM 2024-07-25 11:07:04 +08:00
Yunhorn 0c89633d34 ----fixed color unusual of first LED 2024-07-25 10:44:49 +08:00
Yunhorn 8ee3ed8596 --- revised zero pulse and one pulse 2024-07-23 16:38:16 +08:00
Yunhorn 03f5e2e12e --- restructure combined process ---- 2024-07-23 16:01:23 +08:00
Yunhorn fa2dd4a0b9 --- minor changes 2024-07-22 15:10:08 +08:00
Yunhorn 01dc003367 --- add over threshold event trigger sendtxdata 2024-07-22 13:28:38 +08:00
Yunhorn 8a6851c32d ---- minor change for open/close green/red 2024-07-22 11:53:02 +08:00
Yunhorn c68f3c1a4e ---minor changes, changed flag not used 2024-07-18 19:55:15 +08:00
Yunhorn 9edfa3c816 minor revise 2024-07-18 18:08:16 +08:00
Yunhorn 8d13b6cb6d --- STS-IOC-IN/OUT DEFINES --- 2024-07-18 15:47:55 +08:00
Yunhorn 2d5ff6fe3d ---- add AppLEDstate 2024-07-15 19:21:37 +08:00
Yunhorn 163837de24 --- revised fall detect speed and gravity --- 2024-07-15 18:50:16 +08:00
Yunhorn 9c3d692e47 ---minor update 2024-07-15 16:38:00 +08:00
Yunhorn 3f9bdbe981 ---Change stay still to no movement 2024-07-15 16:25:47 +08:00
Yunhorn 409f4ff2cb ---- add presence normal related defines 2024-07-15 16:22:37 +08:00
Yunhorn 3feaffc5c2 --- ADD NO_MOVEMENT, UNCONCIOUS, STAYSTILL 2024-07-15 15:38:29 +08:00
Yunhorn 2bf4134f7e --- good over stay state and duration display and upload 2024-07-15 15:19:33 +08:00
Yunhorn 7463d52e48 ---- key debouncing fixed ---2024-0715 2024-07-15 11:43:06 +08:00
Yunhorn 027758bfca ---minor changes --- 2024-07-14 18:27:06 +08:00
Yunhorn d9e25e1952 refine OnState3A/3B/3C changes 2024-06-18 19:34:37 +08:00
Yunhorn 5a4f40f7f4 stable STS-O6 2024-06-18 19:24:00 +08:00
Yunhorn 31d07717bb fall detection logic, motion zone 0/1 from ground detection 2024-06-18 17:08:25 +08:00
Yunhorn 8efcbc6ac7 ground up zone define and start dual mode, uni mode fast switch issue 2024-06-18 13:28:52 +08:00
Yunhorn 7927dd9bb1 add sensor install height detection and store ----good so far 2024-06-17 21:03:48 +08:00
Yunhorn f427cdf2ec fix two diff measure inconsistant distance issue 2024-06-17 17:24:22 +08:00
Yunhorn 24b35d7bd3 -----good for sensor 1/2 start stop timer logic... freeze for now 2024-06-17 14:54:38 +08:00
Yunhorn 636c6374d0 add more timer for sensor1 sensor2 start and stop duration 2024-06-17 14:28:23 +08:00
Yunhorn e7e57e5d8a revised decoder.js normal open or normal close 2024-06-17 13:13:53 +08:00
Yunhorn 172b589397 try PIR 2024-06-17 12:34:10 +08:00
Yunhorn ef5a56ba97 park here ----- decorder to be update with color code 2024-06-13 23:21:08 +08:00
Yunhorn 6cf3d20012 refined motionless, unconscious, overstay, fall detection cfg 2024-06-13 22:46:54 +08:00
Yunhorn b4a29c440d update decoder 2024-06-13 13:57:25 +08:00
Yunhorn 890d31711f for uni_mode only --change fall threshold 2024-06-13 12:35:39 +08:00
Yunhorn 697dae2349 refined date time report in YVH (report version) 2024-06-12 20:25:58 +08:00
Yunhorn c5d43191e9 minor improve 2024-06-11 19:43:55 +08:00
Yunhorn a06377dfc5 add bin hex 2024-06-11 14:29:30 +08:00
Yunhorn f8460f8b00 stable STS-O6 O7 2024-06-11 14:26:25 +08:00
Yunhorn 4dbde9dcfe revised with debug messages 2024-06-09 19:28:36 +08:00
Yunhorn 7868e6d0bf ---NO DEBUG MESSAGE -HACTL RTM 20240607 2247 2024-06-07 22:46:45 +08:00
Yunhorn 27df90ccbb ---- good STS-O6 O7 with LED1 for motion indication 2024-06-07 22:13:45 +08:00
Yunhorn ec8dbf5591 MINOR IMPROVE 2024-06-07 20:10:14 +08:00
Yunhorn cb73171c44 ---- STS_O2_HACTL_202406071331 2024-06-07 13:33:05 +08:00
Yunhorn 0405c35ade --- STS-O2 for HACTL 202406071331 2024-06-07 13:31:26 +08:00
Yunhorn fb67997139 ---- with debug message, release to HACTL 202406070918AM 2024-06-07 09:17:42 +08:00
Yunhorn c76171b461 minor improve for logic 2024-06-06 20:29:22 +08:00
Yunhorn 0b4c98ec16 change to event type = event type instead of previos timer mode 2024-06-06 16:40:25 +08:00
Yunhorn e0bf60b742 update decoder 2024-06-06 15:44:51 +08:00
Yunhorn 055c355a5e refined clock sync process 2024-06-06 14:20:33 +08:00
Yunhorn e75d6a1a83 good at work mode switch and system reboot 2024-06-06 13:45:27 +08:00
Yunhorn 095b0428ed ----------- before STS_FALL_DETECTION_MODE 2024-06-06 11:40:05 +08:00
Yunhorn 120c98e1e2 ---- general ok release for STS-O6/O7 2024-06-06 11:38:43 +08:00
Yunhorn 6ec95727b5 ---- good mile stone 2024-06-06 10-19 General OK 2024-06-06 10:19:22 +08:00
Yunhorn 965a8010a9 disabled TxPeriodicity change after join lorawan 2024-06-06 09:51:09 +08:00
Yunhorn ac700fe921 fix nvm p config size issu 2024-06-06 09:43:20 +08:00
Yunhorn f2cc56f8f8 minor changes 2024-06-05 20:54:52 +08:00
Yunhorn fa59c60faf refine localtime report, ignore time zone shift 2024-06-04 19:42:45 +08:00
Yunhorn c0b1bb73dc ==== good time sync to local time ===== 2024-0604-GGG 2024-06-04 18:21:25 +08:00
Yunhorn 0903422450 ---MileStone--- ClockSync and RemoteMulticast enabled 2024-06-04 12:09:02 +08:00
Yunhorn 492120b87f ------ before application layer clock sync ---lorawan_conf.h line 72 2024-06-04 11:36:59 +08:00
Yunhorn 1417c643a2 try local time report...incorrect yet 2024-06-04 11:35:41 +08:00
Yunhorn f0a1f3a510 ----- STS-O6/O7 General OK 2024-06-04 2024-06-04 10:41:45 +08:00
Yunhorn c6bcf2424f minor change 2024-06-04 09:01:45 +08:00
Yunhorn caee31d6c7 minor improve 2024-06-03 22:09:23 +08:00
Yunhorn 444198dc40 minor improve for unconcious 2024-06-03 18:26:20 +08:00
Yunhorn e9c5978f66 add bin hex elf STS_O7_General_OK_2024_06_03C 2024-06-03 17:39:27 +08:00
Yunhorn 221b3c264d minor improve for heart-beat and sampling/wakeuptimer scanning 2024-06-03 17:38:01 +08:00
Yunhorn a75c928b44 minor improve for future red-blue flash or red-dark flash 2024-06-03 16:26:40 +08:00
Yunhorn b7920b676f minor improve 2024-06-03 13:36:01 +08:00
Yunhorn fc04f50293 minor improve... good STS_O7_General_OK_2024_06_03b 2024-06-03 13:09:58 +08:00
Yunhorn 12477c1119 -- good RED/BLUE flash with timer --- stable 2024-06-03 12:48:55 +08:00
Yunhorn e2dd2a8005 good at SOS flash red/blue, good at green/red occupy/vacant 2024-06-03 12:34:00 +08:00
Yunhorn d33f9b7904 refine lamp bar color change. not perfect yet. 2024-05-31 18:22:38 +08:00
Yunhorn 08fa70857e revised over stay state 2024-05-31 16:03:08 +08:00
Yunhorn 470b3e1a74 ---- good STS-O7 2024-05-31 14:56:19 +08:00
Yunhorn a3a07035d7 ----- good STS-O7 with upload port 0 issue solved.... 2024-05-31 14:53:57 +08:00
Yunhorn e6f6f82763 Restart of STS-O7 and O6 2024-05-31 10:39:02 +08:00
Yunhorn 8fa8d59a9c remove unused code 2024-05-14 12:52:10 +08:00
Yunhorn b3cd7d9c22 remove unused code 2024-05-14 12:29:17 +08:00
Yunhorn bfb86a6241 ADD unconcious threshold to 250 2024-05-13 23:21:26 +08:00
Yunhorn b0840e73be minor changes 2024-05-13 22:53:34 +08:00
Yunhorn d168983d62 add bin files 2024-05-13 22:27:42 +08:00
Yunhorn 7eb963563a optimized upload message content 2024-05-13 22:16:02 +08:00
Yunhorn 0d03871567 add flapping adjustment for RSS , 4 seconds threshold 2024-05-13 21:46:32 +08:00
Yunhorn b2c9e673df OPTIMIZED RED BLUE FLASH TIMING less MCU time used 2024-05-13 21:02:28 +08:00
Yunhorn 3cc1000622 good at door contact and SOS button COLOR CHANGES 2024-05-13 20:09:20 +08:00
Yunhorn 3d3534e747 remove unused code in lora_app.c, when LmHandler is busy or not 2024-05-13 09:43:28 +08:00
Yunhorn 7d56514685 add LmHandlerIsBusy debug info print 2024-05-12 19:47:48 +08:00
Yunhorn d77e2e47bc remove unused code for fall_rising detection result process 2024-05-12 18:43:48 +08:00
Yunhorn 9482e98bed sts_presence_fall_detection setting 2024-05-12 18:03:36 +08:00
Yunhorn a947485d64 reduce unused code for fall_detection initial set 2024-05-12 17:44:34 +08:00
Yunhorn 45dfe4cbc7 add bin file 2024-05-12 17:39:57 +08:00
Yunhorn b0e012491e 2024-05-12 good for STS-O2 with 2 reed switches (hall-read-1 for door-contact, hall-read-2 for SOS-emergency button) and rss motion sensor 2024-05-12 17:39:03 +08:00
Yunhorn 354c1332e5 not trigger send uplink when RSS changed 2024-05-12 15:14:14 +08:00
Yunhorn 8d0249df33 revised zone defination 2024-05-12 14:19:34 +08:00
Yunhorn 1b36e3115e combined two half(s) into one, no motion state trigger to lamp bar 2024-05-12 13:47:34 +08:00
Yunhorn 3cede5683d before merge two half of fall rise detection 2024-05-12 13:35:37 +08:00
Yunhorn 80ad4d0c81 MINOR CHANGE 2024-05-12 13:33:59 +08:00
Yunhorn cb4a4530ac fix output message format error 2024-05-12 13:08:14 +08:00
Yunhorn 4d9be6146a good at Red Blue Flash when SOS button pushed 2024-05-12 12:59:47 +08:00
Yunhorn f455308422 almost fixed reed switch, SOS button logic 2024-05-12 12:53:43 +08:00
Yunhorn 80dbb967e1 sensor data ready =0, heart-beat-timer =0, after each send tx 2024-05-12 11:35:35 +08:00
Yunhorn 0d537d423f sensor data ready OVERWRITE heart-beat message 2024-05-12 11:15:59 +08:00
Yunhorn a10ec2dde2 try fix port 0 issue 2024-05-10 21:04:45 +08:00
Yunhorn d7fed51854 rss color change 2024-05-08 19:06:40 +08:00
Yunhorn 5032f6bf20 reduce debug info 2024-05-08 18:52:45 +08:00
Yunhorn 0e0be968dc improve fall down debug message 2024-05-08 18:14:51 +08:00
Yunhorn d0ae66dbcd improve de-bounce interval to 150 ms 2024-05-08 18:03:18 +08:00
Yunhorn 320ca4da3c reduce unused code, and optimize rss process 2024-05-08 18:01:10 +08:00
Yunhorn dfba46119a remove unused code 2024-05-08 17:48:00 +08:00
Yunhorn a1e4171dbc revised RFAC process 2024-05-08 16:30:26 +08:00
Yunhorn 6af9e82016 combined sts_process 2024-05-08 15:00:50 +08:00
Yunhorn 24e62b5c80 add dev doc 2024-05-08 11:03:32 +08:00
Yunhorn 73038f5a3b test good with Hyperbolic lens 2024-05-08 10:41:26 +08:00
Yunhorn 8f6816aa39 add bin 2024-05-08 10:10:24 +08:00
Yunhorn 5567c41615 enabled debug for hall_1 and Hall_2 2024-05-07 21:48:10 +08:00
Yunhorn 80c286ac17 new bin file 2024-05-07 19:46:23 +08:00
Yunhorn 41a5d983ea bring up test failed, power supply test and clock test... park here 2024-05-07 19:19:41 +08:00
Yunhorn dbb729a605 try switch PB3/PB5 2024-05-07 15:25:01 +08:00
Yunhorn c669ea93b9 STS_RM2 old PCBA with PB-3 enable and PB-5 interrupt 2024-05-07 11:31:23 +08:00