Skip to content

Commit

Permalink
Clean-up and templates (#15)
Browse files Browse the repository at this point in the history
* Clean-up of .bat echo output

* Replaced by test-hakos-roof, moved to obsolete

* Replaced by nina-create-sequence2, moved to obsolete

* Removed obsolete stuff

* Replaced by nina-zip-data, moved to obsolete

* Streamlined echo output

* Update startup templates

* Added new "common" version of templates

* Added common-neo, common-vs settings to sample config

* Update
  • Loading branch information
phtnnz authored Sep 12, 2024
1 parent 1979525 commit ab27073
Show file tree
Hide file tree
Showing 23 changed files with 8,845 additions and 67 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ measurements.txt
__pycache__
.config/
IAS-astro-python.7z
get-scripts.bat
804 changes: 804 additions & 0 deletions NINA-Templates-IAS-Common/Base (Discord).json

Large diffs are not rendered by default.

987 changes: 987 additions & 0 deletions NINA-Templates-IAS-Common/Base Loop NAUTICAL (Discord).json

Large diffs are not rendered by default.

804 changes: 804 additions & 0 deletions NINA-Templates-IAS-Common/Base NEO NAUTICAL (Discord).json

Large diffs are not rendered by default.

92 changes: 67 additions & 25 deletions NINA-Templates-IAS-Common/Startup when safe (Discord).template.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
{
"$id": "6",
"$type": "NINA.Sequencer.SequenceItem.Utility.Annotation, NINA.Sequencer",
"Text": "Version 1.2-discord / 2024-08-25 / Martin Junius",
"Text": "Version 1.3-discord / 2024-09-10 / Martin Junius",
"Parent": {
"$ref": "1"
},
Expand Down Expand Up @@ -139,15 +139,36 @@
},
{
"$id": "18",
"$type": "NINA.Sequencer.SequenceItem.Utility.Annotation, NINA.Sequencer",
"Text": "Output 4 = Fan, switch ON",
"Parent": {
"$ref": "11"
},
"ErrorBehavior": 0,
"Attempts": 1
},
{
"$id": "19",
"$type": "NINA.Sequencer.SequenceItem.Switch.SetSwitchValue, NINA.Sequencer",
"Value": 1.0,
"SwitchIndex": 3,
"Parent": {
"$ref": "11"
},
"ErrorBehavior": 0,
"Attempts": 1
},
{
"$id": "20",
"$type": "WhenPlugin.When.CoolCamera, WhenPlugin",
"TempExpr": {
"$id": "19",
"$id": "21",
"$type": "WhenPlugin.When.Expr, WhenPlugin",
"Expression": "",
"Type": null
},
"DurExpr": {
"$id": "20",
"$id": "22",
"$type": "WhenPlugin.When.Expr, WhenPlugin",
"Expression": "",
"Type": null
Expand All @@ -161,7 +182,7 @@
"Attempts": 1
},
{
"$id": "21",
"$id": "23",
"$type": "NINA.Sequencer.SequenceItem.Utility.Annotation, NINA.Sequencer",
"Text": "1 = High Gain Mode",
"Parent": {
Expand All @@ -171,7 +192,7 @@
"Attempts": 1
},
{
"$id": "22",
"$id": "24",
"$type": "NINA.Sequencer.SequenceItem.Camera.SetReadoutMode, NINA.Sequencer",
"Mode": 1,
"Parent": {
Expand All @@ -181,7 +202,7 @@
"Attempts": 1
},
{
"$id": "23",
"$id": "25",
"$type": "NINA.DiscordAlert.DiscordAlertSequenceItems.DiscordMessageInstruction, Discord Alert",
"Text": "Waiting for astronomical dusk",
"Parent": {
Expand All @@ -191,14 +212,14 @@
"Attempts": 1
},
{
"$id": "24",
"$id": "26",
"$type": "NINA.Sequencer.SequenceItem.Utility.WaitForTime, NINA.Sequencer",
"Hours": 19,
"Minutes": 57,
"Hours": 20,
"Minutes": 1,
"MinutesOffset": 0,
"Seconds": 30,
"Seconds": 54,
"SelectedProvider": {
"$id": "25",
"$id": "27",
"$type": "NINA.Sequencer.Utility.DateTimeProvider.DuskProvider, NINA.Sequencer"
},
"Parent": {
Expand All @@ -208,7 +229,28 @@
"Attempts": 1
},
{
"$id": "26",
"$id": "28",
"$type": "NINA.Sequencer.SequenceItem.Utility.Annotation, NINA.Sequencer",
"Text": "Output 4 = Fan, switch OFF",
"Parent": {
"$ref": "11"
},
"ErrorBehavior": 0,
"Attempts": 1
},
{
"$id": "29",
"$type": "NINA.Sequencer.SequenceItem.Switch.SetSwitchValue, NINA.Sequencer",
"Value": 0.0,
"SwitchIndex": 3,
"Parent": {
"$ref": "11"
},
"ErrorBehavior": 0,
"Attempts": 1
},
{
"$id": "30",
"$type": "NINA.Sequencer.SequenceItem.Utility.Annotation, NINA.Sequencer",
"Text": "Additional safety check, will stop the sequence if the shutter is NOT OPEN",
"Parent": {
Expand All @@ -218,7 +260,7 @@
"Attempts": 1
},
{
"$id": "27",
"$id": "31",
"$type": "NINA.Sequencer.SequenceItem.Utility.ExternalScript, NINA.Sequencer",
"Script": "\"D:\\Users\\remote\\Documents\\Scripts\\test-hakos-roof.bat\" -v --open",
"Parent": {
Expand All @@ -228,16 +270,16 @@
"Attempts": 1
},
{
"$id": "28",
"$id": "32",
"$type": "NINA.Sequencer.SequenceItem.Telescope.UnparkScope, NINA.Sequencer",
"Parent": {
"$ref": "11"
},
"ErrorBehavior": 0,
"ErrorBehavior": 2,
"Attempts": 1
},
{
"$id": "29",
"$id": "33",
"$type": "NINA.Sequencer.SequenceItem.Telescope.SetTracking, NINA.Sequencer",
"TrackingMode": 5,
"Parent": {
Expand All @@ -247,7 +289,7 @@
"Attempts": 1
},
{
"$id": "30",
"$id": "34",
"$type": "NINA.Sequencer.SequenceItem.Utility.WaitForTimeSpan, NINA.Sequencer",
"Time": 10.0,
"Parent": {
Expand All @@ -257,7 +299,7 @@
"Attempts": 1
},
{
"$id": "31",
"$id": "35",
"$type": "NINA.DiscordAlert.DiscordAlertSequenceItems.DiscordMessageInstruction, Discord Alert",
"Text": "READY",
"Parent": {
Expand All @@ -269,7 +311,7 @@
]
},
"Triggers": {
"$id": "32",
"$id": "36",
"$type": "System.Collections.ObjectModel.ObservableCollection`1[[NINA.Sequencer.Trigger.ISequenceTrigger, NINA.Sequencer]], System.ObjectModel",
"$values": []
},
Expand All @@ -282,36 +324,36 @@
]
},
"Triggers": {
"$id": "33",
"$id": "37",
"$type": "System.Collections.ObjectModel.ObservableCollection`1[[NINA.Sequencer.Trigger.ISequenceTrigger, NINA.Sequencer]], System.ObjectModel",
"$values": [
{
"$id": "34",
"$id": "38",
"$type": "NINA.DiscordAlert.DiscordAlertSequenceItems.DiscordAlertOnErrorTrigger, Discord Alert",
"Text": "@everyone ERROR in startup sequence",
"Parent": {
"$ref": "1"
},
"TriggerRunner": {
"$id": "35",
"$id": "39",
"$type": "NINA.Sequencer.Container.SequentialContainer, NINA.Sequencer",
"Strategy": {
"$type": "NINA.Sequencer.Container.ExecutionStrategy.SequentialStrategy, NINA.Sequencer"
},
"Name": null,
"Conditions": {
"$id": "36",
"$id": "40",
"$type": "System.Collections.ObjectModel.ObservableCollection`1[[NINA.Sequencer.Conditions.ISequenceCondition, NINA.Sequencer]], System.ObjectModel",
"$values": []
},
"IsExpanded": true,
"Items": {
"$id": "37",
"$id": "41",
"$type": "System.Collections.ObjectModel.ObservableCollection`1[[NINA.Sequencer.SequenceItem.ISequenceItem, NINA.Sequencer]], System.ObjectModel",
"$values": []
},
"Triggers": {
"$id": "38",
"$id": "42",
"$type": "System.Collections.ObjectModel.ObservableCollection`1[[NINA.Sequencer.Trigger.ISequenceTrigger, NINA.Sequencer]], System.ObjectModel",
"$values": []
},
Expand Down
Loading

0 comments on commit ab27073

Please sign in to comment.