Index: trunk/src_plugins/export_openems/excitation.c
===================================================================
--- trunk/src_plugins/export_openems/excitation.c	(revision 31977)
+++ trunk/src_plugins/export_openems/excitation.c	(revision 31978)
@@ -50,10 +50,12 @@
 typedef struct {
 	const char *name;
 	void (*dad)(int idx);
-	char *(*get)(int idx);
+	char *(*get)(int idx, int fmt_matlab);
 	void (*ser)(int idx, int save);  /* serialization: if save is 1, set attributes, else load attributes */
 	int type_id;
 } exc_t;
+#define MAX_EXC_TYPES 5
+static const exc_t excitations[MAX_EXC_TYPES];
 
 
 static void ser_save(const char *data, const char *attrkey)
@@ -183,7 +185,7 @@
 }
 
 
-static char *exc_gaus_get(int idx)
+static char *exc_gaus_get(int idx, int fmt_matlab)
 {
 	double f0 = 0, fc = 0;
 
@@ -193,7 +195,10 @@
 	if (!to_hz(rnd_attribute_get(&PCB->Attributes, AEPREFIX "gaussian::fc"), &fc))
 		rnd_message(RND_MSG_ERROR, "Gauss excitation: unable to parse frequency gaussian::fc\n");
 
-	return rnd_strdup_printf("FDTD = SetGaussExcite(FDTD, %f, %f);", fc, f0);
+	if (fmt_matlab)
+		return rnd_strdup_printf("FDTD = SetGaussExcite(FDTD, %f, %f);", fc, f0);
+
+	return rnd_strdup_printf("type='%d' f0='%f' fc='%f'", excitations[idx].type_id, fc, f0);
 }
 
 static void exc_gaus_ser(int idx, int save)
@@ -221,7 +226,7 @@
 	RND_DAD_END(exc_ctx.dlg);
 }
 
-static char *exc_sin_get(int idx)
+static char *exc_sin_get(int idx, int fmt_matlab)
 {
 	double f0;
 
@@ -228,7 +233,9 @@
 	if (!to_hz(rnd_attribute_get(&PCB->Attributes, AEPREFIX "sinusoidal::f0"), &f0))
 		rnd_message(RND_MSG_ERROR, "Sinus excitation: unable to parse frequency sinusoidal::f0\n");
 
-	return rnd_strdup_printf("FDTD = SetSinusExcite(FDTD, %f);", f0);
+	if (fmt_matlab)
+		return rnd_strdup_printf("FDTD = SetSinusExcite(FDTD, %f);", f0);
+	return rnd_strdup_printf("type='%d' f0='%f'", excitations[idx].type_id, f0);
 }
 
 static void exc_sin_ser(int idx, int save)
@@ -261,7 +268,7 @@
 	RND_DAD_END(exc_ctx.dlg);
 }
 
-static char *exc_cust_get(int idx)
+static char *exc_cust_get(int idx, int fmt_matlab)
 {
 	double f0;
 
@@ -268,8 +275,15 @@
 	if (!to_hz(rnd_attribute_get(&PCB->Attributes, AEPREFIX "custom::f0"), &f0))
 		rnd_message(RND_MSG_ERROR, "Custom excitation: unable to parse frequency custom::f0\n");
 
-	return rnd_strdup_printf(
-		"FDTD = SetCustomExcite(FDTD, %f, %s)",
+	if (fmt_matlab)
+		return rnd_strdup_printf(
+			"FDTD = SetCustomExcite(FDTD, %f, %s)",
+			f0,
+			rnd_attribute_get(&PCB->Attributes, AEPREFIX "custom::func")
+		);
+
+	return rnd_strdup_printf("type='%d' f0='%f' Function='%s'",
+		excitations[idx].type_id,
 		f0,
 		rnd_attribute_get(&PCB->Attributes, AEPREFIX "custom::func")
 	);
@@ -301,9 +315,11 @@
 	RND_DAD_END(exc_ctx.dlg);
 }
 
-static char *exc_user_get(int idx)
+static char *exc_user_get(int idx, int fmt_matlab)
 {
-	return rnd_strdup(rnd_attribute_get(&PCB->Attributes, AEPREFIX "user-defined::script"));
+	if (fmt_matlab)
+		return rnd_strdup(rnd_attribute_get(&PCB->Attributes, AEPREFIX "user-defined::script"));
+	return NULL;
 }
 
 static void exc_user_ser(int idx, int save)
@@ -322,7 +338,7 @@
 #undef I_SCRIPT
 /*** generic code ***/
 
-static const exc_t excitations[] = {
+static const exc_t excitations[MAX_EXC_TYPES] = {
 	{ "gaussian",      exc_gaus_dad, exc_gaus_get, exc_gaus_ser, 0 },
 	{ "sinusoidal",    exc_sin_dad,  exc_sin_get,  exc_sin_ser,  1 },
 	{ "custom",        exc_cust_dad, exc_cust_get, exc_cust_ser, 10 },
@@ -527,13 +543,16 @@
 	return 0;
 }
 
-static char *pcb_openems_excitation_get(pcb_board_t *pcb)
+static char *pcb_openems_excitation_get(pcb_board_t *pcb, int fmt_matlab)
 {
 	if ((exc_ctx.selected < 0) || (exc_ctx.selected >= sizeof(excitations)/sizeof(excitations[0]))) {
 		rnd_message(RND_MSG_ERROR, "No excitation selected\n");
-		return rnd_strdup("%% ERROR: no excitation selected\n");
+		if (fmt_matlab)
+			return rnd_strdup("%% ERROR: no excitation selected\n");
+		else
+			return NULL;
 	}
-	return excitations[exc_ctx.selected].get(exc_ctx.selected);
+	return excitations[exc_ctx.selected].get(exc_ctx.selected, fmt_matlab);
 }
 
 static void exc_ev_board_changed(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
Index: trunk/src_plugins/export_openems/export_openems.c
===================================================================
--- trunk/src_plugins/export_openems/export_openems.c	(revision 31977)
+++ trunk/src_plugins/export_openems/export_openems.c	(revision 31978)
@@ -518,7 +518,7 @@
 static void openems_wr_m_mesh1(wctx_t *ctx)
 {
 	pcb_mesh_t *mesh = pcb_mesh_get(MESH_NAME);
-	char *exc = pcb_openems_excitation_get(ctx->pcb);
+	char *exc = pcb_openems_excitation_get(ctx->pcb, 1);
 	int n;
 
 	fprintf(ctx->fsim, "%%%%%% Board mesh, part 1\n");
Index: trunk/src_plugins/export_openems/openems_xml.c
===================================================================
--- trunk/src_plugins/export_openems/openems_xml.c	(revision 31977)
+++ trunk/src_plugins/export_openems/openems_xml.c	(revision 31978)
@@ -31,16 +31,27 @@
 static void openems_wr_xml(wctx_t *ctx)
 {
 	pcb_mesh_t *mesh = pcb_mesh_get(MESH_NAME);
+	char *exc;
 
+
 	fprintf(ctx->f, "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>\n");
 	fprintf(ctx->f, "<openEMS>\n");
 	fprintf(ctx->f, "  <FDTD NumberOfTimesteps='%ld' endCriteria='%f' f_max='%ld'>\n", def_num_timesteps, def_end_crit, def_f_max);
-	fprintf(ctx->f, "    <Excitation Type='0' f0='1100000000' fc='1000000000'>\n");
-	fprintf(ctx->f, "    </Excitation>\n");
+
+	exc = pcb_openems_excitation_get(ctx->pcb, 0);
+	if (exc != NULL) {
+		fprintf(ctx->f, "    <Excitation %s>\n", exc);
+		fprintf(ctx->f, "    </Excitation>\n");
+	}
+	else
+		fprintf(ctx->f, "<!-- ERROR: no excitation selected -->\n");
+	free(exc);
+
 	if ((mesh != NULL) && (mesh->bnd[0] != NULL)) {
 		fprintf(ctx->f, "    <BoundaryCond xmin='%s' xmax='%s' ymin='%s' ymax='%s' zmin='%s' zmax='%s'>\n", mesh->bnd[0], mesh->bnd[1], mesh->bnd[2], mesh->bnd[3], mesh->bnd[4], mesh->bnd[5]);
 		fprintf(ctx->f, "    </BoundaryCond>\n");
 	}
+
 	fprintf(ctx->f, "  </FDTD>\n");
 	fprintf(ctx->f, "</openEMS>\n");
 }