Skip to content

Commit 5af4f64

Browse files
committed
Merge branch 'task/claim_config' into 'master'
claim_configs: Allow choosing between self/assisted claiming for esp32c3 and esp32s3 See merge request app-frameworks/esp-rainmaker!292
2 parents 1d7c325 + c445fe4 commit 5af4f64

File tree

1 file changed

+39
-19
lines changed

1 file changed

+39
-19
lines changed

Diff for: components/esp_rainmaker/Kconfig.projbuild

+39-19
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,42 @@
11
menu "ESP RainMaker Config"
22

3-
config ESP_RMAKER_SELF_CLAIM
4-
bool "Use Self Claiming"
5-
depends on IDF_TARGET_ESP32S2
6-
default y
3+
choice ESP_RMAKER_CLAIM_TYPE
4+
bool "Claiming Type"
5+
default ESP_RMAKER_SELF_CLAIM if IDF_TARGET_ESP32S2
6+
default ESP_RMAKER_ASSISTED_CLAIM if !IDF_TARGET_ESP32S2
77
help
8-
Use Self Claiming i.e. get the MQTT credentials
9-
directly from the claiming service.
8+
Claiming type to be used.
9+
10+
config ESP_RMAKER_NO_CLAIM
11+
bool "Do not use Claiming"
12+
help
13+
Do not use any claiming. The MQTT credentials need to
14+
be pre-programmed for this to work. This should be used
15+
for all private RainMaker deployments.
16+
17+
config ESP_RMAKER_SELF_CLAIM
18+
bool "Use Self Claiming"
19+
depends on !IDF_TARGET_ESP32
20+
help
21+
Use Self Claiming i.e. get the MQTT credentials
22+
directly from the claiming service.
23+
24+
config ESP_RMAKER_ASSISTED_CLAIM
25+
bool "Use Assisted Claiming"
26+
depends on BT_ENABLED && !IDF_TARGET_ESP32S2
27+
help
28+
Use Assisted Claiming i.e. get the MQTT credentials
29+
from the claiming service via assistance from clients,
30+
like the phone apps.
31+
32+
endchoice
33+
34+
35+
config ESP_RMAKER_CLAIM_TYPE
36+
int
37+
default 0 if ESP_RMAKER_NO_CLAIM
38+
default 1 if ESP_RMAKER_SELF_CLAIM
39+
default 2 if ESP_RMAKER_ASSISTED_CLAIM
1040

1141
config ESP_RMAKER_CLAIM_SERVICE_BASE_URL
1242
string "ESP RainMaker Claiming Service Base URL"
@@ -15,16 +45,6 @@ menu "ESP RainMaker Config"
1545
help
1646
ESP RainMaker Claiming Service Base URL.
1747

18-
config ESP_RMAKER_ASSISTED_CLAIM
19-
bool "Use Assisted Claiming"
20-
depends on BT_ENABLED
21-
select MBEDTLS_HARDWARE_MPI
22-
default y
23-
help
24-
Use Assisted Claiming i.e. get the MQTT credentials
25-
from the claiming service via assistance from clients,
26-
like the phone apps.
27-
2848
config ESP_RMAKER_MQTT_HOST
2949
string "ESP RainMaker MQTT Host"
3050
depends on ESP_RMAKER_SELF_CLAIM || ESP_RMAKER_ASSISTED_CLAIM
@@ -158,10 +178,10 @@ menu "ESP RainMaker Config"
158178
default 1024
159179
range 512 LWIP_TCP_WND_DEFAULT
160180
help
161-
Increasing this value beyond the default would speed up the OTA download process.
162-
However, please ensure that your application has enough memory headroom to allow this,
181+
Increasing this value beyond the default would speed up the OTA download process.
182+
However, please ensure that your application has enough memory headroom to allow this,
163183
else, the OTA may fail.
164-
184+
165185
endmenu
166186

167187
menu "ESP RainMaker Scheduling"

0 commit comments

Comments
 (0)