mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-30 10:27:49 +00:00
129c33dddf
- Removed the global (defvar date) and (defvar entry) so as not to conflict with function arguments of that name. Instead I added such `defvar`s in the body of each of the functions where it seemed needed. - I added some FIXMEs for some issues I found along the way. - Added an `org-dlet` macro, just like I had done for `calendar-dlet`, but I also use `defvar` "manually" at some places, when splitting an existing `let` into a mix of `let`s and `dlet`s seemed too much trouble. - Removed uses of `org-let and `org-let2` not only because I consider them offensive to my sense of aesthetics but also because they're basically incompatible with lexical scoping. I replaced them with uses of `cl-progv` which are a bit more verbose. Maybe we should define some `org-progv` macro on top of `cl-progv` to make the code less verbose, but I didn't do that because I like the fact that the current code makes uses of `eval` a bit more obvious (since these behave differently with lexical scoping than with lexical binding, it seemed worthwhile). - Removed the use of `eval` in `org-store-agenda-views` which was only placed there in order to use a macro before it's defined (it would have been simpler/cleaner to just move that functions *after* the macro, but with the new code the problem doesn't occur any more anyway). - Replaced a few `(lambda...) with actual closures. Detailed changes follow: (date, entry): Don't declare as being globally dynbound. (org-agenda-format-date-aligned): Remove unused var `weekyear`. (org-agenda-mode): `run-mode-hooks` is always available nowadays. (org-agenda-undo): Remove unused var `last-undo-buffer`. (org-agenda): Rename arg to `keys` and then dyn-bind it as `org-keys`. Remove unused vars `buf` and `key`. (org-agenda): Use `pcase` and `cl-progv` instead of `org-let`. (org-let, org-let2): Mark as obsolete. (org-agenda-run-series): Use `cl-progv` instead of `org-let` and `org-let2`. (org-agenda-run-series): New function. (org--batch-agenda): New function extracted from `org-batch-agenda`. (org-batch-agenda): Use it. (org--batch-agenda-csv): New function extracted from `org-batch-agenda-csv`. (org-batch-agenda-csv): Use it. (org--batch-store-agenda-views): New function, extracted from `org-batch-store-agenda-views`. (org-store-agenda-views, org-batch-store-agenda-views): Use it. (org--batch-store-agenda-views): Use `cl-progv` instead of `org-eval-in-environment`. (org-agenda-write): Use `cl-progv` instead of `org-let`. Use `with-current-buffer`. (org-agenda-filter-any): Use `cl-some` instead of `eval`. (org-agenda-list): Remove unused var `e`. (org-search-view): η-reduce. (crm-separator): Declare var. (org-agenda-skip-if): Remove unused var `beg`. (org-agenda-list-stuck-projects): Use a closure rather than `(lambda..). (diary-modify-entry-list-string-function, diary-file-name-prefix) (diary-display-function): Declare vars. (org-diary): Declare `date` and `entry` as dynbound. (org-agenda-get-day-entries): Use `org-dlet`. (org-agenda-get-timestamps, org-agenda-get-progress) (org-agenda-get-deadlines, org-agenda-get-scheduled, org-agenda-get-blocks): Declare `date` as dynbound. (org-agenda-get-sexps, org-class): Declare `date` and `entry` as dynbound. (org-agenda-format-item): Declare the vars mentioned in `org-compile-prefix-format` as dyn-bound. Also binding `extra`, suggested by Kyle Meyer <kyle@kyleam.com>. (org-compile-prefix-format): Remove unused var `e`. Use `member` rather than or+equal. (org-set-sorting-strategy): Minor simplification. (org-entries-lessp): Use `org-dlet`. (org-agenda-redo): Declare var `org-agenda-tag-filter-while-redo`. (org-agenda-redo): Use `cl-progv` rather than `org-let`. (org-agenda-filter): Remove unused var `rpl-fn`. Use `org-pushnew-to-end` to replace `add-to-list` on lexical var. (org-agenda-filter-by-tag): Remove unused var `n`. (org-agenda-filter-apply): Use `org-dlet`. (org-agenda-compute-starting-span): Remove unused var `dg`. (org-agenda-forward-block): Remove unused var `pos`. (org-archive-from-agenda): Declare var. (org-agenda-refile): Remove unused var `pos`. (org-agenda-headline-snapshot-before-repeat): Declare var. (org-agenda-todo): Remove redundant use of `bound-and-true-p`. (org-agenda-add-note): Remove unused var `hdmarker` and unused `arg`. (org-agenda-change-all-lines): Remove unused var `pl`. (org-agenda-priority): Remove unused var `marker`. (org-agenda-set-effort): Remove unused var `newhead`. (org-agenda-schedule): Remove unused var `type`. (org-agenda-clock-cancel): Remove unused `arg`. (org-agenda-execute-calendar-command): Use `org-dlet`. (org-agenda-bulk-action): Use closures instead of `(lambda ...). (org-agenda-show-the-flagging-note): Remove unused vars `heading` and `newhead`. (org-agenda-remove-flag): Avoid `setq`. * testing/org-test.el (org--compile-when): New macro. (org-test-jump): Use it so compilation doesn't fail or generate broken code when `jump` is not available. * testing/lisp/test-org-src.el: * testing/lisp/test-org-attach.el: * testing/lisp/test-org-agenda.el: * testing/lisp/test-ob-java.el: Pass explicit filename to `require` so as not to rely on ".../testing" being in `load-path` during compilation. * lisp/org-num.el: Require` org`. * lisp/org-macs.el (org-eval-in-environment): Declare obsolete. (org-dlet, org-pushnew-to-end): New macros. * doc/Makefile (org.texi, orgguide.texi, %_letter.tex): Simplify quoting. * contrib/lisp/ob-sclang.el: Don't crash compilation when `sclang` is not available. * contrib/lisp/ob-clojure-literate.el: Don't crash compilation when `cider` is not available. * contrib/lisp/ob-arduino.el: Don't crash compilation when `arduino-mode` is not available. * .gitignore: Add files generated during `make packages/org`.
106 lines
3.2 KiB
EmacsLisp
106 lines
3.2 KiB
EmacsLisp
;;; ob-arduino.el --- Org-mode Babel support for Arduino.
|
||
;;
|
||
;; Authors: stardiviner <numbchild@gmail.com>
|
||
;; Package-Requires: ((emacs "24.4") (org "24.1"))
|
||
;; Package-Version: 1.0
|
||
;; Keywords: arduino org babel
|
||
;; homepage: https://github.com/stardiviner/arduino-mode
|
||
;;
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||
;;
|
||
;;; Commentary:
|
||
;;
|
||
;; Like the following src block, press =[C-c C-c]= to upload to Arduino board.
|
||
;;
|
||
;; #+begin_src arduino
|
||
;; // the setup function runs once when you press reset or power the board
|
||
;; void setup() {
|
||
;; // initialize digital pin LED_BUILTIN as an output.
|
||
;; pinMode(LED_BUILTIN, OUTPUT);
|
||
;; }
|
||
;;
|
||
;; // the loop function runs over and over again forever
|
||
;; void loop() {
|
||
;; digitalWrite(LED_BUILTIN, HIGH); // turn the LED on (HIGH is the voltage level)
|
||
;; delay(100); // wait for 0.1 second
|
||
;; digitalWrite(LED_BUILTIN, LOW); // turn the LED off by making the voltage LOW
|
||
;; delay(100); // wait for 0.1 second
|
||
;; }
|
||
;; #+end_src
|
||
;;
|
||
;;; Code:
|
||
|
||
(require 'org)
|
||
(require 'ob)
|
||
(require 'arduino-mode nil t)
|
||
|
||
(defgroup ob-arduino nil
|
||
"org-mode blocks for Arduino."
|
||
:group 'org)
|
||
|
||
(defcustom ob-arduino:program "arduino"
|
||
"Default Arduino program name."
|
||
:group 'ob-arduino
|
||
:type 'string)
|
||
|
||
(defcustom ob-arduino:port "/dev/ttyACM0"
|
||
"Default Arduino port."
|
||
:group 'ob-arduino
|
||
:type 'string)
|
||
|
||
(defcustom ob-arduino:board "arduino:avr:uno"
|
||
"Default Arduino board."
|
||
:group 'ob-arduino
|
||
:type 'string)
|
||
|
||
|
||
(defvar org-babel-default-header-args:sclang nil)
|
||
|
||
;;;###autoload
|
||
(defun org-babel-execute:arduino (body params)
|
||
"org-babel arduino hook."
|
||
(let* ((port (cdr (assoc :port params)))
|
||
(board (cdr (assoc :board params)))
|
||
(cmd (mapconcat 'identity (list
|
||
ob-arduino:program "--upload"
|
||
(if port (concat "--port " port))
|
||
(if board (concat "--board " board))
|
||
) " "))
|
||
(code (org-babel-expand-body:generic body params))
|
||
(src-file (org-babel-temp-file "ob-arduino-" ".ino")))
|
||
;; delete all `ob-arduino' temp files, otherwise arduino will compile all
|
||
;; ob-arduino temp files, and report error.
|
||
(mapc
|
||
(lambda (f)
|
||
(unless (file-directory-p f)
|
||
(delete-file (expand-file-name f org-babel-temporary-directory))))
|
||
(directory-files
|
||
(file-name-directory (org-babel-temp-file "ob-arduino-" ".ino"))
|
||
nil ".ino"))
|
||
;; specify file for arduino command.
|
||
(with-temp-file src-file
|
||
(insert code))
|
||
(org-babel-eval
|
||
(concat ob-arduino:program
|
||
" " "--upload"
|
||
" " (if port (concat "--port " port))
|
||
" " (if board (concat "--board " board))
|
||
" " src-file)
|
||
"" ; pass empty string "" as `BODY' to `org-babel--shell-command-on-region'
|
||
;; to fix command `arduino' don't accept string issue.
|
||
)
|
||
))
|
||
|
||
|
||
;;;###autoload
|
||
(eval-after-load 'org
|
||
'(add-to-list 'org-src-lang-modes '("arduino" . arduino)))
|
||
|
||
|
||
|
||
|
||
(provide 'ob-arduino)
|
||
|
||
;;; ob-arduino.el ends here
|