Added functionality for attention tones

Author: MaxMyzer

README.md

@@ -20,14 +20,14 @@ Please please please please PLEASE use this responsibly.  Did you just buy an ol
 Don't use this to hack / exploit anything.  I made this for funsies in a few hours.  Please use it accordingly.
 
 # Installation
-To Run: `python3 <location of same.py> <args>` 
-  
+To Run: `python3 <location of same.py> <args>`
+
   OR: `cd <directory of git folder>` THEN `python3 same.py <args>`
 
-Install: 
+Install:
   Download this repo and unzip (You only actually need [same.py](https://raw.githubusercontent.com/MaxMyzer/eas-same-encoder/master/same.py), you can just download that if you want)
-  
-Install Python3 
+
+Install Python3
   - Windows: `python3` then install from Microsoft Store.
   - Linux and MacOS: `sudo apt update && sudo apt-get install python3`
 
@@ -36,14 +36,18 @@ Install dependencies: Single command version: `pip3 install --upgrade pip && pip
   - `pip3 install <dependency>`
      -  numpy
      -  scipy
- You should now be ready to run it. 
+ You should now be ready to run it.
 
 # USAGE
 [More about these perameters](https://en.wikipedia.org/wiki/Specific_Area_Message_Encoding#Header_format).
 For a more condenced version, check out [the readme of the dsame repo](https://github.com/cuppa-joe/dsame/blob/master/README.md)
 | --Argument      | -A   | Default  | Example | Function                                                             |
 |-----------------|------|----------|---------|----------------------------------------------------------------------|
 | --playaudiolive | -pal | -1       | 1       | Plays audio with command. Warning: Loud.                             |
+---|
+| --attention | -as | 0       | 1       | 1 = single tone (1050hz), 2 = duel tone (853hz and 960hz)                             |
+---|
+| --attentionlength | -al | 8       | 1       | How many seconds to play the attention signal                          |
 | --code          | -c   |          |         | If you wanted to copy and paste a code string, you can do that here. |
 | --org           | -o   | WXR      | PEP     | The organization in the SAME code                                    |
 | --event         | -e   | RWT      | TOR     | The event type                                                       |

same.py

@@ -1,5 +1,6 @@
 import numpy as np
 from scipy.io import wavfile
+# import audiogen
 import random
 import sys
 import subprocess # to play the resulting wave file
@@ -9,6 +10,8 @@
 # parse command-line arguments
 parser = argparse.ArgumentParser()
 parser.add_argument("--code", "-c", nargs='?', default="")
+parser.add_argument("--attention", "-as", nargs='?', default='0')
+parser.add_argument("--attentionlength", "-al", nargs='?', default=8)
 parser.add_argument("--playaudiolive", "-pal", nargs='?', default=-1)
 parser.add_argument("--org", "-o", nargs='?', default="WXR")
 parser.add_argument("--event", "-e", nargs='?', default="RWT")
@@ -59,7 +62,6 @@
 
 
 fs = 43750
-
 # t = 1.0 / (520 + (5/6))
 
 
@@ -95,7 +97,6 @@ def spaceBit():
 
 signal = np.zeros(20000)
 
-
 def byte(the_byte):
 	sys.stdout.write(the_byte)
 	sys.stdout.write(" ")
@@ -140,6 +141,10 @@ def preamble():
 
 	return byte_data
 
+# SingleTone =
+# CombinedTone =
+
+
 
 # EAS alerts are heavily dependent on timestamps so this makes it easy/fun to send a thing now
 sameCompatibleTimestamp = datetime.datetime.now().strftime("%j%H%M")
@@ -171,23 +176,35 @@ def preamble():
 	# turn each character into a sequence of sine waves
 	for char in code:
 		signal = np.append(signal, byte(char))
-
-	# signal = np.append(signal, extramarks(6)) # ENDEC might not be as picky about this as I once thought
-
 	signal = np.append(signal, np.zeros(43750)) # wait the requisite one second
+	# signal = np.append(signal, extramarks(6)) # ENDEC might not be as picky about this as I once thought
 
 
+sampleRate = 43750
+length = np.linspace(0, args.attentionlength, sampleRate * args.attentionlength)
+tonesamples = length # (np.arange(length * sampleRate)/sampleRate)
+SingleTone = 1050
+CombinedTone = [853, 960]
+attn = np.zeros(20000)
+tones = np.zeros(43750*8)
+if args.attention != 0:
+	if args.attention == '1':
+		tones = np.sin(2 * np.pi * SingleTone * tonesamples)
+	elif args.attention == '2':
+		tones = np.sin(2 * np.pi * CombinedTone[0] * tonesamples) + np.sin(2 * np.pi * CombinedTone[1] * tonesamples)
+	attn = np.append(attn, tones*0.8)
+eom = np.zeros(20000)
 # EOM (3x)
 for i in range(0, 3):
 	# signal = np.append(signal, extramarks(10))
-	signal = np.append(signal, preamble())
+	eom = np.append(eom, preamble())
 
 	for char in "ZCZCNNNN": # NNNN = End Of Message
-		signal = np.append(signal, byte(char))
+		eom = np.append(eom, byte(char))
 
 	# signal = np.append(signal, extramarks(6))
 
-	signal = np.append(signal, np.zeros(43750)) # wait the requisite one second
+	eom = np.append(eom, np.zeros(43750)) # wait the requisite one second
 
 
 
@@ -196,7 +213,13 @@ def preamble():
 signal = np.int16(signal)
 
 wavfile.write(str("same.wav"), fs, signal)
+if args.attention != 0:
+	wavfile.write(str("attention.wav"), sampleRate, attn)
+wavfile.write(str("eom.wav"), fs, eom)
 
 
 if args.playaudiolive == "1":
 	subprocess.call("afplay same.wav", shell=True)
+	if args.attention != 0:
+		subprocess.call("afplay attention.wav", shell=True)
+	subprocess.call("afplay eom.wav", shell=True)