Skip to content

Commit c4d30b5

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into master
2 parents 6bb3bc6 + 915d45d commit c4d30b5

34 files changed

+1043
-317
lines changed

‎boards.txt

+275
Original file line numberDiff line numberDiff line change
@@ -4248,6 +4248,281 @@ vintlabs-devkit-v1.menu.DebugLevel.debug.build.code_debug=4
42484248

42494249
##############################################################
42504250

4251+
mgbot-iotik32a.name=MGBOT IOTIK 32A
4252+
4253+
mgbot-iotik32a.upload.tool=esptool_py
4254+
mgbot-iotik32a.upload.maximum_size=1310720
4255+
mgbot-iotik32a.upload.maximum_data_size=327680
4256+
mgbot-iotik32a.upload.wait_for_upload_port=true
4257+
4258+
mgbot-iotik32a.serial.disableDTR=true
4259+
mgbot-iotik32a.serial.disableRTS=true
4260+
4261+
mgbot-iotik32a.build.mcu=esp32
4262+
mgbot-iotik32a.build.core=esp32
4263+
mgbot-iotik32a.build.variant=mgbot-iotik32a
4264+
mgbot-iotik32a.build.board=MGBOT_IOTIK32A
4265+
4266+
mgbot-iotik32a.build.f_cpu=240000000L
4267+
mgbot-iotik32a.build.flash_size=4MB
4268+
mgbot-iotik32a.build.flash_freq=40m
4269+
mgbot-iotik32a.build.flash_mode=dio
4270+
mgbot-iotik32a.build.boot=dio
4271+
mgbot-iotik32a.build.partitions=default
4272+
mgbot-iotik32a.build.defines=
4273+
4274+
mgbot-iotik32a.menu.PSRAM.disabled=Disabled
4275+
mgbot-iotik32a.menu.PSRAM.disabled.build.defines=
4276+
mgbot-iotik32a.menu.PSRAM.enabled=Enabled
4277+
mgbot-iotik32a.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
4278+
4279+
mgbot-iotik32a.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
4280+
mgbot-iotik32a.menu.PartitionScheme.default.build.partitions=default
4281+
mgbot-iotik32a.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
4282+
mgbot-iotik32a.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
4283+
mgbot-iotik32a.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
4284+
mgbot-iotik32a.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
4285+
mgbot-iotik32a.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
4286+
mgbot-iotik32a.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
4287+
mgbot-iotik32a.menu.PartitionScheme.minimal.build.partitions=minimal
4288+
mgbot-iotik32a.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
4289+
mgbot-iotik32a.menu.PartitionScheme.no_ota.build.partitions=no_ota
4290+
mgbot-iotik32a.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
4291+
mgbot-iotik32a.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
4292+
mgbot-iotik32a.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
4293+
mgbot-iotik32a.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
4294+
mgbot-iotik32a.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
4295+
mgbot-iotik32a.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
4296+
mgbot-iotik32a.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
4297+
mgbot-iotik32a.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
4298+
mgbot-iotik32a.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
4299+
mgbot-iotik32a.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
4300+
mgbot-iotik32a.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
4301+
mgbot-iotik32a.menu.PartitionScheme.huge_app.build.partitions=huge_app
4302+
mgbot-iotik32a.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
4303+
mgbot-iotik32a.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
4304+
mgbot-iotik32a.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
4305+
mgbot-iotik32a.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
4306+
mgbot-iotik32a.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
4307+
mgbot-iotik32a.menu.PartitionScheme.fatflash.build.partitions=ffat
4308+
mgbot-iotik32a.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
4309+
mgbot-iotik32a.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
4310+
mgbot-iotik32a.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
4311+
mgbot-iotik32a.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
4312+
4313+
mgbot-iotik32a.menu.CPUFreq.240=240MHz (WiFi/BT)
4314+
mgbot-iotik32a.menu.CPUFreq.240.build.f_cpu=240000000L
4315+
mgbot-iotik32a.menu.CPUFreq.160=160MHz (WiFi/BT)
4316+
mgbot-iotik32a.menu.CPUFreq.160.build.f_cpu=160000000L
4317+
mgbot-iotik32a.menu.CPUFreq.80=80MHz (WiFi/BT)
4318+
mgbot-iotik32a.menu.CPUFreq.80.build.f_cpu=80000000L
4319+
mgbot-iotik32a.menu.CPUFreq.40=40MHz (40MHz XTAL)
4320+
mgbot-iotik32a.menu.CPUFreq.40.build.f_cpu=40000000L
4321+
mgbot-iotik32a.menu.CPUFreq.26=26MHz (26MHz XTAL)
4322+
mgbot-iotik32a.menu.CPUFreq.26.build.f_cpu=26000000L
4323+
mgbot-iotik32a.menu.CPUFreq.20=20MHz (40MHz XTAL)
4324+
mgbot-iotik32a.menu.CPUFreq.20.build.f_cpu=20000000L
4325+
mgbot-iotik32a.menu.CPUFreq.13=13MHz (26MHz XTAL)
4326+
mgbot-iotik32a.menu.CPUFreq.13.build.f_cpu=13000000L
4327+
mgbot-iotik32a.menu.CPUFreq.10=10MHz (40MHz XTAL)
4328+
mgbot-iotik32a.menu.CPUFreq.10.build.f_cpu=10000000L
4329+
4330+
mgbot-iotik32a.menu.FlashMode.qio=QIO
4331+
mgbot-iotik32a.menu.FlashMode.qio.build.flash_mode=dio
4332+
mgbot-iotik32a.menu.FlashMode.qio.build.boot=qio
4333+
mgbot-iotik32a.menu.FlashMode.dio=DIO
4334+
mgbot-iotik32a.menu.FlashMode.dio.build.flash_mode=dio
4335+
mgbot-iotik32a.menu.FlashMode.dio.build.boot=dio
4336+
mgbot-iotik32a.menu.FlashMode.qout=QOUT
4337+
mgbot-iotik32a.menu.FlashMode.qout.build.flash_mode=dout
4338+
mgbot-iotik32a.menu.FlashMode.qout.build.boot=qout
4339+
mgbot-iotik32a.menu.FlashMode.dout=DOUT
4340+
mgbot-iotik32a.menu.FlashMode.dout.build.flash_mode=dout
4341+
mgbot-iotik32a.menu.FlashMode.dout.build.boot=dout
4342+
4343+
mgbot-iotik32a.menu.FlashFreq.80=80MHz
4344+
mgbot-iotik32a.menu.FlashFreq.80.build.flash_freq=80m
4345+
mgbot-iotik32a.menu.FlashFreq.40=40MHz
4346+
mgbot-iotik32a.menu.FlashFreq.40.build.flash_freq=40m
4347+
4348+
mgbot-iotik32a.menu.FlashSize.4M=4MB (32Mb)
4349+
mgbot-iotik32a.menu.FlashSize.4M.build.flash_size=4MB
4350+
mgbot-iotik32a.menu.FlashSize.8M=8MB (64Mb)
4351+
mgbot-iotik32a.menu.FlashSize.8M.build.flash_size=8MB
4352+
mgbot-iotik32a.menu.FlashSize.8M.build.partitions=default_8MB
4353+
mgbot-iotik32a.menu.FlashSize.2M=2MB (16Mb)
4354+
mgbot-iotik32a.menu.FlashSize.2M.build.flash_size=2MB
4355+
mgbot-iotik32a.menu.FlashSize.2M.build.partitions=minimal
4356+
mgbot-iotik32a.menu.FlashSize.16M=16MB (128Mb)
4357+
mgbot-iotik32a.menu.FlashSize.16M.build.flash_size=16MB
4358+
4359+
mgbot-iotik32a.menu.UploadSpeed.921600=921600
4360+
mgbot-iotik32a.menu.UploadSpeed.921600.upload.speed=921600
4361+
mgbot-iotik32a.menu.UploadSpeed.115200=115200
4362+
mgbot-iotik32a.menu.UploadSpeed.115200.upload.speed=115200
4363+
mgbot-iotik32a.menu.UploadSpeed.256000.windows=256000
4364+
mgbot-iotik32a.menu.UploadSpeed.256000.upload.speed=256000
4365+
mgbot-iotik32a.menu.UploadSpeed.230400.windows.upload.speed=256000
4366+
mgbot-iotik32a.menu.UploadSpeed.230400=230400
4367+
mgbot-iotik32a.menu.UploadSpeed.230400.upload.speed=230400
4368+
mgbot-iotik32a.menu.UploadSpeed.460800.linux=460800
4369+
mgbot-iotik32a.menu.UploadSpeed.460800.macosx=460800
4370+
mgbot-iotik32a.menu.UploadSpeed.460800.upload.speed=460800
4371+
mgbot-iotik32a.menu.UploadSpeed.512000.windows=512000
4372+
mgbot-iotik32a.menu.UploadSpeed.512000.upload.speed=512000
4373+
4374+
mgbot-iotik32a.menu.DebugLevel.none=None
4375+
mgbot-iotik32a.menu.DebugLevel.none.build.code_debug=0
4376+
mgbot-iotik32a.menu.DebugLevel.error=Error
4377+
mgbot-iotik32a.menu.DebugLevel.error.build.code_debug=1
4378+
mgbot-iotik32a.menu.DebugLevel.warn=Warn
4379+
mgbot-iotik32a.menu.DebugLevel.warn.build.code_debug=2
4380+
mgbot-iotik32a.menu.DebugLevel.info=Info
4381+
mgbot-iotik32a.menu.DebugLevel.info.build.code_debug=3
4382+
mgbot-iotik32a.menu.DebugLevel.debug=Debug
4383+
mgbot-iotik32a.menu.DebugLevel.debug.build.code_debug=4
4384+
mgbot-iotik32a.menu.DebugLevel.verbose=Verbose
4385+
mgbot-iotik32a.menu.DebugLevel.verbose.build.code_debug=5
4386+
4387+
##############################################################
4388+
4389+
mgbot-iotik32b.name=MGBOT IOTIK 32B
4390+
4391+
mgbot-iotik32b.upload.tool=esptool_py
4392+
mgbot-iotik32b.upload.maximum_size=1310720
4393+
mgbot-iotik32b.upload.maximum_data_size=327680
4394+
mgbot-iotik32b.upload.wait_for_upload_port=true
4395+
4396+
mgbot-iotik32b.serial.disableDTR=true
4397+
mgbot-iotik32b.serial.disableRTS=true
4398+
4399+
mgbot-iotik32b.build.mcu=esp32
4400+
mgbot-iotik32b.build.core=esp32
4401+
mgbot-iotik32b.build.variant=mgbot-iotik32b
4402+
mgbot-iotik32b.build.board=MGBOT_IOTIK32B
4403+
4404+
mgbot-iotik32b.build.f_cpu=240000000L
4405+
mgbot-iotik32b.build.flash_size=4MB
4406+
mgbot-iotik32b.build.flash_freq=40m
4407+
mgbot-iotik32b.build.flash_mode=dio
4408+
mgbot-iotik32b.build.boot=dio
4409+
mgbot-iotik32b.build.partitions=default
4410+
mgbot-iotik32b.build.defines=
4411+
4412+
mgbot-iotik32b.menu.PSRAM.disabled=Disabled
4413+
mgbot-iotik32b.menu.PSRAM.disabled.build.defines=
4414+
mgbot-iotik32b.menu.PSRAM.enabled=Enabled
4415+
mgbot-iotik32b.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
4416+
4417+
mgbot-iotik32b.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
4418+
mgbot-iotik32b.menu.PartitionScheme.default.build.partitions=default
4419+
mgbot-iotik32b.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
4420+
mgbot-iotik32b.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
4421+
mgbot-iotik32b.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
4422+
mgbot-iotik32b.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
4423+
mgbot-iotik32b.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
4424+
mgbot-iotik32b.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
4425+
mgbot-iotik32b.menu.PartitionScheme.minimal.build.partitions=minimal
4426+
mgbot-iotik32b.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
4427+
mgbot-iotik32b.menu.PartitionScheme.no_ota.build.partitions=no_ota
4428+
mgbot-iotik32b.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
4429+
mgbot-iotik32b.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
4430+
mgbot-iotik32b.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
4431+
mgbot-iotik32b.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
4432+
mgbot-iotik32b.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
4433+
mgbot-iotik32b.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
4434+
mgbot-iotik32b.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
4435+
mgbot-iotik32b.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
4436+
mgbot-iotik32b.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
4437+
mgbot-iotik32b.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
4438+
mgbot-iotik32b.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
4439+
mgbot-iotik32b.menu.PartitionScheme.huge_app.build.partitions=huge_app
4440+
mgbot-iotik32b.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
4441+
mgbot-iotik32b.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
4442+
mgbot-iotik32b.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
4443+
mgbot-iotik32b.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
4444+
mgbot-iotik32b.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
4445+
mgbot-iotik32b.menu.PartitionScheme.fatflash.build.partitions=ffat
4446+
mgbot-iotik32b.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
4447+
mgbot-iotik32b.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
4448+
mgbot-iotik32b.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
4449+
mgbot-iotik32b.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
4450+
4451+
mgbot-iotik32b.menu.CPUFreq.240=240MHz (WiFi/BT)
4452+
mgbot-iotik32b.menu.CPUFreq.240.build.f_cpu=240000000L
4453+
mgbot-iotik32b.menu.CPUFreq.160=160MHz (WiFi/BT)
4454+
mgbot-iotik32b.menu.CPUFreq.160.build.f_cpu=160000000L
4455+
mgbot-iotik32b.menu.CPUFreq.80=80MHz (WiFi/BT)
4456+
mgbot-iotik32b.menu.CPUFreq.80.build.f_cpu=80000000L
4457+
mgbot-iotik32b.menu.CPUFreq.40=40MHz (40MHz XTAL)
4458+
mgbot-iotik32b.menu.CPUFreq.40.build.f_cpu=40000000L
4459+
mgbot-iotik32b.menu.CPUFreq.26=26MHz (26MHz XTAL)
4460+
mgbot-iotik32b.menu.CPUFreq.26.build.f_cpu=26000000L
4461+
mgbot-iotik32b.menu.CPUFreq.20=20MHz (40MHz XTAL)
4462+
mgbot-iotik32b.menu.CPUFreq.20.build.f_cpu=20000000L
4463+
mgbot-iotik32b.menu.CPUFreq.13=13MHz (26MHz XTAL)
4464+
mgbot-iotik32b.menu.CPUFreq.13.build.f_cpu=13000000L
4465+
mgbot-iotik32b.menu.CPUFreq.10=10MHz (40MHz XTAL)
4466+
mgbot-iotik32b.menu.CPUFreq.10.build.f_cpu=10000000L
4467+
4468+
mgbot-iotik32b.menu.FlashMode.qio=QIO
4469+
mgbot-iotik32b.menu.FlashMode.qio.build.flash_mode=dio
4470+
mgbot-iotik32b.menu.FlashMode.qio.build.boot=qio
4471+
mgbot-iotik32b.menu.FlashMode.dio=DIO
4472+
mgbot-iotik32b.menu.FlashMode.dio.build.flash_mode=dio
4473+
mgbot-iotik32b.menu.FlashMode.dio.build.boot=dio
4474+
mgbot-iotik32b.menu.FlashMode.qout=QOUT
4475+
mgbot-iotik32b.menu.FlashMode.qout.build.flash_mode=dout
4476+
mgbot-iotik32b.menu.FlashMode.qout.build.boot=qout
4477+
mgbot-iotik32b.menu.FlashMode.dout=DOUT
4478+
mgbot-iotik32b.menu.FlashMode.dout.build.flash_mode=dout
4479+
mgbot-iotik32b.menu.FlashMode.dout.build.boot=dout
4480+
4481+
mgbot-iotik32b.menu.FlashFreq.80=80MHz
4482+
mgbot-iotik32b.menu.FlashFreq.80.build.flash_freq=80m
4483+
mgbot-iotik32b.menu.FlashFreq.40=40MHz
4484+
mgbot-iotik32b.menu.FlashFreq.40.build.flash_freq=40m
4485+
4486+
mgbot-iotik32b.menu.FlashSize.4M=4MB (32Mb)
4487+
mgbot-iotik32b.menu.FlashSize.4M.build.flash_size=4MB
4488+
mgbot-iotik32b.menu.FlashSize.8M=8MB (64Mb)
4489+
mgbot-iotik32b.menu.FlashSize.8M.build.flash_size=8MB
4490+
mgbot-iotik32b.menu.FlashSize.8M.build.partitions=default_8MB
4491+
mgbot-iotik32b.menu.FlashSize.2M=2MB (16Mb)
4492+
mgbot-iotik32b.menu.FlashSize.2M.build.flash_size=2MB
4493+
mgbot-iotik32b.menu.FlashSize.2M.build.partitions=minimal
4494+
mgbot-iotik32b.menu.FlashSize.16M=16MB (128Mb)
4495+
mgbot-iotik32b.menu.FlashSize.16M.build.flash_size=16MB
4496+
4497+
mgbot-iotik32b.menu.UploadSpeed.921600=921600
4498+
mgbot-iotik32b.menu.UploadSpeed.921600.upload.speed=921600
4499+
mgbot-iotik32b.menu.UploadSpeed.115200=115200
4500+
mgbot-iotik32b.menu.UploadSpeed.115200.upload.speed=115200
4501+
mgbot-iotik32b.menu.UploadSpeed.256000.windows=256000
4502+
mgbot-iotik32b.menu.UploadSpeed.256000.upload.speed=256000
4503+
mgbot-iotik32b.menu.UploadSpeed.230400.windows.upload.speed=256000
4504+
mgbot-iotik32b.menu.UploadSpeed.230400=230400
4505+
mgbot-iotik32b.menu.UploadSpeed.230400.upload.speed=230400
4506+
mgbot-iotik32b.menu.UploadSpeed.460800.linux=460800
4507+
mgbot-iotik32b.menu.UploadSpeed.460800.macosx=460800
4508+
mgbot-iotik32b.menu.UploadSpeed.460800.upload.speed=460800
4509+
mgbot-iotik32b.menu.UploadSpeed.512000.windows=512000
4510+
mgbot-iotik32b.menu.UploadSpeed.512000.upload.speed=512000
4511+
4512+
mgbot-iotik32b.menu.DebugLevel.none=None
4513+
mgbot-iotik32b.menu.DebugLevel.none.build.code_debug=0
4514+
mgbot-iotik32b.menu.DebugLevel.error=Error
4515+
mgbot-iotik32b.menu.DebugLevel.error.build.code_debug=1
4516+
mgbot-iotik32b.menu.DebugLevel.warn=Warn
4517+
mgbot-iotik32b.menu.DebugLevel.warn.build.code_debug=2
4518+
mgbot-iotik32b.menu.DebugLevel.info=Info
4519+
mgbot-iotik32b.menu.DebugLevel.info.build.code_debug=3
4520+
mgbot-iotik32b.menu.DebugLevel.debug=Debug
4521+
mgbot-iotik32b.menu.DebugLevel.debug.build.code_debug=4
4522+
mgbot-iotik32b.menu.DebugLevel.verbose=Verbose
4523+
mgbot-iotik32b.menu.DebugLevel.verbose.build.code_debug=5
4524+
4525+
##############################################################
42514526
piranha_esp-32.name=Piranha ESP-32
42524527

42534528
piranha_esp-32.upload.tool=esptool_py

‎cores/esp32/WString.h

+28-1
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,20 @@ class String {
203203
unsigned char equalsIgnoreCase(const String &s) const;
204204
unsigned char equalsConstantTime(const String &s) const;
205205
unsigned char startsWith(const String &prefix) const;
206+
unsigned char startsWith(const char *prefix) const {
207+
return this->startsWith(String(prefix));
208+
}
209+
unsigned char startsWith(const __FlashStringHelper *prefix) const {
210+
return this->startsWith(String(prefix));
211+
}
206212
unsigned char startsWith(const String &prefix, unsigned int offset) const;
207213
unsigned char endsWith(const String &suffix) const;
214+
unsigned char endsWith(const char *suffix) const {
215+
return this->endsWith(String(suffix));
216+
}
217+
unsigned char endsWith(const __FlashStringHelper * suffix) const {
218+
return this->endsWith(String(suffix));
219+
}
208220

209221
// character access
210222
char charAt(unsigned int index) const;
@@ -238,7 +250,22 @@ class String {
238250

239251
// modification
240252
void replace(char find, char replace);
241-
void replace(const String& find, const String& replace);
253+
void replace(const String &find, const String &replace);
254+
void replace(const char *find, const String &replace) {
255+
this->replace(String(find), replace);
256+
}
257+
void replace(const __FlashStringHelper *find, const String &replace) {
258+
this->replace(String(find), replace);
259+
}
260+
void replace(const char *find, const char *replace) {
261+
this->replace(String(find), String(replace));
262+
}
263+
void replace(const __FlashStringHelper *find, const char *replace) {
264+
this->replace(String(find), String(replace));
265+
}
266+
void replace(const __FlashStringHelper *find, const __FlashStringHelper *replace) {
267+
this->replace(String(find), String(replace));
268+
}
242269
void remove(unsigned int index);
243270
void remove(unsigned int index, unsigned int count);
244271
void toLowerCase(void);

0 commit comments

Comments
 (0)