A minimal table to compare the Espressif's MCU families.
| ESP8266 | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C6 | |
|---|---|---|---|---|---|---|
| Announcement Date | 2014, August | 2016, September | 2019, September | 2020, December |
Install Meld from their webpage http://meldmerge.org/
I had to tell git where it was:
git config --global merge.tool meld
git config --global diff.tool meld
If using windows 8 and 10 use the following
git config --global mergetool.meld.path "/c/Program Files (x86)/meld/meld.exe"
git config --global difftool.meld.path "/c/Program Files (x86)/meld/meld.exe"
| #!/bin/bash | |
| # | |
| # Requires openresolv. | |
| # | |
| # This file goes into | |
| # | |
| # /usr/share/openvpn/update-resolv-conf | |
| # | |
| # And this goes into your OpenVPN conf: | |
| # |
| [ | |
| { "keys": [":",":"], "command": "insert_snippet", "args": {"contents": "∷"}, "context": | |
| [ | |
| { "key": "selector", "operator": "equal", "operand": "source.haskell" } | |
| ] | |
| }, | |
| { "keys": ["-",">"], "command": "insert_snippet", "args": {"contents": "→"}, "context": | |
| [ | |
| { "key": "selector", "operator": "equal", "operand": "source.haskell" } | |
| ] |