Changeset 538
- Timestamp:
- 04/24/08 17:57:41 (3 weeks ago)
- Files:
-
- nano-RK/projects/SAMPL/app_pkt_handlers/ff_basic_sensor_pkt.c (modified) (2 diffs)
- nano-RK/projects/SAMPL/client/aggregate.c (modified) (2 diffs)
- nano-RK/projects/SAMPL/client/generate.c (modified) (3 diffs)
- nano-RK/projects/SAMPL/client/makefile (modified) (1 diff)
- nano-RK/projects/SAMPL/include/sampl.h (modified) (1 diff)
- nano-RK/projects/SAMPL/slip-clients/xmpp-client/ff_config.txt (modified) (1 diff)
- nano-RK/src/kernel/source/nrk_stats.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
nano-RK/projects/SAMPL/app_pkt_handlers/ff_basic_sensor_pkt.c
r537 r538 2 2 #include <sampl.h> 3 3 #include <ff_basic_sensor_pkt.h> 4 #include <debug.h>5 4 6 5 #ifdef NANORK … … 10 9 #include <nrk_driver.h> 11 10 #include <ff_basic_sensor.h> 11 #include <debug.h> 12 12 #else 13 13 #define my_mac 0 nano-RK/projects/SAMPL/client/aggregate.c
r536 r538 11 11 #include <control_pkt.h> 12 12 #include <trace.h> 13 #include <stats_pkt.h> 13 14 14 15 … … 54 55 break; 55 56 57 case FF_STATS_PKT: 58 stats_aggregate(us_pkt_in, us_pkt ); 59 break; 60 56 61 // No DATA STORAGE AGGREGATE, so just treat as an empty pkt 57 62 case DATA_STORAGE_PKT: nano-RK/projects/SAMPL/client/generate.c
r524 r538 10 10 #include <control_pkt.h> 11 11 #include <trace.h> 12 #include <stats_pkt.h> 12 13 13 14 /* … … 56 57 } 57 58 59 // Don't reply if packet is not encrypted 60 // if((ds_pkt->ctrl_flags & ENCRYPT) == 0 ) return; 61 58 62 if(ds_pkt->is_mac_selected==1) 59 63 { … … 76 80 break; 77 81 82 83 case FF_STATS_PKT: 84 stats_generate(us_pkt,ds_pkt); 85 break; 78 86 79 87 case TRACEROUTE_PKT: nano-RK/projects/SAMPL/client/makefile
r537 r538 30 30 SRC += ../app_pkt_handlers/ack_pkt.c 31 31 SRC += ../app_pkt_handlers/route_pkt.c 32 SRC += ../app_pkt_handlers/stats_pkt.c 32 33 SRC += ../app_pkt_handlers/trace.c 33 34 SRC += ../app_pkt_handlers/eeprom_data.c nano-RK/projects/SAMPL/include/sampl.h
r536 r538 91 91 #define DATA_STORAGE_PKT 0X0B 92 92 #define XMPP_PKT 0X0C 93 #define UNKNOWN_PKT 0X0D 93 #define FF_STATS_PKT 0X0D 94 #define UNKNOWN_PKT 0X0E 94 95 // UNKNOWN_PKT used by phoenix etc, do not remove 95 96 nano-RK/projects/SAMPL/slip-clients/xmpp-client/ff_config.txt
r530 r538 27 27 28 28 # Sensor Short with LED 29 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x78 0x64 0xd3 0x00 0x00 0x00 0x00 0x00 29 # 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x78 0x64 0xd3 0x00 0x00 0x00 0x00 0x00 30 0x01 0x01 0xb9 0x07 0x00 0xf0 0x00 0x00 0x00 0x00 0x00 0x06 0x01 0x10 0x64 0xd3 0x00 0x00 0x00 0x00 0x00 30 31 nano-RK/src/kernel/source/nrk_stats.c
r537 r538 31 31 { 32 32 //_nrk_stats_sleep_time+=t; 33 _nrk_stats_sleep_time.nano_secs =t*NANOS_PER_TICK;33 _nrk_stats_sleep_time.nano_secs+=t*NANOS_PER_TICK; 34 34 nrk_time_compact_nanos(&_nrk_stats_sleep_time); 35 35 }
