Skip to content

Commit 3d13ce6

Browse files
authored
Merge pull request #11 from mROS-base/refactor_dirs
Refactor directory structure
2 parents ad30b3d + 205138c commit 3d13ce6

File tree

25 files changed

+27
-13
lines changed

25 files changed

+27
-13
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ set(INCS "mros2/include"
2828
"mros2/embeddedRTPS/thirdparty/lwip"
2929
"mros2/embeddedRTPS/thirdparty/Micro-CDR/include"
3030
"cmsis-esp32/include"
31-
"include"
32-
"custom_msgs"
31+
"platform"
32+
"workspace/custom_msgs"
3333
${CMAKE_SOURCE_DIR}/main
3434
)
3535

Readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ git clone --recursive https://github.com/mROS-base/mros2-esp32.git
2929
cd mros2-esp32
3030
```
3131
### Change WiFi SSID/Pass
32-
Change ESP_WIFI_SSID and ESP_WIFI_PASS in ```/workspace/common/wifi/wifi.h```.
32+
Change ESP_WIFI_SSID and ESP_WIFI_PASS in `platform/wifi/wifi.h`.
3333

3434
### Change IP address
35-
Change IP address in ```/include/rtps/config.h```.
35+
Change IP address in `platform/rtps/config.h`.
3636

3737
When using DHCP, it is also necessary to specify the IP address.
3838
Flash the app and check the IP address from startup log.
File renamed without changes.
File renamed without changes.

workspace/common/wifi/wifi.c renamed to platform/wifi/wifi.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*
2+
* NOTE:
3+
* This file is copied from esp-idf examples as the below, and modified for usage of mros2-esp32.
4+
* https://github.com/espressif/esp-idf/blob/master/examples/wifi/getting_started/station/main/station_example_main.c
5+
* Therefore, mROS-base org inherits the Public Domain (or CC0) LICENCE for this file from the original file.
6+
*/
7+
18
#include "wifi.h"
29

310
#include "freertos/FreeRTOS.h"

workspace/common/wifi/wifi.h renamed to platform/wifi/wifi.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
/*
2+
* NOTE:
3+
* This file is copied from esp-idf examples as the below, and modified for usage of mros2-esp32.
4+
* https://github.com/espressif/esp-idf/blob/master/examples/wifi/getting_started/station/main/station_example_main.c
5+
* Therefore, mROS-base org inherits the Public Domain (or CC0) LICENCE for this file from the original file.
6+
*/
7+
18
#include "esp_wifi_types.h"
29

310
#define ESP_WIFI_SSID "SSID"

0 commit comments

Comments
 (0)