diff --git a/Readme.md b/Readme.md index 5a254da..f8390cd 100644 --- a/Readme.md +++ b/Readme.md @@ -18,6 +18,7 @@ CC-BY-SA Olli Graf |11 | Datum und Zeit| |12 | Multithreading| |13 | Netzwerk| -|14 | GPIO| -|15 | Testing| +|14 | Logging| +|15 | GPIO| +|16 | Testing| diff --git a/gpio/.gitignore b/gpio/.gitignore new file mode 100644 index 0000000..c7fb3aa --- /dev/null +++ b/gpio/.gitignore @@ -0,0 +1,2 @@ +./__pycache__ +./network/__pycache__/* diff --git a/gpio/__pycache__/led.cpython-39.pyc b/gpio/__pycache__/led.cpython-39.pyc new file mode 100644 index 0000000..41b6ef7 Binary files /dev/null and b/gpio/__pycache__/led.cpython-39.pyc differ diff --git a/teil14/led.py b/gpio/led.py similarity index 100% rename from teil14/led.py rename to gpio/led.py diff --git a/gpio/ledserver.log b/gpio/ledserver.log new file mode 100644 index 0000000..caed544 --- /dev/null +++ b/gpio/ledserver.log @@ -0,0 +1 @@ +2023-04-29 10:49:08,638 [DEBUG] : MAIN: start diff --git a/gpio/ledserver.py b/gpio/ledserver.py new file mode 100755 index 0000000..a48064c --- /dev/null +++ b/gpio/ledserver.py @@ -0,0 +1,32 @@ +#! /usr/bin/python3 +from http.server import BaseHTTPRequestHandler,HTTPServer +import logging + +logging.basicConfig( format='%(asctime)-15s [%(levelname)s] %(funcName)s: %(message)s', filename='ledserver.log', level=logging.DEBUG) +class http_server: + def __init__(self): + def handler(*args): + myHandler(*args) + server = HTTPServer(('', 8080), handler) + +class myHandler(BaseHTTPRequestHandler): + def __init__(self,*args): + self.t1 = t1 + BaseHTTPRequestHandler.__init__(self, *args) + + def do_GET(self): + logging.debug('GET: empfangen') + self.send_response(200) + self.send_header('Content-type','text/html') + self.end_headers() + self.wfile.write(self.t1.show()) #Doesnt work + return + +class main: + def __init__(self): + + self.server = http_server() + +if __name__ == '__main__': + logging.debug('MAIN: start') + main() diff --git a/gpio/network/__init__.py b/gpio/network/__init__.py new file mode 100644 index 0000000..55552da --- /dev/null +++ b/gpio/network/__init__.py @@ -0,0 +1,3 @@ +from .const import __ADDRESSLOCAL__ +#from .const import __ADDRESSREMOTE__ + diff --git a/gpio/network/__pycache__/__init__.cpython-39.pyc b/gpio/network/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..66f1280 Binary files /dev/null and b/gpio/network/__pycache__/__init__.cpython-39.pyc differ diff --git a/gpio/network/__pycache__/const.cpython-39.pyc b/gpio/network/__pycache__/const.cpython-39.pyc new file mode 100644 index 0000000..0e3b26c Binary files /dev/null and b/gpio/network/__pycache__/const.cpython-39.pyc differ diff --git a/gpio/network/code.py b/gpio/network/code.py new file mode 100644 index 0000000..2264e1a --- /dev/null +++ b/gpio/network/code.py @@ -0,0 +1,10 @@ +def receive(conn): + msg = conn.recv(64).decode('utf-8') + + return msg + +def send(client, msg): + message = msg.encode('utf-8') + client.send(message) + + diff --git a/gpio/network/const.py b/gpio/network/const.py new file mode 100644 index 0000000..b3a410c --- /dev/null +++ b/gpio/network/const.py @@ -0,0 +1,19 @@ +#network/const.py + +import socket + +# TCP Port +__PORT__ = 6554 + +#Server-IP +# für den Server (immer localhost) +__SERVERLOCAL__ = socket.gethostbyname(socket.gethostname()) + +#für Server auf einem Remote-Pi +#__SERVERREMOTE__ = socket.gethostbyname('gabbo') + +# Server-Adresse (IP,Port) +#lokal +__ADDRESSLOCAL__ = (__SERVERLOCAL__,__PORT__) +#remote +#__ADDRESSREMOTE__ = (__SERVERREMOTE__,__PORT__) diff --git a/logging/conf.py b/teil14/conf.py similarity index 100% rename from logging/conf.py rename to teil14/conf.py diff --git a/logging/test.log b/teil14/test.log similarity index 100% rename from logging/test.log rename to teil14/test.log diff --git a/logging/testlogging.py b/teil14/testlogging.py similarity index 100% rename from logging/testlogging.py rename to teil14/testlogging.py