3 files changed, 200 insertions, 200 deletions
diff --git a/esp32/esp_project/components/matrix/CMakeLists.txt b/esp32/esp_project/components/matrix/CMakeLists.txt
index 2387948..bf7da7a 100644
--- a/esp32/esp_project/components/matrix/CMakeLists.txt
+++ b/esp32/esp_project/components/matrix/CMakeLists.txt
@@ -1,16 +1,16 @@
-idf_component_register(SRCS
-                            "../../../../src/matrix.c"
-                            "../../../../src/matrix_http_esp32.c"
-                            "../../../../ext/mjson/src/mjson.c"
-                       INCLUDE_DIRS
-                            "../../../../ext/olm/include"
-                            "../../../../ext/olm/lib"
-                            "../../../../ext/mjson/src"
-                            "../../../../src"
-                       REQUIRES
-                            esp-tls
-                            esp_http_client
-                            esp_netif
-                            nvs_flash)
-
-SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")
+idf_component_register(SRCS
+                            "../../../../src/matrix.c"
+                            "../../../../src/matrix_http_esp32.c"
+                            "../../../../ext/mjson/src/mjson.c"
+                       INCLUDE_DIRS
+                            "../../../../ext/olm/include"
+                            "../../../../ext/olm/lib"
+                            "../../../../ext/mjson/src"
+                            "../../../../src"
+                       REQUIRES
+                            esp-tls
+                            esp_http_client
+                            esp_netif
+                            nvs_flash)
+
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")
diff --git a/esp32/esp_project/main/SendEncrypted.c b/esp32/esp_project/main/SendEncrypted.c
index 8d813ad..11e9e0d 100644
--- a/esp32/esp_project/main/SendEncrypted.c
+++ b/esp32/esp_project/main/SendEncrypted.c
@@ -1,65 +1,65 @@
-#define OLMLIB_VERSION_MAJOR 3
-#define OLMLIB_VERSION_MINOR 2
-#define OLMLIB_VERSION_PATCH 15
-
-#define OLM_STATIC_DEFINE
-
-#include <stdio.h>
-#include <matrix.h>
-
-#define SERVER       "https://matrix.org"
-#define USER_ID      "@pscho:matrix.org"
-#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"
-
-int
-main(void)
-{
-    MatrixClient client;
-    MatrixClientInit(&client);
-    
-    MatrixHttpInit(&client.hc, SERVER);
-
-    MatrixClientSetUserId(&client, USER_ID);
-
-    MatrixClientLoginPassword(&client,
-        "pscho",
-        "Wc23EbmB9G3faMq",
-        "Test1");
-
-    MatrixClientUploadDeviceKeys(&client);
-    MatrixClientGenerateOnetimeKeys(&client, 10);
-    MatrixClientUploadOnetimeKeys(&client);
-
-    // create megolmsession
-    MatrixMegolmOutSession * megolmOutSession;
-    MatrixClientNewMegolmOutSession(&client,
-        ROOM_ID,
-        &megolmOutSession);
-    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);
-
-    MatrixClientShareMegolmOutSession(&client,
-        USER_ID,
-        "ULZZOKJBYN",
-        megolmOutSession);
-
-    MatrixClientSendEventEncrypted(&client,
-        ROOM_ID,
-        "m.room.message",
-        "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");
-    
-    MatrixClientDeleteDevice(&client);
-
-    MatrixHttpDeinit(&client.hc);
-
-    return 0;
-}
-
-#include "wifi.h"
-
-void
-app_main(void)
-{
-    wifi_init("Hundehuette", "Affensicherespw55");
-
-    main();
-}
+#define OLMLIB_VERSION_MAJOR 3
+#define OLMLIB_VERSION_MINOR 2
+#define OLMLIB_VERSION_PATCH 15
+
+#define OLM_STATIC_DEFINE
+
+#include <stdio.h>
+#include <matrix.h>
+
+#define SERVER       "https://matrix.org"
+#define USER_ID      "@pscho:matrix.org"
+#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"
+
+int
+main(void)
+{
+    MatrixClient client;
+    MatrixClientInit(&client);
+    
+    MatrixHttpInit(&client.hc, SERVER);
+
+    MatrixClientSetUserId(&client, USER_ID);
+
+    MatrixClientLoginPassword(&client,
+        "pscho",
+        "Wc23EbmB9G3faMq",
+        "Test1");
+
+    MatrixClientUploadDeviceKeys(&client);
+    MatrixClientGenerateOnetimeKeys(&client, 10);
+    MatrixClientUploadOnetimeKeys(&client);
+
+    // create megolmsession
+    MatrixMegolmOutSession * megolmOutSession;
+    MatrixClientNewMegolmOutSession(&client,
+        ROOM_ID,
+        &megolmOutSession);
+    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);
+
+    MatrixClientShareMegolmOutSession(&client,
+        USER_ID,
+        "ULZZOKJBYN",
+        megolmOutSession);
+
+    MatrixClientSendEventEncrypted(&client,
+        ROOM_ID,
+        "m.room.message",
+        "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");
+    
+    MatrixClientDeleteDevice(&client);
+
+    MatrixHttpDeinit(&client.hc);
+
+    return 0;
+}
+
+#include "wifi.h"
+
+void
+app_main(void)
+{
+    wifi_init("Hundehuette", "Affensicherespw55");
+
+    main();
+}
diff --git a/esp32/esp_project/main/Verify.c b/esp32/esp_project/main/Verify.c
index 91f9be8..cda5709 100644
--- a/esp32/esp_project/main/Verify.c
+++ b/esp32/esp_project/main/Verify.c
@@ -1,119 +1,119 @@
-#include <matrix.h>
-#include <mjson.h>
-#include <olm/sas.h>
-
-#if !CONFIG_IDF_TARGET_LINUX
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
-#include "esp_system.h"
-#include "driver/gpio.h"
-#endif
-
-#include <stdio.h>
-
-#define SERVER       "https://matrix.org"
-#define USER_ID      "@pscho:matrix.org"
-
-#define DEVICE_ID    "ULZZOKJBYN"
-#define SENDER_KEY   "cjP41XzRlY+pd8DoiBuKQJj9o15mrx6gkrpqTkAPZ2c"
-#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"
-#define EVENT_ID     "$vOS09eUaI0CduqAcaIU5ZVk6ljLQfLspz7UThP8vaUM"
-#define SESSION_ID   "90UbGLue3ADVhvW7hFjoA2c6yg0JJKs/lPdMDZXnZAk"
-
-// main stack size: 3584
-
-#define STATIC static
-
-
-
-int
-main(void)
-{
-    MatrixClient * client = (MatrixClient*)malloc(sizeof(MatrixClient));
-    MatrixClientInit(client);
-
-    MatrixHttpInit(&client->hc, SERVER);
-    MatrixClientSetUserId(client, USER_ID);
-
-    MatrixClientLoginPassword(client,
-        "pscho",
-        "Wc23EbmB9G3faMq",
-        "Test1");
-    printf("deviceId: %s\n", client->deviceId);
-    MatrixClientGenerateOnetimeKeys(client, 10);
-    MatrixClientUploadOnetimeKeys(client);
-    MatrixClientUploadDeviceKeys(client);
-
-    STATIC char eventBuffer[1024];
-    MatrixClientGetRoomEvent(client,
-        ROOM_ID,
-        EVENT_ID,
-        eventBuffer, 1024);
-    printf("event: %s\n", eventBuffer);
-
-    #define SYNC_BUFFER_SIZE 1024*10
-
-    // char * syncBuffer = (char*)malloc(SYNC_BUFFER_SIZE);
-    STATIC char syncBuffer[SYNC_BUFFER_SIZE];
-    STATIC char nextBatch[1024];
-
-    while (! client->verified) {
-        MatrixClientSync(client, syncBuffer, SYNC_BUFFER_SIZE, nextBatch, 1024);
-    }
-
-    printf("verified!\n");
-
-    // create and share megolm out session
-    MatrixMegolmOutSession * megolmOutSession;
-    MatrixClientNewMegolmOutSession(client,
-        ROOM_ID,
-        &megolmOutSession);
-    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);
-    MatrixClientShareMegolmOutSession(client,
-        USER_ID,
-        "ULZZOKJBYN",
-        megolmOutSession);
-
-    // send 10 random messages
-    for (int i = 0; i < 10; i++) {
-        static const char * msgs[] = { "A", "B", "C" };
-        static char msg[128];
-        snprintf(msg, 128, "{\"body\":\"%s\",\"msgtype\":\"m.text\"}", msgs[rand()%(sizeof(msgs)/sizeof(msgs[0]))]);
-
-        MatrixClientSendEventEncrypted(client,
-            ROOM_ID,
-            "m.room.message",
-            msg);
-    }
-
-    MatrixClientDeleteDevice(client);
-        
-    MatrixHttpDeinit(&client->hc);
-
-    return 0;
-}
-
-#include "wifi.h"
-#include <esp_netif.h>
-
-void
-app_main(void)
-{
-    // wifi_init("Pixel_7762", "affeaffe");
-    // wifi_init("Hundehuette", "Affensicherespw55");
-    wifi_init("test", "/O801i25");
-
-    esp_netif_ip_info_t ip_info;
-    esp_netif_get_ip_info(IP_EVENT_STA_GOT_IP,&ip_info);
-    printf("My IP: " IPSTR "\n", IP2STR(&ip_info.ip));
-    printf("My GW: " IPSTR "\n", IP2STR(&ip_info.gw));
-    printf("My NETMASK: " IPSTR "\n", IP2STR(&ip_info.netmask));
-
-    // uint64_t bitmask = 0xffffffffffffffff;
-    // bitmask = bitmask & SOC_GPIO_VALID_GPIO_MASK;
-    // gpio_dump_io_configuration(stdout, bitmask);
-    gpio_set_direction(GPIO_NUM_2, GPIO_MODE_OUTPUT);
-    // gpio_dump_io_configuration(stdout, bitmask);
-
-    main();
-}
+#include <matrix.h>
+#include <mjson.h>
+#include <olm/sas.h>
+
+#if !CONFIG_IDF_TARGET_LINUX
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "esp_system.h"
+#include "driver/gpio.h"
+#endif
+
+#include <stdio.h>
+
+#define SERVER       "https://matrix.org"
+#define USER_ID      "@pscho:matrix.org"
+
+#define DEVICE_ID    "ULZZOKJBYN"
+#define SENDER_KEY   "cjP41XzRlY+pd8DoiBuKQJj9o15mrx6gkrpqTkAPZ2c"
+#define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"
+#define EVENT_ID     "$vOS09eUaI0CduqAcaIU5ZVk6ljLQfLspz7UThP8vaUM"
+#define SESSION_ID   "90UbGLue3ADVhvW7hFjoA2c6yg0JJKs/lPdMDZXnZAk"
+
+// main stack size: 3584
+
+#define STATIC static
+
+
+
+int
+main(void)
+{
+    MatrixClient * client = (MatrixClient*)malloc(sizeof(MatrixClient));
+    MatrixClientInit(client);
+
+    MatrixHttpInit(&client->hc, SERVER);
+    MatrixClientSetUserId(client, USER_ID);
+
+    MatrixClientLoginPassword(client,
+        "pscho",
+        "Wc23EbmB9G3faMq",
+        "Test1");
+    printf("deviceId: %s\n", client->deviceId);
+    MatrixClientGenerateOnetimeKeys(client, 10);
+    MatrixClientUploadOnetimeKeys(client);
+    MatrixClientUploadDeviceKeys(client);
+
+    STATIC char eventBuffer[1024];
+    MatrixClientGetRoomEvent(client,
+        ROOM_ID,
+        EVENT_ID,
+        eventBuffer, 1024);
+    printf("event: %s\n", eventBuffer);
+
+    #define SYNC_BUFFER_SIZE 1024*10
+
+    // char * syncBuffer = (char*)malloc(SYNC_BUFFER_SIZE);
+    STATIC char syncBuffer[SYNC_BUFFER_SIZE];
+    STATIC char nextBatch[1024];
+
+    while (! client->verified) {
+        MatrixClientSync(client, syncBuffer, SYNC_BUFFER_SIZE, nextBatch, 1024);
+    }
+
+    printf("verified!\n");
+
+    // create and share megolm out session
+    MatrixMegolmOutSession * megolmOutSession;
+    MatrixClientNewMegolmOutSession(client,
+        ROOM_ID,
+        &megolmOutSession);
+    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);
+    MatrixClientShareMegolmOutSession(client,
+        USER_ID,
+        "ULZZOKJBYN",
+        megolmOutSession);
+
+    // send 10 random messages
+    for (int i = 0; i < 10; i++) {
+        static const char * msgs[] = { "A", "B", "C" };
+        static char msg[128];
+        snprintf(msg, 128, "{\"body\":\"%s\",\"msgtype\":\"m.text\"}", msgs[rand()%(sizeof(msgs)/sizeof(msgs[0]))]);
+
+        MatrixClientSendEventEncrypted(client,
+            ROOM_ID,
+            "m.room.message",
+            msg);
+    }
+
+    MatrixClientDeleteDevice(client);
+        
+    MatrixHttpDeinit(&client->hc);
+
+    return 0;
+}
+
+#include "wifi.h"
+#include <esp_netif.h>
+
+void
+app_main(void)
+{
+    // wifi_init("Pixel_7762", "affeaffe");
+    // wifi_init("Hundehuette", "Affensicherespw55");
+    wifi_init("test", "/O801i25");
+
+    esp_netif_ip_info_t ip_info;
+    esp_netif_get_ip_info(IP_EVENT_STA_GOT_IP,&ip_info);
+    printf("My IP: " IPSTR "\n", IP2STR(&ip_info.ip));
+    printf("My GW: " IPSTR "\n", IP2STR(&ip_info.gw));
+    printf("My NETMASK: " IPSTR "\n", IP2STR(&ip_info.netmask));
+
+    // uint64_t bitmask = 0xffffffffffffffff;
+    // bitmask = bitmask & SOC_GPIO_VALID_GPIO_MASK;
+    // gpio_dump_io_configuration(stdout, bitmask);
+    gpio_set_direction(GPIO_NUM_2, GPIO_MODE_OUTPUT);
+    // gpio_dump_io_configuration(stdout, bitmask);
+
+    main();
+}