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

Fix timing of EOMtheEMSrunner #501

Merged
merged 4 commits into from
Jun 14, 2024
Merged

Fix timing of EOMtheEMSrunner #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
039f5dc
fixed oosiit_microtime_get() so that it is robust vs race conditions …
marcoaccame Jun 13, 2024
364993a
added support (not enabled now) for info messages about min, max and …
marcoaccame Jun 13, 2024
d2956b7
just commented out test harness() for osal_system_abstime_get()
marcoaccame Jun 13, 2024
567e1ca
updated version number
marcoaccame Jun 13, 2024
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
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/board/amc/application/v2/cfg/theApplication_config.h
View file
Open in desktop
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, 5},
{2024, Month::Jun, Day::ten, 14, 00}
{2, 6},
{2024, Month::Jun, Day::thirteen, 14, 45}
},
.OStick = 1000*embot::core::time1microsec,
.OSstacksizeinit = 10*1024,
Expand Down
6 changes: 3 additions & 3 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 91
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 92

// </h>version

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

Expand Down
48 changes: 48 additions & 0 deletions emBODY/eBcode/arch-arm/board/ems004/appl/v2/cfg/eoemsappl/overridden_configurator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,54 @@ extern void eom_emsconfigurator_hid_userdef_ProcessUserdef02Event(EOMtheEMSconfi
}



//#include "osal.h"

//int32_t tdelta {0};
//volatile uint64_t tnow {0};
//volatile uint64_t tpre {0};
//volatile uint32_t negs {0};
//volatile uint32_t poss {0};
//volatile uint64_t oks {0};

//
//#include "hal_sys.h"
//void test()
//{
//
// tnow = tpre = osal_system_abstime_get();
//// dbg_time_add();
// for(;;)
// {
//// hal_sys_delay(20);
// tnow = osal_system_abstime_get();
//// dbg_time_add();
// tdelta = tnow - tpre;

// if(tdelta < 0)
// {
// negs ++;
// }
// else if(tdelta > 1000)
// {
// poss ++;
// }
// else
// {
// oks ++;
// }
//
// tpre = tnow;
// }
//
//
//}
//
//extern void eom_emsconfigurator_hid_userdef_ProcessTimeout(EOMtheEMSconfigurator* p)
//{
// test();
//}

// simone.girardi on 8 Nov 2021: with the following macro enabled we can test the reading on aea3 encoder.
// with a minimum effort we can use it to test other similar encoders (e.g. aea1, aea2 ...) as well.
//#define TEST_SPI_ENCODER
Expand Down
6 changes: 3 additions & 3 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,7 @@ extern "C" {
#define EOMTHEEMSAPPLCFG_VERSION_MAJOR 3
// <o> minor <0-255>
// <o> minor <0-255>
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 71
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 72

// </h>version

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

// </h>Info
Expand Down
6 changes: 3 additions & 3 deletions emBODY/eBcode/arch-arm/board/mc2plus/appl/v2/proj/mc2plus.diagnostic2ready.uvoptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,8 +971,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.lib</PathWithFileName>
<FilenameWithoutPath>osal.cm4.lib</FilenameWithoutPath>
<PathWithFileName>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.dbg.lib</PathWithFileName>
<FilenameWithoutPath>osal.cm4.dbg.lib</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down Expand Up @@ -1612,7 +1612,7 @@

<Group>
<GroupName>eo-emsappl</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down
8 changes: 4 additions & 4 deletions emBODY/eBcode/arch-arm/board/mc2plus/appl/v2/proj/mc2plus.diagnostic2ready.uvprojx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,9 @@
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\ipal\lib\ipal.base.medium.cm4.lib</FilePath>
</File>
<File>
<FileName>osal.cm4.lib</FileName>
<FileName>osal.cm4.dbg.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.lib</FilePath>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.dbg.lib</FilePath>
</File>
<File>
<FileName>hal2.mc2plus.ethdbg.lib</FileName>
Expand Down Expand Up @@ -1810,9 +1810,9 @@
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\ipal\lib\ipal.base.medium.cm4.lib</FilePath>
</File>
<File>
<FileName>osal.cm4.lib</FileName>
<FileName>osal.cm4.dbg.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.lib</FilePath>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.dbg.lib</FilePath>
</File>
<File>
<FileName>hal2.mc2plus.ethdbg.lib</FileName>
Expand Down
6 changes: 3 additions & 3 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 92
#define EOMTHEEMSAPPLCFG_VERSION_MINOR 93

// </h>version

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

// </h>build date

Expand Down
8 changes: 4 additions & 4 deletions emBODY/eBcode/arch-arm/board/mc4plus/appl/v2/proj/mc4plus.diagnostic2ready.uvoptx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@

<Group>
<GroupName>abslayer-lib</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand All @@ -547,8 +547,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.lib</PathWithFileName>
<FilenameWithoutPath>osal.cm4.lib</FilenameWithoutPath>
<PathWithFileName>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.dbg.lib</PathWithFileName>
<FilenameWithoutPath>osal.cm4.dbg.lib</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
Expand Down Expand Up @@ -1200,7 +1200,7 @@

<Group>
<GroupName>eo-emsappl</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down
8 changes: 4 additions & 4 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 @@ -400,9 +400,9 @@
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\ipal\lib\ipal.base.medium.cm4.lib</FilePath>
</File>
<File>
<FileName>osal.cm4.lib</FileName>
<FileName>osal.cm4.dbg.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.lib</FilePath>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.dbg.lib</FilePath>
</File>
<File>
<FileName>hal2.mc4plus.ethdbg.lib</FileName>
Expand Down Expand Up @@ -1835,9 +1835,9 @@
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\ipal\lib\ipal.base.medium.cm4.lib</FilePath>
</File>
<File>
<FileName>osal.cm4.lib</FileName>
<FileName>osal.cm4.dbg.lib</FileName>
<FileType>4</FileType>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.lib</FilePath>
<FilePath>..\..\..\..\..\libs\highlevel\abslayer\osal\lib\osal.cm4.dbg.lib</FilePath>
</File>
<File>
<FileName>hal2.mc4plus.ethdbg.lib</FileName>
Expand Down
Loading