update esp examples

diff --git a/esp32/esp_project/main/CMakeLists.txt b/esp32/esp_project/main/CMakeLists.txt
index ddba2b12b1134cd0fbf0825f9b225b79d4327952..49944e886b31aa6d18ddef11f2999b0b65b98161 100644 (file)
--- a/esp32/esp_project/main/CMakeLists.txt
+++ b/esp32/esp_project/main/CMakeLists.txt
@@ -1,2 +1,2 @@
-idf_component_register(SRCS "wifi.c" "Verify.c"\r
+idf_component_register(SRCS "wifi.c" "SendEncrypted.c"\r

                     INCLUDE_DIRS "")
\ No newline at end of file
                     INCLUDE_DIRS "")
\ No newline at end of file

diff --git a/esp32/esp_project/main/SendEncrypted.c b/esp32/esp_project/main/SendEncrypted.c
index 11e9e0d4c8b445e801d8f8d405e451e4f89dd8f3..41429170d240a2f8c5c18fb7eee8aafccfa82106 100644 (file)
--- a/esp32/esp_project/main/SendEncrypted.c
+++ b/esp32/esp_project/main/SendEncrypted.c
@@ -7,49 +7,54 @@
 #include <stdio.h>\r
 #include <matrix.h>\r
 \r
 #include <stdio.h>\r
 #include <matrix.h>\r
 \r

-#define SERVER       "https://matrix.org"\r
-#define USER_ID      "@pscho:matrix.org"\r
-#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
+#define SERVER        "https://matrix.org"\r
+#define USER_ID       "@example:matrix.org"\r
+#define ROOM_ID       "!example:matrix.org"\r
+#define USERNAME      ""\r
+#define PASSWORD      ""\r
+#define DEVICE_NAME   ""\r
+#define WIFI_SSID     ""\r
+#define WIFI_PASSWORD ""\r

 \r
 int\r
 main(void)\r
 {\r
 \r
 int\r
 main(void)\r
 {\r

-    MatrixClient client;\r
-    MatrixClientInit(&client);\r
+    MatrixClient * client = (MatrixClient*)malloc(sizeof(MatrixClient));\r
+    MatrixClientInit(client);\r

     \r
     \r

-    MatrixHttpInit(&client.hc, SERVER);\r
+    MatrixHttpInit(&client->hc, SERVER);\r

 \r
 \r

-    MatrixClientSetUserId(&client, USER_ID);\r
+    MatrixClientSetUserId(client, USER_ID);\r

 \r
 \r

-    MatrixClientLoginPassword(&client,\r
-        "pscho",\r
-        "Wc23EbmB9G3faMq",\r
-        "Test1");\r
+    MatrixClientLoginPassword(client,\r
+        USERNAME,\r
+        PASSWORD,\r
+        DEVICE_NAME);\r

 \r
 \r

-    MatrixClientUploadDeviceKeys(&client);\r
-    MatrixClientGenerateOnetimeKeys(&client, 10);\r
-    MatrixClientUploadOnetimeKeys(&client);\r
+    MatrixClientUploadDeviceKeys(client);\r
+    MatrixClientGenerateOnetimeKeys(client, 10);\r
+    MatrixClientUploadOnetimeKeys(client);\r

 \r
     // create megolmsession\r
     MatrixMegolmOutSession * megolmOutSession;\r
 \r
     // create megolmsession\r
     MatrixMegolmOutSession * megolmOutSession;\r

-    MatrixClientNewMegolmOutSession(&client,\r
+    MatrixClientNewMegolmOutSession(client,\r

         ROOM_ID,\r
         &megolmOutSession);\r
     printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
 \r
         ROOM_ID,\r
         &megolmOutSession);\r
     printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
 \r

-    MatrixClientShareMegolmOutSession(&client,\r
+    MatrixClientShareMegolmOutSession(client,\r

         USER_ID,\r
         "ULZZOKJBYN",\r
         megolmOutSession);\r
 \r
         USER_ID,\r
         "ULZZOKJBYN",\r
         megolmOutSession);\r
 \r

-    MatrixClientSendEventEncrypted(&client,\r
+    MatrixClientSendEventEncrypted(client,\r

         ROOM_ID,\r
         "m.room.message",\r
         "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
     \r
         ROOM_ID,\r
         "m.room.message",\r
         "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
     \r

-    MatrixClientDeleteDevice(&client);\r
+    MatrixClientDeleteDevice(client);\r

 \r
 \r

-    MatrixHttpDeinit(&client.hc);\r
+    MatrixHttpDeinit(&client->hc);\r

 \r
     return 0;\r
 }\r
 \r
     return 0;\r
 }\r


@@ -59,7 +64,7 @@ main(void)
 void\r
 app_main(void)\r
 {\r
 void\r
 app_main(void)\r
 {\r

-    wifi_init("Hundehuette", "Affensicherespw55");\r
+    wifi_init(WIFI_SSID, WIFI_PASSWORD);\r

 \r
     main();\r
 }\r
 \r
     main();\r
 }\r

diff --git a/esp32/esp_project/main/Verify.c b/esp32/esp_project/main/Verify.c
index cda57097befcafd2cb869d271b0300de0a8c8d71..a5ddbcd2ebbc09ed82dd6283cfac8914dec7bec5 100644 (file)
--- a/esp32/esp_project/main/Verify.c
+++ b/esp32/esp_project/main/Verify.c
@@ -11,21 +11,22 @@
 \r
 #include <stdio.h>\r
 \r
 \r
 #include <stdio.h>\r
 \r

-#define SERVER       "https://matrix.org"\r
-#define USER_ID      "@pscho:matrix.org"\r
-\r
-#define DEVICE_ID    "ULZZOKJBYN"\r
-#define SENDER_KEY   "cjP41XzRlY+pd8DoiBuKQJj9o15mrx6gkrpqTkAPZ2c"\r
-#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
-#define EVENT_ID     "$vOS09eUaI0CduqAcaIU5ZVk6ljLQfLspz7UThP8vaUM"\r
-#define SESSION_ID   "90UbGLue3ADVhvW7hFjoA2c6yg0JJKs/lPdMDZXnZAk"\r
-\r
-// main stack size: 3584\r
+#define SERVER        "https://matrix.org"\r
+#define USER_ID       "@example:matrix.org"\r
+#define ROOM_ID       "!example:matrix.org"\r
+#define USERNAME      ""\r
+#define PASSWORD      ""\r
+#define DEVICE_NAME   ""\r
+#define WIFI_SSID     ""\r
+#define WIFI_PASSWORD ""\r
+\r
+// event id of an encrypted event\r
+// devices can only be verified after they used e2ee in some way\r
+// (at least in Element)\r
+#define EVENT_ID     "$example"\r

 \r
 #define STATIC static\r
 \r
 \r
 #define STATIC static\r
 \r

-\r
-\r

 int\r
 main(void)\r
 {\r
 int\r
 main(void)\r
 {\r


@@ -36,9 +37,9 @@ main(void)
     MatrixClientSetUserId(client, USER_ID);\r
 \r
     MatrixClientLoginPassword(client,\r
     MatrixClientSetUserId(client, USER_ID);\r
 \r
     MatrixClientLoginPassword(client,\r

-        "pscho",\r
-        "Wc23EbmB9G3faMq",\r
-        "Test1");\r
+        USERNAME,\r
+        PASSWORD,\r
+        DEVICE_NAME);\r

     printf("deviceId: %s\n", client->deviceId);\r
     MatrixClientGenerateOnetimeKeys(client, 10);\r
     MatrixClientUploadOnetimeKeys(client);\r
     printf("deviceId: %s\n", client->deviceId);\r
     MatrixClientGenerateOnetimeKeys(client, 10);\r
     MatrixClientUploadOnetimeKeys(client);\r


@@ -99,9 +100,7 @@ main(void)
 void\r
 app_main(void)\r
 {\r
 void\r
 app_main(void)\r
 {\r

-    // wifi_init("Pixel_7762", "affeaffe");\r
-    // wifi_init("Hundehuette", "Affensicherespw55");\r
-    wifi_init("test", "/O801i25");\r
+    wifi_init(WIFI_SSID, WIFI_PASSWORD);\r

 \r
     esp_netif_ip_info_t ip_info;\r
     esp_netif_get_ip_info(IP_EVENT_STA_GOT_IP,&ip_info);\r
 \r
     esp_netif_ip_info_t ip_info;\r
     esp_netif_get_ip_info(IP_EVENT_STA_GOT_IP,&ip_info);\r

diff --git a/esp32/esp_project_risc_v/main/CMakeLists.txt b/esp32/esp_project_risc_v/main/CMakeLists.txt
index 6d651602730bf4924be2a0bd33dac5b3e2b52e1f..879f912f11a3443cc23fed6473aadde9c214a493 100644 (file)
--- a/esp32/esp_project_risc_v/main/CMakeLists.txt
+++ b/esp32/esp_project_risc_v/main/CMakeLists.txt
@@ -1,2 +1,2 @@
-idf_component_register(SRCS "../../../esp_project/main/wifi.c" "../../../esp_project/main/Verify.c"\r
+idf_component_register(SRCS "../../../esp_project/main/wifi.c" "../../../esp_project/main/SendEncrypted.c"\r

                     INCLUDE_DIRS "../../../esp_project/main/")
\ No newline at end of file
                     INCLUDE_DIRS "../../../esp_project/main/")
\ No newline at end of file