Commit Graph

78 Commits (12ebabb70fa9b1dd4af04442349936d56f0d490e)

Author SHA1 Message Date
Augusto Monteiro 'Sparky 253e3bdc66 #706 - Using configuration to get msm bin 2017-06-26 13:48:09 -07:00
SoloVeniaASaludar 638c0ec40c + 2017-06-26 13:48:09 -07:00
SoloVeniaASaludar f3fd34c7c5 bugfix/issue-688 2017-06-26 13:45:23 -07:00
SoloVeniaASaludar 7d05431bfd + 2017-06-26 13:45:23 -07:00
Steve Penrod 2eecfebaa7 Merge branch 'dev' into dev 2017-04-23 16:44:49 -05:00
Augusto Monteiro 'Sparky be2d97907a #683 - removing msm path configuration 2017-04-21 11:00:35 -07:00
Steve Penrod 60abb41fc6 Fix for issue #659, broken git install after recent changes
There are several issues with the changes recently made to break out
Skills from mycroft-core.
* The subdirectory mycroft/skills/intent/ is left behind when you do
  a pull, so the change to core.py that tries to
  "import mycroft.skills.intent" gets confused.  I renamed the file
  intent.py to intent_service.py
* Added a bunch of comments
* Made a bunch of functions "private", using the leading _
* The MSM install was failing.  Still working on that, but we should
  probably make msm.sh a part of mycroft-core instead of its own
  repo.
* Restored some mycroft.conf values that I noticed got lost during
  an automatic merge.
2017-04-14 01:53:29 -07:00
penrods 00eeadd9df Curse you pep8! :) 2017-04-13 12:43:19 -07:00
penrods 35a213d4db The configuration values were poorly documented. See issue #653
This addresses this in several ways:
* Created mechanism to load 'commented' JSON (using '//' or '#' comments on a single line)
* Embedded comments into the mycroft.conf, indicating use, legal values, and where they get overridden
* Create ConfigurationManager.instance() static method to replace ConfigurationManager.get().  This produces more readable code like:
  ConfigurationManager.instance().get("value") instead of ConfigurationManager.get().get("value")
* Made _ConfigurationListener 'private'
* docstring'ed things
2017-04-13 01:09:50 -07:00
JarbasAI 805aefc0d7 pep8 2017-04-11 16:24:14 +01:00
JarbasAI faf2e9f3b3 change loading order
load_order = [DEFAULT_CONFIG, REMOTE_CONFIG, SYSTEM_CONFIG, USER_CONFIG]
2017-04-10 20:29:54 +01:00
Augusto Monteiro 'Sparky 1087d0e3b4 #636 - Adding loglevel 2017-04-06 17:14:18 -07:00
Augusto Monteiro 'Sparky b35c012692 #636 - Adding ignore logs 2017-04-06 17:14:18 -07:00
Augusto Monteiro 2b96f2dd19 #527 - Adding msm install script and renaming skill 2017-03-28 11:20:00 -07:00
Art McGee 6d3d120517 Changes to record mycroft wake word when configured to do so.
NOTE: this doesn't check for disk space and doesn't clean up
file stored in /tmp/ called mycroft_wake_sucess<time>.wav

TODO: some cleanup should be considered.

Signed-off-by: Art McGee <amcgee7@jaguarlandrover.com>
2017-03-02 14:14:50 -08:00
kfezer 28f452bd6b Update mycroft.conf 2017-02-15 15:37:52 -06:00
Karl Fezer a691003071 modified: mycroft/configuration/mycroft.conf
modified:   mycroft/util/__init__.py
2017-02-15 15:37:52 -06:00
penrods 5f8775883a Refining new "listening" sound mechanism
This adds several refinements to the listening sound mechanism added by:
* Added a default sound file
* Allowing various ways to override "resource files" for customization
* Moved the sound configuration path from "confirm_ding" to
  "sounds" > "start_listening"
* Also added "sounds" > "end_listening" configuration for the future

This submission adds the new mycroft.util.resolve_resource_file(res_name)
method.  This method takes a name such as "snd/start_listening.wav" and
looks (in order):
* For an absolute path <res_name>
* For ~/.mycroft/<res_name>
* For /opt/mycroft/<res_name>
* For mycroft/res/<res_name> within the source package
2017-02-15 15:37:52 -06:00
Arron Atchison 990dd27c5e Revert "Refining new "listening" sound mechanism (#503)" 2017-02-15 15:37:52 -06:00
Steve Penrod a53a5bf0a6 Refining new "listening" sound mechanism (#504)
This adds several refinements to the listening sound mechanism added by:
* Added a default sound file
* Allowing various ways to override "resource files" for customization
* Moved the sound configuration path from "confirm_ding" to
  "sounds" > "start_listening"
* Also added "sounds" > "end_listening" configuration for the future

This submission adds the new mycroft.util.resolve_resource_file(res_name)
method.  This method takes a name such as "snd/start_listening.wav" and
looks (in order):
* For an absolute path <res_name>
* For ~/.mycroft/<res_name>
* For /opt/mycroft/<res_name>
* For mycroft/res/<res_name> within the source package
2017-02-15 15:37:52 -06:00
tmajibon 647f90f836 Listen Confirmation Ding (#472)
* Listen confirmation

If enabled, will play a wave file to confirm that Mycroft is listening

* Listen confirmation ding config options

* Rename config option

* Update mycroft.conf

* Type: Rename config option

* Missing imports

Whoops, forgot them (was copying edits since I didn't have my dev environment set up)

* Removing unnecessary import functions
2017-02-15 15:37:52 -06:00
Augusto Monteiro fc71c9fbcc #487 - Updating synchronize configuration time 2017-02-01 23:40:13 -03:00
Augusto Monteiro 3e092554e3 #487 - Checking if location exists if doesn't say location not found dialog 2017-02-01 23:40:13 -03:00
Augusto Monteiro d1068ab3ac #487 - Adding default values for location on weather skill 2017-02-01 23:40:13 -03:00
Augusto Monteiro bed6175b7d #487 - Saving all location object in the configuration instead of only the name 2017-02-01 23:40:13 -03:00
Augusto Monteiro 540cd893c2 #487 - Integrating location microservice with mycroft core 2017-02-01 23:40:13 -03:00
penrods 6b7a514cdb Fix for issue #416
Type on mycroft.conf had set both min and max volume to 100.
2016-12-20 14:18:14 -06:00
Jonathan D'Orleans 2503fb1450 Issues 351 - Tartarus Integration
- Stopping enclosure in case of incompatibility with Mark 1
- Preventing stop to be called twice in enclosure and wifi processes
2016-12-17 17:57:58 -05:00
Augusto Monteiro 9f6ecda338 Issues 395 - Creating not.paired event 2016-12-17 10:27:01 -05:00
Augusto Monteiro 657123577d Issues 395 - Creating configuration skill to sync tartarus 2016-12-17 10:27:01 -05:00
Jonathan D'Orleans d80e83d575 Issues 350 - Formatting date and time 2016-12-17 10:27:01 -05:00
Jonathan D'Orleans 416191e598 Issues 350 - Synchronizing local and remote configuration 2016-12-17 10:27:01 -05:00
Jonathan D'Orleans f781e1db02 Issues 350 - Ensuring Listener has sampleRate and channels settings 2016-12-17 10:27:01 -05:00
Jonathan D'Orleans 558425b27d Issues 356 - Configuring wifi setup 2016-12-17 10:27:01 -05:00
Jonathan D'Orleans bf9d29ab67 Issues 356 - Adding STT multi credentials support and fixing proxy flag type 2016-12-17 10:16:29 -05:00
Jonathan D'Orleans 58ba7f2558 Issues 356 - Tartarus integration
- Adding proxy flag to be used in WA and OWM skill
- Integrating Tartarus login session
- Refactoring OWM to use Tartarus api and removing owm repackaging
- Fixing WA data response
2016-12-17 10:16:29 -05:00
Jonathan D'Orleans 4c1ba4e337 Issues 356 - Rebasing with master 2016-12-17 10:16:29 -05:00
Jonathan D'Orleans c71c054258 Issues 351 - Creating STT module and classes 2016-12-17 10:15:24 -05:00
Jonathan D'Orleans 6749852320 Issues 351 - Setting mycroft as default STT engine 2016-12-17 10:15:24 -05:00
Jonathan D'Orleans fe5b96e051 Issues 351 - Updating STT configuration 2016-12-17 10:15:24 -05:00
Jonathan D'Orleans 935e2699ba Issues 351 - Merging metrics with server configuration 2016-12-17 10:14:42 -05:00
Jonathan D'Orleans db9c12c122 Issues 351 - Merging service and client web socket configuration 2016-12-17 10:14:42 -05:00
Jonathan D'Orleans 9e982aa114 Issues 351 - Fixing Listener variables types 2016-12-17 10:12:10 -05:00
Jonathan D'Orleans 8af0acff76 Issues 351 - Renaming auto_update to update 2016-12-17 10:12:10 -05:00
Jonathan D'Orleans 3304474a22 Issues 354 - Pairing device with remote server
- Getting pairing code from server
- Treating Api response after request
- Simplifying enclosure mouth events control, upgrade and test process
2016-12-17 10:12:10 -05:00
Jonathan D'Orleans 3280d57b18 Issues 351 - Tartarus Integration
- Creating API to communicate with remote server
- Updating Identity data
- Adapting RemoteConfiguration load to new server
2016-12-17 10:11:15 -05:00
Jonathan D'Orleans 0ecb369397 Issues 351 - Splitting date and time format 2016-12-17 10:11:15 -05:00
Arron Atchison 1be93c2963 Set WiFi setup to false
... so it doesn't happen every time it is installed.
2016-09-22 10:22:47 -05:00
Arron Atchison c52f92f949 Feature/issues 356 (#362)
* working on a client for wi-fi setup

* added refactored code, ready to integrate

* client is running, now to handle the rest

* Staring touble in the face

* saved

* added config settings for wifi setup

* add an entry point for wifisetup to mycroft-base-setup.py

* moved SSID sorting into LinkUtils

* I'm now using the new SanAp class throughout

* Cleaning up code. All bash executions use bashThreadHandling class, mycroft's LOGGER

* removed legacy configuration parser

* funneling effort into cleanup

* fixed pep8, see if she builds

*  changed entry point for init script

*  changed import path to full path

* changed import path to full path for all files

* change ws port to 8080 for now

*  pep8 in wifi.py fixed

* fixed a few more pep8 errors

* strange import stuff goign on

* strange import stuff goign on

* renamed wifi.py to prevent import conflict

* freeze pip requirement versions

* changed import path in LinkUtils

* changed import path again

* trying to fix wifi import.. something is wrong

* consumer and producer queues now working

* Consumer & producer API's are coming alogn

* Refactor: developing an API

* add ap up/down procedure to api

*  looking googd

*  removed some older code, api is nearly written

* success

* Sending conection status to browser is now working

* Fixed pep8 errors again

* removed blank line from file

* fixed entrypoint name

* added shutdown and save upon connect; reducing verbosity

* now disabling and flushing network on connection fail

*  fix start.sh

* Corrected amount of arguments passed to wpa_cli_disable_network

* added iface to disable network

* added shutdown on success; restart wpa_supplicant upon ap up

* turning powersave mode off for wlan0

* removed wpa_cli flush

*  fix some file restore and exit issues

* re enabled flush networks on fail

* powersave mode was logged but not executed

* stop and start dhcpcd withh ap up

* changed hostapd channel; bring links up and down after successful pair

*  removed double quotes from the wpa_supplicant template

* Multiple files combined into util.py

* clean up some comments, added license headers

* what is up

* Ap mode event fires on enclosure event

* added logic for open network

* Changed empty passphrase from bool to empty string

* enclosure version bump

* changed ap down method in WiFiConsumer

* I'm now pulling all configuration from mycroft.ini and grabbing the mac address for ap ssid

* REFACTOR: removed util.py, as it was a bit messy

* REFACTOR: remove pep8 errors again, you would think that I would do this each time

* chagned some logic for open net

* open networks now function properly

* Reboot on success

* changed network save method

* Issues 356 - Setup wifi connection
- Removing tornado dependency
- Merging WS reader with Wifi process

* Issues 356 - Refactoring
- Using PyRIC and WIFI libs

* Issues 356 - Refactoring bash command

* Issues 356 - Refactoring FileUtils

* Issues 356 - WebClient refactoring

* Issues 356 - create password and loading pages

* Issues 356 - connecting

* Issues 356 - parsing data on ws

* Issues 356 - removing fake function on wifisetup

* Issues 356 - connecting on public network

* Issues 356 - show loading page on backbutton

* Issues 356 - sort networks by quality

* Issues 356 - Fixing message type variable

* Issues 356 - Adding more logs to wifi setup

* Issues 356 - network sort by quality

* Issues 356 - Fixing cell ssid param and using correct interface for scheme

* Issues 356 - Ensuring to save scheme before activating

* Issues 356 - Logging bash command

* Issues 356 - Refactoring wifi to P2P

* Issues 356 - Simplifying cli usage and getting results from wpa_cli

* Issues 356 - Parsing ssid and pass

* Issues 356 - Saving wpa configuration

* Issues 356 - Removing postfix in favor of wpa_supplicant config

* Issues 356 - Setting host to 0.0.0.0

* Issues 356 - Fixing parsing for wpa_cli output

* Issues 356 - Ensuring to save wpa config after connected

* Issues 356 - Setting interface for save config

* Issues 356 - Ensuring interfaces in all wpa cli

* Issues 356 - Creating, staring and stopping wifi web server

* Issues 356 - Adding logs to web server

* Issues 356 - create succes page and merge connect page on list page

* Issues 356 - Config.js server addr

* Issues 356 - Adding wifi status and connected control

* Issues 356 - lock margin top wifisetup

* Issues 356 - waiting connection

* Issues 356 - Moving dnsmasq backup logic to main.py

* Issues 356 - Cleaning imports

* Changed the base manifest to reflect new file locations

* fixed indent for pep8

* changed the mycroft-base-setup.py to reference the proper entry point for wifisetup

*  Enclosure version bump

* Added the wifi index.html to the base manifest, as it doesn't seem to catch it recursively

* Issues 356 - Updating first setup flag after running the first time

* Issues 356 - Ensure to stop server only if it exists

* Issues 356 - Ensuring to set first setup to false when connected

* Issues 356 - Closing web server after shutdown

* Issues 356 - Running web server as daemon

* Issues 356 - Creating server connection only once at initialization

* Issues 356 - Disconnecting network before connecting and fixing get status

* Issues 356 - Starting web server only once after AP is up

* Issues 356 - Returning empty status if not able to parse

* Issues 356 - Creating web server loop control

* Issues 356 - Performing final request call in order to unblock server

* Issues 356 - Adding GET method to server request

* Issues 356 - Requesting web server to stop on main thread
2016-09-19 12:28:58 -05:00
Ethan Ward 27bc4d255e Merge branch 'master' into feature/issues-303 2016-08-16 13:57:46 -05:00