Skip to content

Commit 9e5ccc1

Browse files
Update template files
1 parent ac93a4c commit 9e5ccc1

File tree

2 files changed

+94
-22
lines changed

2 files changed

+94
-22
lines changed

.gitignore

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919
## BOM files
2020
*bom*
2121

22+
<<<<<<< Updated upstream
23+
=======
2224
## VSCode directories
2325
.vscode
2426

27+
>>>>>>> Stashed changes
2528
#################
2629
## Eclipse
2730
#################
@@ -57,6 +60,11 @@ local.properties
5760
## Eagle
5861
#############
5962

63+
<<<<<<< Updated upstream
64+
# Ignore the board and schematic backup files
65+
*.b#?
66+
*.s#?
67+
=======
6068
# Ignore the board and schematic backup files and lock files
6169
*.b#?
6270
*.s#?
@@ -72,6 +80,19 @@ local.properties
7280
*.kicad_pcb-bak
7381
*.net
7482
*.gbr
83+
*.drl
84+
85+
#KiCad Backup files
86+
*.kicad_prl
87+
fp-info-cache
88+
~*.lck
89+
*-bak
90+
*-backups
91+
*-cache*
92+
*-bak*
93+
_autosave*
94+
\#auto_saved_files\#
95+
>>>>>>> Stashed changes
7596

7697

7798
#################
@@ -160,23 +181,75 @@ Backup*/
160181
UpgradeLog*.XML
161182

162183

184+
<<<<<<< Updated upstream
185+
=======
186+
# =========================
187+
# Operating System Files
188+
# =========================
189+
190+
>>>>>>> Stashed changes
163191
############
164192
## Windows
165193
############
166194

167195
# Windows image file caches
168196
Thumbs.db
197+
<<<<<<< Updated upstream
198+
=======
199+
ehthumbs.db
200+
>>>>>>> Stashed changes
169201

170202
# Folder config file
171203
Desktop.ini
172204

173205

206+
#############
207+
## Python
208+
#############
209+
210+
<<<<<<< Updated upstream
211+
*.py[co]
212+
213+
# Packages
214+
*.egg
215+
*.egg-info
216+
dist
217+
build
218+
eggs
219+
parts
220+
bin
221+
var
222+
sdist
223+
develop-eggs
224+
.installed.cfg
225+
=======
174226
#############
175227
## Mac OS
176228
#############
229+
>>>>>>> Stashed changes
230+
231+
# Installer logs
232+
pip-log.txt
233+
234+
# Unit test / coverage reports
235+
.coverage
236+
.tox
177237

238+
#Translations
239+
*.mo
240+
241+
#Mr Developer
242+
.mr.developer.cfg
243+
244+
# Mac crap
178245
.DS_Store
246+
<<<<<<< Updated upstream
247+
=======
179248

249+
# OSX
250+
# ===========
251+
.AppleDouble
252+
.LSOverride
180253

181254
#############
182255
## Linux
@@ -205,15 +278,26 @@ sdist
205278
develop-eggs
206279
.installed.cfg
207280

281+
# Icon must ends with two \r.
282+
Icon
283+
208284
# Installer logs
209285
pip-log.txt
210286

211287
# Unit test / coverage reports
212288
.coverage
213289
.tox
214290

291+
# Thumbnails
292+
._*
293+
215294
#Translations
216295
*.mo
217296

297+
# Files that might appear on external disk
298+
.Spotlight-V100
299+
.Trashes
300+
218301
#Mr Developer
219302
.mr.developer.cfg
303+
>>>>>>> Stashed changes

LICENSE.md

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ Note: This is a human-readable summary of (and not a substitute for) the [licens
1313
You are free to:
1414

1515
Share — copy and redistribute the material in any medium or format
16-
Adapt — remix, transform, and build upon the material
17-
for any purpose, even commercially.
16+
Adapt — remix, transform, and build upon the material for any purpose, even commercially.
1817
The licensor cannot revoke these freedoms as long as you follow the license terms.
1918
Under the following terms:
2019

2120
Attribution — You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
2221
ShareAlike — If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
2322
No additional restrictions — You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits.
23+
2424
Notices:
2525

2626
You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
@@ -30,26 +30,14 @@ No warranties are given. The license may not give you all of the permissions nec
3030
Code
3131
--------
3232

33-
**SparkFun code, firmware, and software is released under the [MIT License](http://opensource.org/licenses/MIT).**
33+
**SparkFun code, firmware, and software are released under the [MIT License](http://opensource.org/licenses/MIT).**
3434

3535
The MIT License (MIT)
3636

37-
Copyright (c) 2016 SparkFun Electronics
38-
39-
Permission is hereby granted, free of charge, to any person obtaining a copy
40-
of this software and associated documentation files (the "Software"), to deal
41-
in the Software without restriction, including without limitation the rights
42-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
43-
copies of the Software, and to permit persons to whom the Software is
44-
furnished to do so, subject to the following conditions:
45-
46-
The above copyright notice and this permission notice shall be included in all
47-
copies or substantial portions of the Software.
48-
49-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
50-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
51-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
52-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
53-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
54-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
55-
SOFTWARE.
37+
Copyright (c) 2025 SparkFun Electronics
38+
39+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
40+
41+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
42+
43+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)