Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed Mar 30, 2024
2 parents 2564b82 + 160c504 commit 64201aa
Show file tree
Hide file tree
Showing 131 changed files with 2,022 additions and 1,458 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ trim_trailing_whitespace = false
ij_kotlin_line_break_after_multiline_when_entry = false
ij_kotlin_variable_annotation_wrap = off
ij_kotlin_field_annotation_wrap = off
ij_kotlin_continuation_indent_size = 8

[*.py]
ij_python_wrap_long_lines = false
ij_python_method_parameters_wrap = off

3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ on:
branches: [ main ]
paths:
- '**.kt'
- '**/src/test/resources/**'
pull_request:
branches: [ main ]
paths:
- '**.kt'
- '**/src/test/resources/**'
workflow_dispatch:

jobs:
Expand Down
1 change: 1 addition & 0 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
kapt("org.springframework:spring-context-indexer:6.1.4")
testImplementation(project(":nebulosa-astrobin-api"))
testImplementation(project(":nebulosa-skycatalog-stellarium"))
testImplementation(project(":nebulosa-test"))
}
Expand Down
152 changes: 50 additions & 102 deletions api/schemas/objectbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,273 +4,221 @@
"_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
"entities": [
{
"id": "1:2141918888386721824",
"lastPropertyId": "7:637271438293072650",
"name": "LocationEntity",
"properties": [
{
"id": "1:3442525931231983774",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:759171631592640168",
"name": "name",
"type": 9
},
{
"id": "3:8579542454327527012",
"name": "latitude",
"type": 8
},
{
"id": "4:2278417754998832727",
"name": "longitude",
"type": 8
},
{
"id": "5:6340857252773714708",
"name": "elevation",
"type": 8
},
{
"id": "6:8178041138715870006",
"name": "offsetInMinutes",
"type": 5
},
{
"id": "7:637271438293072650",
"name": "selected",
"type": 1
}
],
"relations": []
},
{
"id": "2:2045817682728620153",
"lastPropertyId": "13:7087599727202298624",
"id": "1:8996632906249699640",
"lastPropertyId": "13:4967132491159177650",
"name": "CalibrationFrameEntity",
"properties": [
{
"id": "1:278364626282462565",
"id": "1:8753104016604228424",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:2256350506731837179",
"id": "2:5256997905701910721",
"name": "type",
"indexId": "4:817263978142134714",
"indexId": "1:6629699679938480062",
"type": 5,
"flags": 8
},
{
"id": "3:3456302856844566424",
"id": "3:4250539975904011338",
"name": "camera",
"indexId": "1:3662625594835691874",
"indexId": "2:8670761666150034104",
"type": 9,
"flags": 2048
},
{
"id": "4:5972230499024785383",
"id": "4:2964126873299902795",
"name": "filter",
"indexId": "2:1025779831315419041",
"indexId": "3:356806529647771872",
"type": 9,
"flags": 2048
},
{
"id": "5:6361954738111255053",
"id": "5:6592821044234392872",
"name": "exposureTime",
"type": 6
},
{
"id": "6:8528955891035480680",
"id": "6:7841731947961734124",
"name": "temperature",
"type": 8
},
{
"id": "7:2574616483728323822",
"id": "7:8769358817044866175",
"name": "width",
"type": 5
},
{
"id": "8:8865939992938062812",
"id": "8:9066846022258802237",
"name": "height",
"type": 5
},
{
"id": "9:975912299719394995",
"id": "9:6089591003549470592",
"name": "binX",
"type": 5
},
{
"id": "10:1271977543915641201",
"id": "10:1137944585964286888",
"name": "binY",
"type": 5
},
{
"id": "11:5411887422831392953",
"id": "11:75379120605439289",
"name": "gain",
"type": 8
},
{
"id": "12:5768939074601408853",
"id": "12:5234537218429949481",
"name": "path",
"indexId": "3:3193767946870807856",
"indexId": "4:1409612170773192505",
"type": 9,
"flags": 2080
},
{
"id": "13:7087599727202298624",
"id": "13:4967132491159177650",
"name": "enabled",
"type": 1
}
],
"relations": []
},
{
"id": "3:6517804651010773363",
"lastPropertyId": "3:7280575610200271256",
"id": "2:2865903592621070186",
"lastPropertyId": "3:4231519923961266979",
"name": "PreferenceEntity",
"properties": [
{
"id": "1:7536416243834995627",
"id": "1:6437649959717305879",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:1965090070669971323",
"id": "2:3424721012607374437",
"name": "key",
"indexId": "5:4282004812167689322",
"indexId": "5:3959175721933196667",
"type": 9,
"flags": 34848
},
{
"id": "3:7280575610200271256",
"id": "3:4231519923961266979",
"name": "value",
"type": 9
}
],
"relations": []
},
{
"id": "4:3737128326466279707",
"lastPropertyId": "4:2231211530557374123",
"id": "3:7591326030822090985",
"lastPropertyId": "4:960749109935496711",
"name": "SatelliteEntity",
"properties": [
{
"id": "1:6295515048769926146",
"id": "1:8984524405419355357",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:2455064913731043963",
"id": "2:954886680255875455",
"name": "name",
"type": 9
},
{
"id": "3:4151339193253592643",
"id": "3:2209800562197387575",
"name": "tle",
"type": 9
},
{
"id": "4:2231211530557374123",
"id": "4:960749109935496711",
"name": "groups",
"type": 30
}
],
"relations": []
},
{
"id": "6:3705054558003767840",
"lastPropertyId": "12:762260734150852642",
"id": "4:1799461706223884117",
"lastPropertyId": "12:1425111719526355640",
"name": "SimbadEntity",
"properties": [
{
"id": "1:2815331295543596023",
"id": "1:8675363815775912010",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:1094957247301775448",
"id": "2:9134078346895015096",
"name": "name",
"type": 9
},
{
"id": "3:2894803910674914590",
"id": "3:5687549887167089900",
"name": "type",
"type": 5
},
{
"id": "4:2941887692366753803",
"id": "4:425502224150658936",
"name": "rightAscensionJ2000",
"type": 8
},
{
"id": "5:9102733480395399072",
"id": "5:2116112963954541453",
"name": "declinationJ2000",
"type": 8
},
{
"id": "6:5928907297748334710",
"id": "6:3944877011180871841",
"name": "magnitude",
"type": 8
},
{
"id": "7:6938045857158270084",
"id": "7:7502412627527780934",
"name": "pmRA",
"type": 8
},
{
"id": "8:3191952939943328844",
"id": "8:2354824452575366292",
"name": "pmDEC",
"type": 8
},
{
"id": "9:116139679953849730",
"id": "9:266214111788703179",
"name": "parallax",
"type": 8
},
{
"id": "10:8499347473053691215",
"id": "10:3283290633306994233",
"name": "radialVelocity",
"type": 8
},
{
"id": "11:5618236643604972886",
"id": "11:2537767302764251008",
"name": "redshift",
"type": 8
},
{
"id": "12:762260734150852642",
"id": "12:1425111719526355640",
"name": "constellation",
"type": 5
}
],
"relations": []
}
],
"lastEntityId": "6:3705054558003767840",
"lastIndexId": "6:9080720220858934797",
"lastEntityId": "4:1799461706223884117",
"lastIndexId": "5:3959175721933196667",
"lastRelationId": "0:0",
"lastSequenceId": "0:0",
"modelVersion": 5,
"modelVersionParserMinimum": 5,
"retiredEntityUids": [
6518840186314177945
],
"retiredIndexUids": [
9080720220858934797
],
"retiredPropertyUids": [
5740207060374171983,
4684765207346563658,
7171122916482173681
],
"retiredEntityUids": [],
"retiredIndexUids": [],
"retiredPropertyUids": [],
"retiredRelationUids": [],
"version": 1
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package nebulosa.api.alignment.polar

import nebulosa.api.alignment.polar.darv.DARVStartRequest
import nebulosa.api.alignment.polar.tppa.TPPAStartRequest
import nebulosa.api.beans.converters.indi.DeviceOrEntityParam
import nebulosa.api.beans.converters.device.DeviceOrEntityParam
import nebulosa.indi.device.camera.Camera
import nebulosa.indi.device.guide.GuideOutput
import nebulosa.indi.device.mount.Mount
Expand Down
Loading

0 comments on commit 64201aa

Please sign in to comment.