Skip to content

Commit

Permalink
Merge pull request #201 from project-alice-assistant/1.0.0-a5
Browse files Browse the repository at this point in the history
1.0.0 a5
  • Loading branch information
Psychokiller1888 committed Feb 23, 2020
2 parents 81259c6 + 4763820 commit fcd6fc2
Show file tree
Hide file tree
Showing 223 changed files with 5,628 additions and 5,756 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ trained/hotwords/*

var/cache/*
var/logs/*
!var/cache/.gitkeep
!var/cache/nlu/trainingData/.gitkeep
!var/cache/dialogTemplates/checksums.json
!var/logs/.gitkeep

/deviceshotwords/*
Expand All @@ -139,8 +140,8 @@ system/database/*

test.py

trained/assistants/*
!trained/assistants/.gitkeep

var/assistants/*
!var/assistants/.gitkeep

skills/*
34 changes: 16 additions & 18 deletions ProjectAlice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@
# #
################################################
# DON'T CHANGE ME #
version: 1.11
version: 1.14
################################################

# How to prevent frequent errors:
# Always add a space after the ":" (e.g. deviceName: default instead of deviceName:default)

# If you place this file into /boot after a first initialization it won't overwrite your settings unless you set this to yes
forceRewrite: no

Expand All @@ -26,14 +29,17 @@ doGroundInstall: yes
keepYAMLBackup: no

# If you are installing on Raspbian Buster, set the following to yes
installOnBuster: no
installOnBuster: yes

# Base configs
# Enter Wifi credentials for automatic adding of tasmota/zigbee/netatmo devices even when Alice has wired access
useWifi: yes
wifiNetworkName:
wifiWPAPass:
wifiCountryCode:

# The name of the device to set up
# Caution: The main device should be named default! This will be changed later.
deviceName: default
soundPlaybackAndRecordEnabled: yes

Expand All @@ -44,16 +50,6 @@ mqttUser:
mqttPassword:
mqttTLSFile:

# Required to generate/train and download the assistant. We strongly suggest a new account
snipsConsoleLogin:
snipsConsolePassword:

# Leave empty if this is the first time you use ProjectAlice
snipsProjectId:

# Your Snips registered nickname
intentsOwner:

# hardware - Turn only one to yes!
audioHardware:
usbMic: no
Expand All @@ -68,12 +64,12 @@ audioHardware:
matrixVoice: no

# Capture
micSampleRate: 44100
micSampleRate: 16000
micChannels: 1

# System
# Whether to install Snips Led Control or not. SLC is the best way to manage your device leds if you have any
useSLC: yes
# Whether to install Hermes Led Control or not. HLC is the best way to manage your device leds if you have any
useHLC: yes

stayCompletlyOffline: no
keepASROffline: yes
Expand Down Expand Up @@ -114,8 +110,8 @@ shortReplies: no
# If set to yes Alice will whisper instead of using short answers when you are sleeping. Currently only available with Amazon TTS
whisperWhenSleeping: no

# Either 'snips' or 'google'
asr: snips
# Either 'pocketsphinx' or 'google'
asr: pocketsphinx

# Either 'pico', 'snips', 'mycroft', 'amazon' or 'google'
tts: pico
Expand All @@ -138,7 +134,9 @@ githubToken:

# !WARNING! You know what you are doing by changing the following to anything else than "master"!
# This allows to init ProjectAlice on any branches, even unstable ones
updateChannel: master
# Available: master / alpha / beta / rc
aliceUpdateChannel: master
skillsUpdateChannel: master

# Google
# If you are using Google as ASR and/or TTS you need to create an account on their console and activate the API
Expand Down
2 changes: 1 addition & 1 deletion ProjectAliceConsole.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from core.console.SyncCommand import Sync
from core.console.UpdateCommand import Update

@click.group(context_settings={'help_option_names':['--help', '-h']})
@click.group(context_settings={'help_option_names': ['--help', '-h']})
def cli():
"""
This is the Command Line Interface of Project Alice.
Expand Down
2 changes: 0 additions & 2 deletions README_CONSOLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ AliceConsole
#### Dependencies

- terminaltables
- PyInquirer
- prompt_toolkit==1.0.14
- click
Loading

0 comments on commit fcd6fc2

Please sign in to comment.