Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
Nall-chan committed Dec 3, 2023
1 parent 0f8922a commit 54e6fc4
Show file tree
Hide file tree
Showing 49 changed files with 1,219 additions and 1,715 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Check Style

on: [push, pull_request]

jobs:
style:
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
- name: Checkout module
uses: actions/checkout@master
- name: Check style
uses: Nall-chan/action-style@master
14 changes: 14 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Run Tests

on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Checkout module
uses: actions/checkout@master
with:
submodules: true
- name: Run tests
uses: symcon/action-tests@master
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "tests/stubs"]
path = tests/stubs
url = https://github.com/Nall-chan/SymconStubs
[submodule ".vscode"]
path = .vscode
url = https://github.com/Nall-chan/SymconVSCTasks.git
[submodule ".style"]
path = .style
url = https://github.com/Nall-chan/StylePHP
1 change: 1 addition & 0 deletions .style
Submodule .style added at db9431
14 changes: 0 additions & 14 deletions .styleci.yml

This file was deleted.

1 change: 1 addition & 0 deletions .vscode
Submodule .vscode added at 672a09
18 changes: 9 additions & 9 deletions ClientSplitter/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ClientSplitter (IPSNetwork)
# ClientSplitter (Network)

Implementierung eines Splitters für ServerSocket und WebSocket-Server.

Expand Down Expand Up @@ -31,7 +31,7 @@ Implementierung eines Splitters für ServerSocket und WebSocket-Server.
## 3. Installation

Über das Modul-Control folgende URL hinzufügen.
`git://github.com/Nall-chan/IPSNetwork.git`
`git://github.com/Nall-chan/Network.git`

**Bei kommerzieller Nutzung (z.B. als Errichter oder Integrator) wenden Sie sich bitte an den Autor.**

Expand Down Expand Up @@ -59,15 +59,15 @@ Implementierung eines Splitters für ServerSocket und WebSocket-Server.

GUID des Modules (z.B. wenn Instanz per PHP angelegt werden soll):

| Instanz | GUID |
| :--------------: | :------------------------------------: |
| Client Splitter | {7A107D38-75ED-47CB-83F9-F41228CAEEFA} |
| Instanz | GUID |
| :-------------: | :------------------------------------: |
| Client Splitter | {7A107D38-75ED-47CB-83F9-F41228CAEEFA} |

Eigenschaften des 'Client Splitter' für Get/SetProperty-Befehle:

| Eigenschaft | Typ | Standardwert | Funktion |
| :-----------: | :-----: | :----------: | :-----------------------: |
| ClientIP | string | | Die IP-Adresse des Client |
| Eigenschaft | Typ | Standardwert | Funktion |
| :---------: | :----: | :----------: | :-----------------------: |
| ClientIP | string | | Die IP-Adresse des Client |


## 8. Datenaustausch
Expand All @@ -79,7 +79,7 @@ Kompatibel zum Interface Virtual-IO.
**Changlog:**

Version 1.1:
- In IPSNetwork-Library integriert
- In Network-Library integriert

Version 1.0:
- Erstes offizielles Release
Expand Down
15 changes: 7 additions & 8 deletions ClientSplitter/form.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"elements":
[
{
"name": "ClientIP",
"type": "ValidationTextBox",
"caption": "Client IP:"
}
]
"elements": [
{
"name": "ClientIP",
"type": "ValidationTextBox",
"caption": "Client IP:"
}
]
}
20 changes: 15 additions & 5 deletions ClientSplitter/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@
"name": "ClientSplitter",
"type": 2,
"vendor": "",
"aliases": ["Client Splitter"],
"parentRequirements": ["{C8792760-65CF-4C53-B5C7-A30FCC84FEFE}"],
"childRequirements": ["{018EF6B5-AB94-40C6-AA53-46943E824ACF}"],
"implemented": ["{7A1272A4-CBDB-46EF-BFC6-DCF4A53D2FC7}", "{79827379-F36E-4ADA-8A95-5F8D1DC92FA9}"],
"prefix": "WSC"
"aliases": [
"Client Splitter"
],
"parentRequirements": [
"{C8792760-65CF-4C53-B5C7-A30FCC84FEFE}"
],
"childRequirements": [
"{018EF6B5-AB94-40C6-AA53-46943E824ACF}"
],
"implemented": [
"{7A1272A4-CBDB-46EF-BFC6-DCF4A53D2FC7}",
"{79827379-F36E-4ADA-8A95-5F8D1DC92FA9}"
],
"prefix": "WSC",
"url": "https://github.com/Nall-chan/Network"
}
2 changes: 2 additions & 0 deletions ClientSplitter/module.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

require_once __DIR__ . '/../libs/NetworkTraits.php';

/*
Expand Down
18 changes: 9 additions & 9 deletions DHCPSniffer/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# DHCPSniffer (IPSNetwork)
# DHCPSniffer (Network)

Modul für IP-Symcon ab Version 4.3 ermöglicht es auf Events von Geräten zu reagieren, die eine Anfrage ins Netzwerk per DHCP oder dem Bootstrap Protocol stellen.
So lässt sich zum Beispiel auf das Drücken eines Dashbuttons (siehe [Anhang](#7-anhang)) reagieren oder auf das Anmelden eines Geräts, wie ein Smartphone, in einem LAN.
Expand Down Expand Up @@ -43,7 +43,7 @@ In dem sich öffnenden Fenster folgende URL hinzufügen:
![Modules](../imgs/RepositoryURL.png?raw=true "URL Repository")


`https://github.com/Nall-chan/IPSNetwork`
`https://github.com/Nall-chan/Network`

und mit _OK_ bestätigen.

Expand Down Expand Up @@ -71,18 +71,18 @@ Auf die Variable kann dann ein Ereigniss gelegt werden, dass bei Variablenänder

GUID des Modules (z.B. wenn Instanz per PHP angelegt werden soll):

| Instanz | GUID |
| :--------------: | :------------------------------------: |
| DHCP Sniffer | {E93BCE5E-BA95-424E-8C3A-BF6AEE6CB976} |
| Instanz | GUID |
| :----------: | :------------------------------------: |
| DHCP Sniffer | {E93BCE5E-BA95-424E-8C3A-BF6AEE6CB976} |

Eigenschaften des 'DHCP Sniffer' für Get/SetProperty-Befehle:


| Eigenschaft | Typ | Standardwert | Funktion |
| Eigenschaft | Typ | Standardwert | Funktion |
| :---------: | :-----: | :----------: | :-------------------------------------------------------------: |
| Protocol | integer | | Auswahl des Protokolls |
| Address | string | | MAC Adresse des Geräts das ein Event in IP-Symcon auslösen soll |
| Action | integer | | Art der Aktion, die ausgeführt werden soll |
| Protocol | integer | | Auswahl des Protokolls |
| Address | string | | MAC Adresse des Geräts das ein Event in IP-Symcon auslösen soll |
| Action | integer | | Art der Aktion, die ausgeführt werden soll |



Expand Down
103 changes: 52 additions & 51 deletions DHCPSniffer/form.json
Original file line number Diff line number Diff line change
@@ -1,58 +1,59 @@
{
"elements":
[
"elements": [
{
"name": "Protocol",
"type": "Select",
"caption": "Protocol",
"options": [
{
"name": "Protocol",
"type": "Select",
"caption": "Protocol",
"options": [
{
"caption": "DHCP",
"value": 0
},
{
"caption": "BOOTP",
"value": 1
},
{
"caption": "DHCP & BOOTP",
"value": 2
}
]
}, {
"name": "Address",
"type": "ValidationTextBox",
"caption": "MAC Address"
}, {
"name": "Action",
"type": "Select",
"caption": "State",
"options": [
{
"caption": "Event (true)",
"value": 0
},
{
"caption": "Impulse (monostabil)",
"value": 1
},
{
"caption": "Toggle (bistabil)",
"value": 2
}
]
}],
"status":
[
"caption": "DHCP",
"value": 0
},
{
"caption": "BOOTP",
"value": 1
},
{
"caption": "DHCP & BOOTP",
"value": 2
}
]
},
{
"name": "Address",
"type": "ValidationTextBox",
"caption": "MAC Address"
},
{
"name": "Action",
"type": "Select",
"caption": "State",
"options": [
{
"caption": "Event (true)",
"value": 0
},
{
"code": 102,
"icon": "active",
"caption": "Mac ok."
"caption": "Impulse (monostabil)",
"value": 1
},
{
"code": 201,
"icon": "error",
"caption": "Mac invalid."
"caption": "Toggle (bistabil)",
"value": 2
}
]
}
}
],
"status": [
{
"code": 102,
"icon": "active",
"caption": "Mac ok."
},
{
"code": 201,
"icon": "error",
"caption": "Mac invalid."
}
]
}
14 changes: 7 additions & 7 deletions DHCPSniffer/locale.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"translations": {
"de": {
"Protocol": "Protokoll",
"MAC Address":"MAC Adresse",
"Action":"Aktion"
}
}
"translations": {
"de": {
"Protocol": "Protokoll",
"MAC Address": "MAC Adresse",
"Action": "Aktion"
}
}
}
17 changes: 11 additions & 6 deletions DHCPSniffer/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
"id": "{E93BCE5E-BA95-424E-8C3A-BF6AEE6CB976}",
"name": "DHCP Sniffer",
"type": 3,
"vendor": "Nall-chan",
"aliases": [],
"parentRequirements": ["{79827379-F36E-4ADA-8A95-5F8D1DC92FA9}"],
"vendor": "",
"aliases": [],
"parentRequirements": [
"{79827379-F36E-4ADA-8A95-5F8D1DC92FA9}"
],
"childRequirements": [],
"implemented": ["{018EF6B5-AB94-40C6-AA53-46943E824ACF}"],
"prefix": "DHCP"
}
"implemented": [
"{018EF6B5-AB94-40C6-AA53-46943E824ACF}"
],
"prefix": "DHCP",
"url": "https://github.com/Nall-chan/Network"
}
Loading

0 comments on commit 54e6fc4

Please sign in to comment.