Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
7cbce63
first commit
Jun 12, 2013
b2d4608
Adding a separate header and source file for external temp_sensor.
micharu123 Jun 12, 2013
c0e3a2b
IAR 5.4 project file upgrade and add of temp_sensor
micharu123 Jun 12, 2013
695e2d2
changed temp function name.
Jun 12, 2013
e0851d7
Modified func handles for x_temperature()
micharu123 Jun 12, 2013
7b13be9
temp_sensor modeled after quick_accel_sensor. Using ACTIVE_SENSOR == …
micharu123 Jun 12, 2013
bafde4c
modified a central sensor implementation.
micharu123 Jun 13, 2013
9b71d66
modified a central sensor implementation.
micharu123 Jun 13, 2013
2de9e84
Patched in mod function against sensor_counter to flip between accel/…
micharu123 Jun 13, 2013
decfd06
set sensor id within init_sensor() function
Jun 13, 2013
6ef7b62
swapped placement of x and y inside the epc packet for WispGUI consis…
Jun 14, 2013
73ade08
added path.txt to gitignore
Jun 16, 2013
2d42cd1
-added power check at beginning of ext temp sensor.
Jun 17, 2013
6847cf7
Modified the g itignore for eclipse.
micharu123 Jun 20, 2013
b58ebdb
The following is a mirror of the LLRP communication done in the WISP …
micharu123 Jun 20, 2013
6269450
Added advanced logging functionality for running the binary on boot. …
micharu123 Jun 21, 2013
13eedb5
concrete reader loop fix.
micharu123 Jun 21, 2013
b4b4f5f
This looks exactly like the wisp demo.
micharu123 Jun 21, 2013
7a666ee
100ms duration. I also noticed a slight diminishing of tag rate when …
micharu123 Jun 21, 2013
af31632
Cleaned up syntax of moo_concrete_reader.c and stripped extrenous cod…
micharu123 Jun 22, 2013
4792b9b
Minor modification to session and maximum transmit power.
micharu123 Jun 22, 2013
2f4777a
Ah, session 2 does nothing on tag matches... this will show us more i…
micharu123 Jun 22, 2013
be0a177
Added in arm libs/includes... just need to adjust the Makefile if you…
micharu123 Jun 24, 2013
18f8ce0
minor mods to header files.
micharu123 Jun 25, 2013
a373538
Minor mods to libs.
micharu123 Jun 25, 2013
6f56d66
This will stop it from breaking. No more version.inc.
micharu123 Jun 25, 2013
c667aa7
Part one of multipart inputs.
micharu123 Jun 25, 2013
dd3bfc5
Modifying main to include getopts.
micharu123 Jun 25, 2013
3f55008
Randomly pasted a large comment, removing that. Creating a global sta…
micharu123 Jun 26, 2013
9cc2606
Lots of type casting and atois... but it looks like we are getting cl…
micharu123 Jun 26, 2013
954a6c6
Cleaned up usage a bit... now I have a strange filename creation. Wil…
micharu123 Jun 26, 2013
101434c
The debug and verbose flags work with getopt. Added a new method to p…
micharu123 Jun 26, 2013
81a3939
Modified make to have a clean because I am lazy... and its a lazy mak…
micharu123 Jun 26, 2013
cf30ae1
Fixed memory corruption of time... though it would be interesting to …
micharu123 Jun 26, 2013
230995e
addROSpec now configurable from the command line. We just need to cov…
micharu123 Jun 26, 2013
9454f07
Minor fix... the next step is to make sure that variables are consist…
micharu123 Jun 27, 2013
81ebda6
Modified all instances of hardcoded ROSpec values.
micharu123 Jun 27, 2013
5f39351
Modified clean to remove log files too.
micharu123 Jun 27, 2013
11b400d
Resize AntennaIDs.nValue based on the AntennaIDs array size (simple c…
micharu123 Jun 28, 2013
e61b17a
AntennaIDs can now be configured correctly and it assumes bad input, …
micharu123 Jun 30, 2013
649f376
Defaults to antennaids of 0 finally... so if you don't set it, it wil…
micharu123 Jun 30, 2013
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@ Debug/
settings/
*.dep
*.ewd
path.txt
[Tt]humbs.db
*.DS_Store
.project
.settings/
.cproject
3 changes: 3 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ Kickstart (code size limited) edition available from TI.
* ThingMagic Mercury 5e
* ThingMagic Mercury 6
* Michael Buettner's GNU Radio gen2_rfid reader (YMMV)

This branch is for Moo Concrete Deployment in Home
toggling between temperature sensor and accelerometer sensors
17 changes: 15 additions & 2 deletions moo.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ int main(void)
// dest = destorig;

#if READ_SENSOR
init_sensor();
// Not using anymore.
//init_sensor();
#endif

#if !(ENABLE_SLOTS)
Expand Down Expand Up @@ -553,7 +554,19 @@ int main(void)
state = STATE_READY;
delimiterNotFound = 1; // reset
#elif SENSOR_DATA_IN_ID
read_sensor(&ackReply[3]);
// We need to specify which sensor by passing its ID.
// 0x0B for accel, 0x0E for temp.

if((sensor_counter % 2) == 0) {
init_sensor(0x0B);
} else if((sensor_counter % 2) == 1) {
init_sensor(0x0E);
}



// TODO: Read sensor on &ackReply[3] never used.
read_sensor();
RECEIVE_CLOCK;
ackReplyCRC = crc16_ccitt(&ackReply[0], 14);
ackReply[15] = (unsigned char)ackReplyCRC;
Expand Down
30 changes: 30 additions & 0 deletions moo_llrpc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
############################################################################
# Copyright 2007,2008 Impinj, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
############################################################################

LTKC_DIR = .
LTKC_LIBS = $(LTKC_DIR)/lib/libltkc.a
LTKC_INCL = -I$(LTKC_DIR)/include
CFLAGS = -g $(LTKC_INCL)
TARGET = moo_concrete_reader

$(TARGET) : moo_concrete_reader.c
$(CC) $(CFLAGS) -o moo_concrete_reader moo_concrete_reader.c $(LTKC_LIBS)

clean:
-rm -f $(TARGET) Mon_* Tue_* Wed_* Thu_* Fri_* Sat_* Sun_*

.PHONY: clean
15 changes: 15 additions & 0 deletions moo_llrpc/MooBoot.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh

# The following script will start moo_concrete_app on boot.
nohup /home/micharu123/Desktop/moo_concrete_reader 192.168.1.171 &
sleep 2
nohup /home/micharu123/Desktop/moo_concrete_reader 192.168.1.75 &
sleep 2
nohup /home/micharu123/Desktop/moo_concrete_reader 192.168.1.86 &


###
# To add it on Ubuntu, do the following:
# Place this script in /etc/init.d
# chmod 775 MooBoot.sh
# sudo update-rc.d boot_reader.sh defaults
46 changes: 46 additions & 0 deletions moo_llrpc/arm/include/ltkc.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

/*
***************************************************************************
* Copyright 2007,2008 Impinj, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
***************************************************************************
*/


#ifndef _LTKC_H
#define _LTKC_H

#include "ltkc_platform.h"
#include "ltkc_base.h"

#include "ltkc_frame.h"
#include "ltkc_xmltext.h"
#include "ltkc_connection.h"

#include "out_ltkc.h"

/* for passing version information as a define */
#define STRINGIFY(x) XSTRINGIFY(x)
#define XSTRINGIFY(x) #x

//#include "version.inc"


extern LLRP_tSTypeRegistry *
LLRP_getTheTypeRegistry (void);


#endif /* !_LTKC_H */

Loading