martino/ec-gn-ja-pcf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed HTTP Interface and DAN DIO time

Browse Source
This commit is contained in:
ferrog
2026-02-09 16:32:58 +00:00
parent 1db89f9c01
commit cdafede708
5 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app.marte
View File

@@ -17,23 +17,23 @@
Plot0 = { Plot0 = {
APS_HVON = { APS_HVON = {
Component = RTApp.Data.DDB3 Component = RTApp.Data.DDB3
Signal = "APS_HVON" Signal = "Signals.APS_HVON"
} }
APS_SWON = { APS_SWON = {
Component = RTApp.Data.DDB3 Component = RTApp.Data.DDB3
Signal = "APS_SWON" Signal = "Signals.APS_SWON"
} }
BPS_HVON = { BPS_HVON = {
Component = RTApp.Data.DDB3 Component = RTApp.Data.DDB3
Signal = "BPS_HVON" Signal = "Signals.BPS_HVON"
} }
BPS_SWON = { BPS_SWON = {
Component = RTApp.Data.DDB3 Component = RTApp.Data.DDB3
Signal = "BPS_SWON" Signal = "Signals.BPS_SWON"
} }
HVPS_HVON = { HVPS_HVON = {
Component = RTApp.Data.DDB3 Component = RTApp.Data.DDB3
Signal = "MHVPS_HVON" Signal = "Signals.MHVPS_HVON"
} }
} }
} }

18
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/app_states.marte
View File

@@ -53,7 +53,7 @@
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
CPUs = @cpus_dan CPUs = @cpus_dan
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
Class = RealTimeThread Class = RealTimeThread
@@ -118,7 +118,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -187,7 +187,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -259,7 +259,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -326,7 +326,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -396,7 +396,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -458,7 +458,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -523,7 +523,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {
@@ -589,7 +589,7 @@
} }
+DANThread = { +DANThread = {
Class = RealTimeThread Class = RealTimeThread
Functions = { DANDIOPublisherGAM } Functions = { CurrentTimeDIO, DANDIOPublisherGAM }
CPUs = @cpus_dan CPUs = @cpus_dan
} }
+ReferenceGenerationThread = { +ReferenceGenerationThread = {

2
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/data/pxi.marte
View File

@@ -464,7 +464,7 @@
+NI6528_0_DIO = { +NI6528_0_DIO = {
Class = NI6528 Class = NI6528
DeviceName = "/dev/pxi6528" DeviceName = "/dev/pxi6528"
BoardId = 0 // TODO: check if not 1 BoardId = 1 // TODO: check if not 1
Signals = { Signals = {
//# P0.0 I.00 APS A Ready //# P0.0 I.00 APS A Ready
//# P0.1 I.01 APS A Fault //# P0.1 I.01 APS A Fault

6
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/state_machine/0_initial.marte
View File

@@ -6,6 +6,12 @@
Class = StateMachineEvent Class = StateMachineEvent
NextState = "WAITSTANDBY" NextState = "WAITSTANDBY"
NextStateError = "ERROR" NextStateError = "ERROR"
+StartHttpServer = {
Class = Message
Destination = WebServer
Function = "Start"
Mode = "ExpectsReply"
}
+PrepareNextStateMsg = { +PrepareNextStateMsg = {
Class = Message Class = Message
Destination = RTApp Destination = RTApp

22
EC-GN-JA-PCF-IN/src/main/resources/qst-gyrotron-fast-controller/Configurations/src/thread5/dio_dan_writer.marte
View File

@@ -2,7 +2,14 @@
+Data = { +Data = {
+DDB5 = {
AllowNoProducers = 1
Signals = {
CurrTime = {
Type = uint64
}
}
}
+DANDIODataSource = { +DANDIODataSource = {
Class = "DAN::DANSource" Class = "DAN::DANSource"
NumberOfBuffers = 1000 NumberOfBuffers = 1000
@@ -199,12 +206,21 @@
} }
+Functions = { +Functions = {
+CurrentTimeDIO = {
Class = "IOExt::SystemClockGAM"
OutputSignals = {
CurrTime = {
DataSource = DDB5
Type = uint64
}
}
}
+DANDIOPublisherGAM = { +DANDIOPublisherGAM = {
Class = IOGAM Class = IOGAM
InputSignals = { InputSignals = {
Time = { Time = {
DataSource = FastTimer DataSource = DDB5
Alias = AbsoluteTime Alias = CurrTime
} }
PXI6528_Status = { PXI6528_Status = {
DataSource = SynchThread DataSource = SynchThread