Skip to content

Commit b724d1e

Browse files
sakumisusakumisu
committed
update(cherryecat): remove timer1 and bump cherryecat version to v1.0.0
Signed-off-by: sakumisu <1203593632@qq.com>
1 parent 3af5972 commit b724d1e

File tree

13 files changed

+26
-224
lines changed

13 files changed

+26
-224
lines changed

‎projects/etherkit_ethercat_cherryecat/board/ec_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#endif
4949

5050
#ifndef CONFIG_EC_SCAN_STACKSIZE
51-
#define CONFIG_EC_SCAN_STACKSIZE 2048
51+
#define CONFIG_EC_SCAN_STACKSIZE 4096
5252
#endif
5353

5454
#ifndef CONFIG_EC_SCAN_INTERVAL_MS
@@ -73,11 +73,11 @@
7373
#endif
7474

7575
#ifndef CONFIG_EC_MAX_ENET_TXBUF_COUNT
76-
#define CONFIG_EC_MAX_ENET_TXBUF_COUNT 10
76+
#define CONFIG_EC_MAX_ENET_TXBUF_COUNT 8
7777
#endif
7878

7979
#ifndef CONFIG_EC_MAX_ENET_RXBUF_COUNT
80-
#define CONFIG_EC_MAX_ENET_RXBUF_COUNT 10
80+
#define CONFIG_EC_MAX_ENET_RXBUF_COUNT 8
8181
#endif
8282

8383
// #define CONFIG_EC_FOE

‎projects/etherkit_ethercat_cherryecat/configuration.xml‎

Lines changed: 1 addition & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<option key="#pinconfiguration#" value="R9A07G084M04GBG.pincfg"/>
1212
<option key="#FSPVersion#" value="2.2.0"/>
1313
<option key="#ConfigurationFragments#" value="Renesas##BSP##Board##rzn2l_rsk##xspi0_x1_boot"/>
14-
<option key="#SELECTED_TOOLCHAIN#" value="gcc-arm-embedded"/>
14+
<option key="#SELECTED_TOOLCHAIN#" value="iar.arm.toolchain"/>
1515
<option key="#ToolchainVersion#" value=""/>
1616
</generalSettings>
1717
<raBspConfiguration>
@@ -1046,86 +1046,6 @@
10461046
<property id="module.driver.timer.elc_trigger_mtu4" value="_disabled"/>
10471047
<property id="module.driver.timer.operation_select_mtu4" value="Disabled"/>
10481048
</module>
1049-
<module id="module.driver.timer_on_gpt.1352861500">
1050-
<property id="module.driver.timer.name" value="g_timer1"/>
1051-
<property id="module.driver.gpt.unit" value="0"/>
1052-
<property id="module.driver.gpt.channel" value="1"/>
1053-
<property id="module.driver.timer.mode" value="module.driver.timer.mode.mode_periodic"/>
1054-
<property id="module.driver.timer.period" value="1"/>
1055-
<property id="module.driver.timer.unit" value="module.driver.timer.unit.unit_period_usec"/>
1056-
<property id="module.driver.timer.duty_cycle" value="50"/>
1057-
<property id="module.driver.timer.gtioca_output_enabled" value="module.driver.timer.gtioca_output_enabled.false"/>
1058-
<property id="module.driver.timer.gtioca_stop_level" value="module.driver.timer.gtioca_stop_level.pin_level_low"/>
1059-
<property id="module.driver.timer.gtiocb_output_enabled" value="module.driver.timer.gtiocb_output_enabled.false"/>
1060-
<property id="module.driver.timer.gtiocb_stop_level" value="module.driver.timer.gtiocb_stop_level.pin_level_low"/>
1061-
<property id="module.driver.timer.count_up_source" value=""/>
1062-
<property id="module.driver.timer.count_down_source" value=""/>
1063-
<property id="module.driver.timer.phase_count_setting_automatically_enable" value="module.driver.timer.phase_count_setting_automatically_enable.disabled"/>
1064-
<property id="module.driver.timer.counting_mode" value="module.driver.timer.counting_mode.mode1"/>
1065-
<property id="module.driver.timer.start_source" value=""/>
1066-
<property id="module.driver.timer.stop_source" value=""/>
1067-
<property id="module.driver.timer.clear_source" value=""/>
1068-
<property id="module.driver.timer.capture_a_source" value=""/>
1069-
<property id="module.driver.timer.capture_b_source" value=""/>
1070-
<property id="module.driver.timer.gtioca_filter" value="module.driver.timer.gtioc_filter.gtioc_filter_none"/>
1071-
<property id="module.driver.timer.gtiocb_filter" value="module.driver.timer.gtioc_filter.gtioc_filter_none"/>
1072-
<property id="module.driver.timer.p_callback" value="g_timer1_callback"/>
1073-
<property id="module.driver.timer.ipl" value="board.icu.common.irq.priority10"/>
1074-
<property id="module.driver.timer.capture_a_ipl" value="_disabled"/>
1075-
<property id="module.driver.timer.capture_b_ipl" value="_disabled"/>
1076-
<property id="module.driver.timer.trough_ipl" value="_disabled"/>
1077-
<property id="module.driver.timer.gpt_sel.p_callback" value="NULL"/>
1078-
<property id="module.driver.timer.gpt_sel.overflow_interrupt_source" value=""/>
1079-
<property id="module.driver.timer.gpt_sel.capture_a_interrupt_source" value=""/>
1080-
<property id="module.driver.timer.gpt_sel.capture_b_interrupt_source" value=""/>
1081-
<property id="module.driver.timer.gpt_sel.trough_interrupt_source" value=""/>
1082-
<property id="module.driver.timer.gpt_sel.dead_time_error_interrupt_source" value=""/>
1083-
<property id="module.driver.timer.gpt_sel.int0_ipl" value="_disabled"/>
1084-
<property id="module.driver.timer.gpt_sel.int1_ipl" value="_disabled"/>
1085-
<property id="module.driver.timer.gpt_sel.int2_ipl" value="_disabled"/>
1086-
<property id="module.driver.timer.gpt_sel.int3_ipl" value="_disabled"/>
1087-
<property id="module.driver.timer.gpt_sel.int4_ipl" value="_disabled"/>
1088-
<property id="module.driver.timer.extra" value="module.driver.timer.extra.disabled"/>
1089-
<property id="module.driver.timer.poeg_link" value="module.driver.timer.poeg_link.poeg_link_poeg0"/>
1090-
<property id="module.driver.timer.output_disable" value=""/>
1091-
<property id="module.driver.timer.adc_trigger" value=""/>
1092-
<property id="module.driver.timer.dead_time_count_up" value="0"/>
1093-
<property id="module.driver.timer.dead_time_count_down" value="0"/>
1094-
<property id="module.driver.timer.adc_a_compare_match" value="0"/>
1095-
<property id="module.driver.timer.adc_b_compare_match" value="0"/>
1096-
<property id="module.driver.timer.interrupt_skip.source" value="module.driver.timer.interrupt_skip.source.none"/>
1097-
<property id="module.driver.timer.interrupt_skip.count" value="module.driver.timer.interrupt_skip.count.count_0"/>
1098-
<property id="module.driver.timer.interrupt_skip.adc" value="module.driver.timer.interrupt_skip.skip_sources.interrupt_skip.adc.none"/>
1099-
<property id="module.driver.timer.gtioca_disable_setting" value="module.driver.timer.gtioca_disable_setting.gtioc_disable_prohibited"/>
1100-
<property id="module.driver.timer.gtiocb_disable_setting" value="module.driver.timer.gtiocb_disable_setting.gtioc_disable_prohibited"/>
1101-
<property id="module.driver.timer.interrupt_skip_ext1.source" value="module.driver.timer.interrupt_skip_ext1.source.none"/>
1102-
<property id="module.driver.timer.interrupt_skip_ext1.count" value="module.driver.timer.interrupt_skip_ext1.count.count_0"/>
1103-
<property id="module.driver.timer.interrupt_skip_ext2.source" value="module.driver.timer.interrupt_skip_ext2.source.none"/>
1104-
<property id="module.driver.timer.interrupt_skip_ext2.count" value="module.driver.timer.interrupt_skip_ext2.count.count_0"/>
1105-
<property id="module.driver.timer.interrupt_skip_func.ovf" value="module.driver.timer.interrupt_skip_func.ovf.none"/>
1106-
<property id="module.driver.timer.interrupt_skip_func.unf" value="module.driver.timer.interrupt_skip_func.unf.none"/>
1107-
<property id="module.driver.timer.interrupt_skip_func.adc_a" value="module.driver.timer.interrupt_skip_func.adc_a.none"/>
1108-
<property id="module.driver.timer.interrupt_skip_func.adc_b" value="module.driver.timer.interrupt_skip_func.adc_b.none"/>
1109-
<property id="module.driver.timer.dead_time_error_ipl" value="_disabled"/>
1110-
<property id="module.driver.timer.input_capture" value="module.driver.timer.input_capture.enabled"/>
1111-
<property id="module.driver.timer.gtioc_isel" value="module.driver.timer.gtioc_isel.not_supported"/>
1112-
<property id="module.driver.timer.elc_trigger_llpp_event_a" value="_disabled"/>
1113-
<property id="module.driver.timer.elc_trigger_llpp_event_b" value="_disabled"/>
1114-
<property id="module.driver.timer.elc_trigger_llpp_event_c" value="_disabled"/>
1115-
<property id="module.driver.timer.elc_trigger_llpp_event_d" value="_disabled"/>
1116-
<property id="module.driver.timer.elc_trigger_llpp_event_e" value="_disabled"/>
1117-
<property id="module.driver.timer.elc_trigger_llpp_event_f" value="_disabled"/>
1118-
<property id="module.driver.timer.elc_trigger_llpp_event_g" value="_disabled"/>
1119-
<property id="module.driver.timer.elc_trigger_llpp_event_h" value="_disabled"/>
1120-
<property id="module.driver.timer.elc_trigger_nonsafty_event_a" value="_disabled"/>
1121-
<property id="module.driver.timer.elc_trigger_nonsafty_event_b" value="_disabled"/>
1122-
<property id="module.driver.timer.elc_trigger_nonsafty_event_c" value="_disabled"/>
1123-
<property id="module.driver.timer.elc_trigger_nonsafty_event_d" value="_disabled"/>
1124-
<property id="module.driver.timer.elc_trigger_nonsafty_event_e" value="_disabled"/>
1125-
<property id="module.driver.timer.elc_trigger_nonsafty_event_f" value="_disabled"/>
1126-
<property id="module.driver.timer.elc_trigger_nonsafty_event_g" value="_disabled"/>
1127-
<property id="module.driver.timer.elc_trigger_nonsafty_event_h" value="_disabled"/>
1128-
</module>
11291049
<context id="_hal.0">
11301050
<stack module="module.driver.ioport_on_ioport.0"/>
11311051
<stack module="module.bsp.memory_config.0"/>
@@ -1144,7 +1064,6 @@
11441064
</stack>
11451065
<stack module="module.driver.timer_on_gpt.1285445287"/>
11461066
<stack module="module.driver.timer_on_mtu3.1982797798"/>
1147-
<stack module="module.driver.timer_on_gpt.1352861500"/>
11481067
</context>
11491068
<config id="config.driver.ether_selector">
11501069
<property id="config.driver.ether_selector.param_checking_enable" value="config.driver.ether_selector.param_checking_enable.bsp"/>

‎projects/etherkit_ethercat_cherryecat/packages/CherryECAT-latest/VERSION‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
VERSION_MAJOR = 0
2-
VERSION_MINOR = 1
1+
VERSION_MAJOR = 1
2+
VERSION_MINOR = 0
33
PATCHLEVEL = 0
44
VERSION_TWEAK = 0
55
EXTRAVERSION = 0

‎projects/etherkit_ethercat_cherryecat/packages/CherryECAT-latest/cherryec_config_template.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#endif
4747

4848
#ifndef CONFIG_EC_SCAN_STACKSIZE
49-
#define CONFIG_EC_SCAN_STACKSIZE 2048
49+
#define CONFIG_EC_SCAN_STACKSIZE 4096
5050
#endif
5151

5252
#ifndef CONFIG_EC_SCAN_INTERVAL_MS

‎projects/etherkit_ethercat_cherryecat/packages/CherryECAT-latest/include/ec_version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef EC_VERSION_H
77
#define EC_VERSION_H
88

9-
#define CHERRYECAT_VERSION 0x000100
10-
#define CHERRYECAT_VERSION_STR "v0.1.0"
9+
#define CHERRYECAT_VERSION 0x010000
10+
#define CHERRYECAT_VERSION_STR "v1.0.0"
1111

1212
#endif

‎projects/etherkit_ethercat_cherryecat/packages/CherryECAT-latest/src/ec_mailbox.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ uint8_t *ec_mailbox_fill_send(ec_master_t *master,
1515
{
1616
ec_slave_t *slave;
1717

18-
EC_ASSERT_MSG(slave_index >= master->slave_count, "Invalid slave index");
18+
EC_ASSERT_MSG(slave_index < master->slave_count, "Invalid slave index");
1919

2020
slave = &master->slaves[slave_index];
2121

‎projects/etherkit_ethercat_cherryecat/packages/CherryECAT-latest/src/ec_master.c‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,20 @@ int ec_master_start(ec_master_t *master, uint32_t period_us)
541541

542542
slave->sm_info[sm_idx].pdo_assign.count = slave->config->sync[i].n_pdos;
543543

544+
EC_ASSERT_MSG(slave->sm_info[sm_idx].pdo_assign.count <= CONFIG_EC_PER_SM_MAX_PDOS,
545+
"Slave %u: Too many PDOs %u for SM %u\n",
546+
slave_idx, slave->sm_info[sm_idx].pdo_assign.count, sm_idx);
547+
544548
for (uint32_t j = 0; j < slave->config->sync[i].n_pdos; j++) {
545549
slave->sm_info[sm_idx].pdo_assign.entry[j] = slave->config->sync[i].pdos[j].index;
546550

547551
slave->sm_info[sm_idx].pdo_mapping[j].count = slave->config->sync[i].pdos[j].n_entries;
548552

553+
EC_ASSERT_MSG(slave->sm_info[sm_idx].pdo_mapping[j].count <= CONFIG_EC_PER_PDO_MAX_PDO_ENTRIES,
554+
"Slave %u: Too many entries %u for PDO 0x%04X\n",
555+
slave_idx, slave->sm_info[sm_idx].pdo_mapping[j].count,
556+
slave->config->sync[i].pdos[j].index);
557+
549558
for (uint32_t k = 0; k < slave->config->sync[i].pdos[j].n_entries; k++) {
550559
uint32_t entry = (slave->config->sync[i].pdos[j].entries[k].index << 16) |
551560
(slave->config->sync[i].pdos[j].entries[k].subindex & 0xFF) << 8 |

‎projects/etherkit_ethercat_cherryecat/packages/CherryECAT-latest/src/ec_slave.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,8 @@ void ec_slaves_scanning(ec_master_t *master)
969969
EC_LOG_INFO("Detect link down on %s\n",
970970
master->netdev[netdev_idx]->name);
971971

972+
ec_master_stop(master);
973+
972974
ec_osal_mutex_take(master->scan_lock);
973975
ec_master_clear_slaves(master);
974976

@@ -1017,6 +1019,8 @@ void ec_slaves_scanning(ec_master_t *master)
10171019

10181020
rescan_required = 0;
10191021

1022+
ec_master_stop(master);
1023+
10201024
ec_osal_mutex_take(master->scan_lock);
10211025

10221026
master->scan_done = false;

‎projects/etherkit_ethercat_cherryecat/rzn_cfg.txt‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,83 +1442,3 @@ FSP Configuration
14421442
ELC: MTU4: Trigger Source: Disabled
14431443
ELC: MTU4: Operation Select: Disabled
14441444

1445-
Instance "g_timer1 Timer, General PWM (r_gpt)"
1446-
General: Name: g_timer1
1447-
General: Unit: 0
1448-
General: Channel: 1
1449-
General: Mode: Periodic
1450-
General: Period: 1
1451-
General: Period Unit: Microseconds
1452-
Output: Duty Cycle Percent (only applicable in PWM mode): 50
1453-
Output: GTIOCA Output Enabled: False
1454-
Output: GTIOCA Stop Level: Pin Level Low
1455-
Output: GTIOCB Output Enabled: False
1456-
Output: GTIOCB Stop Level: Pin Level Low
1457-
Input: Count Up Source:
1458-
Input: Count Down Source:
1459-
Input: Phase Count Setting Automatically Enable: Disabled
1460-
Input: Counting Mode: Mode1
1461-
Input: Start Source:
1462-
Input: Stop Source:
1463-
Input: Clear Source:
1464-
Input: Capture A Source:
1465-
Input: Capture B Source:
1466-
Input: Noise Filter A Sampling Clock Select: No Filter
1467-
Input: Noise Filter B Sampling Clock Select: No Filter
1468-
Interrupts: Callback: g_timer1_callback
1469-
Interrupts: Overflow/Crest Interrupt Priority: Priority 10
1470-
Interrupts: Capture A Interrupt Priority: Disabled
1471-
Interrupts: Capture B Interrupt Priority: Disabled
1472-
Interrupts: Trough Interrupt Priority: Disabled
1473-
Interrupts (GPT_SEL): Callback: NULL
1474-
Interrupts (GPT_SEL): Overflow/Crest Interrupt Source:
1475-
Interrupts (GPT_SEL): Capture A Interrupt Source:
1476-
Interrupts (GPT_SEL): Capture B Interrupt Source:
1477-
Interrupts (GPT_SEL): Trough Interrupt Source:
1478-
Interrupts (GPT_SEL): Dead Time Error Interrupt Source:
1479-
Interrupts (GPT_SEL): INT0 Interrupt Priority: Disabled
1480-
Interrupts (GPT_SEL): INT1 Interrupt Priority: Disabled
1481-
Interrupts (GPT_SEL): INT2 Interrupt Priority: Disabled
1482-
Interrupts (GPT_SEL): INT3 Interrupt Priority: Disabled
1483-
Interrupts (GPT_SEL): INT4 Interrupt Priority: Disabled
1484-
Extra Features: Extra Features: Disabled
1485-
Extra Features: Output Disable: POEG Link: POEG Channel 0
1486-
Extra Features: Output Disable: Output Disable POEG Trigger:
1487-
Extra Features: ADC Trigger: Start Event Trigger:
1488-
Extra Features: Dead Time: Dead Time Count Up (Raw Counts): 0
1489-
Extra Features: Dead Time: Dead Time Count Down (Raw Counts): 0
1490-
Extra Features: ADC Trigger: ADC A Compare Match (Raw Counts): 0
1491-
Extra Features: ADC Trigger: ADC B Compare Match (Raw Counts): 0
1492-
Extra Features: Interrupt Skipping: Interrupt to Count: None
1493-
Extra Features: Interrupt Skipping: Interrupt Skip Count: 0
1494-
Extra Features: Interrupt Skipping: Skip ADC Events: None
1495-
Extra Features: Output Disable: GTIOCA Disable Setting: Disable Prohibited
1496-
Extra Features: Output Disable: GTIOCB Disable Setting: Disable Prohibited
1497-
Extra Features: Extended Interrupt Skipping 1: Interrupt to Count: None
1498-
Extra Features: Extended Interrupt Skipping 1: Interrupt Skip Count: 0
1499-
Extra Features: Extended Interrupt Skipping 2: Interrupt to Count: None
1500-
Extra Features: Extended Interrupt Skipping 2: Interrupt Skip Count: 0
1501-
Extra Features: Input Capture Interrupt Extended Skipping Function: Overflow Interrupt: None
1502-
Extra Features: Input Capture Interrupt Extended Skipping Function: Underflow Interrupt: None
1503-
Extra Features: Input Capture Interrupt Extended Skipping Function: GTADTRA A/D Converter Start Request: None
1504-
Extra Features: Input Capture Interrupt Extended Skipping Function: GTADTRB A/D Converter Start Request: None
1505-
Interrupts: Dead Time Error Interrupt Priority: Disabled
1506-
Extra Features: Input Capture at Count Stop: Enabled
1507-
Extra Features: Input Capture Signal: Not Supported
1508-
ELC: LLPP GPT event A: Trigger Source: Disabled
1509-
ELC: LLPP GPT event B: Trigger Source: Disabled
1510-
ELC: LLPP GPT event C: Trigger Source: Disabled
1511-
ELC: LLPP GPT event D: Trigger Source: Disabled
1512-
ELC: LLPP GPT event E: Trigger Source: Disabled
1513-
ELC: LLPP GPT event F: Trigger Source: Disabled
1514-
ELC: LLPP GPT event G: Trigger Source: Disabled
1515-
ELC: LLPP GPT event H: Trigger Source: Disabled
1516-
ELC: NONSAFTY GPT event A: Trigger Source: Disabled
1517-
ELC: NONSAFTY GPT event B: Trigger Source: Disabled
1518-
ELC: NONSAFTY GPT event C: Trigger Source: Disabled
1519-
ELC: NONSAFTY GPT event D: Trigger Source: Disabled
1520-
ELC: NONSAFTY GPT event E: Trigger Source: Disabled
1521-
ELC: NONSAFTY GPT event F: Trigger Source: Disabled
1522-
ELC: NONSAFTY GPT event G: Trigger Source: Disabled
1523-
ELC: NONSAFTY GPT event H: Trigger Source: Disabled
1524-

‎projects/etherkit_ethercat_cherryecat/rzn_gen/hal_data.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#else
88
#define ETHER_BUFFER_PLACE_IN_SECTION
99
#endif
10-
1110
mtu3_instance_ctrl_t g_mtu3_ctrl;
1211
#if 0
1312
const mtu3_extended_uvw_cfg_t g_mtu3_uvw_extend =

0 commit comments

Comments
 (0)