From ae1f1eb9ca118e6239cf9ab5613e7f1d50621063 Mon Sep 17 00:00:00 2001 From: Imanol-Mikel Barba Sabariego Date: Mon, 12 May 2014 19:05:38 +0000 Subject: [PATCH] --- .metadata/.log | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ .metadata/.plugins/org.eclipse.cdt.core/.log | 2 ++ .metadata/.plugins/org.eclipse.core.resources/.projects/Blinker/.markers | Bin 516 -> 0 bytes .metadata/.plugins/org.eclipse.core.resources/.projects/DUREX/.indexes/history.index | Bin 596 -> 0 bytes .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources | Bin 765 -> 0 bytes .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- .metadata/.plugins/org.eclipse.jdt.core/1141783261.index | Bin 11237 -> 0 bytes .metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt | 1 + .metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml | 2 +- DUREX/out/DUREX-TODO.c | 42 +++++++++++++----------------------------- DUREX/out/DUREX.c | 53 +++++++++++++++++++++++++---------------------------- DUREX/out/DUREX.h | 41 ++++++++++++++++++++++------------------- DUREX/out/DUREX.zip | Bin 4708 -> 0 bytes DUREX/out/durex.json | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------- DUREX/schema.ems | 39 +++++++++++++++++++++++++++++++++------ MyAppSchema/out/MyApp-TODO.c | 2 +- MyAppSchema/out/MyApp.c | 4 ++-- MyAppSchema/out/MyApp.h | 2 +- MyAppSchema/out/MyApp.zip | Bin 4198 -> 0 bytes MyAppSchema/out/myapp.json | 10 +++++----- 20 files changed, 368 insertions(+), 248 deletions(-) diff --git a/.metadata/.log b/.metadata/.log index 451f8c4..bf87517 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -907,3 +907,95 @@ org.eclipse.swt.SWTException: Invalid thread access at org.eclipse.ui.internal.ide.dialogs.CleanDialog$1.runInWorkspace(CleanDialog.java:151) at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) +!SESSION 2014-05-11 01:17:31.943 ----------------------------------------------- +eclipse.buildId=4.3.2.M20140221-1700 +java.version=1.7.0_45 +java.vendor=Oracle Corporation +BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US +Framework arguments: -product org.eclipse.epp.package.standard.product -keyring /Users/imanol/.eclipse_keyring -showlocation +Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.standard.product -keyring /Users/imanol/.eclipse_keyring -showlocation + +!ENTRY org.eclipse.core.net 1 0 2014-05-11 01:18:29.777 +!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences +!SESSION 2014-05-12 16:18:18.541 ----------------------------------------------- +eclipse.buildId=4.3.2.M20140221-1700 +java.version=1.7.0_45 +java.vendor=Oracle Corporation +BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US +Framework arguments: -product org.eclipse.epp.package.standard.product -keyring /Users/imanol/.eclipse_keyring -showlocation +Command-line arguments: -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.standard.product -keyring /Users/imanol/.eclipse_keyring -showlocation + +!ENTRY org.eclipse.core.net 1 0 2014-05-12 16:18:32.506 +!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences + +!ENTRY org.eclipse.ui.console 4 2 2014-05-12 17:13:13.898 +!MESSAGE Problems occurred when invoking code from plug-in: "org.eclipse.ui.console". +!STACK 0 +org.eclipse.swt.SWTException: Invalid thread access + at org.eclipse.swt.SWT.error(SWT.java:4397) + at org.eclipse.swt.SWT.error(SWT.java:4312) + at org.eclipse.swt.SWT.error(SWT.java:4283) + at org.eclipse.swt.widgets.Widget.error(Widget.java:783) + at org.eclipse.swt.widgets.Widget.checkWidget(Widget.java:574) + at org.eclipse.swt.widgets.Control.redraw(Control.java:2773) + at org.eclipse.swt.custom.StyledText.redraw(StyledText.java:7354) + at org.eclipse.ui.console.TextConsolePage.propertyChange(TextConsolePage.java:252) + at org.eclipse.ui.console.AbstractConsole$PropertyNotifier.run(AbstractConsole.java:104) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.console.AbstractConsole$PropertyNotifier.notify(AbstractConsole.java:120) + at org.eclipse.ui.console.AbstractConsole.firePropertyChange(AbstractConsole.java:246) + at org.eclipse.ui.console.IOConsoleOutputStream.setColor(IOConsoleOutputStream.java:140) + at com.emmoco.mcmtooling.core.build.MCMProjectBuilder.clean(Unknown Source) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:735) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:206) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:246) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:299) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:302) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:263) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:401) + at org.eclipse.core.internal.resources.Project$1.run(Project.java:618) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2345) + at org.eclipse.core.internal.resources.Project.internalBuild(Project.java:597) + at org.eclipse.core.internal.resources.Project.build(Project.java:114) + at org.eclipse.ui.internal.ide.dialogs.CleanDialog.doClean(CleanDialog.java:319) + at org.eclipse.ui.internal.ide.dialogs.CleanDialog$1.runInWorkspace(CleanDialog.java:151) + at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) + +!ENTRY org.eclipse.ui.console 4 120 2014-05-12 17:13:13.914 +!MESSAGE Exception occurred during console property change notification. +!STACK 0 +org.eclipse.swt.SWTException: Invalid thread access + at org.eclipse.swt.SWT.error(SWT.java:4397) + at org.eclipse.swt.SWT.error(SWT.java:4312) + at org.eclipse.swt.SWT.error(SWT.java:4283) + at org.eclipse.swt.widgets.Widget.error(Widget.java:783) + at org.eclipse.swt.widgets.Widget.checkWidget(Widget.java:574) + at org.eclipse.swt.widgets.Control.redraw(Control.java:2773) + at org.eclipse.swt.custom.StyledText.redraw(StyledText.java:7354) + at org.eclipse.ui.console.TextConsolePage.propertyChange(TextConsolePage.java:252) + at org.eclipse.ui.console.AbstractConsole$PropertyNotifier.run(AbstractConsole.java:104) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.ui.console.AbstractConsole$PropertyNotifier.notify(AbstractConsole.java:120) + at org.eclipse.ui.console.AbstractConsole.firePropertyChange(AbstractConsole.java:246) + at org.eclipse.ui.console.IOConsoleOutputStream.setColor(IOConsoleOutputStream.java:140) + at com.emmoco.mcmtooling.core.build.MCMProjectBuilder.clean(Unknown Source) + at org.eclipse.core.internal.events.BuildManager$2.run(BuildManager.java:735) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:206) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:246) + at org.eclipse.core.internal.events.BuildManager$1.run(BuildManager.java:299) + at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:42) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:302) + at org.eclipse.core.internal.events.BuildManager.basicBuild(BuildManager.java:263) + at org.eclipse.core.internal.events.BuildManager.build(BuildManager.java:401) + at org.eclipse.core.internal.resources.Project$1.run(Project.java:618) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2345) + at org.eclipse.core.internal.resources.Project.internalBuild(Project.java:597) + at org.eclipse.core.internal.resources.Project.build(Project.java:114) + at org.eclipse.ui.internal.ide.dialogs.CleanDialog.doClean(CleanDialog.java:319) + at org.eclipse.ui.internal.ide.dialogs.CleanDialog$1.runInWorkspace(CleanDialog.java:151) + at org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38) + at org.eclipse.core.internal.jobs.Worker.run(Worker.java:53) diff --git a/.metadata/.plugins/org.eclipse.cdt.core/.log b/.metadata/.plugins/org.eclipse.cdt.core/.log index 2ec7992..2c22aa7 100644 --- a/.metadata/.plugins/org.eclipse.cdt.core/.log +++ b/.metadata/.plugins/org.eclipse.cdt.core/.log @@ -3,3 +3,5 @@ *** SESSION May 09, 2014 14:46:59.40 ------------------------------------------- *** SESSION May 09, 2014 15:37:35.48 ------------------------------------------- *** SESSION May 09, 2014 15:39:11.56 ------------------------------------------- +*** SESSION May 11, 2014 01:18:39.69 ------------------------------------------- +*** SESSION May 12, 2014 16:18:48.00 ------------------------------------------- diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/Blinker/.markers b/.metadata/.plugins/org.eclipse.core.resources/.projects/Blinker/.markers index 38dac65..3e9e815 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/Blinker/.markers and b/.metadata/.plugins/org.eclipse.core.resources/.projects/Blinker/.markers differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.projects/DUREX/.indexes/history.index b/.metadata/.plugins/org.eclipse.core.resources/.projects/DUREX/.indexes/history.index index 8236382..cbd6653 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.projects/DUREX/.indexes/history.index and b/.metadata/.plugins/org.eclipse.core.resources/.projects/DUREX/.indexes/history.index differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 21310a6..a97bd19 100644 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 8bd2d1c..c37e353 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,9 +1,9 @@ - + activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration ModelMigrationProcessor.001 - + @@ -89,7 +89,7 @@ - + @@ -100,10 +100,9 @@ - + newtablook org.eclipse.e4.secondaryDataStack - active @@ -168,26 +167,29 @@ categoryTag:Help - + newtablook org.eclipse.e4.primaryDataStack EditorStack + active - + Editor com.emmoco.embuilder.schemaEditor removeOnHide - - + + Editor org.eclipse.cdt.ui.editor.CEditor removeOnHide + active + activeOnClose - - + + Editor - org.eclipse.cdt.ui.editor.CEditor + com.emmoco.embuilder.schemaEditor removeOnHide @@ -221,11 +223,9 @@ - + View categoryTag:General - active - activeOnClose ViewMenu menuContribution:menu @@ -304,83 +304,74 @@ Draggable - - - - - - - - - - - - - + + + + + + + + + + + + + toolbarSeparator - + Draggable + + Draggable - - - - - - + + + Draggable - - - - + + Draggable - - - - + + - + Draggable - - + + Draggable - - - - + + + + Draggable - - - - - - - - + + + + Draggable - - - - + + + + toolbarSeparator @@ -388,15 +379,15 @@ Draggable - - - - - - - - - + + + + + + + + + toolbarSeparator @@ -408,8 +399,8 @@ Draggable - - + + stretch @@ -700,7 +691,7 @@ platform:cocoa - + @@ -1047,7 +1038,7 @@ - + diff --git a/.metadata/.plugins/org.eclipse.jdt.core/1141783261.index b/.metadata/.plugins/org.eclipse.jdt.core/1141783261.index index b0c1c5f..3bd4f66 100644 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/1141783261.index and b/.metadata/.plugins/org.eclipse.jdt.core/1141783261.index differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index cbb6390..2a9208a 100644 --- a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,3 +1,4 @@ INDEX VERSION 1.126+/Users/imanol/devel/durex/.metadata/.plugins/org.eclipse.jdt.core +1699548220.index 1141783261.index 2272743771.index diff --git a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml index 651b34d..820e9d9 100644 --- a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -14,8 +14,8 @@
- +
diff --git a/DUREX/out/DUREX-TODO.c b/DUREX/out/DUREX-TODO.c index 9d463b6..1beb62a 100644 --- a/DUREX/out/DUREX-TODO.c +++ b/DUREX/out/DUREX-TODO.c @@ -1,4 +1,4 @@ -/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.DUREX on 2014-05-09T15:40:38T ****/ +/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.DUREX on 2014-05-12T17:07:56T ****/ /**** protocolLevel = 12, toolsVersion = 12.0.0.201211010336 ****/ #include "DUREX.h" @@ -15,52 +15,36 @@ void DUREX_disconnectHandler(void) { /* TODO: application is now disconnected */ } -void DUREX_serverBytesAvailable_fetch(DUREX_serverBytesAvailable_t* const output) { - /* TODO: write resource 'serverBytesAvailable' into 'output' */ +void DUREX_numServerBytes_fetch(DUREX_numServerBytes_t* const output) { + /* TODO: write resource 'numServerBytes' into 'output' */ } -void DUREX_serverBytesAvailable_store(DUREX_serverBytesAvailable_t* const input) { - /* TODO: read resource 'serverBytesAvailable' from 'input' */ -} - -void DUREX_clientBytesAvailable_fetch(DUREX_clientBytesAvailable_t* const output) { - /* TODO: write resource 'clientBytesAvailable' into 'output' */ -} - -void DUREX_clientBytesAvailable_store(DUREX_clientBytesAvailable_t* const input) { - /* TODO: read resource 'clientBytesAvailable' from 'input' */ +void DUREX_numClientBytes_store(DUREX_numClientBytes_t* const input) { + /* TODO: read resource 'numClientBytes' from 'input' */ } void DUREX_serverData_fetch(DUREX_serverData_t* const output) { /* TODO: write resource 'serverData' into 'output' */ } -void DUREX_serverData_store(DUREX_serverData_t* const input) { - /* TODO: read resource 'serverData' from 'input' */ -} - -void DUREX_clientData_fetch(DUREX_clientData_t* const output) { - /* TODO: write resource 'clientData' into 'output' */ -} - void DUREX_clientData_store(DUREX_clientData_t* const input) { /* TODO: read resource 'clientData' from 'input' */ } -void DUREX_serverMoreData_fetch(DUREX_serverMoreData_t* const output) { - /* TODO: write resource 'serverMoreData' into 'output' */ +void DUREX_numServerPackets_fetch(DUREX_numServerPackets_t* const output) { + /* TODO: write resource 'numServerPackets' into 'output' */ } -void DUREX_serverMoreData_store(DUREX_serverMoreData_t* const input) { - /* TODO: read resource 'serverMoreData' from 'input' */ +void DUREX_numClientPackets_store(DUREX_numClientPackets_t* const input) { + /* TODO: read resource 'numClientPackets' from 'input' */ } -void DUREX_clientMoreData_fetch(DUREX_clientMoreData_t* const output) { - /* TODO: write resource 'clientMoreData' into 'output' */ +void DUREX_clientMessageAvailable_store(DUREX_clientMessageAvailable_t* const input) { + /* TODO: read resource 'clientMessageAvailable' from 'input' */ } -void DUREX_clientMoreData_store(DUREX_clientMoreData_t* const input) { - /* TODO: read resource 'clientMoreData' from 'input' */ +void DUREX_serverMessageAvailable_fetch(DUREX_serverMessageAvailable_t* const output) { + /* TODO: write resource 'serverMessageAvailable' into 'output' */ } #endif /* dummy file */ diff --git a/DUREX/out/DUREX.c b/DUREX/out/DUREX.c index dcf5eee..f5721a7 100644 --- a/DUREX/out/DUREX.c +++ b/DUREX/out/DUREX.c @@ -1,4 +1,4 @@ -/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.DUREX on 2014-05-09T15:40:38T ****/ +/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.DUREX on 2014-05-12T17:07:56T ****/ /**** protocolLevel = 12, toolsVersion = 12.0.0.201211010336 ****/ #include "Em_Message.h" @@ -17,11 +17,11 @@ typedef struct Em_App_Message { uint8_t data[240]; } Em_App_Message; -const uint8_t Em_App_hash[] = {218, 74, 41, 73, 107, 164, 154, 232, 180, 185, 128, 44, 30, 56, 49, 63, 12, 0, ((sizeof(struct{uint8_t f1; uint16_t f2;}) - sizeof(uint16_t)) << 4) | (sizeof(struct{uint8_t f1; uint32_t f2;}) - sizeof(uint32_t))}; +const uint8_t Em_App_hash[] = {224, 162, 126, 89, 171, 226, 61, 111, 140, 230, 8, 235, 3, 233, 184, 44, 12, 0, ((sizeof(struct{uint8_t f1; uint16_t f2;}) - sizeof(uint16_t)) << 4) | (sizeof(struct{uint8_t f1; uint32_t f2;}) - sizeof(uint32_t))}; -const uint8_t Em_App_build[] = {94, 212, 54, 225, 69, 1, 0, 0}; +const uint8_t Em_App_build[] = {98, 214, 249, 240, 69, 1, 0, 0}; -#define Em_App_APP_RESOURCE_COUNT 6 +#define Em_App_APP_RESOURCE_COUNT 8 #define Em_App_SYS_RESOURCE_COUNT 8 #define Em_App_ACCEPT DUREX_accept @@ -34,7 +34,7 @@ const uint8_t Em_App_build[] = {94, 212, 54, 225, 69, 1, 0, 0}; #define Em_App_CONNECTHANDLER DUREX_connectHandler #define Em_App_DISCONNECTHANDLER DUREX_disconnectHandler -#define Em_App_MAX_INDICATOR 1 +#define Em_App_MAX_INDICATOR 2 enum {Em_App_IDLE, Em_App_DISCONNECTED, Em_App_CONNECTED}; @@ -289,27 +289,19 @@ void Em_App_fetchDispatch(void) { case 0: break; case 1: - DUREX_serverBytesAvailable_fetch((DUREX_serverBytesAvailable_t*)Em_App_msg.data); - size = 1; - break; - case 2: - DUREX_clientBytesAvailable_fetch((DUREX_clientBytesAvailable_t*)Em_App_msg.data); + DUREX_numServerBytes_fetch((DUREX_numServerBytes_t*)Em_App_msg.data); size = 1; break; case 3: DUREX_serverData_fetch((DUREX_serverData_t*)Em_App_msg.data); size = 240; break; - case 4: - DUREX_clientData_fetch((DUREX_clientData_t*)Em_App_msg.data); - size = 240; - break; case 5: - DUREX_serverMoreData_fetch((DUREX_serverMoreData_t*)Em_App_msg.data); + DUREX_numServerPackets_fetch((DUREX_numServerPackets_t*)Em_App_msg.data); size = 1; break; - case 6: - DUREX_clientMoreData_fetch((DUREX_clientMoreData_t*)Em_App_msg.data); + case 8: + DUREX_serverMessageAvailable_fetch((DUREX_serverMessageAvailable_t*)Em_App_msg.data); size = 1; break; } @@ -320,23 +312,17 @@ void Em_App_storeDispatch(void) { switch (Em_App_msg.hdr.resId) { case 0: break; - case 1: - DUREX_serverBytesAvailable_store((DUREX_serverBytesAvailable_t*)Em_App_msg.data); - break; case 2: - DUREX_clientBytesAvailable_store((DUREX_clientBytesAvailable_t*)Em_App_msg.data); - break; - case 3: - DUREX_serverData_store((DUREX_serverData_t*)Em_App_msg.data); + DUREX_numClientBytes_store((DUREX_numClientBytes_t*)Em_App_msg.data); break; case 4: DUREX_clientData_store((DUREX_clientData_t*)Em_App_msg.data); break; - case 5: - DUREX_serverMoreData_store((DUREX_serverMoreData_t*)Em_App_msg.data); - break; case 6: - DUREX_clientMoreData_store((DUREX_clientMoreData_t*)Em_App_msg.data); + DUREX_numClientPackets_store((DUREX_numClientPackets_t*)Em_App_msg.data); + break; + case 7: + DUREX_clientMessageAvailable_store((DUREX_clientMessageAvailable_t*)Em_App_msg.data); break; } Em_App_sendResponse(Em_Message_STORE_DONE, 0); @@ -345,6 +331,13 @@ void Em_App_storeDispatch(void) { void Em_App_sendIndicator(Em_Message_ResId indId) { Em_Message_Size resId = 0; Em_Message_Size size = 0; + switch (indId) { + case 1: + DUREX_serverMessageAvailable_fetch((DUREX_serverMessageAvailable_t*)&Em_App_ind.data); + resId = 8; + size = 1; + break; +} Em_App_ind.sot = 0; Em_App_ind.hdr.kind = Em_Message_INDICATOR; Em_App_ind.hdr.size = sizeof (Em_Message_Header) + size; @@ -352,6 +345,10 @@ void Em_App_sendIndicator(Em_Message_ResId indId) { Em_App_startIndSend(); } +void DUREX_serverMessageAvailable_indicate(void) { + if (Em_App_state != Em_App_IDLE && Em_App_xmitReady(1)) Em_App_sendIndicator(1); +} + #ifdef __cplusplus } #endif diff --git a/DUREX/out/DUREX.h b/DUREX/out/DUREX.h index 54685da..788d200 100644 --- a/DUREX/out/DUREX.h +++ b/DUREX/out/DUREX.h @@ -1,4 +1,4 @@ -/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.DUREX on 2014-05-09T15:40:38T ****/ +/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.DUREX on 2014-05-12T17:07:56T ****/ /**** protocolLevel = 12, toolsVersion = 12.0.0.201211010336 ****/ #ifndef DUREX__H @@ -20,35 +20,38 @@ typedef uint8_t DUREX_BOOLEAN; #define DUREX_TRUE 0 #define DUREX_FALSE 1 -/* resource serverBytesAvailable */ -typedef uint8_t DUREX_serverBytesAvailable_t; -extern void DUREX_serverBytesAvailable_fetch(DUREX_serverBytesAvailable_t* const output); -extern void DUREX_serverBytesAvailable_store(DUREX_serverBytesAvailable_t* const input); +/* resource numServerBytes */ +typedef uint8_t DUREX_numServerBytes_t; +extern void DUREX_numServerBytes_fetch(DUREX_numServerBytes_t* const output); -/* resource clientBytesAvailable */ -typedef uint8_t DUREX_clientBytesAvailable_t; -extern void DUREX_clientBytesAvailable_fetch(DUREX_clientBytesAvailable_t* const output); -extern void DUREX_clientBytesAvailable_store(DUREX_clientBytesAvailable_t* const input); +/* resource numClientBytes */ +typedef uint8_t DUREX_numClientBytes_t; +extern void DUREX_numClientBytes_store(DUREX_numClientBytes_t* const input); /* resource serverData */ typedef DUREX_String DUREX_serverData_t[240]; extern void DUREX_serverData_fetch(DUREX_serverData_t* const output); -extern void DUREX_serverData_store(DUREX_serverData_t* const input); /* resource clientData */ typedef DUREX_String DUREX_clientData_t[240]; -extern void DUREX_clientData_fetch(DUREX_clientData_t* const output); extern void DUREX_clientData_store(DUREX_clientData_t* const input); -/* resource serverMoreData */ -typedef DUREX_BOOLEAN DUREX_serverMoreData_t; -extern void DUREX_serverMoreData_fetch(DUREX_serverMoreData_t* const output); -extern void DUREX_serverMoreData_store(DUREX_serverMoreData_t* const input); +/* resource numServerPackets */ +typedef uint8_t DUREX_numServerPackets_t; +extern void DUREX_numServerPackets_fetch(DUREX_numServerPackets_t* const output); -/* resource clientMoreData */ -typedef DUREX_BOOLEAN DUREX_clientMoreData_t; -extern void DUREX_clientMoreData_fetch(DUREX_clientMoreData_t* const output); -extern void DUREX_clientMoreData_store(DUREX_clientMoreData_t* const input); +/* resource numClientPackets */ +typedef uint8_t DUREX_numClientPackets_t; +extern void DUREX_numClientPackets_store(DUREX_numClientPackets_t* const input); + +/* resource clientMessageAvailable */ +typedef DUREX_BOOLEAN DUREX_clientMessageAvailable_t; +extern void DUREX_clientMessageAvailable_store(DUREX_clientMessageAvailable_t* const input); + +/* resource serverMessageAvailable */ +typedef DUREX_BOOLEAN DUREX_serverMessageAvailable_t; +extern void DUREX_serverMessageAvailable_fetch(DUREX_serverMessageAvailable_t* const output); +extern void DUREX_serverMessageAvailable_indicate(void); void DUREX_reset(void); void DUREX_run(void); diff --git a/DUREX/out/DUREX.zip b/DUREX/out/DUREX.zip index 000b56a..5183f21 100644 Binary files a/DUREX/out/DUREX.zip and b/DUREX/out/DUREX.zip differ diff --git a/DUREX/out/durex.json b/DUREX/out/durex.json index 044e57f..33c6eb9 100644 --- a/DUREX/out/durex.json +++ b/DUREX/out/durex.json @@ -1,75 +1,54 @@ { "resources": { - "$schemaHash": { - "id": -6, - "align": 1, - "attributes": {"readonly": true}, - "type": "A20:u1", - "access": "r", - "size": 20 - }, - "$eapProtocolLevel": { - "id": -3, - "align": 2, - "attributes": {"readonly": true}, - "type": "u2", - "access": "r", - "size": 2 - }, "serverData": { "id": 3, "align": 1, - "attributes": {}, + "attributes": {"readonly": true}, "type": "C:240", - "access": "rw", + "access": "r", "size": 240 }, - "clientMoreData": { - "id": 6, + "numServerPackets": { + "id": 5, "align": 1, - "attributes": {}, - "type": "E:@emmoco.com.DUREX/BOOLEAN", - "access": "rw", + "attributes": {"readonly": true}, + "type": "u1", + "access": "r", "size": 1 }, - "serverMoreData": { - "id": 5, + "serverMessageAvailable": { + "id": 8, "align": 1, - "attributes": {}, + "attributes": { + "indicator": true, + "readonly": true + }, "type": "E:@emmoco.com.DUREX/BOOLEAN", - "access": "rw", + "access": "ir", "size": 1 }, - "$mcmProtocolLevel": { - "id": -2, + "$eapProtocolLevel": { + "id": -3, "align": 2, "attributes": {"readonly": true}, "type": "u2", "access": "r", "size": 2 }, - "$mobileRssi": { - "id": -8, - "align": 1, - "attributes": {"readonly": true}, - "type": "i1", - "access": "r", - "size": 1 - }, - "serverBytesAvailable": { - "id": 1, + "numClientPackets": { + "id": 6, "align": 1, - "attributes": {}, + "attributes": {"writeonly": true}, "type": "u1", - "access": "rw", + "access": "w", "size": 1 }, - "clientBytesAvailable": { + "numClientBytes": { "id": 2, "align": 1, - "attributes": {}, + "attributes": {"writeonly": true}, "type": "u1", - "access": "rw", + "access": "w", "size": 1 }, "$mcmDisconnect": { @@ -96,21 +75,61 @@ "access": "r", "size": 2 }, - "$fileIndexReset": { - "id": -5, - "align": 2, + "clientMessageAvailable": { + "id": 7, + "align": 1, "attributes": {"writeonly": true}, - "type": "i2", + "type": "E:@emmoco.com.DUREX/BOOLEAN", "access": "w", - "size": 2 + "size": 1 }, "clientData": { "id": 4, "align": 1, - "attributes": {}, + "attributes": {"writeonly": true}, "type": "C:240", - "access": "rw", + "access": "w", "size": 240 + }, + "$schemaHash": { + "id": -6, + "align": 1, + "attributes": {"readonly": true}, + "type": "A20:u1", + "access": "r", + "size": 20 + }, + "$mcmProtocolLevel": { + "id": -2, + "align": 2, + "attributes": {"readonly": true}, + "type": "u2", + "access": "r", + "size": 2 + }, + "$mobileRssi": { + "id": -8, + "align": 1, + "attributes": {"readonly": true}, + "type": "i1", + "access": "r", + "size": 1 + }, + "numServerBytes": { + "id": 1, + "align": 1, + "attributes": {"readonly": true}, + "type": "u1", + "access": "r", + "size": 1 + }, + "$fileIndexReset": { + "id": -5, + "align": 2, + "attributes": {"writeonly": true}, + "type": "i2", + "access": "w", + "size": 2 } }, "resourceNamesSys": [ @@ -126,48 +145,50 @@ "manifest": { "protocolLevel": 12, "hash": [ - 218, - 74, - 41, - 73, - 107, - 164, - 154, - 232, - 180, - 185, - 128, - 44, - 30, - 56, - 49, - 63 + 224, + 162, + 126, + 89, + 171, + 226, + 61, + 111, + 140, + 230, + 8, + 235, + 3, + 233, + 184, + 44 ], "toolVersion": "12.0.0.201211010336", "name": "DUREX", - "$$md5": "275479fd2e9dfc29825d3d8004f33029", + "$$md5": "7a97baaab5717ba8bbefb2b2f3ce97fe", "build": [ - 94, - 212, - 54, - 225, + 98, + 214, + 249, + 240, 69, 1, 0, 0 ], - "date": "2014-05-09T15:40:38T", + "date": "2014-05-12T17:07:56T", "maxAlign": 2, "maxSize": 240, "version": "1.0.0" }, "resourceNames": [ - "serverBytesAvailable", - "clientBytesAvailable", + "numServerBytes", + "numClientBytes", "serverData", "clientData", - "serverMoreData", - "clientMoreData", + "numServerPackets", + "numClientPackets", + "clientMessageAvailable", + "serverMessageAvailable", "$mcmProtocolLevel", "$eapProtocolLevel", "$eapBuildDate", @@ -230,12 +251,14 @@ } }, "resourceNamesApp": [ - "clientBytesAvailable", "clientData", - "clientMoreData", - "serverBytesAvailable", + "clientMessageAvailable", + "numClientBytes", + "numClientPackets", + "numServerBytes", + "numServerPackets", "serverData", - "serverMoreData" + "serverMessageAvailable" ], "imports": {"@emmoco.com.DUREX": true} } \ No newline at end of file diff --git a/DUREX/schema.ems b/DUREX/schema.ems index e0016e9..ee347d8 100644 --- a/DUREX/schema.ems +++ b/DUREX/schema.ems @@ -6,10 +6,37 @@ schema DUREX enum BOOLEAN{ TRUE, FALSE }; typedef string<239> String; //MAXIMUM SIZE AVAILABLE - uint8 serverBytesAvailable; - uint8 clientBytesAvailable; - String serverData; - String clientData; - BOOLEAN serverMoreData; - BOOLEAN clientMoreData; + uint8 numServerBytes + { + readonly + } + uint8 numClientBytes + { + writeonly + } + String serverData + { + readonly + } + String clientData + { + writeonly + } + uint8 numServerPackets + { + readonly + } + uint8 numClientPackets + { + writeonly + } + BOOLEAN clientMessageAvailable + { + writeonly + } + BOOLEAN serverMessageAvailable + { + readonly + indicator + } } diff --git a/MyAppSchema/out/MyApp-TODO.c b/MyAppSchema/out/MyApp-TODO.c index 4b8627e..1b5b32c 100644 --- a/MyAppSchema/out/MyApp-TODO.c +++ b/MyAppSchema/out/MyApp-TODO.c @@ -1,4 +1,4 @@ -/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.MyApp on 2014-05-09T15:40:38T ****/ +/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.MyApp on 2014-05-12T17:13:14T ****/ /**** protocolLevel = 12, toolsVersion = 12.0.0.201211010336 ****/ #include "MyApp.h" diff --git a/MyAppSchema/out/MyApp.c b/MyAppSchema/out/MyApp.c index 3ebe2ad..a3bd592 100644 --- a/MyAppSchema/out/MyApp.c +++ b/MyAppSchema/out/MyApp.c @@ -1,4 +1,4 @@ -/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.MyApp on 2014-05-09T15:40:38T ****/ +/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.MyApp on 2014-05-12T17:13:14T ****/ /**** protocolLevel = 12, toolsVersion = 12.0.0.201211010336 ****/ #include "Em_Message.h" @@ -19,7 +19,7 @@ typedef struct Em_App_Message { const uint8_t Em_App_hash[] = {214, 20, 94, 119, 153, 158, 83, 114, 52, 253, 232, 39, 41, 80, 38, 6, 12, 0, ((sizeof(struct{uint8_t f1; uint16_t f2;}) - sizeof(uint16_t)) << 4) | (sizeof(struct{uint8_t f1; uint32_t f2;}) - sizeof(uint32_t))}; -const uint8_t Em_App_build[] = {134, 213, 54, 225, 69, 1, 0, 0}; +const uint8_t Em_App_build[] = {49, 176, 254, 240, 69, 1, 0, 0}; #define Em_App_APP_RESOURCE_COUNT 1 #define Em_App_SYS_RESOURCE_COUNT 8 diff --git a/MyAppSchema/out/MyApp.h b/MyAppSchema/out/MyApp.h index 820d479..5ba6999 100644 --- a/MyAppSchema/out/MyApp.h +++ b/MyAppSchema/out/MyApp.h @@ -1,4 +1,4 @@ -/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.MyApp on 2014-05-09T15:40:38T ****/ +/**** DO NOT EDIT -- this file has been automatically generated from @emmoco.com.MyApp on 2014-05-12T17:13:14T ****/ /**** protocolLevel = 12, toolsVersion = 12.0.0.201211010336 ****/ #ifndef MyApp__H diff --git a/MyAppSchema/out/MyApp.zip b/MyAppSchema/out/MyApp.zip index aefa315..846ee17 100644 Binary files a/MyAppSchema/out/MyApp.zip and b/MyAppSchema/out/MyApp.zip differ diff --git a/MyAppSchema/out/myapp.json b/MyAppSchema/out/myapp.json index 675211f..b864910 100644 --- a/MyAppSchema/out/myapp.json +++ b/MyAppSchema/out/myapp.json @@ -107,16 +107,16 @@ "name": "MyApp", "$$md5": "b184e3f65b05cd53903a85dfa1918a7b", "build": [ - 134, - 213, - 54, - 225, + 49, + 176, + 254, + 240, 69, 1, 0, 0 ], - "date": "2014-05-09T15:40:38T", + "date": "2014-05-12T17:13:14T", "maxAlign": 2, "maxSize": 20, "version": "1.0.0" -- libgit2 0.22.2