Commit Graph

666 Commits

Author SHA1 Message Date
Matteo Cypriani b62987efb0 Merge branch 'dev' into dev-drone
Update string2data() to the new CSV format (and clean it a bit).
2011-08-18 13:26:40 +02:00
Matteo Cypriani 7ce171b2ef [ARDrone] Use ++var instead of var++ if possible 2011-08-18 11:51:00 +02:00
Matteo Cypriani ac4dd87ef9 Use ++var instead of var++ whenever possible 2011-08-18 11:45:36 +02:00
Matteo Cypriani 3f328e0e69 [Positioning] CSV format: remove "Error" string
Result::to_csv() do not give a fixed "Error" string field before the
error value field any more.

Update comments to better document the CSV format.
2011-08-18 11:36:50 +02:00
Matteo Cypriani ab8ad83e52 Add emacs mode command to each Makefile_atheros* 2011-08-18 11:05:45 +02:00
Matteo Cypriani b2b24ed551 Add emacs mode command to each Makefile_drone 2011-08-18 11:01:13 +02:00
Matteo Cypriani 5284120632 [ARDrone] A bit of beautifying/cleaning
Long lines, trailing white spaces, unused variables, etc.
I left most of the commented code, but it certainly should be deleted
someday.
2011-08-18 10:51:50 +02:00
Matteo Cypriani c079ee14ca [ARDrone] Fix parsing of option -l 2011-08-18 10:43:38 +02:00
Matteo Cypriani fe8846cca9 [ARDrone] Reorganise .h, clean includes 2011-08-18 10:00:45 +02:00
Matteo Cypriani 2c91f5b976 [ARDrone] Fix static compilation, synchro Makefiles 2011-08-18 09:57:07 +02:00
Matteo Cypriani dc3ba41222 [ARDrone] Create oc.h
Create oc.h from oc.c, include it in owlps-drone.h instead of directly
oc.c.
Compile oc.o separately.
2011-08-18 09:54:50 +02:00
Matteo Cypriani fb9d093d5a [Listener] Add extract_radiotap_data()
Another refactoring step for read_packet().
2011-08-04 00:35:32 +02:00
Matteo Cypriani 4bae0c9b4e [Listener] Add extract_calibration_data()
A first step in the long way of read_packet() refactoring.
2011-08-04 00:25:08 +02:00
Matteo Cypriani ac3c7b4352 [lib] Move listener code to owlps-listener.h
Move listener-specific code (Radiotap fields' definition, etc.) from
owlps.h to owlps-listener.h.
2011-08-03 23:13:16 +02:00
Matteo Cypriani e823014708 Merge branch dev (v1.1.7) into dev-drone 2011-08-03 09:51:29 +02:00
Florian Taillard e57e4cfc8d Merge branch dev (v1.1.6) into dev-drone
Update Makefiles.
Use -D DEBUG instead of #defines.
Improve getopt code for the -l option.
2011-08-03 09:47:10 +02:00
Matteo Cypriani 2c887899b3 [Positioning] Fix FBCM with autocalibration
Regenerate Friis indexes at each call of the algorithm when
autocalibration is used (without this fix, FBCM given always the same
result autocalibration activated, because of the Friis indexes equal to
zero).
2011-08-01 20:41:14 +02:00
Matteo Cypriani 6167f664e8 [Positioning] Use AccessPoint::friis_constant_term()
Use AccessPoint::friis_constant_term() wherever possible.
Fix MultilaterationAlgorithm::make_constant_term() and
ReferencePoint::friis_indexes_for_ap(), where the AP's trx
power was used instead of the mobile's power.
2011-08-01 19:57:40 +02:00
Matteo Cypriani dde917485a [Positioning] Add AccessPoint::friis_constant_term() 2011-08-01 19:53:54 +02:00
Matteo Cypriani d9adbc3f88 [Positioning] Fix InputMedium::fill_calibration_request_data()
The first test was logically wrong.
2011-08-01 18:24:39 +02:00
Matteo Cypriani 90f26261a2 [Positioning] InputMedium::fill_calibration_request_data()
Refactor some code of Input{CSV,UDPSocket}::fill_current_request() into
the new function InputMedium::fill_calibration_request_data().
2011-08-01 18:24:39 +02:00
Matteo Cypriani a71dcfdcfe [Positioning] InputMedium::get_next_request() non-virtual
Refactor some code of Input{CSV,UDPSocket}::get_next_request() into
InputMedium::get_next_request().
The medium-specific code must now be implemented in
fill_current_request().
2011-08-01 12:03:41 +02:00
Matteo Cypriani 2886d87ab6 Merge TODOs
Merge owlps-positioning/TODO into TODO.
2011-08-01 10:00:59 +02:00
Matteo Cypriani e527b791ad [Positioning] TODO: finish translation 2011-08-01 09:57:29 +02:00
Matteo Cypriani bfc09fdbe6 [Positioning] Stock::in_which_area_is(): ref param
Fix a typo in the header of Stock::in_which_area_is() to pass the
argument as a reference.
2011-07-30 20:46:32 +02:00
Matteo Cypriani 141515b5db [Positioning] operator=() return non-const reference
Change the return type of all operator=() from const reference to
non-const reference.
2011-07-30 20:46:32 +02:00
Matteo Cypriani dcf425fce5 [Positioning] Stock::generate_reference_point()
Create the function Stock::generate_reference_point(Point3D) from
regenerate_reference_points().
2011-07-30 20:46:32 +02:00
Matteo Cypriani 4c9a3070ac [Positioning] Stock::delete_non_ap_calibration_requests()
Create the function Stock::delete_non_ap_calibration_requests() from
regenerate_reference_points().
2011-07-30 20:46:32 +02:00
Matteo Cypriani c0a179e34e [Positioning] Result::to_csv(): include area
Add the area in which is the result's coordinate, after the error.
This changes the behaviour of OutputUDP and OutputCSV.
2011-07-30 20:46:32 +02:00
Matteo Cypriani 79ad31b351 [Positioning] .conf: UDP & TCPEvAAL output options 2011-07-30 20:46:32 +02:00
Matteo Cypriani cd25c4ddcd [Positioning] Add class OutputNetworkSocket
Factorise code of OutputUDPSocket and OutputTCPSocketEvAAL.
2011-07-30 20:46:32 +02:00
Matteo Cypriani 21c7f80345 [Positioning] Rename options minmax-* area-*
The options minmax-start and minmax-stop are also used by the
autocalibration process to know in which area reference points must be
generated. Therefore these options are renamed area-start and area-stop.
2011-07-30 19:53:13 +02:00
Matteo Cypriani bf3a6eb661 [Positioning] Rename owlps-positioning.cfg -> .conf
Rename the sample configuration file to have the standard UNIX suffix.
Add a Vim modeline to keep the "Windows .ini" syntax.
2011-07-30 19:53:13 +02:00
Matteo Cypriani 1a5fab9b99 Update TODOs 2011-07-30 19:49:46 +02:00
Matteo Cypriani a9f4750f34 [Positioning] Split option generated-meshing-grain
Split the option positioning.generated-meshing-grain in two:
positioning.generated-meshing-grain-x and
positioning.generated-meshing-grain-y.
2011-07-30 19:49:42 +02:00
Matteo Cypriani 0da98cdb05 [Positioning] Opt. radar-ignore-ap-reference-points
Add the option positioning.radar-ignore-ap-reference-points, to be able
to select only generated reference points.
2011-07-30 19:48:20 +02:00
Matteo Cypriani 089c8e3f8f [Positioning] Result: operator<< displays area
If the result point is in a known area, the area's name is displayed
(this changes the output of OutputTerminal).
2011-07-29 23:02:26 +02:00
Matteo Cypriani 8295666178 [Positioning] Add Result::in_which_area() 2011-07-29 23:02:26 +02:00
Matteo Cypriani 4675ac9f48 [Positioning] Stock::store_CR() returns the CR
Stock::store_calibration_request() now returns the stored/found
calibration request.
2011-07-29 23:02:26 +02:00
Matteo Cypriani a1dd6d90d8 [Positioning] Fix RP generation with >3 APs
When selecting the 2 reference APs, skip the APs that do not have (yet)
an associated reference point.
2011-07-29 23:02:26 +02:00
Matteo Cypriani 84acee629c [Positioning] Add Stock::reference_point_exists() 2011-07-29 23:02:26 +02:00
Matteo Cypriani c11e33fd0b [Positioning] Add missing #include <iostream> 2011-07-29 23:02:26 +02:00
Matteo Cypriani 42bcef2c0e [Positioning] Add options tcpevaal-{host,port}
Add options output.tcpevaal-host and output.tcpevaal-port, with
localhost:4444 as default values, as recommended by the organisers.
2011-07-29 23:02:26 +02:00
Matteo Cypriani 593da5e422 [Positioning] TCPEvAAL: send area of interest
The areas of interest must be defined as areas in the topology
configuration file. Their names must be integer values, to conform with
the EvAAL naming.
2011-07-29 23:02:26 +02:00
Matteo Cypriani a951717433 [Positioning] Add Stock::in_which_area_is() 2011-07-29 23:02:26 +02:00
Matteo Cypriani 9f5305b496 [Positioning] TCPEvAAL: send request's timestamp 2011-07-29 23:02:26 +02:00
Matteo Cypriani 1dfe30ea03 [Positioning] Add Result::request
Associate a Result with the origin Request.
2011-07-29 23:02:26 +02:00
Matteo Cypriani d5fcfed1f2 [Positioning] Add OutputTCPSocketEvAAL 2011-07-29 23:02:26 +02:00
Matteo Cypriani 3490b94df7 [Positioning] Building & CSVFileReader: minor edits
Building: fix a comment.
CSVFileReader: delete useless "boost::" prefix (we have using namespace
boost).
2011-07-29 23:02:26 +02:00
Matteo Cypriani 9b245ce152 [Positioning] Add option generated-meshing-grain
The option positioning.generated-meshing-grain allows to set the
grain of the generated reference points' meshing.
2011-07-29 23:02:26 +02:00