Gitpull daily

 To update new github everyday (for vial and qmkfirmware to do accordingly)

git pull

 

To clean previous files when merging/.deleting

git stash

git pull 

git stash pop 

cygwin_exception::open_stackdumpfile: Dumping stack trace to make.exe.stackdump

new problem exist

to solve it, delete the keyboards folder that you are not using. for example, my case delete the number folder before abc. problem solves. 

 

this could be a temporary problem but it works

// Advice from solartempest

1. git fetch upstream master
2. [12:09 AM]

   git pull upstream master

Error

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

// Try to check from https://stackoverflow.com/questions/26376832/why-does-git-say-pull-is-not-possible-because-you-have-unmerged-files

            git add .

            git commit

Error Stuck at BOT mode

 

// Try git fetch upstream master, then git pull upstream master

hence From https://github.com/qmk/qmk_firmware

// then again

            git pull

// cant pull

            git stash

            git pull

// updating

still not working

 

 

Submodule lib/chibios is not up to date!

 

make git-submodule

synchronizing

.... not working

//rework

git fetch upstream master git pull upstream master end up: error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. so i git status all the changes appeared, and qmk msys advises me to Untracked files: (use "git add <file>..." to include in what will be committed) lib/ugfx/

 Changes to be committed:
(use "git restore --staged <file>..." to unstage)
deleted: keyboards/0_sixty/0_sixty.c

 .....

 Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: keyboards/0_sixty/info.json

 Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
deleted: keyboards/0_sixty/underglow/config.h

 Untracked files:
(use "git add <file>..." to include in what will be committed)
lib/ugfx/


It took 3.88 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').

 

 

 

 

 

 

 

Setting up VIAL environment

1. Genereate ssh key

ssh-keygen

2. Read ssh key

cat .ssh/id_rsa.pub

3. Copy the ssh key to github setting>ssh and GPG keys

4. Clone vial qmk

git clone git@github.com:vial-kb/vial-qmk.git

5. Clone the submodules

cd vial-qmk/ && make git-submodule && cd ..

6. Setup qmk with vial as homefolder

qmk setup -H ./vial-qmk/

7. Compile default keymap

qmk compile -kb PS17 -km via

8. Generate vial uid

python3 util/vial_generate_keyboard_uid.py

9. Compile via and vial keymap

qmk compile -kb PS17 -km via

From VIA to VIAL (Torn as example)

 1.

 

keymaps/via/rules.mk

VIAL_ENABLE = yes
VIAL_INSECURE = yes
VIAL_ENCODERS_ENABLE = yes

      

2. via.json change to vial.json, store in keymaps/via/

 

3. vial-qmk run 

 python3 util/vial_generate_keyboard_uid.py

 

4. copy the id add to define under config.h

 #define VIAL_KEYBOARD_UID

 

 

//problem occured when trying o get VIAL_KEYBOARD_UID

credit to @CheahAlec

 

Some notes here which shows setup home at 

setup.home=C:/Users/chino/qmk_firmware/vial-qm

 qmk config -a

 

Check on pwd to show the default location 

/c/Users/chino

pwd

 

Cd here to allow path from here

cd qmk_firmware/vial-qmk 

Or all from here

cd vial_qmk

Successfully run

python3 util/vial_generate_keyboard_uid.py

#define VIAL_KEYBOARD_UID {0x4C, 0x7A, 0x2C, 0x5F, 0x76, 0x33, 0x06, 0x74}

All fine, build hex file located at

c:\users\chino\vial-qmk