diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml index 508bacc5..1413f1a4 100644 --- a/.github/workflows/linux-release.yml +++ b/.github/workflows/linux-release.yml @@ -29,9 +29,13 @@ jobs: - name: build_all_static run: bscripts/build_all_static.sh - - name: package artifacts + - name: package artifacts deb run: | bscripts/build_package.sh + + - name: package artifacts appimage + if: ${{ matrix.os == 'ubuntu-20.04' }} + run: | bscripts/build_appimage.sh - uses: actions/upload-artifact@v2 diff --git a/VERSION b/VERSION index c1f7fd03..e3437997 100644 --- a/VERSION +++ b/VERSION @@ -2,5 +2,5 @@ PACKAGE=picsimlab MAINVER=0 MINORVER=9 VERSION=0.9.2 -DATE=240818 +DATE=240824 VERSION_STABLE=0.9.1 diff --git a/package/com.github.lcgamboa.picsimlab/com.github.lcgamboa.picsimlab.yaml b/package/com.github.lcgamboa.picsimlab/com.github.lcgamboa.picsimlab.yaml index 8bb87f32..6a7025b3 100644 --- a/package/com.github.lcgamboa.picsimlab/com.github.lcgamboa.picsimlab.yaml +++ b/package/com.github.lcgamboa.picsimlab/com.github.lcgamboa.picsimlab.yaml @@ -146,7 +146,7 @@ modules: branch: master - type: git url: https://github.com/sammycage/lunasvg.git - branch: master + branch: v2.4.1 dest: lunasvg modules: - name : wxgtk diff --git a/src/boards/board_Blue_Pill.cc b/src/boards/board_Blue_Pill.cc index ca7f9cda..efbd2fb7 100644 --- a/src/boards/board_Blue_Pill.cc +++ b/src/boards/board_Blue_Pill.cc @@ -1306,6 +1306,14 @@ void cboard_Blue_Pill::PinsExtraConfig(int cfg) { // printf("TIM %i chn %i dut set to %i\n", timer + // 1, chn + 1, duty); bitbang_pwm_set_duty(&pwm_out, (timer << 2) + chn, duty); + } else if ((cfg & 0xF00000) == 0xD00000) { // timer frequency + int freq = (cfg & 0xFFFFC) >> 2; + int timer = cfg & 0x0003; + // printf("TIM %i freq set to %i\n", timer + 1, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 0, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 1, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 2, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 3, freq); } } diff --git a/src/boards/board_STM32_H103.cc b/src/boards/board_STM32_H103.cc index 0bb9f255..daf076f4 100644 --- a/src/boards/board_STM32_H103.cc +++ b/src/boards/board_STM32_H103.cc @@ -1503,6 +1503,14 @@ void cboard_STM32_H103::PinsExtraConfig(int cfg) { // timer + 1, chn + 1, // duty); bitbang_pwm_set_duty(&pwm_out, (timer << 2) + chn, duty); + } else if ((cfg & 0xF00000) == 0xD00000) { // timer frequency + int freq = (cfg & 0xFFFFC) >> 2; + int timer = cfg & 0x0003; + // printf("TIM %i freq set to %i\n", timer + 1, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 0, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 1, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 2, freq); + bitbang_pwm_set_freq(&pwm_out, timer + 3, freq); } }