Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mc4plus double pinout #412

Merged
merged 16 commits into from
Sep 15, 2023
Merged

mc4plus double pinout #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d981494
mc4plus - firmware mods for double current in stmhal
davidetome Jul 27, 2023
1831970
mc4plus - firmware mods for double current in stmhal
davidetome Jul 28, 2023
ec56d49
mc4plus - addition of 2 currents for double pin in stmhal
davidetome Jul 28, 2023
68cf603
mc4plus - addition of 2 currents for double pin in stmhal -removed u…
davidetome Jul 28, 2023
6989cbe
mc4plus - addition of 2 currents for double pin in stmhal - added su…
davidetome Aug 1, 2023
1d029af
mc4plus duoble pin fixed Motor5 (P4P)
davidetome Aug 8, 2023
cd6f995
mc4plus - firmware mods for double current in stmhal
davidetome Jul 27, 2023
c7fd766
mc4plus - firmware mods for double current in stmhal
davidetome Jul 28, 2023
2ce4b6b
mc4plus - addition of 2 currents for double pin in stmhal
davidetome Jul 28, 2023
6974600
mc4plus - firmware mods for double current in stmhal
davidetome Jul 27, 2023
058c22b
mc4plus - firmware mods for double current in stmhal
davidetome Jul 28, 2023
b672fd0
mc4plus - firmware mods for double current
davidetome Aug 25, 2023
76374a4
mc4plus - firmware mods for double current
davidetome Aug 25, 2023
29d3a12
updated revisions and .lib
davidetome Sep 6, 2023
34010a7
updated revisions and .lib
davidetome Sep 6, 2023
abcdc85
updated revisions and libs
davidetome Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions emBODY/eBcode/arch-arm/board/amc/examples/appl-01/cfg/theApplication_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ namespace embot { namespace app { namespace eth {
Process::eApplication,
#if defined(WRIST_MK2)
#if defined(WRIST_MK2_RIGHT)
{101, 10},
{101, 11},
#else
{102, 10},
{102, 11},
#endif
#else
{103, 10},
{103, 11},
#endif
{2023, Month::Sep, Day::eight, 17, 00}
{2023, Month::Sep, Day::fourteen, 11, 18}
},
.OStick = 1000*embot::core::time1microsec,
.OSstacksizeinit = 10*1024,
Expand Down
8 changes: 4 additions & 4 deletions emBODY/eBcode/arch-arm/board/ems004/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR (VERSION_MAJOR_OFFSET+3)
// <o> minor <0-255>
// <o> minor <0-255>
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 74
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 75

// </h>version

Expand All @@ -91,11 +91,11 @@ extern "C" {
// <o> month <1-12>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 9
// <o> day <1-31>
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 8
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 14
// <o> hour <0-23>
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 17
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 11
// <o> minute <0-59>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 00
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 21
// </h>build date
// </h>Info

Expand Down
9 changes: 5 additions & 4 deletions emBODY/eBcode/arch-arm/board/mc2plus/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR 3
// <o> minor <0-255>
// <o> minor <0-255>
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 56
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 57

// </h>version

// <h> build date
Expand All @@ -84,11 +85,11 @@ extern "C" {
// <o> month <1-12>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 9
// <o> day <1-31>
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 8
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 14
// <o> hour <0-23>
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 17
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 11
// <o> minute <0-59>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 00
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 23
// </h>build date

// </h>Info
Expand Down
8 changes: 4 additions & 4 deletions emBODY/eBcode/arch-arm/board/mc4plus/appl/v2/cfg/eoemsappl/EOMtheEMSapplCfg_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR (VERSION_MAJOR_OFFSET+3)
// <o> minor <0-255>

#define EOMTHEEMSAPPLCFG_VERSION_MINOR 77
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 78

// </h>version

Expand All @@ -94,11 +94,11 @@ extern "C" {
// <o> month <1-12>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 9
// <o> day <1-31>
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 8
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 14
// <o> hour <0-23>
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 17
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 11
// <o> minute <0-59>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 00
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 24

// </h>build date

Expand Down
6 changes: 3 additions & 3 deletions emBODY/eBcode/arch-arm/board/mc4plus/appl/v2/proj/mc4plus.diagnostic2ready.uvprojx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -1337,7 +1337,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -2747,7 +2747,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down
4 changes: 3 additions & 1 deletion emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/api/hal_motor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,13 @@ typedef enum
hal_motor2 = 1, /**< motor 2 */
hal_motor3 = 2, /**< motor 3 */
hal_motor4 = 3, /**< motor 4 */
hal_motor5 = 4, /**< motor 5 (1+2) */
hal_motor6 = 5, /**< motor 6 (3+4) */
hal_motorALL = 254, /**< all supported motors */
hal_motorNONE = 255 /**< no motor */
} hal_motor_t;

enum { hal_motors_number = 4 };
enum { hal_motors_number = 6 };


///** @typedef typedef enum hal_pwm_status_t
Expand Down
12 changes: 6 additions & 6 deletions emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/hal.stm32f4.uvprojx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -995,7 +995,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -2128,7 +2128,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -3159,7 +3159,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -4088,7 +4088,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -5017,7 +5017,7 @@
<TargetCommonOption>
<Device>STM32F407IGHx</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.16.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.15.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) IROM(0x08000000,0x100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down
Binary file modified emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.ems4rd.ethdbg.lib
View file
Open in desktop
Binary file not shown.
Binary file modified emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc2plus.ethdbg.lib
View file
Open in desktop
Binary file not shown.
Binary file modified emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/lib/hal2.mc4plus.ethdbg.lib
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/libs/highlevel/abslayer/hal2/src/brdcfg/mc4plus/hal_brdcfg_mc4plus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@

const hal_motor_boardconfig_t hal_motor__theboardconfig =
{
.supportedmask = (1 << hal_motor1) | (1 << hal_motor2) | (1 << hal_motor3) | (1 << hal_motor4)
.supportedmask = (1 << hal_motor1) | (1 << hal_motor2) | (1 << hal_motor3) | (1 << hal_motor4) | (1 << hal_motor5) | (1 << hal_motor6)
};

#endif//HAL_USE_DEVICE_MOTORCTL
Expand Down
Loading