diff --git a/AdaBobbiCara/fonts/.DS_Store b/AdaBobbiCara/fonts/.DS_Store deleted file mode 100644 index 4160c8c..0000000 Binary files a/AdaBobbiCara/fonts/.DS_Store and /dev/null differ diff --git a/AdaBobbiCara/0705.py b/web/enconv/0705.py similarity index 100% rename from AdaBobbiCara/0705.py rename to web/enconv/0705.py diff --git a/AdaBobbiCara/bg.jpg b/web/enconv/bg.jpg similarity index 100% rename from AdaBobbiCara/bg.jpg rename to web/enconv/bg.jpg diff --git a/AdaBobbiCara/bg_bw.jpg b/web/enconv/bg_bw.jpg similarity index 100% rename from AdaBobbiCara/bg_bw.jpg rename to web/enconv/bg_bw.jpg diff --git a/AdaBobbiCara/enconv.css b/web/enconv/enconv.css similarity index 100% rename from AdaBobbiCara/enconv.css rename to web/enconv/enconv.css diff --git a/AdaBobbiCara/enconv.html b/web/enconv/enconv.html similarity index 100% rename from AdaBobbiCara/enconv.html rename to web/enconv/enconv.html diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Black.woff b/web/enconv/fonts/worksans/WorkSans-Black.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Black.woff rename to web/enconv/fonts/worksans/WorkSans-Black.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Black.woff2 b/web/enconv/fonts/worksans/WorkSans-Black.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Black.woff2 rename to web/enconv/fonts/worksans/WorkSans-Black.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-BlackItalic.woff b/web/enconv/fonts/worksans/WorkSans-BlackItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-BlackItalic.woff rename to web/enconv/fonts/worksans/WorkSans-BlackItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-BlackItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-BlackItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-BlackItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-BlackItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Bold.woff b/web/enconv/fonts/worksans/WorkSans-Bold.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Bold.woff rename to web/enconv/fonts/worksans/WorkSans-Bold.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Bold.woff2 b/web/enconv/fonts/worksans/WorkSans-Bold.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Bold.woff2 rename to web/enconv/fonts/worksans/WorkSans-Bold.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-BoldItalic.woff b/web/enconv/fonts/worksans/WorkSans-BoldItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-BoldItalic.woff rename to web/enconv/fonts/worksans/WorkSans-BoldItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-BoldItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-BoldItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-BoldItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-BoldItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraBold.woff b/web/enconv/fonts/worksans/WorkSans-ExtraBold.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraBold.woff rename to web/enconv/fonts/worksans/WorkSans-ExtraBold.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraBold.woff2 b/web/enconv/fonts/worksans/WorkSans-ExtraBold.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraBold.woff2 rename to web/enconv/fonts/worksans/WorkSans-ExtraBold.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraBoldItalic.woff b/web/enconv/fonts/worksans/WorkSans-ExtraBoldItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraBoldItalic.woff rename to web/enconv/fonts/worksans/WorkSans-ExtraBoldItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraBoldItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-ExtraBoldItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraBoldItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-ExtraBoldItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraLight.woff b/web/enconv/fonts/worksans/WorkSans-ExtraLight.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraLight.woff rename to web/enconv/fonts/worksans/WorkSans-ExtraLight.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraLight.woff2 b/web/enconv/fonts/worksans/WorkSans-ExtraLight.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraLight.woff2 rename to web/enconv/fonts/worksans/WorkSans-ExtraLight.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraLightItalic.woff b/web/enconv/fonts/worksans/WorkSans-ExtraLightItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraLightItalic.woff rename to web/enconv/fonts/worksans/WorkSans-ExtraLightItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ExtraLightItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-ExtraLightItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ExtraLightItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-ExtraLightItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Italic.woff b/web/enconv/fonts/worksans/WorkSans-Italic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Italic.woff rename to web/enconv/fonts/worksans/WorkSans-Italic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Italic.woff2 b/web/enconv/fonts/worksans/WorkSans-Italic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Italic.woff2 rename to web/enconv/fonts/worksans/WorkSans-Italic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Light.woff b/web/enconv/fonts/worksans/WorkSans-Light.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Light.woff rename to web/enconv/fonts/worksans/WorkSans-Light.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Light.woff2 b/web/enconv/fonts/worksans/WorkSans-Light.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Light.woff2 rename to web/enconv/fonts/worksans/WorkSans-Light.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-LightItalic.woff b/web/enconv/fonts/worksans/WorkSans-LightItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-LightItalic.woff rename to web/enconv/fonts/worksans/WorkSans-LightItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-LightItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-LightItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-LightItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-LightItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Medium.woff b/web/enconv/fonts/worksans/WorkSans-Medium.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Medium.woff rename to web/enconv/fonts/worksans/WorkSans-Medium.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Medium.woff2 b/web/enconv/fonts/worksans/WorkSans-Medium.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Medium.woff2 rename to web/enconv/fonts/worksans/WorkSans-Medium.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-MediumItalic.woff b/web/enconv/fonts/worksans/WorkSans-MediumItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-MediumItalic.woff rename to web/enconv/fonts/worksans/WorkSans-MediumItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-MediumItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-MediumItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-MediumItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-MediumItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Regular.woff b/web/enconv/fonts/worksans/WorkSans-Regular.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Regular.woff rename to web/enconv/fonts/worksans/WorkSans-Regular.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Regular.woff2 b/web/enconv/fonts/worksans/WorkSans-Regular.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Regular.woff2 rename to web/enconv/fonts/worksans/WorkSans-Regular.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-SemiBold.woff b/web/enconv/fonts/worksans/WorkSans-SemiBold.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-SemiBold.woff rename to web/enconv/fonts/worksans/WorkSans-SemiBold.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-SemiBold.woff2 b/web/enconv/fonts/worksans/WorkSans-SemiBold.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-SemiBold.woff2 rename to web/enconv/fonts/worksans/WorkSans-SemiBold.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-SemiBoldItalic.woff b/web/enconv/fonts/worksans/WorkSans-SemiBoldItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-SemiBoldItalic.woff rename to web/enconv/fonts/worksans/WorkSans-SemiBoldItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-SemiBoldItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-SemiBoldItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-SemiBoldItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-SemiBoldItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Thin.woff b/web/enconv/fonts/worksans/WorkSans-Thin.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Thin.woff rename to web/enconv/fonts/worksans/WorkSans-Thin.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-Thin.woff2 b/web/enconv/fonts/worksans/WorkSans-Thin.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-Thin.woff2 rename to web/enconv/fonts/worksans/WorkSans-Thin.woff2 diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ThinItalic.woff b/web/enconv/fonts/worksans/WorkSans-ThinItalic.woff similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ThinItalic.woff rename to web/enconv/fonts/worksans/WorkSans-ThinItalic.woff diff --git a/AdaBobbiCara/fonts/worksans/WorkSans-ThinItalic.woff2 b/web/enconv/fonts/worksans/WorkSans-ThinItalic.woff2 similarity index 100% rename from AdaBobbiCara/fonts/worksans/WorkSans-ThinItalic.woff2 rename to web/enconv/fonts/worksans/WorkSans-ThinItalic.woff2 diff --git a/AdaBobbiCara/fonts/worksans/stylesheet.css b/web/enconv/fonts/worksans/stylesheet.css similarity index 100% rename from AdaBobbiCara/fonts/worksans/stylesheet.css rename to web/enconv/fonts/worksans/stylesheet.css diff --git a/AdaBobbiCara/references.html b/web/enconv/references.html similarity index 100% rename from AdaBobbiCara/references.html rename to web/enconv/references.html diff --git a/AdaBobbiCara/referencesforwebsite.txt b/web/enconv/referencesforwebsite.txt similarity index 100% rename from AdaBobbiCara/referencesforwebsite.txt rename to web/enconv/referencesforwebsite.txt diff --git a/web/index.html b/web/index.html index 565e8f1..1acb5f2 100644 --- a/web/index.html +++ b/web/index.html @@ -1,4 +1,19 @@ 
-SI21 - test
-Hello world!
+special issue 21
+experimental publishing
+
+ _   _         
+| |_| |_ _   _ 
+| __| __| | | |
+| |_| |_| |_| |
+ \__|\__|\__, |
+         |___/ 
+
+
+
+
+
+
+week 2
+Encoding Converter
diff --git a/web/week5/1-web.jpeg b/web/week5/1-web.jpeg new file mode 100644 index 0000000..973f7b5 Binary files /dev/null and b/web/week5/1-web.jpeg differ diff --git a/web/week5/10-web.jpeg b/web/week5/10-web.jpeg new file mode 100644 index 0000000..c7f14f3 Binary files /dev/null and b/web/week5/10-web.jpeg differ diff --git a/web/week5/11-web.jpeg b/web/week5/11-web.jpeg new file mode 100644 index 0000000..d2a46c4 Binary files /dev/null and b/web/week5/11-web.jpeg differ diff --git a/web/week5/2-web.jpeg b/web/week5/2-web.jpeg new file mode 100644 index 0000000..9fc6fbe Binary files /dev/null and b/web/week5/2-web.jpeg differ diff --git a/web/week5/3-web.jpeg b/web/week5/3-web.jpeg new file mode 100644 index 0000000..4e07905 Binary files /dev/null and b/web/week5/3-web.jpeg differ diff --git a/web/week5/4-web.jpeg b/web/week5/4-web.jpeg new file mode 100644 index 0000000..1d7efd4 Binary files /dev/null and b/web/week5/4-web.jpeg differ diff --git a/web/week5/5-web.jpeg b/web/week5/5-web.jpeg new file mode 100644 index 0000000..88a4107 Binary files /dev/null and b/web/week5/5-web.jpeg differ diff --git a/web/week5/6-web.jpeg b/web/week5/6-web.jpeg new file mode 100644 index 0000000..a766bf2 Binary files /dev/null and b/web/week5/6-web.jpeg differ diff --git a/web/week5/7-web.jpeg b/web/week5/7-web.jpeg new file mode 100644 index 0000000..fde35c3 Binary files /dev/null and b/web/week5/7-web.jpeg differ diff --git a/web/week5/8-web.jpeg b/web/week5/8-web.jpeg new file mode 100644 index 0000000..55f1600 Binary files /dev/null and b/web/week5/8-web.jpeg differ diff --git a/web/week5/9-web.jpeg b/web/week5/9-web.jpeg new file mode 100644 index 0000000..74b7cbb Binary files /dev/null and b/web/week5/9-web.jpeg differ diff --git a/week3/call-simpler.py b/week3/call-simpler.py index c82ef3b..0da142f 100644 --- a/week3/call-simpler.py +++ b/week3/call-simpler.py @@ -4,7 +4,7 @@ import os import time import subprocess import random -#logging.getLogger().setLevel(5) +logging.getLogger().setLevel(5) sim800l = SIM800L(port='/dev/serial0', baudrate=115000, timeout=3.0) audios = ["love1.wav", "love2.wav", "love3.wav"] @@ -17,9 +17,8 @@ time.sleep(3) while True: activecall = sim800l.command("AT+CPAS\n") #check if someone is calling or not - if "+CPAS: 3" in activecall: #if someone is calling - print("some one is calling") - time.sleep(3) #wait 3 seoncds + if "3" in activecall: #if someone is calling + print("some one is calling") sim800l.command("ATA\n") #answer the phone audio = rando`m.choice(audios) print("playing python file") @@ -29,5 +28,5 @@ while True: callisactive = sim800l.command("AT+CPAS\n") if "+CPAS: 0" in callisactive: #call is not active anymore print ("call stopped") - os.system("killall play") + os.system("sudo killall play") break diff --git a/week3/call.py b/week3/call.py index 9167162..bd0cdbc 100644 --- a/week3/call.py +++ b/week3/call.py @@ -2,7 +2,7 @@ from sim800l import SIM800L import logging import os import time -import subprocess +#import subprocess #logging.getLogger().setLevel(5) sim800l = SIM800L(port='/dev/serial0', baudrate=115000, timeout=3.0) @@ -20,15 +20,15 @@ while True: time.sleep(3) #wait 3 seoncds sim800l.command("ATA\n") #answer the phone print("playing python file") - # os.system("play test.wav &") - p = subprocess.Popen([sys.executable, 'audio.py'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) + os.system("play test.wav &") + #p = subprocess.Popen([sys.executable, 'audio.py'], + #stdout=subprocess.PIPE, + #stderr=subprocess.STDOUT) while True: #check if call is still active callisactive = sim800l.command("AT+CPAS\n") if "+CPAS: 0" in callisactive: #call is not active anymore print ("call stopped") - # os.system("killall play") - p.terminate() + os.system("killall play") + #p.terminate() break diff --git a/week3/receivecalls.py b/week3/receivecalls.py new file mode 100644 index 0000000..1983e80 --- /dev/null +++ b/week3/receivecalls.py @@ -0,0 +1,53 @@ +from sim800l import SIM800L +import logging +import os +import time +logging.getLogger().setLevel(5) + +play = False +call = False +audios = ["love1.wav", "love2.wav", "love3.wav"] +sim800l = SIM800L(port='/dev/serial0', baudrate=115000, timeout=3.0) +print(sim800l.command("ATS0=0\n")) +time.sleep(2) +print(sim800l.command("AT\n")) +time.sleep(5) +#print(sim800l.command("AT+DDET=1\n")) +#time.sleep(3) +#print("<>") +time.sleep(3) + +while True: + if call is False: + try: + activecall = sim800l.command("AT+CPAS\n", waitfor=1500) #check if someone is calling or not + except: + activecall = "" + print(activecall) + r = sim800l.check_incoming() + print(r) + if r[-1] is not None and "3" in r[-1] and call is False: #if someone is callin + print("some one is calling") + call = True + time.sleep(1) #wait 3 seoncds + sim800l.command("ATA\n") #answer the phone + if play is False: + print("playing sound file") + import random + audio = random.choice(audios) + os.system("play " + audio + " &") + play = True + #check =sim800l.command("AT+DDET=?\n") + #print(check) + while True: + #check if call is still active + callisactive = sim800l.command("AT+CPAS\n") + r = sim800l.check_incoming() + print(r) + if r[-1] is not None: + if "0" in r[-1]: #call is not active anymore + print ("call stopped") + os.system("sudo killall play") + call = False + play = False + break diff --git a/week3/schematics-pi-sim800l.svg b/week3/schematics-pi-sim800l.svg new file mode 100644 index 0000000..6dc606f --- /dev/null +++ b/week3/schematics-pi-sim800l.svg @@ -0,0 +1,26126 @@ + + + +diode 1N4007capacitor 100uF 15volt+-Audio outputsolder cables to jack plug to connect to raspberry pisolder cables to jack socket to connect to jack cable for speakersaudio in diff --git a/week5/1.jpeg b/week5/1.jpeg new file mode 100644 index 0000000..9f6be74 Binary files /dev/null and b/week5/1.jpeg differ diff --git a/week5/10.jpeg b/week5/10.jpeg new file mode 100644 index 0000000..0492fe5 Binary files /dev/null and b/week5/10.jpeg differ diff --git a/week5/11.jpeg b/week5/11.jpeg new file mode 100644 index 0000000..17bb513 Binary files /dev/null and b/week5/11.jpeg differ diff --git a/week5/2.jpeg b/week5/2.jpeg new file mode 100644 index 0000000..8afbd99 Binary files /dev/null and b/week5/2.jpeg differ diff --git a/week5/3.jpeg b/week5/3.jpeg new file mode 100644 index 0000000..5dece15 Binary files /dev/null and b/week5/3.jpeg differ diff --git a/week5/4.jpeg b/week5/4.jpeg new file mode 100644 index 0000000..eb4a6bd Binary files /dev/null and b/week5/4.jpeg differ diff --git a/week5/5.jpeg b/week5/5.jpeg new file mode 100644 index 0000000..20ccae3 Binary files /dev/null and b/week5/5.jpeg differ diff --git a/week5/6.jpeg b/week5/6.jpeg new file mode 100644 index 0000000..f4d83d1 Binary files /dev/null and b/week5/6.jpeg differ diff --git a/week5/7.jpeg b/week5/7.jpeg new file mode 100644 index 0000000..270b546 Binary files /dev/null and b/week5/7.jpeg differ diff --git a/week5/8.jpeg b/week5/8.jpeg new file mode 100644 index 0000000..e96a159 Binary files /dev/null and b/week5/8.jpeg differ diff --git a/week5/9.jpeg b/week5/9.jpeg new file mode 100644 index 0000000..f3e6ce7 Binary files /dev/null and b/week5/9.jpeg differ