Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pps with modulations dev #28

Merged
merged 9 commits into from
Aug 26, 2016
Merged

Pps with modulations dev #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
52b1d4f
cosmetical changes so far
matejhof Aug 25, 2016
d5f5abf
adding comments
matejhof Aug 25, 2016
699d475
allowing all palm taxels for right hand
matejhof Aug 25, 2016
0eb2632
updating arm chains with torso joints + global single updateEncodersA…
matejhof Aug 25, 2016
bce4098
Removed trailing whitespaces, plus minor fixes to comments and other …
alecive Aug 25, 2016
0fe466a
removing NR_TORSO_JOINTS_MACRO - using jntsT instead
matejhof Aug 26, 2016
d57f15e
removing NR_TORSO_JOINTS_MACRO - using jntsT instead
matejhof Aug 26, 2016
67c7c6f
replacing NR_ARM_JOINTS macro with jntsAL, jntsAR
matejhof Aug 26, 2016
8a067ce
readHeadEncodersAndUpdateWEyeChains()
matejhof Aug 26, 2016
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
14 changes: 7 additions & 7 deletions lib/include/iCub/periPersonalSpace/taxelPWE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/**
* Copyright (C) 2013 RobotCub Consortium, European Commission FP6 Project IST-004370
* Author: Alessandro Roncone
* email: [email protected]
* website: www.robotcub.org
* Author: Alessandro Roncone, Matej Hoffmann
* email: [email protected], [email protected]
* Permission is granted to copy, distribute, and/or modify this program
* under the terms of the GNU General Public License, version 2 or any
* later version published by the Free Software Foundation.
Expand All @@ -23,7 +22,7 @@
*
* Utilities used throughout the modules and libraries.
*
* \author Alessandro Roncone
* \author Alessandro Roncone, Matej Hoffmann
*
* Date: first release 30/10/2013
*
Expand All @@ -41,10 +40,11 @@
class TaxelPWE : public iCub::skinDynLib::Taxel
{
public:
double Resp; // taxels' activation level <0,1>
double RFangle; // angle of the receptive field [rad]
double Resp; // Taxels' activation level <0,1>
double RFangle; // Angle of the receptive field [rad] - from the taxel normal
// The effective angle is thus double that

IncomingEvent4TaxelPWE Evnt; //
IncomingEvent4TaxelPWE Evnt; // Stimuli/events nearing the taxel in the taxel's FoR
parzenWindowEstimator *pwe; //

/**
Expand Down
Loading