Skip to content

Commit 1873eaa

Browse files
facchinmfacchinm
authored
Merge pull request arduino#54 from bcmi-labs/muxto_I2C_gpio_bug_fix
Muxto i2c support and gpio bug fix
2 parents eaac320 + 84bbb79 commit 1873eaa

34 files changed

+1947
-35
lines changed

‎cores/arduino/analog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ bool analogAddPinToCompare(pin_size_t pinNumber, bool lower_or_outside_wnd);
5959

6060
int analogRead(bsp_io_port_pin_t pinNumber);
6161

62-
62+
void analogWriteDAC(pin_size_t pinNumber, int value);
6363

6464
#endif

‎extras/e2studioProjects/Santiago/.settings/e2studio_project.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#
2-
#Tue Feb 14 11:30:32 CET 2023
2+
#Mon Mar 13 10:57:49 CET 2023

‎extras/e2studioProjects/Santiago/.settings/language.settings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-835941081058158514" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="727094528048825788" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -16,7 +16,7 @@
1616
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-835941081058158514" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
19+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="727094528048825788" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2020
<language-scope id="org.eclipse.cdt.core.gcc"/>
2121
<language-scope id="org.eclipse.cdt.core.g++"/>
2222
</provider>

‎extras/e2studioProjects/muxto_lib/.cproject

+106
Large diffs are not rendered by default.

‎extras/e2studioProjects/muxto_lib/.secure_azone

+8
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,25 @@
99
<slot name="P300" secure="false"/>
1010
</peripheral>
1111
<peripheral name="SCI0" group="SCI" security=""/>
12+
<peripheral name="IIC0" group="IIC" security=""/>
1213
<peripheral name="USB_FS" security=""/>
1314
<peripheral name="AGT0" group="AGT" security=""/>
1415
<peripheral name="GPT0" group="GPT" security=""/>
1516
<peripheral name="ADC0" group="ADC" security=""/>
17+
<peripheral name="DAC0" group="DAC" security=""/>
18+
<peripheral name="DAC120" group="DAC12" security=""/>
19+
<peripheral name="DAC80" group="DAC8" security=""/>
1620
<peripheral name="ICU">
1721
<slot name="IRQ0" secure="false"/>
1822
<slot name="IRQ1" secure="false"/>
1923
<slot name="IRQ2" secure="false"/>
2024
<slot name="IRQ3" secure="false"/>
2125
<slot name="IRQ4" secure="false"/>
2226
<slot name="IRQ5" secure="false"/>
27+
<slot name="IRQ6" secure="false"/>
28+
<slot name="IRQ7" secure="false"/>
29+
<slot name="IRQ8" secure="false"/>
30+
<slot name="IRQ9" secure="false"/>
2331
</peripheral>
2432
</partition>
2533
</azone>

‎extras/e2studioProjects/muxto_lib/.settings/com.renesas.cdt.ddsc.packs.componentfiles.prefs

+22-10
Large diffs are not rendered by default.

‎extras/e2studioProjects/muxto_lib/.settings/com.renesas.cdt.ddsc.settingseditor.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
com.renesas.cdt.ddsc.settingseditor.active_page=DeviceAndToolSelection
1+
com.renesas.cdt.ddsc.settingseditor.active_page=SWPConfigurator
22
eclipse.preferences.version=1

‎extras/e2studioProjects/muxto_lib/.settings/com.renesas.cdt.ddsc.threads.configurator.prefs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
collapse/module.driver.i2c_on_iic_master.1477785219=false
2+
collapse/module.driver.i2c_on_sci_i2c.1053428145=false
13
collapse/module.driver.pcdc_on_usb.1610074047=false
24
collapse/module.driver.uart_on_sci_uart.1721156276=false
35
collapse/module.driver.uart_on_sci_uart.960228264=false

‎extras/e2studioProjects/muxto_lib/.settings/e2studio_project.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#
2-
#Wed Dec 07 18:14:51 CET 2022
2+
#Mon Mar 13 14:37:58 CET 2023
33
activeConfiguration=com.renesas.cdt.managedbuild.gnuarm.config.lib.debug.1218447377

‎extras/e2studioProjects/muxto_lib/.settings/language.settings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-155276074857078745" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="761876741735439644" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -16,7 +16,7 @@
1616
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1717
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1818
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-155276074857078745" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
19+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="761876741735439644" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2020
<language-scope id="org.eclipse.cdt.core.gcc"/>
2121
<language-scope id="org.eclipse.cdt.core.g++"/>
2222
</provider>

‎extras/e2studioProjects/muxto_lib/configuration.xml

+126
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,30 @@
175175
<description>USB Peripheral Communications Device Class</description>
176176
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
177177
</component>
178+
<component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dac" variant="" vendor="Renesas" version="4.0.0">
179+
<description>12-bit D/A Converter</description>
180+
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
181+
</component>
182+
<component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dac8" variant="" vendor="Renesas" version="4.0.0">
183+
<description>8-bit D/A Converter</description>
184+
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
185+
</component>
186+
<component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_dtc" variant="" vendor="Renesas" version="4.0.0">
187+
<description>Data Transfer Controller</description>
188+
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
189+
</component>
190+
<component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_master" variant="" vendor="Renesas" version="4.0.0">
191+
<description>I2C Master Interface</description>
192+
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
193+
</component>
194+
<component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_iic_slave" variant="" vendor="Renesas" version="4.0.0">
195+
<description>I2C Slave Interface</description>
196+
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
197+
</component>
198+
<component apiversion="" class="HAL Drivers" condition="" group="all" subgroup="r_sci_i2c" variant="" vendor="Renesas" version="4.0.0">
199+
<description>SCI I2C Master Interface</description>
200+
<originalPack>Renesas.RA.4.0.0.pack</originalPack>
201+
</component>
178202
</raComponentSelection>
179203
<raElcConfiguration/>
180204
<raIcuConfiguration/>
@@ -362,6 +386,79 @@
362386
<property id="module.driver.adc.window_b_ipl" value="_disabled"/>
363387
<property id="module.driver.adc.adbuf" value="module.driver.adc.adbuf.disabled"/>
364388
</module>
389+
<module id="module.driver.i2c_on_iic_master.1477785219">
390+
<property id="module.driver.i2c_master.name" value="g_i2c_master0"/>
391+
<property id="module.driver.i2c_master.channel" value="0"/>
392+
<property id="module.driver.i2c_master.rate" value="module.driver.i2c_master.rate.rate_standard"/>
393+
<property id="module.driver.i2c_master.rise_time_ns" value="120"/>
394+
<property id="module.driver.i2c_master.fall_time_ns" value="120"/>
395+
<property id="module.driver.i2c_master.duty" value="50"/>
396+
<property id="module.driver.i2c_master.slave" value="0x00"/>
397+
<property id="module.driver.i2c_master.addr_mode" value="module.driver.i2c_master.addr_mode.addr_mode_7bit"/>
398+
<property id="module.driver.i2c_master.timeout_mode" value="module.driver.i2c_master.timeout_mode.short_mode"/>
399+
<property id="module.driver.i2c_master.timeout_scl_low" value="module.driver.i2c_master.timeout_scl_low.enabled"/>
400+
<property id="module.driver.i2c_master.p_callback" value="NULL"/>
401+
<property id="module.driver.i2c_master.ipl" value="board.icu.common.irq.priority2"/>
402+
</module>
403+
<module id="module.driver.i2c_on_iic_slave.349639397">
404+
<property id="module.driver.i2c_slave.name" value="g_i2c_slave0"/>
405+
<property id="module.driver.i2c_slave.channel" value="0"/>
406+
<property id="module.driver.i2c_slave.rate" value="module.driver.i2c_slave.rate.rate_standard"/>
407+
<property id="module.driver.i2c_slave.cks" value="module.driver.i2c_slave.cks.cks_1"/>
408+
<property id="module.driver.i2c_slave.dfs" value="module.driver.i2c_slave.dfs.3"/>
409+
<property id="module.driver.i2c_slave.slave" value="0x08"/>
410+
<property id="module.driver.i2c_slave.general_call_enable" value="module.driver.i2c_slave.general_call_enable.disabled"/>
411+
<property id="module.driver.i2c_slave.addr_mode" value="module.driver.i2c_slave.addr_mode.addr_mode_7bit"/>
412+
<property id="module.driver.i2c_slave.scl_low_hold_wait_enable" value="module.driver.i2c_slave.scl_low_hold_wait_enable.disabled"/>
413+
<property id="module.driver.i2c_slave.p_callback" value="NULL"/>
414+
<property id="module.driver.i2c_slave.ipl" value="board.icu.common.irq.priority2"/>
415+
<property id="module.driver.i2c_slave.eri_ipl" value="board.icu.common.irq.priority2"/>
416+
</module>
417+
<module id="module.driver.i2c_on_sci_i2c.1053428145">
418+
<property id="module.driver.i2c.name" value="g_i2c0"/>
419+
<property id="module.driver.i2c.channel" value="0"/>
420+
<property id="module.driver.i2c.slave" value="0x00"/>
421+
<property id="module.driver.i2c.addr_mode" value="module.driver.i2c.addr_mode.addr_mode_7bit"/>
422+
<property id="module.driver.i2c.rate" value="module.driver.i2c.rate.rate_standard"/>
423+
<property id="module.driver.i2c.sda_delay" value="300"/>
424+
<property id="module.driver.i2c.snfr" value="module.driver.i2c.snfr.div_one"/>
425+
<property id="module.driver.i2c.bitrate_modulation" value="module.driver.i2c.bitrate_modulation.true"/>
426+
<property id="module.driver.i2c.p_callback" value="sci_i2c_master_callback"/>
427+
<property id="module.driver.i2c.ipl" value="board.icu.common.irq.priority2"/>
428+
<property id="module.driver.i2c.rx_ipl" value="_disabled"/>
429+
</module>
430+
<module id="module.driver.transfer_on_dtc.730078823">
431+
<property id="module.driver.transfer.name" value="g_transfer0"/>
432+
<property id="module.driver.transfer.mode" value="module.driver.transfer.mode.mode_normal"/>
433+
<property id="module.driver.transfer.size" value="module.driver.transfer.size.size_2_byte"/>
434+
<property id="module.driver.transfer.dest_addr_mode" value="module.driver.transfer.dest_addr_mode.addr_mode_fixed"/>
435+
<property id="module.driver.transfer.src_addr_mode" value="module.driver.transfer.src_addr_mode.addr_mode_fixed"/>
436+
<property id="module.driver.transfer.repeat_area" value="module.driver.transfer.repeat_area.repeat_area_source"/>
437+
<property id="module.driver.transfer.p_dest" value="NULL"/>
438+
<property id="module.driver.transfer.p_src" value="NULL"/>
439+
<property id="module.driver.transfer.interrupt" value="module.driver.transfer.interrupt.interrupt_end"/>
440+
<property id="module.driver.transfer.length" value="0"/>
441+
<property id="module.driver.transfer.num_blocks" value="0"/>
442+
<property id="module.driver.transfer.activation_source" value="_disabled"/>
443+
</module>
444+
<module id="module.driver.dac_on_dac.1286116983">
445+
<property id="module.driver.dac.name" value="g_dac0"/>
446+
<property id="module.driver.dac.channel_id" value="0"/>
447+
<property id="module.driver.dac.ad_da_synchronized" value="module.driver.dac.ad_da_synchronized.disabled"/>
448+
<property id="module.driver.dac.data_format" value="module.driver.dac.data_format.data_format_flush_right"/>
449+
<property id="module.driver.dac.output_amplifier_enabled" value="module.driver.dac.output_amplifier.disabled"/>
450+
<property id="module.driver.dac.charge_pump_enabled" value="enum.mcu.dac.charge_pump.disabled"/>
451+
<property id="module.driver.dac.internal_output" value="enum.mcu.dac.internal_output.disabled"/>
452+
<property id="module.driver.dac.elc_trigger" value="_disabled"/>
453+
</module>
454+
<module id="module.driver.dac_on_dac8.166479115">
455+
<property id="module.driver.dac8.name" value="g_dac8_0"/>
456+
<property id="module.driver.dac8.channel_id" value="0"/>
457+
<property id="module.driver.dac8.ad_da_synchronized" value="module.driver.dac8.ad_da_synchronized.false"/>
458+
<property id="module.driver.dac8.dac_mode" value="module.driver.dac8.dac_mode.normal"/>
459+
<property id="module.driver.dac8.realtime_trigger" value="_disabled"/>
460+
<property id="module.driver.dac8.charge_pump" value="module.driver.dac8.charge_pump.true"/>
461+
</module>
365462
<context id="_hal.0">
366463
<stack module="module.driver.ioport_on_ioport.0"/>
367464
<stack module="module.driver.uart_on_sci_uart.960228264"/>
@@ -372,7 +469,16 @@
372469
<stack module="module.driver.timer_on_agt.2138804694"/>
373470
<stack module="module.driver.timer_on_gpt.1546900609"/>
374471
<stack module="module.driver.adc_on_adc.407688414"/>
472+
<stack module="module.driver.i2c_on_iic_master.1477785219"/>
473+
<stack module="module.driver.i2c_on_iic_slave.349639397"/>
474+
<stack module="module.driver.i2c_on_sci_i2c.1053428145"/>
475+
<stack module="module.driver.transfer_on_dtc.730078823"/>
476+
<stack module="module.driver.dac_on_dac.1286116983"/>
477+
<stack module="module.driver.dac_on_dac8.166479115"/>
375478
</context>
479+
<config id="config.driver.dac8">
480+
<property id="config.driver.dac8.param_checking_enable" value="config.driver.dac8.param_checking_enable.bsp"/>
481+
</config>
376482
<config id="config.driver.usb_pcdc">
377483
<property id="config.driver.usb_pcdc.bulk_in" value="config.driver.usb_pcdc.bulk_in.pipe4"/>
378484
<property id="config.driver.usb_pcdc.bulk_out" value="config.driver.usb_pcdc.bulk_out.pipe5"/>
@@ -385,6 +491,11 @@
385491
<config id="config.driver.adc">
386492
<property id="config.driver.adc.param_checking_enable" value="config.driver.adc.param_checking_enable.bsp"/>
387493
</config>
494+
<config id="config.driver.sci_i2c">
495+
<property id="config.driver.sci_i2c.param_checking_enable" value="config.driver.sci_i2c.param_checking_enable.bsp"/>
496+
<property id="config.driver.sci_i2c.dtc_enable" value="config.driver.sci_i2c.dtc_enable.enabled"/>
497+
<property id="config.driver.sci_i2c.addr_mode_10_bit_enable" value="config.driver.sci_i2c.addr_mode_10_bit_enable.enabled"/>
498+
</config>
388499
<config id="config.driver.usb_basic">
389500
<property id="config.driver.usb_basic.param_checking_enable" value="config.driver.usb_basic.param_checking_enable.bsp"/>
390501
<property id="config.driver.usb_basic.pll_clock_frequency" value="config.driver.usb_basic.pll_clock_frequency.24mhz"/>
@@ -407,6 +518,18 @@
407518
<property id="config.driver.agt.output_support_enable" value="config.driver.agt.output_support_enable.disabled"/>
408519
<property id="config.driver.agt.input_support_enable" value="config.driver.agt.input_support_enable.disabled"/>
409520
</config>
521+
<config id="config.driver.dtc">
522+
<property id="config.driver.dtc.param_checking_enable" value="config.driver.dtc.param_checking_enable.bsp"/>
523+
<property id="config.driver.dtc.vector_table" value=".fsp_dtc_vector_table"/>
524+
</config>
525+
<config id="config.driver.dac">
526+
<property id="config.driver.dac.param_checking_enable" value="config.driver.dac.param_checking_enable.bsp"/>
527+
</config>
528+
<config id="config.driver.iic_master">
529+
<property id="config.driver.iic_master.param_checking_enable" value="config.driver.iic_master.param_checking_enable.bsp"/>
530+
<property id="config.driver.iic_master.dtc_enable" value="config.driver.iic_master.dtc_enable.enabled"/>
531+
<property id="config.driver.iic_master.addr_mode_10_bit_enable" value="config.driver.iic_master.addr_mode_10_bit_enable.enabled"/>
532+
</config>
410533
<config id="config.driver.sci_uart">
411534
<property id="config.driver.sci_uart.param_checking_enable" value="config.driver.sci_uart.param_checking_enable.bsp"/>
412535
<property id="config.driver.sci_uart.fifo_support" value="config.driver.sci_uart.fifo_support.disabled"/>
@@ -420,6 +543,9 @@
420543
<property id="config.driver.gpt.write_protect_enable" value="config.driver.gpt.write_protect_enable.disabled"/>
421544
<property id="config.driver.gpt.gpt_core_clock" value="module.driver.timer.gpt_core_clock.pclk"/>
422545
</config>
546+
<config id="config.driver.iic_slave">
547+
<property id="config.driver.iic_slave.param_checking_enable" value="config.driver.iic_slave.param_checking_enable.bsp"/>
548+
</config>
423549
</raModuleConfiguration>
424550
<raPinConfiguration>
425551
<pincfg active="true" name="R7FA2A1AB3CNF.pincfg" selected="true" symbol="g_bsp_pin_cfg">

0 commit comments

Comments
 (0)