<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14816] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14816">14816</a></dd>
<dt>Author</dt> <dd>trixter</dd>
<dt>Date</dt> <dd>2009-09-10 20:17:01 -0500 (Thu, 10 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>refactor, fixed some timing issues</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribtrixterradiomorsejs">freeswitch/trunk/contrib/trixter/radio/morse.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribtrixterradiomorsejs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/trixter/radio/morse.js (14815 => 14816)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/trixter/radio/morse.js 2009-09-10 23:37:18 UTC (rev 14815)
+++ freeswitch/trunk/contrib/trixter/radio/morse.js 2009-09-11 01:17:01 UTC (rev 14816)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> // supplied
</span><span class="cx"> //
</span><span class="cx"> // examples:
</span><del>-// jsapi conference 123 morse code is great
-// jsapi uuid b0b05504-97be-11de-a116-611fa158f341 morse code is great
</del><ins>+// jsapi morse.js conference 123 CQ CQ CQ this is FreeSWITCH
+// jsapi morse.js uuid b0b05504-97be-11de-a116-611fa158f341 morse code is great
</ins><span class="cx">
</span><span class="cx"> var cw_wpm=20;
</span><span class="cx"> var cw_freq=900; // in Hz
</span><span class="lines">@@ -38,14 +38,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> // you probably do not need to edit anything below here
</span><del>-var cw_unit=parseInt(1000/cw_wpm);
</del><span class="cx">
</span><ins>+// international standard is 50 symbols per word - we need units in ms
+var cw_unit=parseInt(60000/(50*cw_wpm));
+
</ins><span class="cx"> var DIT = "%("+cw_unit+","+cw_unit+","+cw_freq+");";
</span><del>-var DAH = "%("+cw_unit*3+","+cw_unit*3+","+cw_freq+");";
</del><ins>+var DAH = "%("+cw_unit*3+","+cw_unit+","+cw_freq+");";
+var SYM_SPACE = "%(0,"+cw_unit*3+","+cw_freq+");";
+var WORD_SPACE = "%(0,"+cw_unit*7+","+cw_freq+");";
</ins><span class="cx">
</span><del>-// so far there are not any prosigns which are just made up from
-// the letters below, but the spacing needs to be adjusted
-// I also do not have the non-officially defined characters
</del><ins>+// I do not have the non-officially defined characters
</ins><span class="cx"> var charCodes = new Array();
</span><span class="cx"> charCodes["a"]="._";
</span><span class="cx"> charCodes["b"]="_...";
</span><span class="lines">@@ -92,6 +94,45 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+function makeMorse(c)
+{
+ var morseStr="";
+
+ if(c==" ") {
+ return WORD_SPACE;
+ }
+
+ if(typeof charCodes[c] == "undefined") {
+ console_log("DEBUG","Invalid character "+c+"\n");
+ return;
+ }
+
+ for(var j=0;j<charCodes[c].length;j++) {
+ if(charCodes[c][j] == ".") {
+ morseStr+=DIT;
+ } else {
+ morseStr+=DAH;
+ }
+ }
+
+ return morseStr;
+}
+
+
+function playMorse(command,target,message)
+{
+ var newStr="tone_stream://v="+cw_vol+";";
+ for(var i=0;i<message.length;i++) {
+ newStr+=makeMorse(message[i].toLowerCase());
+ if(i<(message.length-1) && message[i+1]!=" " && message[i]!=" ") {
+ newStr+=SYM_SPACE;
+ }
+ }
+ newStr+=WORD_SPACE;
+ apiExecute(command, target+newStr);
+}
+
+
</ins><span class="cx"> if(typeof argv[2] == "undefined" || argv[2].length==0) {
</span><span class="cx"> usage();
</span><span class="cx"> }
</span><span class="lines">@@ -112,22 +153,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-while(typeof argv[0] != "undefined") {
- var newStr="tone_stream://v="+cw_vol+";";
- for(var i=0;i<argv[0].length;i++) {
- for(var j=0;j<charCodes[argv[0][i]].length;j++) {
- if(charCodes[argv[0][i]][j] == ".") {
- newStr+=DIT;
- } else {
- newStr+=DAH;
- }
- }
- // symbol space
- newStr+="%(0,"+cw_unit*3+","+cw_freq+")";
- }
- // word space
- // we only do a cw_unit*4 here because we have a cw_unit*3 already
- newStr+="%(0,"+cw_unit*4+","+cw_freq+")";
- apiExecute(command, target+newStr);
- argv.shift();
</del><ins>+if(typeof argv[0] != "undefined") {
+ playMorse(command,target,argv.join(" "));
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>