MMM-AssistantMk2

citizendevpi

Updating c379637…3538008
error: Your local changes to the following files would be overwritten by merge:
MMM-AssistantMk2.js
Please commit your changes or stash them before you merge.
Aborting
how do i get past this?

A Former User

@citizendevpi
You may have modified the source by yourself.
Read the answer of https://stackoverflow.com/questions/14318234/how-do-i-ignore-an-error-on-git-pull-about-my-local-changes-would-be-overwritt
Or you just remove that file than retry.

citizendevpi

@sean thank you , yes i did set some preferences like my location and 8 sec response time which i reset after update thank you for your help(again)

A Former User

@citizendevpi
Oh, You don’t need to modify source itself. the everything you had to adjust for your environment should be done in config.js, not MMM-AssistantMk2.js. If you need more configuration options, tell me.

Arkitct

@Sean this is awesome module, thanks! I have been successful in getting it installed and working with Hotword - responds and provides answers including integrating with calendar, etc. (can make appointment).

But when I attempt to proceed with the instructions for “Register your Mirror as Google Assistant related device.” I am not sure what input to provide in the deviceInstance.json file for the YOUR_MODEL_ID. I have tried various permutations of what I think it is, but no luck.

The instructions indicate it comes from the Google Project Console. Is this the Google Cloud Platform? There is a Project Name and Project ID listed on the Cloud Platform; are one of these the YOUR_MODEL_ID?

Thanks!

A Former User

@arkitct
You’ve already made deviceModelId when you mad your credentials.json on first installation. (https://github.com/eouia/MMM-AssistantMk2/blob/master/INSTALL.md#get-auth-and-credentials-to-make-profile)
If you have forgotten your deviceModelId,
Go to Google Action console homepage(https://console.actions.google.com) Then find your project and the menu - Device Registration

Of course, there are other methods to get Model Id (If you have a plan to get deviceInstanceId also, you need to use CLI. - See https://developers.google.com/assistant/sdk/reference/device-registration/register-device-manual

A Former User

@arkitct
But… many features are restricted in this SDK, So I think you don’t need to register Mirror to your Google Home network. Even though your mirror registered on your phone looks very nice, but that’s all. :D

Jmh474

Sorry this is my first post, are there any guides for helping me install the MMM-assistantMK2 I’m a total beginner With the raspberry pi any help would be much appreciated

Cr4z33

@jmh474 Follow the link in the first post that bring you to GitHub.
Once there follow CAREFULLY the step-by-step installation & configuration.

Only then if there’s still anything not clear or not working ask here. ;)

Jmh474

@cr4z33 OK thanks mate