Skip to content

Commit 810e212

Browse files
author
Waldemar Porscha
committed
Merge branch 'devel'
2 parents 58a9550 + 7e35def commit 810e212

19 files changed

Lines changed: 1516 additions & 492 deletions

‎.vscode/extensions.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
2-
// See http://go.microsoft.com/fwlink/?LinkId=827846
3-
// for the documentation about the extensions.json format
42
"recommendations": [
3+
"pioarduino.pioarduino-ide",
54
"platformio.platformio-ide"
65
],
76
"unwantedRecommendations": [

‎.vscode/tasks.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,94 @@
11
{
22
"version": "2.0.0",
33
"tasks": [
4+
{
5+
"label": "\u2714 (release)",
6+
"type": "shell",
7+
"command": "scripts/OpenKNX-Build.ps1",
8+
"args": [
9+
"useCurrent"
10+
],
11+
"group": "build",
12+
"problemMatcher": []
13+
},
14+
{
15+
"label": "\u2714 (debug)",
16+
"type": "shell",
17+
"command": "scripts/OpenKNX-Build.ps1",
18+
"args": [
19+
"-DebugBuild",
20+
"useCurrent"
21+
],
22+
"presentation": {
23+
"panel": "shared",
24+
"group": "build-and-flash"
25+
},
26+
"group": "build",
27+
"problemMatcher": []
28+
},
29+
{
30+
"label": "\u2794 (release)",
31+
"type": "shell",
32+
"command": "scripts/OpenKNX-Build.ps1",
33+
"args": [
34+
"useCurrent",
35+
"upload"
36+
],
37+
"group": "build",
38+
"problemMatcher": []
39+
},
40+
{
41+
"label": "\u2794 (debug)",
42+
"type": "shell",
43+
"command": "scripts/OpenKNX-Build.ps1",
44+
"args": [
45+
"-DebugBuild",
46+
"useCurrent",
47+
"upload"
48+
],
49+
"runOptions": {
50+
"instanceLimit": 1,
51+
"instancePolicy": "terminateNewest"
52+
},
53+
"presentation": {
54+
"panel": "shared",
55+
"group": "build-and-flash"
56+
},
57+
"group": "build",
58+
"problemMatcher": []
59+
},
60+
{
61+
"label": "\u2794\u2794 upload only",
62+
"type": "shell",
63+
"command": "scripts/OpenKNX-Build.ps1",
64+
"args": [
65+
"-DebugBuild",
66+
"useCurrent",
67+
"uploadOnly"
68+
],
69+
"group": "build",
70+
"problemMatcher": []
71+
},
72+
{
73+
"label": "\u2794 (debug) + Monitor",
74+
"type": "shell",
75+
"command": "scripts/OpenKNX-Build.ps1",
76+
"args": [
77+
"-Monitor",
78+
"useCurrent"
79+
],
80+
"runOptions": {
81+
"instanceLimit": 1,
82+
"instancePolicy": "terminateNewest"
83+
},
84+
"presentation": {
85+
"panel": "shared",
86+
"group": "monitor"
87+
},
88+
"dependsOn": ["\u2794 (debug)"],
89+
"group": "build",
90+
"problemMatcher": []
91+
},
492
{
593
"label": "OpenKNXproducer",
694
"type": "shell",
@@ -24,6 +112,18 @@
24112
"problemMatcher": [],
25113
"group": "test"
26114
},
115+
{
116+
"label": "Resolve platformio.ini",
117+
"type": "shell",
118+
"command": "~/.platformio/penv/Scripts/pio",
119+
"args": [
120+
"project",
121+
"config",
122+
">platformio.ini.full.txt"
123+
],
124+
"problemMatcher": [],
125+
"group": "test"
126+
},
27127
{
28128
"label": "Develop: RP2040",
29129
"type": "shell",

‎AccessControl.code-workspace‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@
44
"path": "."
55
},
66
{
7-
"path": "../OFM-AccessControl"
7+
"path": "../knx"
88
},
99
{
10-
"path": "./../OFM-SwitchActuator"
10+
"path": "../OFM-AccessControl"
1111
},
1212
{
13-
"path": "./../OFM-Logicmodule"
13+
"path": "../OFM-BinaryInput"
1414
},
1515
{
16-
"path": "../OGM-Common"
16+
"path": "../OFM-ConfigTransfer"
1717
},
1818
{
19-
"path": "../OGM-HardwareConfig"
19+
"path": "../OFM-Feedback"
2020
},
2121
{
22-
"path": "../OFM-VirtualButton"
22+
"path": "../OFM-FileTransferModule"
2323
},
2424
{
25-
"path": "../OFM-BinaryInput"
25+
"path": "../OFM-Logicmodule"
2626
},
2727
{
28-
"path": "../OFM-ConfigTransfer"
28+
"path": "../OFM-SwitchActuator"
2929
},
3030
{
31-
"path": "../OFM-FileTransferModule"
31+
"path": "../OFM-VirtualButton"
3232
},
3333
{
34-
"path": "../OFM-GPIOModule"
34+
"path": "../OGM-Common"
3535
},
3636
{
37-
"path": "../knx"
37+
"path": "../OGM-HardwareConfig"
3838
}
3939
],
4040
"settings": {
@@ -132,7 +132,10 @@
132132
"xloctime": "cpp",
133133
"xmemory": "cpp",
134134
"xtr1common": "cpp",
135-
"text_encoding": "cpp"
135+
"text_encoding": "cpp",
136+
"coroutine": "cpp",
137+
"source_location": "cpp",
138+
"cfenv": "cpp"
136139
}
137140
}
138141
}

‎dependencies.txt‎

-820 Bytes
Binary file not shown.

‎include/hardware.h‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
#define NFC_VEN_PIN 17
5252
#define NFC_DWL_REQ_PIN 23
5353

54+
#define KEYPAD_PCA9633_ADDR 0x62 //(0xc0 >> 1)
55+
5456
#define OPENKNX_BI_GPIO_PINS 28, 18, 29, 19
5557
#define OPENKNX_BI_GPIO_COUNT 4
5658
#endif
@@ -60,10 +62,10 @@
6062
#define SCANNER_SERIAL_RX_PIN OKNXHW_SENSOR_E1_SCL_PIN
6163
#define SCANNER_SERIAL_TX_PIN OKNXHW_SENSOR_E2_SDA_PIN
6264
#define SCANNER_TOUCH_PIN OKNXHW_SENSOR_F1_SCL_PIN
63-
#define DIRECT_TOUCH_LEFT_PIN OKNXHW_SENSOR_B2_SDA_PIN
64-
#define DIRECT_TOUCH_RIGHT_PIN OKNXHW_SENSOR_B1_SCL_PIN
65-
#define DIRECT_LED_GREEN_PIN OKNXHW_SENSOR_C2_SDA_PIN
66-
#define DIRECT_LED_RED_PIN OKNXHW_SENSOR_C1_SCL_PIN
65+
#define DIRECT_TOUCH_LEFT_PIN -1
66+
#define DIRECT_TOUCH_RIGHT_PIN -1
67+
#define DIRECT_LED_GREEN_PIN -1
68+
#define DIRECT_LED_RED_PIN -1
6769

6870
#define EXTERN_TOUCH_LEFT_PIN -1
6971
#define EXTERN_TOUCH_RIGHT_PIN -1
@@ -79,6 +81,11 @@
7981
#define OPENKNX_SWA_RESET_ACTIVE_ON LOW
8082
#define OPENKNX_SWA_BISTABLE_IMPULSE_LENGTH 50
8183

82-
#define OPENKNX_BI_GPIO_PINS OKNXHW_SENSOR_D1_SCL_PIN, OKNXHW_SENSOR_D2_SDA_PIN, OKNXHW_SENSOR_G1_SCL_PIN, OKNXHW_SENSOR_G2_SDA_PIN
84+
#define OPENKNX_BI_GPIO_PINS OKNXHW_SENSOR_G2_SDA_PIN, OKNXHW_SENSOR_G1_SCL_PIN, OKNXHW_SENSOR_G1_SCL_PIN, OKNXHW_SENSOR_G2_SDA_PIN
8385
#define OPENKNX_BI_GPIO_COUNT 4
86+
87+
#define OPENKNX_ACC_KEYPAD_ROW_PINS OKNXHW_SENSOR_A1_SCL_PIN, OKNXHW_SENSOR_A2_SDA_PIN, OKNXHW_SENSOR_B1_SCL_PIN, OKNXHW_SENSOR_B2_SDA_PIN
88+
#define OPENKNX_ACC_KEYPAD_COL_PINS OKNXHW_SENSOR_C1_SCL_PIN, OKNXHW_SENSOR_C2_SDA_PIN, OKNXHW_SENSOR_D1_SCL_PIN
89+
90+
#define OPENKNX_BUZZER_PIN OKNXHW_SENSOR_D2_SDA_PIN
8491
#endif

0 commit comments

Comments
 (0)