You can get really good official docs here now https://github.com/adafruit/circuitpython/tree/main/ports/espressif
Below are the old notes (19 Oct 2020)
#!/bin/bash | |
if [ ! -f /opt/homebrew/bin/brew ]; then | |
echo "Install ARM homebrew to /opt/homebrew" | |
exit | |
fi | |
message() { | |
TIME=$(date "+%Y-%m-%dT%H:%M:%S") | |
MSG=$@ | |
echo "$TIME | $MSG" |
You can get really good official docs here now https://github.com/adafruit/circuitpython/tree/main/ports/espressif
Below are the old notes (19 Oct 2020)
;[program:theprogramname] | |
;command=/bin/cat ; the program (relative uses PATH, can take args) | |
;process_name=%(program_name)s ; process_name expr (default %(program_name)s) | |
;numprocs=1 ; number of processes copies to start (def 1) | |
;directory=/tmp ; directory to cwd to before exec (def no cwd) | |
;umask=022 ; umask for process (default None) | |
;priority=999 ; the relative start priority (default 999) | |
;autostart=true ; start at supervisord start (default: true) | |
;autorestart=true ; retstart at unexpected quit (default: true) | |
;startsecs=10 ; number of secs prog must stay running (def. 1) |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c
and [c
.
Choose which version you want to keep with :diffget //2
or :diffget //3
(the //2
and //3
are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)