update esp examples

[matrix_esp_thesis] / esp32 / esp_project / main / SendEncrypted.c

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