[nongnu] elpa/arduino-mode aa051bb 014/107: Add a serial monitor.

[ELPA Syncer]

branch: elpa/arduino-mode
commit aa051bbed8f9c9881201cb95dfcad5548c2176af
Author: Peter Oliver <git@mavit.org.uk>
Commit: Peter Oliver <git@mavit.org.uk>

    Add a serial monitor.
---
 arduino-mode.el                | 18 ++++++++++++++++--
 emacs-common-arduino-mode.spec | 12 ++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/arduino-mode.el b/arduino-mode.el
index a51a6be..224e429 100644
--- a/arduino-mode.el
+++ b/arduino-mode.el
@@ -33,7 +33,8 @@
 (eval-when-compile
   (require 'cc-langs)
   (require 'cc-fonts)
-  (require 'cc-menus))
+  (require 'cc-menus)
+  (require 'term))
 
 (eval-and-compile
   ;; fall back on c-mode
@@ -107,6 +108,8 @@ Each list item should be a regexp matching a single 
identifier." :group 'arduino
                       map)
   "Keymap used in arduino-mode buffers.")
 (define-key arduino-mode-map "\C-cg"  'arduino-upload)
+(unless (string-match "XEmacs" emacs-version)
+  (define-key arduino-mode-map "\C-cm"  'arduino-serial-monitor))
 
 (easy-menu-define arduino-menu arduino-mode-map "Arduino Mode Commands"
                   (cons "Arduino" (c-lang-const c-mode-menu arduino)))
@@ -118,7 +121,9 @@ Each list item should be a regexp matching a single 
identifier." :group 'arduino
   (easy-menu-add-item arduino-menu
                      nil ["----" nil nil])
   (easy-menu-add-item arduino-menu
-                     nil ["Upload" arduino-upload t]))
+                     nil ["Upload" arduino-upload t])
+  (easy-menu-add-item arduino-menu
+                     nil ["Serial monitor" arduino-serial-monitor t]))
 
 (defcustom arduino-makefile-name "Makefile"
   "Name of Makefile used to compile and upload Arduino sketches."
@@ -159,6 +164,15 @@ include /usr/share/arduino/Arduino.mk
          (message "Edit the Makefile as required and re-run arduino-upload."))
       (message (concat "No Makefile `" arduino-makefile-name "' exists.  
Uploading cancelled.")))))
 
+(unless (string-match "XEmacs" emacs-version)
+  (defun arduino-serial-monitor (port speed)
+    "Monitor the serial connection to the Arduino."
+    (interactive (list (serial-read-name) nil))
+    
+    (if (get-buffer-process port)
+       (switch-to-buffer port)
+      (serial-term port (or speed (serial-read-speed))))))
+
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.pde\\'" . arduino-mode))
 
diff --git a/emacs-common-arduino-mode.spec b/emacs-common-arduino-mode.spec
index a7eca7d..5df6bda 100644
--- a/emacs-common-arduino-mode.spec
+++ b/emacs-common-arduino-mode.spec
@@ -1,10 +1,10 @@
 %global pkg arduino-mode
 %global pkgname Arduino Mode
-%global gitcommit 16e1d57
+%global gitcommit 3cc39d9
 
 Name:          emacs-common-%{pkg}
-Version:       git1.%{gitcommit}
-Release:       2%{?dist}
+Version:       git2.%{gitcommit}
+Release:       1%{?dist}
 Summary:       Emacs editing mode for Arduino code
 
 Group:         Development/Tools
@@ -16,7 +16,7 @@ BuildRoot:    
%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 BuildRequires: emacs
 BuildRequires: xemacs
-Requires:      arduino
+Requires:      arduino-mk
 
 %description
 %{pkgname} is an add-on package for GNU Emacs and XEmacs, providing an
@@ -125,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  7 2010 Peter Oliver <rpm@mavit.org.uk> - git2.3cc39d9-1
+- Updated version of arduino-mode.
+- Require arduino-mk.
+
 * Tue Sep  7 2010 Peter Oliver <rpm@mavit.org.uk> - git1.16e1d57-2
 - Use correct version of compiled code for GNU Emacs.