refactor: Moved A32NX Clock to fbw-common and add A380X clock (#8491)

Horizon-Simulations · Feb 18, 2024 · 32b38b5 · 32b38b5
1 parent f39ef46
commit 32b38b5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/hsim-a21n-common/src/systems/tsconfig.json b/hsim-a21n-common/src/systems/tsconfig.json
@@ -18,7 +18,8 @@
       "@fmgc/*": ["../../../build-a321neo/src/systems/fmgc/src/*"],
       "@shared/*": ["../../../build-a321neo/src/systems/shared/src/*"],
       "@typings/*": ["../typings/*"],
-      "@flybywiresim/fbw-sdk": ["./index.ts"]
+      "@flybywiresim/fbw-sdk": ["../../../fbw-common/src/systems/index.ts"],
+      "@flybywiresim/clock": ["../../../fbw-common/src/systems/instruments/src/Clock/index.ts"],
     }
-  }
-}
+  },
+}
diff --git a/hsim-a318-common/src/systems/tsconfig.json b/hsim-a318-common/src/systems/tsconfig.json
@@ -18,7 +18,8 @@
       "@fmgc/*": ["../../../build-a318ceo/src/systems/fmgc/src/*"],
       "@shared/*": ["../../../build-a318ceo/src/systems/shared/src/*"],
       "@typings/*": ["../typings/*"],
-      "@flybywiresim/fbw-sdk": ["./index.ts"]
+      "@flybywiresim/fbw-sdk": ["../../../fbw-common/src/systems/index.ts"],
+      "@flybywiresim/clock": ["../../../fbw-common/src/systems/instruments/src/Clock/index.ts"],
     }
-  }
-}
+  },
+}
diff --git a/hsim-a318ceo/src/systems/instruments/src/Clock/instrument.tsx b/hsim-a318ceo/src/systems/instruments/src/Clock/instrument.tsx
@@ -1,6 +1,5 @@
 import { EventBus, FSComponent, HEventPublisher } from '@microsoft/msfs-sdk';
-import { ClockSimvarPublisher } from './shared/ClockSimvarPublisher';
-import { ClockRoot } from './Clock';
+import { ClockRoot, ClockSimvarPublisher } from '@flybywiresim/clock';
 
 // eslint-disable-next-line camelcase
 class A32NX_Clock extends BaseInstrument {

diff --git a/hsim-a319-common/src/systems/tsconfig.json b/hsim-a319-common/src/systems/tsconfig.json
@@ -18,7 +18,8 @@
       "@fmgc/*": ["../../../build-a319ceo/src/systems/fmgc/src/*"],
       "@shared/*": ["../../../build-a319ceo/src/systems/shared/src/*"],
       "@typings/*": ["../typings/*"],
-      "@flybywiresim/fbw-sdk": ["./index.ts"]
+      "@flybywiresim/fbw-sdk": ["../../../fbw-common/src/systems/index.ts"],
+      "@flybywiresim/clock": ["../../../fbw-common/src/systems/instruments/src/Clock/index.ts"],
     }
-  }
-}
+  },
+}
diff --git a/hsim-a319ceo/src/systems/instruments/src/Clock/instrument.tsx b/hsim-a319ceo/src/systems/instruments/src/Clock/instrument.tsx
@@ -1,6 +1,5 @@
 import { EventBus, FSComponent, HEventPublisher } from '@microsoft/msfs-sdk';
-import { ClockSimvarPublisher } from './shared/ClockSimvarPublisher';
-import { ClockRoot } from './Clock';
+import { ClockRoot, ClockSimvarPublisher } from '@flybywiresim/clock';
 
 // eslint-disable-next-line camelcase
 class A32NX_Clock extends BaseInstrument {

diff --git a/hsim-a320-common/src/systems/tsconfig.json b/hsim-a320-common/src/systems/tsconfig.json
@@ -18,7 +18,8 @@
       "@fmgc/*": ["../../../build-a320ceo/src/systems/fmgc/src/*"],
       "@shared/*": ["../../../build-a320ceo/src/systems/shared/src/*"],
       "@typings/*": ["../typings/*"],
-      "@flybywiresim/fbw-sdk": ["./index.ts"]
+      "@flybywiresim/fbw-sdk": ["../../../fbw-common/src/systems/index.ts"],
+      "@flybywiresim/clock": ["../../../fbw-common/src/systems/instruments/src/Clock/index.ts"],
     }
-  }
-}
+  },
+}
diff --git a/hsim-a320ceo/src/systems/instruments/src/Clock/instrument.tsx b/hsim-a320ceo/src/systems/instruments/src/Clock/instrument.tsx
@@ -1,6 +1,5 @@
 import { EventBus, FSComponent, HEventPublisher } from '@microsoft/msfs-sdk';
-import { ClockSimvarPublisher } from './shared/ClockSimvarPublisher';
-import { ClockRoot } from './Clock';
+import { ClockRoot, ClockSimvarPublisher } from '@flybywiresim/clock';
 
 // eslint-disable-next-line camelcase
 class A32NX_Clock extends BaseInstrument {

diff --git a/hsim-a321neo/src/systems/instruments/src/Clock/instrument.tsx b/hsim-a321neo/src/systems/instruments/src/Clock/instrument.tsx
@@ -1,6 +1,5 @@
 import { EventBus, FSComponent, HEventPublisher } from '@microsoft/msfs-sdk';
-import { ClockSimvarPublisher } from './shared/ClockSimvarPublisher';
-import { ClockRoot } from './Clock';
+import { ClockRoot, ClockSimvarPublisher } from '@flybywiresim/clock';
 
 // eslint-disable-next-line camelcase
 class A32NX_Clock extends BaseInstrument {