Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changing 5M communication to new Rest-Api #7642

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f60cf41
build action changes
iherbak Mar 15, 2024
b8721d6
removed apple signing workflow
iherbak Mar 16, 2024
f1752c5
fixing auto release id
iherbak Mar 16, 2024
79e4fa4
Adding flashforge 5M series network support
iherbak Mar 16, 2024
54fe829
Update CMakeLists.txt
iherbak Mar 16, 2024
7e9a41f
Update Flashforge.cpp
iherbak Mar 17, 2024
6297276
Merge pull request #1 from SoftFever/main
iherbak Mar 17, 2024
08ccc69
Merge remote-tracking branch 'upstream/main'
iherbak Aug 15, 2024
17e56e1
Merge pull request #2 from SoftFever/main
iherbak Sep 2, 2024
e43ef35
timeout for flashforge
iherbak Sep 3, 2024
3bb474b
Merge pull request #3 from SoftFever/main
iherbak Sep 4, 2024
238b679
Merge remote-tracking branch 'upstream/main'
iherbak Oct 24, 2024
2bf89c5
Merge branch 'main' of https://github.com/iherbak/OrcaSlicer
iherbak Oct 24, 2024
9364dd7
Changing to new rest api
iherbak Nov 2, 2024
b00ec2a
Merge branch 'SoftFever:main' into main
iherbak Nov 3, 2024
86e4dd4
ading missing includes
iherbak Nov 3, 2024
2b36cc5
translations for new ui elements
iherbak Nov 3, 2024
40d4c6c
finalizing naming
iherbak Nov 3, 2024
3e8f6b2
Merge pull request #4 from SoftFever/main
iherbak Dec 2, 2024
6b7301b
Merge pull request #5 from SoftFever/main
iherbak Dec 2, 2024
0fd9f15
Changing to new rest api
iherbak Nov 2, 2024
31e3c87
ading missing includes
iherbak Nov 3, 2024
d7a39d5
translations for new ui elements
iherbak Nov 3, 2024
bc7d7ca
finalizing naming
iherbak Nov 3, 2024
2370425
Remove unused msg
iherbak Dec 2, 2024
fa72963
Merge remote-tracking branch 'upstream/main'
iherbak Jan 22, 2025
1256df0
Merge branch 'main' into API
iherbak Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 11 additions & 37 deletions .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,34 +101,8 @@ jobs:
./build_release_macos.sh -s -n -x -a ${{inputs.arch}} -t 10.15 -1

# Thanks to RaySajuuk, it's working now
- name: Sign app and notary
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14'
working-directory: ${{ github.workspace }}
env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
run: |
CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/OrcaSlicer.app
ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
xcrun notarytool submit "OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg

- name: Create DMG without notary
if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14'
if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
working-directory: ${{ github.workspace }}
run: |
ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
Expand All @@ -145,8 +119,8 @@ jobs:
if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
upload_url: https://uploads.github.com/repos/iherbak/OrcaSlicer/releases/146857256/assets{?name,label}
release_id: 146857256
asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
asset_name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
asset_content_type: application/octet-stream
Expand Down Expand Up @@ -214,8 +188,8 @@ jobs:
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
upload_url: https://uploads.github.com/repos/iherbak/OrcaSlicer/releases/146857256/assets{?name,label}
release_id: 146857256
asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
asset_name: OrcaSlicer_Windows_${{ env.ver }}_portable.zip
asset_content_type: application/x-zip-compressed
Expand All @@ -225,8 +199,8 @@ jobs:
if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
upload_url: https://uploads.github.com/repos/iherbak/OrcaSlicer/releases/146857256/assets{?name,label}
release_id: 146857256
asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
asset_name: OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
asset_content_type: application/x-msdownload
Expand Down Expand Up @@ -292,8 +266,8 @@ jobs:
ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
upload_url: https://uploads.github.com/repos/iherbak/OrcaSlicer/releases/146857256/assets{?name,label}
release_id: 146857256
asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
asset_content_type: application/octet-stream
Expand All @@ -303,8 +277,8 @@ jobs:
if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-20.04' }}
uses: WebFreak001/[email protected]
with:
upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
release_id: 137995723
upload_url: https://uploads.github.com/repos/iherbak/OrcaSlicer/releases/146857256/assets{?name,label}
release_id: 146857256
asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip
asset_name: orca_custom_preset_tests.zip
asset_content_type: application/octet-stream
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_profiles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: validate custom presets
working-directory: ${{ github.workspace }}
run: |
curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
curl -LJO https://github.com/iherbak/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2

Expand Down
46 changes: 0 additions & 46 deletions .github/workflows/publish_docs_to_wiki.yml

This file was deleted.

5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@

<h1> <p "font-size:200px;"><img align="left" src="https://github.com/SoftFever/OrcaSlicer/blob/main/resources/images/OrcaSlicer.ico" width="100"> Orca Slicer</p> </h1>
Trying to add Flashforge Adventurer5M Pro wifi print functionality.

You could buy me a coffee via paypal [@HerbakIstvan](https://paypal.com/paypalme/herbakIstvan) to thank: :)


[![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
<br>Orca Slicer is an open source slicer for FDM printers.
Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/OrcaSlicer.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8905,6 +8905,9 @@ msgid ""
"username:password@your-octopi-address/"
msgstr ""

msgid "Read timeout"
msgstr "Read timeout"

msgid "Device UI"
msgstr ""

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/ca/OrcaSlicer_ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -9775,6 +9775,9 @@ msgstr ""
"l'autenticació bàsica activada per un nom d'usuari i contrasenya a la URL en "
"el format següent: https://nomusuari:contrasenya@adreça-octopi/"

msgid "Printer ID"
msgstr "ID de la impressora"

msgid "Device UI"
msgstr "Interfície d'Usuari del dispositiu"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/cs/OrcaSlicer_cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -9470,6 +9470,9 @@ msgstr ""
"zadáním uživatelského jména a hesla do adresy URL v následujícím formátu: "
"https://username: password@your-octopi-address/"

msgid "Printer ID"
msgstr "ID tiskárny"

msgid "Device UI"
msgstr "Uživatelské rozhraní zařízení"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/de/OrcaSlicer_de.po
Original file line number Diff line number Diff line change
Expand Up @@ -9888,6 +9888,9 @@ msgstr ""
msgid "Device UI"
msgstr "Gerät"

msgid "Printer ID"
msgstr "Drucker-ID"

msgid ""
"Specify the URL of your device user interface if it's not same as print_host"
msgstr ""
Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/en/OrcaSlicer_en.po
Original file line number Diff line number Diff line change
Expand Up @@ -9415,6 +9415,9 @@ msgstr ""
"user name and password into the URL in the following format: https://"
"username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "Printer ID"

msgid "Device UI"
msgstr "Device UI"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/es/OrcaSlicer_es.po
Original file line number Diff line number Diff line change
Expand Up @@ -9848,6 +9848,9 @@ msgstr ""
"URL en el siguiente formato: https://nombredeusuario:"
"contraseña@tudirecciondeoctopi/"

msgid "Printer ID"
msgstr "Identificación de la impresora"

msgid "Device UI"
msgstr "IU de dispositivo"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/fr/OrcaSlicer_fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -9920,6 +9920,9 @@ msgstr ""
"d'utilisateur et le mot de passe dans l'URL au format suivant : https://"
"username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "ID de l'imprimante"

msgid "Device UI"
msgstr "Interface utilisateur de l’appareil"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/hu/OrcaSlicer_hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -9527,6 +9527,9 @@ msgstr ""
"felhasználónevet és a jelszót a következő formátumban beleírod az URL-be: "
"https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "Nyomtató ID"

msgid "Device UI"
msgstr "Eszköz UI"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/it/OrcaSlicer_it.po
Original file line number Diff line number Diff line change
Expand Up @@ -9750,6 +9750,9 @@ msgstr ""
"base abilitata è accessibile inserendo il nome utente e la password nell'URL "
"nel seguente formato: https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "ID stampante"

msgid "Device UI"
msgstr "Interfaccia utente del dispositivo"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/ja/OrcaSlicer_ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -9347,6 +9347,9 @@ msgstr ""
"ホスト名、IPアドレス、URLを入力してください。ユーザ名とパスワードがある場合、"
"下記形式を参照してください https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "プリンターID"

msgid "Device UI"
msgstr "Device UI"

Expand Down
9 changes: 9 additions & 0 deletions localization/i18n/ko/OrcaSlicer_ko.po
Original file line number Diff line number Diff line change
Expand Up @@ -9472,6 +9472,15 @@ msgstr ""
"username:password@your-octopi-address/ 형식의 URL에 사용자 이름과 암호를 입력"
"하여 액세스할 수 있습니다"

msgid "Read timeout"
msgstr "Read timeout"

msgid "Printer ID"
msgstr "프린터 ID"

msgid "Printer ID"
msgstr "프린터 ID"

msgid "Device UI"
msgstr "장치 UI"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/nl/OrcaSlicer_nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -9660,6 +9660,9 @@ msgstr ""
"indeling in de URL te plaatsen: https://username:password@your-octopi-"
"address/"

msgid "Printer ID"
msgstr "Printer-ID"

msgid "Device UI"
msgstr "UI van het apparaat"

Expand Down
9 changes: 9 additions & 0 deletions localization/i18n/pl/OrcaSlicer_pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -9764,6 +9764,15 @@ msgstr ""
"użytkownika i hasło w URL w następującym formacie: https://"
"username:password@your-octopi-address/"

msgid "Read timeout"
msgstr "Read timeout"

msgid "Printer ID"
msgstr "Identyfikator drukarki"

msgid "Printer ID"
msgstr "Identyfikator drukarki"

msgid "Device UI"
msgstr "UI urządzenia"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/pt_BR/OrcaSlicer_pt_BR.po
Original file line number Diff line number Diff line change
Expand Up @@ -9722,6 +9722,9 @@ msgstr ""
"básica ativada pode ser acessado colocando o nome de usuário e senha na URL "
"no seguinte formato: https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "ID da impressora"

msgid "Device UI"
msgstr "Interface do dispositivo"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/ru/OrcaSlicer_ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -9885,6 +9885,9 @@ msgstr ""
"получить, указав имя пользователя и пароль в поле URL-адрес в следующем "
"формате: https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "Идентификатор принтера"

msgid "Device UI"
msgstr "URL-адрес хоста"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/sv/OrcaSlicer_sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -9437,6 +9437,9 @@ msgstr ""
"aktiverad genom att ange användarnamn och lösenord i URL:en i följande "
"format: https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "Skrivar-ID"

msgid "Device UI"
msgstr "Enhetens gränssnitt"

Expand Down
9 changes: 9 additions & 0 deletions localization/i18n/tr/OrcaSlicer_tr.po
Original file line number Diff line number Diff line change
Expand Up @@ -9638,6 +9638,15 @@ msgstr ""
"biçimdeki URL'ye girilmesiyle erişilebilir: https://username:password@your-"
"octopi-address/"

msgid "Read timeout"
msgstr "Read timeout"

msgid "Printer ID"
msgstr "Yazıcı Kimliği"

msgid "Printer ID"
msgstr "Yazıcı Kimliği"

msgid "Device UI"
msgstr "Cihaz kullanıcı arayüzü"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/uk/OrcaSlicer_uk.po
Original file line number Diff line number Diff line change
Expand Up @@ -9720,6 +9720,9 @@ msgstr ""
"форматі: https://username:\n"
"password@your-octopi-address/"

msgid "Printer ID"
msgstr "Ідентифікатор принтера"

msgid "Device UI"
msgstr "Інтерфейс користувача"

Expand Down
3 changes: 3 additions & 0 deletions localization/i18n/zh_CN/OrcaSlicer_zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -9190,6 +9190,9 @@ msgstr ""
"名、IP地址或URL。启用基本身份验证的Print host可以通过将用户名和密码放入以下格"
"式的URL中来访问:https://username:password@your-octopi-address/"

msgid "Printer ID"
msgstr "打印机 ID"

msgid "Device UI"
msgstr "设备用户界面"

Expand Down
9 changes: 9 additions & 0 deletions localization/i18n/zh_TW/OrcaSlicer_zh_TW.po
Original file line number Diff line number Diff line change
Expand Up @@ -9287,6 +9287,15 @@ msgstr ""
"Orca Slicer 可以將 G-code 檔案上傳到列印設備。此欄位應包含列印設備的主機名、IP 位址或 URL。啟用基本身份驗證的列印設備可以透過將使用者名稱和密碼放入以下格式的URL中來訪問:https://username:password@your-octopi-"
"address/"

msgid "Read timeout"
msgstr "Read timeout"

msgid "Printer ID"
msgstr "印表機 ID"

msgid "Printer ID"
msgstr "印表機 ID"

msgid "Device UI"
msgstr "設備使用者界面"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@
"parking_pos_retraction": "92",
"preferred_orientation": "0",
"print_host": "",
"machine_serial":"",
"printer_id":"",
"print_host_webui": "",
"printable_area": [
"0x0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@
"parking_pos_retraction": "92",
"preferred_orientation": "0",
"print_host": "",
"machine_serial":"",
"printer_id":"",
"print_host_webui": "",
"printable_area": [
"0x0",
Expand Down
Loading
Loading