Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: poppy-project/poppy-ergo-jr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.0.1
Choose a base ref
...
head repository: poppy-project/poppy-ergo-jr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 12, 2021

  1. Copy the full SHA
    90747cd View commit details

Commits on Apr 29, 2022

  1. Fixed face_detector

    From #63
    ymollard committed Apr 29, 2022
    Copy the full SHA
    11e6739 View commit details
  2. Version bump to 4.0.2

    ymollard committed Apr 29, 2022
    Copy the full SHA
    97ce599 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 software/poppy_ergo_jr/_version.py
  2. +2 −2 software/poppy_ergo_jr/poppy_ergo_jr.py
  3. +1 −1 software/setup.py
2 changes: 1 addition & 1 deletion software/poppy_ergo_jr/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '4.0.1'
__version__ = '4.0.2'
4 changes: 2 additions & 2 deletions software/poppy_ergo_jr/poppy_ergo_jr.py
Original file line number Diff line number Diff line change
@@ -49,10 +49,10 @@ def setup(cls, robot):
m.torque_limit = 70.
m.led = 'off'

if not robot.simulated and hasattr(robot, 'face_tracking'):
if not robot.simulated and hasattr(robot, 'face_detector'):
robot.attach_primitive(FaceTracking(robot, 10,
robot.face_detector),
'face_tracking')
'face_detector')

for m in robot.motors:
m.led = 'green'
2 changes: 1 addition & 1 deletion software/setup.py
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ def version():
version=version(),
packages=find_packages(),

install_requires=['pypot >= 4.0.0', 'hampy'],
install_requires=['pypot >= 4.0.0', 'hampy >= 1.4.2'],

include_package_data=True,
exclude_package_data={'': ['README', '.gitignore']},