Skip to content

Commit

Permalink
Merge branch 'dev' into feature/auto-focus
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed May 22, 2024
2 parents 3666fe4 + 4b179c9 commit 29502bc
Show file tree
Hide file tree
Showing 373 changed files with 9,555 additions and 7,456 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: Install Dependencies
run: npm i
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- name: Download API
uses: actions/download-artifact@v4
Expand Down
32 changes: 27 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Active Development](https://img.shields.io/badge/Maintenance%20Level-Actively%20Developed-brightgreen.svg)](https://gist.github.com/cheerfulstoic/d107229326a01ff0f333a1d3476e068d)
[![CI](https://github.com/tiagohm/nebulosa/actions/workflows/ci.yml/badge.svg)](https://github.com/tiagohm/nebulosa/actions/workflows/ci.yml)
[![CodeFactor](https://www.codefactor.io/repository/github/tiagohm/nebulosa/badge/main)](https://www.codefactor.io/repository/github/tiagohm/nebulosa/overview/main)
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/62f7820784d142dab9feebc222cba4a8)](https://app.codacy.com/gh/tiagohm/nebulosa/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)

The complete integrated solution for all of your astronomical imaging needs.

Expand All @@ -15,7 +15,29 @@ The complete integrated solution for all of your astronomical imaging needs.

### Steps

* `./gradlew api:bootJar`
* `cd desktop`
* `npm i`
* `npm run electron:build`
1. `./gradlew api:bootJar`
2. `cd desktop`
3. `npm i`

#### On Linux

4. `npm run electron:build:deb` to build `.deb` package.
5. `npm run electron:build:app` to build `AppImage`.
6. `npm run electron:build:rpm` to build `RPM` package.

Before build a `RPM` package, run `sudo apt install rpm`.

#### On Windows

4. `npm run electron:build` to build the `.exe`.

#### On Linux ARM (Raspberry PI)

run these commands before:

* `sudo apt install ruby ruby-dev`
* `sudo gem install fpm`

4. `USE_SYSTEM_FPM=true npm run electron:build:deb` to build `.deb` package.

> Look at `release` subdirectory for the generated build.
8 changes: 4 additions & 4 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
kotlin("jvm")
id("org.springframework.boot") version "3.2.4"
id("io.spring.dependency-management") version "1.1.4"
id("org.springframework.boot") version "3.2.5"
id("io.spring.dependency-management") version "1.1.5"
kotlin("plugin.spring")
kotlin("kapt")
id("io.objectbox")
Expand All @@ -14,7 +14,6 @@ dependencies {
implementation(project(":nebulosa-astap"))
implementation(project(":nebulosa-astrometrynet"))
implementation(project(":nebulosa-alpaca-indi"))
implementation(project(":nebulosa-batch-processing"))
implementation(project(":nebulosa-common"))
implementation(project(":nebulosa-guiding-phd2"))
implementation(project(":nebulosa-hips2fits"))
Expand All @@ -30,6 +29,7 @@ dependencies {
implementation(project(":nebulosa-watney"))
implementation(project(":nebulosa-wcs"))
implementation(project(":nebulosa-xisf"))
implementation(libs.rx)
implementation(libs.apache.codec)
implementation(libs.csv)
implementation(libs.eventbus)
Expand All @@ -46,7 +46,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-undertow")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
kapt("org.springframework:spring-context-indexer:6.1.5")
kapt("org.springframework:spring-context-indexer:6.1.7")
testImplementation(project(":nebulosa-astrobin-api"))
testImplementation(project(":nebulosa-skycatalog-stellarium"))
testImplementation(project(":nebulosa-test"))
Expand Down
100 changes: 48 additions & 52 deletions api/schemas/objectbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,214 +4,210 @@
"_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
"entities": [
{
"id": "1:8996632906249699640",
"lastPropertyId": "13:4967132491159177650",
"id": "1:4508028933515523414",
"lastPropertyId": "13:5569629325911720184",
"name": "CalibrationFrameEntity",
"properties": [
{
"id": "1:8753104016604228424",
"id": "1:279471804400581871",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:5256997905701910721",
"id": "2:9048727858630632737",
"name": "type",
"indexId": "1:6629699679938480062",
"indexId": "1:3018423918314968566",
"type": 5,
"flags": 8
},
{
"id": "3:4250539975904011338",
"name": "camera",
"indexId": "2:8670761666150034104",
"id": "3:5712791023807889534",
"name": "name",
"indexId": "2:8432810603549739468",
"type": 9,
"flags": 2048
},
{
"id": "4:2964126873299902795",
"id": "4:3434117744352502900",
"name": "filter",
"indexId": "3:356806529647771872",
"type": 9,
"flags": 2048
"type": 9
},
{
"id": "5:6592821044234392872",
"id": "5:1871034143652415809",
"name": "exposureTime",
"type": 6
},
{
"id": "6:7841731947961734124",
"id": "6:8846123268014704509",
"name": "temperature",
"type": 8
},
{
"id": "7:8769358817044866175",
"id": "7:8561154143050278063",
"name": "width",
"type": 5
},
{
"id": "8:9066846022258802237",
"id": "8:6920579444153489022",
"name": "height",
"type": 5
},
{
"id": "9:6089591003549470592",
"id": "9:4300769060778976734",
"name": "binX",
"type": 5
},
{
"id": "10:1137944585964286888",
"id": "10:4693474237106002327",
"name": "binY",
"type": 5
},
{
"id": "11:75379120605439289",
"id": "11:8369728096653684761",
"name": "gain",
"type": 8
},
{
"id": "12:5234537218429949481",
"id": "12:617052828938607363",
"name": "path",
"indexId": "4:1409612170773192505",
"type": 9,
"flags": 2080
"type": 9
},
{
"id": "13:4967132491159177650",
"id": "13:5569629325911720184",
"name": "enabled",
"type": 1
}
],
"relations": []
},
{
"id": "2:2865903592621070186",
"lastPropertyId": "3:4231519923961266979",
"id": "2:4800249862026080527",
"lastPropertyId": "3:211299529025119304",
"name": "PreferenceEntity",
"properties": [
{
"id": "1:6437649959717305879",
"id": "1:3593540058272630983",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:3424721012607374437",
"id": "2:2699303611424729430",
"name": "key",
"indexId": "5:3959175721933196667",
"indexId": "3:2030544424571300028",
"type": 9,
"flags": 34848
},
{
"id": "3:4231519923961266979",
"id": "3:211299529025119304",
"name": "value",
"type": 9
}
],
"relations": []
},
{
"id": "3:7591326030822090985",
"lastPropertyId": "4:960749109935496711",
"id": "3:9190695617085753667",
"lastPropertyId": "4:411434182698925224",
"name": "SatelliteEntity",
"properties": [
{
"id": "1:8984524405419355357",
"id": "1:7748265871438465999",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:954886680255875455",
"id": "2:2980713713220488130",
"name": "name",
"type": 9
},
{
"id": "3:2209800562197387575",
"id": "3:8036745814034214740",
"name": "tle",
"type": 9
},
{
"id": "4:960749109935496711",
"id": "4:411434182698925224",
"name": "groups",
"type": 30
}
],
"relations": []
},
{
"id": "4:1799461706223884117",
"lastPropertyId": "12:1425111719526355640",
"id": "4:6299583728620001761",
"lastPropertyId": "12:4179508964623201115",
"name": "SimbadEntity",
"properties": [
{
"id": "1:8675363815775912010",
"id": "1:7284883107181783588",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:9134078346895015096",
"id": "2:1059978401562504177",
"name": "name",
"type": 9
},
{
"id": "3:5687549887167089900",
"id": "3:2238737597611607433",
"name": "type",
"type": 5
},
{
"id": "4:425502224150658936",
"id": "4:6034348124979703831",
"name": "rightAscensionJ2000",
"type": 8
},
{
"id": "5:2116112963954541453",
"id": "5:6603670815168137185",
"name": "declinationJ2000",
"type": 8
},
{
"id": "6:3944877011180871841",
"id": "6:4798847469480514750",
"name": "magnitude",
"type": 8
},
{
"id": "7:7502412627527780934",
"id": "7:4280564484498302769",
"name": "pmRA",
"type": 8
},
{
"id": "8:2354824452575366292",
"id": "8:1070997648386390650",
"name": "pmDEC",
"type": 8
},
{
"id": "9:266214111788703179",
"id": "9:7408560810497672822",
"name": "parallax",
"type": 8
},
{
"id": "10:3283290633306994233",
"id": "10:7464931444484734827",
"name": "radialVelocity",
"type": 8
},
{
"id": "11:2537767302764251008",
"id": "11:531497562996887037",
"name": "redshift",
"type": 8
},
{
"id": "12:1425111719526355640",
"id": "12:4179508964623201115",
"name": "constellation",
"type": 5
}
],
"relations": []
}
],
"lastEntityId": "4:1799461706223884117",
"lastIndexId": "5:3959175721933196667",
"lastEntityId": "4:6299583728620001761",
"lastIndexId": "3:2030544424571300028",
"lastRelationId": "0:0",
"lastSequenceId": "0:0",
"modelVersion": 5,
Expand Down
Loading

0 comments on commit 29502bc

Please sign in to comment.