7
mirror of https://github.com/janelia-kicad/mouse_joystick_controller.git synced 2025-04-06 09:45:09 +00:00

Update metadata

This commit is contained in:
Peter Polidoro 2024-08-05 14:09:50 -04:00
parent 7270054f47
commit f9121bc137
13 changed files with 188 additions and 62 deletions

View File

@ -220,6 +220,7 @@
},
"system": {
"file_history": [
"/home/polidorop/Repositories/kicad/mouse_joystick_controller/mouse_joystick_controller/mouse_joystick_controller.kicad_sch",
""
],
"first_run_shown": false,

View File

@ -57,13 +57,15 @@
},
"system": {
"check_for_updates": 1,
"file_history": [],
"file_history": [
"/home/polidorop/Repositories/kicad/mouse_joystick_controller/mouse_joystick_controller/mouse_joystick_controller.kicad_pro"
],
"first_run_shown": false,
"last_imperial_units": 0,
"last_metric_units": 1,
"max_undo_items": 0,
"open_projects": [
""
"/home/polidorop/Repositories/kicad/mouse_joystick_controller/mouse_joystick_controller/mouse_joystick_controller.kicad_pro"
],
"units": 1
},
@ -111,10 +113,10 @@
"user_grid_y": "10 mil"
},
"maximized": false,
"mru_path": "",
"perspective": "layout2|name=MainToolbar;caption=;state=139644;dir=4;layer=2;row=0;pos=0;prop=100000;bestw=34;besth=227;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=ProjectTree;caption=Project Files;state=1532;dir=4;layer=1;row=0;pos=0;prop=100000;bestw=250;besth=-1;minw=250;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=Launcher;caption=Editors;state=508;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=621;besth=560;minw=621;minh=560;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(4,2,0)=34|dock_size(4,1,0)=250|dock_size(5,0,0)=621|",
"pos_x": 474,
"pos_y": 227,
"mru_path": "/home/polidorop/Repositories/kicad/mouse_joystick_controller/mouse_joystick_controller/",
"perspective": "layout2|name=MainToolbar;caption=;state=139644;dir=4;layer=2;row=0;pos=0;prop=100000;bestw=34;besth=227;minw=-1;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=ProjectTree;caption=Project Files;state=1532;dir=4;layer=1;row=0;pos=0;prop=100000;bestw=250;besth=-1;minw=250;minh=-1;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|name=Launcher;caption=Editors;state=508;dir=5;layer=0;row=0;pos=0;prop=100000;bestw=583;besth=560;minw=583;minh=560;maxw=-1;maxh=-1;floatx=-1;floaty=-1;floatw=-1;floath=-1|dock_size(4,2,0)=34|dock_size(4,1,0)=250|dock_size(5,0,0)=583|",
"pos_x": 688,
"pos_y": 298,
"size_x": 1024,
"size_y": 582,
"zoom_factors": []

View File

@ -68,6 +68,6 @@
"pdf_viewer_name": "",
"text_editor": "",
"use_system_pdf_viewer": true,
"working_dir": "/home/polidorop/Repositories/kicad/wingbeat_detector"
"working_dir": "/home/polidorop/Repositories/kicad/mouse_joystick_controller"
}
}

View File

@ -18,6 +18,10 @@ metadata-edits:
metadata:
$(GUIX-CONTAINER) -- sh -c "emacs --batch -Q -l $(MAKEFILE_DIR)/emacs/init.el --eval '(process-org \"$(MAKEFILE_DIR)/metadata.org\")'"
.PHONY: guix-shell
guix-shell:
$(GUIX-SHELL)
.PHONY: guix-container
guix-container:
$(GUIX-CONTAINER)
@ -28,10 +32,18 @@ ipython-shell:
.PHONY: kicad-edits
kicad-edits:
# $(GUIX-CONTAINER) -- kicad
# $(GUIX-CONTAINER) -S /home/$(USER)/.config/kicad/7.0=$(MAKEFILE_DIR)/.config/kicad/7.0 -- kicad
# $(GUIX-SHELL) -- kicad
KICAD_CONFIG_HOME=$(KICAD_CONFIG_HOME) $(GUIX-SHELL) -E "^KICAD_CONFIG_HOME" -- kicad
.PHONY: freecad-edits
freecad-edits:
$(GUIX-SHELL) -- FreeCAD
.PHONY: filter-edits
filter-edits:
$(GUIX-SHELL) -- sh -c "dosbox documentation/filter/FILTER42.exe"
.PHONY: skip-worktree-config
skip-worktree-config:
git ls-files -z .metadata/.config/ | xargs -0 git update-index --skip-worktree
@ -43,3 +55,16 @@ no-skip-worktree-config:
.PHONY: ls-files-config
ls-files-config:
git ls-files .metadata/.config/ -v
.PHONY: cropped-svg
cropped-svg:
# $(GUIX-SHELL) -- inkscape -D --export-overwrite --export-plain-svg documentation/pcb/*.svg
inkscape -D --export-overwrite --export-plain-svg documentation/pcb/*.svg && inkscape -D --export-overwrite --export-plain-svg documentation/schematic/*.svg
.PHONY: trimmed-images
trimmed-images:
mogrify -trim documentation/pcb/*.png
.PHONY: zipped-gerbers
zipped-gerbers:
$(GUIX-SHELL) -- sh -c "rm -f documentation/gerbers/*.zip && zip -j -r documentation/gerbers/mouse_joystick_controller-.zip documentation/gerbers"

View File

@ -11,7 +11,8 @@
(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
'((org . t)
(emacs-lisp . t)
(lisp . t)
(shell . t)
(python . t)
@ -40,6 +41,20 @@
(with-current-buffer org-file-buffer
(org-open-file (org-gfm-export-to-markdown)))))
(defun export-org-to-pdf (org-file)
"Export org file to pdf file"
(unless (string= "org" (file-name-extension org-file))
(error "INFILE must be an org file."))
(let ((org-file-buffer (find-file-noselect org-file)))
(with-current-buffer org-file-buffer
(org-open-file (org-latex-export-to-pdf)))))
;; (defun process-org (org-file)
;; "Tangle and export org file"
;; (progn (tangle-org org-file)
;; (export-org-to-markdown org-file)
;; (export-org-to-pdf org-file)))
(defun process-org (org-file)
"Tangle and export org file"
(progn (tangle-org org-file)

View File

@ -1,19 +1,19 @@
;; This file is generated automatically from metadata
;; File edits may be overwritten!
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"7a45f7b9e1b34912ee087daf4014aa4f67b11bf0")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
(channel
(name 'guix-janelia)
(url "https://github.com/guix-janelia/guix-janelia.git")
(branch "main")
(commit
"08fe0b2ecb68d9e17dfa4802c79935ea6339d6d1")))
"6d2cb9cdd679f90c1a4fb02af02d2d1cfe2fcca6"))
(channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"3b5533f9bdac4a929c3d93e628ee2ae279013685")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))

View File

@ -17,4 +17,17 @@
"inkscape"
"python"
"python-ipython"
"python-kicad-bom"))
"python-kicad-bom"
"dosbox"
"freecad"
"font-orbitron"
"zip"
"pandoc"
"texlive-scheme-basic"
"texlive-adjustbox"
"texlive-booktabs"
"texlive-siunitx"
"texlive-graphics"
"texlive-geometry"
"texlive-ulem"
"libxslt"))

View File

@ -46,7 +46,7 @@ https://www.pololu.com/product/2267
#+NAME: kicad-version
#+BEGIN_SRC text :exports none :noweb yes
7.0.10
7.0.11
#+END_SRC
* General and Derived Variables :noexport:
@ -324,44 +324,50 @@ MiSUMi D2F-01FL
** Edit metadata.org
#+BEGIN_EXAMPLE
make -f .metadata/Makefile metadata-edits
make metadata-edits
#+END_EXAMPLE
** Tangle metadata.org
#+BEGIN_EXAMPLE
make -f .metadata/Makefile metadata
make metadata
#+END_EXAMPLE
** Edit project
#+BEGIN_EXAMPLE
make -f .metadata/Makefile kicad-edits
make kicad-edits
exit
#+END_EXAMPLE
* Tangled Files :noexport:
#+BEGIN_SRC org :tangle ../README.org :exports none :noweb yes
# This file is generated automatically from metadata
# File edits may be overwritten!
<<repository-info>>
#+END_SRC
#+BEGIN_SRC scheme :tangle guix/channels.scm :exports none :noweb yes
;; This file is generated automatically from metadata
;; File edits may be overwritten!
(list (channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"7a45f7b9e1b34912ee087daf4014aa4f67b11bf0")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))
(channel
(name 'guix-janelia)
(url "https://github.com/guix-janelia/guix-janelia.git")
(branch "main")
(commit
"08fe0b2ecb68d9e17dfa4802c79935ea6339d6d1")))
"6d2cb9cdd679f90c1a4fb02af02d2d1cfe2fcca6"))
(channel
(name 'guix)
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"3b5533f9bdac4a929c3d93e628ee2ae279013685")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
(openpgp-fingerprint
"BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))
#+END_SRC
#+BEGIN_SRC scheme :tangle guix/manifest.scm :exports none :noweb yes
@ -384,7 +390,26 @@ exit
"inkscape"
"python"
"python-ipython"
"python-kicad-bom"))
"python-kicad-bom"
"dosbox"
"freecad"
"font-orbitron"
"zip"
"pandoc"
"texlive-scheme-basic"
"texlive-adjustbox"
"texlive-booktabs"
"texlive-siunitx"
"texlive-graphics"
"texlive-geometry"
"texlive-ulem"
"libxslt"))
#+END_SRC
#+BEGIN_SRC text :tangle ../Makefile :exports none :noweb yes
# This file is generated automatically from .metadata.org
# File edits may be overwritten!
include .metadata/Makefile
#+END_SRC
#+BEGIN_SRC text :tangle Makefile :exports none :noweb yes
@ -408,6 +433,10 @@ metadata-edits:
metadata:
$(GUIX-CONTAINER) -- sh -c "emacs --batch -Q -l $(MAKEFILE_DIR)/emacs/init.el --eval '(process-org \"$(MAKEFILE_DIR)/metadata.org\")'"
.PHONY: guix-shell
guix-shell:
$(GUIX-SHELL)
.PHONY: guix-container
guix-container:
$(GUIX-CONTAINER)
@ -418,10 +447,18 @@ ipython-shell:
.PHONY: kicad-edits
kicad-edits:
# $(GUIX-CONTAINER) -- kicad
# $(GUIX-CONTAINER) -S /home/$(USER)/.config/kicad/7.0=$(MAKEFILE_DIR)/.config/kicad/7.0 -- kicad
# $(GUIX-SHELL) -- kicad
KICAD_CONFIG_HOME=$(KICAD_CONFIG_HOME) $(GUIX-SHELL) -E "^KICAD_CONFIG_HOME" -- kicad
.PHONY: freecad-edits
freecad-edits:
$(GUIX-SHELL) -- FreeCAD
.PHONY: filter-edits
filter-edits:
$(GUIX-SHELL) -- sh -c "dosbox documentation/filter/FILTER42.exe"
.PHONY: skip-worktree-config
skip-worktree-config:
git ls-files -z .metadata/.config/ | xargs -0 git update-index --skip-worktree
@ -433,6 +470,19 @@ no-skip-worktree-config:
.PHONY: ls-files-config
ls-files-config:
git ls-files .metadata/.config/ -v
.PHONY: cropped-svg
cropped-svg:
# $(GUIX-SHELL) -- inkscape -D --export-overwrite --export-plain-svg documentation/pcb/*.svg
inkscape -D --export-overwrite --export-plain-svg documentation/pcb/*.svg && inkscape -D --export-overwrite --export-plain-svg documentation/schematic/*.svg
.PHONY: trimmed-images
trimmed-images:
mogrify -trim documentation/pcb/*.png
.PHONY: zipped-gerbers
zipped-gerbers:
$(GUIX-SHELL) -- sh -c "rm -f documentation/gerbers/*.zip && zip -j -r documentation/gerbers/<<project-name>>-<<pcb-version>>.zip documentation/gerbers"
#+END_SRC
#+BEGIN_SRC scheme :tangle emacs/init.el :exports none :noweb yes
@ -449,7 +499,8 @@ ls-files-config:
(org-babel-do-load-languages
'org-babel-load-languages
'((emacs-lisp . t)
'((org . t)
(emacs-lisp . t)
(lisp . t)
(shell . t)
(python . t)
@ -478,6 +529,20 @@ ls-files-config:
(with-current-buffer org-file-buffer
(org-open-file (org-gfm-export-to-markdown)))))
(defun export-org-to-pdf (org-file)
"Export org file to pdf file"
(unless (string= "org" (file-name-extension org-file))
(error "INFILE must be an org file."))
(let ((org-file-buffer (find-file-noselect org-file)))
(with-current-buffer org-file-buffer
(org-open-file (org-latex-export-to-pdf)))))
;; (defun process-org (org-file)
;; "Tangle and export org file"
;; (progn (tangle-org org-file)
;; (export-org-to-markdown org-file)
;; (export-org-to-pdf org-file)))
(defun process-org (org-file)
"Tangle and export org file"
(progn (tangle-org org-file)

View File

@ -1,6 +1,6 @@
Janelia Open-Source Software (3-clause BSD License)
Copyright 2023 Howard Hughes Medical Institute
Copyright 2024 Howard Hughes Medical Institute
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

3
Makefile Normal file
View File

@ -0,0 +1,3 @@
# This file is generated automatically from .metadata.org
# File edits may be overwritten!
include .metadata/Makefile

View File

@ -1,16 +1,16 @@
- [About](#orga41f441)
- [Images](#org27b9c2d)
- [Schematic](#org0fa77e9)
- [PCB](#org050fcea)
- [Bill of Materials](#orga8858a8)
- [Notes](#orgce7e649)
- [Development](#org94b695f)
- [About](#orgbfb5ebf)
- [Images](#org912eb98)
- [Schematic](#org0782f5f)
- [PCB](#org14a825d)
- [Bill of Materials](#orgcd1d3bb)
- [Notes](#org100e3b2)
- [Development](#orga0ec191)
<!-- This file is generated automatically from metadata -->
<!-- File edits may be overwritten! -->
<a id="orga41f441"></a>
<a id="orgbfb5ebf"></a>
# About
@ -18,8 +18,8 @@
- Project Name: mouse_joystick_controller
- Description: Janelia mouse joystick controller for the Dudman lab experiments.
- Version: 2.0
- Kicad Version: 7.0.10
- Release Date: 2024-02-02
- Kicad Version: 7.0.11
- Release Date: 2024-08-05
- Creation Date: 2017-08-14
- License: BSD-3-Clause
- URL: https://github.com/janelia-kicad/mouse_joystick_controller
@ -36,22 +36,22 @@
```
<a id="org27b9c2d"></a>
<a id="org912eb98"></a>
# Images
<a id="org0fa77e9"></a>
<a id="org0782f5f"></a>
# Schematic
<a id="org050fcea"></a>
<a id="org14a825d"></a>
# PCB
<a id="orga8858a8"></a>
<a id="orgcd1d3bb"></a>
# Bill of Materials
@ -69,7 +69,7 @@
|---- |----------- |------------------------ |------------ |-------- |
<a id="orgce7e649"></a>
<a id="org100e3b2"></a>
# Notes
@ -119,7 +119,7 @@ MiSUMi D2F-01FL
- Normally open or normally closed
<a id="org94b695f"></a>
<a id="orga0ec191"></a>
# Development
@ -131,15 +131,15 @@ MiSUMi D2F-01FL
## Edit metadata.org
make -f .metadata/Makefile metadata-edits
make metadata-edits
## Tangle metadata.org
make -f .metadata/Makefile metadata
make metadata
## Edit project
make -f .metadata/Makefile kicad-edits
make kicad-edits
exit

2
README.org Normal file
View File

@ -0,0 +1,2 @@
# This file is generated automatically from metadata
# File edits may be overwritten!

View File

@ -4,7 +4,7 @@
"license": "https://spdx.org/licenses/BSD-3-Clause",
"codeRepository": "https://github.com/janelia-kicad/mouse_joystick_controller",
"dateCreated": "2017-08-14",
"dateModified": "2023-10-12",
"dateModified": "2024-08-05",
"name": "mouse_joystick_controller",
"version": "2.0",
"description": "Janelia mouse joystick controller for the Dudman lab experiments.",