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.

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

Improved EOMtheEMSrunner #496

Merged
merged 5 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ namespace embot { namespace app { namespace eth {
.property =
{
Process::eApplication,
{2, 3},
{2024, Month::Apr, Day::eleven, 11, 18}
{2, 4},
{2024, Month::May, Day::twentyseven, 15, 24}
},
.OStick = 1000*embot::core::time1microsec,
.OSstacksizeinit = 10*1024,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ constexpr embot::hw::Config hwCFG {nullptr, get1microtime2};
#undef DEBUG_stayinhere
// if defined it enables the CM4 core after clock initialization inside embot::hw::init()
#undef DEBUG_startCM4now
#undef DEBUG_eraseeeprom

// used functions

Expand Down Expand Up @@ -247,6 +248,10 @@ constexpr uint32_t LOADER_ADR_INVALID {0xffffffff};

void thejumper()
{
#if defined(DEBUG_eraseeeprom)
embot::hw::eeprom::init(embot::hw::EEPROM::one, {});
embot::hw::eeprom::erase(embot::hw::EEPROM::one, 3*embot::core::time1millisec); // 0, 8*1024);
#endif
s_loader_shared_services_init();

s_loader_eval_jump_request_from_an_eproc();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,21 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR (VERSION_MAJOR_OFFSET+3)
// <o> minor <0-255>
// <o> minor <0-255>
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 88
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 89

// </h>version

// <h> build date
// <o> year <2010-2030>
#define EOMTHEEMSAPPLCFG_BUILDDATE_YEAR 2024
// <o> month <1-12>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 4
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 5
// <o> day <1-31>
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 4
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 27
// <o> hour <0-23>
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 15
// <o> minute <0-59>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 00
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 29
// </h>build date
// </h>Info

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
// --------------------------------------------------------------------------------------------------------------------

// if defined, the CAN flush is done at end of the DO phase, else at the beginning of the TX phase
// #define CANflushMODE_DO_phase
#define CANflushMODE_DO_phase


// --------------------------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1988,12 +1988,12 @@
<SetRegEntry>
<Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key>
<Name>-L200 -Z5 -C0 -M1 -T1</Name>
<Name>-L200 -Z14 -C0 -M1 -T1</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>ULP2CM3</Key>
<Name>-UP0948199 -O207 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO65555 -TC168000000 -TT168000000 -TP18 -TDX0 -TDD0 -TDS8000 -TDT0 -TDC1F -TIE80000001 -TIP9 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407IG$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
<Name>-UP1123199 -O207 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO65555 -TC168000000 -TT168000000 -TP18 -TDX0 -TDD0 -TDS8000 -TDT0 -TDC1F -TIE80000001 -TIP9 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_1024.FLM -FS08000000 -FL0100000 -FP0($$Device:STM32F407IG$CMSIS\Flash\STM32F4xx_1024.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
Expand Down Expand Up @@ -2869,7 +2869,7 @@

<Group>
<GroupName>eo-emsappl</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down Expand Up @@ -2972,7 +2972,7 @@
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>61</FileNumber>
<FileType>1</FileType>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
Expand Down Expand Up @@ -4445,7 +4445,7 @@

<Group>
<GroupName>embot-app-scope</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down Expand Up @@ -1467,7 +1467,7 @@
<TargetCommonOption>
<Device>STM32F407IG</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.17.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.17.1</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) CPUTYPE("Cortex-M4") FPU2</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -2201,7 +2201,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down Expand Up @@ -3009,7 +3009,7 @@
<TargetCommonOption>
<Device>STM32F407IG</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.17.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.17.1</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) CPUTYPE("Cortex-M4") FPU2</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -3743,7 +3743,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down Expand Up @@ -4653,7 +4653,7 @@
<TargetCommonOption>
<Device>STM32F407IG</Device>
<Vendor>STMicroelectronics</Vendor>
<PackID>Keil.STM32F4xx_DFP.2.17.0</PackID>
<PackID>Keil.STM32F4xx_DFP.2.17.1</PackID>
<PackURL>https://www.keil.com/pack/</PackURL>
<Cpu>IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) CPUTYPE("Cortex-M4") FPU2</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -5387,7 +5387,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR 3
// <o> minor <0-255>
// <o> minor <0-255>
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 69
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 70

// </h>version

// <h> build date
// <o> year <2010-2030>
#define EOMTHEEMSAPPLCFG_BUILDDATE_YEAR 2024
// <o> month <1-12>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 3
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 5
// <o> day <1-31>
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 21
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 27
// <o> hour <0-23>
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 15
// <o> minute <0-59>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 00
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 39
// </h>build date

// </h>Info
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
// --------------------------------------------------------------------------------------------------------------------

// if defined, the CAN flush is done at end of the DO phase, else at the beginning of the TX phase
// #define CANflushMODE_DO_phase
#define CANflushMODE_DO_phase


// --------------------------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@

<Group>
<GroupName>eo-emsappl</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down Expand Up @@ -1703,7 +1703,7 @@
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>59</FileNumber>
<FileType>1</FileType>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down Expand Up @@ -2131,7 +2131,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,21 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR (VERSION_MAJOR_OFFSET+3)
// <o> minor <0-255>

#define EOMTHEEMSAPPLCFG_VERSION_MINOR 90
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 91

// </h>version

// <h> build date
// <o> year <2010-2030>
#define EOMTHEEMSAPPLCFG_BUILDDATE_YEAR 2024
// <o> month <1-12>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 3
#define EOMTHEEMSAPPLCFG_BUILDDATE_MONTH 5
// <o> day <1-31>
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 21
#define EOMTHEEMSAPPLCFG_BUILDDATE_DAY 27
// <o> hour <0-23>
#define EOMTHEEMSAPPLCFG_BUILDDATE_HOUR 15
// <o> minute <0-59>
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 00
#define EOMTHEEMSAPPLCFG_BUILDDATE_MIN 34

// </h>build date

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
// --------------------------------------------------------------------------------------------------------------------

// if defined, the CAN flush is done at end of the DO phase, else at the beginning of the TX phase
// #define CANflushMODE_DO_phase
#define CANflushMODE_DO_phase


// --------------------------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@

<Group>
<GroupName>eo-emsappl</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down Expand Up @@ -1291,7 +1291,7 @@
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>60</FileNumber>
<FileType>1</FileType>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
Expand Down Expand Up @@ -1364,7 +1364,7 @@

<Group>
<GroupName>eo-emsappl-cfg</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down Expand Up @@ -2180,7 +2180,7 @@
</File>
<File>
<FileName>EOMtheEMSrunner.c</FileName>
<FileType>1</FileType>
<FileType>8</FileType>
<FilePath>..\..\..\..\..\embobj\plus\ctrloop\EOMtheEMSrunner.c</FilePath>
</File>
<File>
Expand Down
Loading