CohenLabPrinceton / pvp

25%

master: 100%

LAST BUILD ON BRANCH sounds

branch: sounds

CHANGE BRANCH

x

Reset

• sounds
• danielsuo-patch-1
• docs
• docs_hardware
• gui
• gui-tests
• gui-tests-old
• hardware_docs
• master
• pcb-docs
• safepaths
• tmp
• tmp_hardware
• tmp_hardware_docs
• v1.0

Build # 535

Build Type

push

travis-ci-com

Committed by sneakers-the-rat

Commit Message

Merge remote-tracking branch 'remotes/origin/gui' into sounds

# Conflicts:
#	pvp/controller/control_module.py
#	pvp/external/FiraCode-Bold.otf
#	pvp/external/FiraCode-Regular.otf
#	pvp/external/Fira_License.txt
#	pvp/external/PySide2-5.11.4a1-5.11.3-cp37-cp37m-linux_armv7l.whl
#	pvp/external/audio/high_0.wav
#	pvp/external/audio/high_1.wav
#	pvp/external/audio/high_2.wav
#	pvp/external/audio/high_3.wav
#	pvp/external/audio/high_4.wav
#	pvp/external/audio/high_5.wav
#	pvp/external/audio/low_0.wav
#	pvp/external/audio/low_1.wav
#	pvp/external/audio/low_2.wav
#	pvp/external/audio/low_3.wav
#	pvp/external/audio/low_4.wav
#	pvp/external/audio/low_5.wav
#	pvp/external/audio/medium_0.wav
#	pvp/external/audio/medium_1.wav
#	pvp/external/audio/medium_2.wav
#	pvp/external/audio/medium_3.wav
#	pvp/external/audio/medium_4.wav
#	pvp/external/audio/medium_5.wav
#	pvp/gui/main.py
#	pvp/gui/widgets/alarm_bar.py
#	setup.py

Run Details

889 of 3604 relevant lines covered (24.67%)

0.25 hits per line