Compare commits

...

27 Commits

Author SHA1 Message Date
gullradriel bfbbacd43c Update hackrf submodule (#3034)
* fix warnings

* update hackrf submodule
2026-02-24 00:41:59 +01:00
Sandbox 065d01b591 Move POCSAG Tx to Ext. (#3033)
* Disable POCSAG TX in menu

Comment out POCSAG TX related code in ui_navigation.cpp

* Comment out ui_pocsag_tx.cpp in CMakeLists

Comment out the ui_pocsag_tx.cpp file in CMakeLists.

* Move POCSAG Tx to Ext.

* Update external.cmake

* Delete firmware/application/apps/ui_pocsag_tx.hpp

* Delete firmware/application/apps/ui_pocsag_tx.cpp

* Update main.cpp

* Update main.cpp

* Update external.ld

* fix namespace

* deleted commented out entry

* delete commented entries

* fix: correct baseband for pocsag tx

* run prepared

---------

Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
2026-02-23 21:37:03 +01:00
stafur b197a4b1de Update to CLK4 and CLK5 configuration for PRALINE. (#3031)
* Updated harckrf_gpio methods to more closely reflect hackrf_usb. Added some ui debug updates to RFFC5072 Status View.

* Updated tuning tables for tuning.cpp. Remnoved 15MHz lower limit in max2831.cpp since lower bandwidths don't seem to be causing lower band issues. Added more opportunities for clocks to stabalize at startup in board.cpp. Added/amended UI to help with addresssing low band tuning issues. Cleaned up stale comments in radio.cpp.

* Ran format-code.sh

* Updated to remove commented lines as part of clean up addressing review comments.

* Fixed clock_manager.cpp configruation for praline. Praline hackrf pro should have: CLK4: 6mA, Invert RFFC5072 40MHz ref and CLK5: 4mA, Invert MAX2831 40MHz ref. Improvements should be visible in the watefall at 2.4GHz, and between 2.311 and 2.599GHz.

* After reviewin clock config, updated values to reflect: CLK0 MAX5864 (ADC) 40 MHz 4mA Normal Integer Minimizes sampling jitter for SNR. CLK1 iCE40 FPGA 40 MHz 6mA Normal Integer Stable timing for the SPI bridge. CLK2 LPC43xx MCU 40 MHz 4mA Normal Integer Standard reference for MCU PLL. CLK3 SMA Port P1 10 MHz 8mA Normal Integer Cleanest square wave for Ext Ref. CLK4 RFFC5072 (Mixer) 40 MHz 6mA Inverted Integer Crucial for PLL Lock stability. CLK5 MAX2831 (TRX) 40 MHz 4mA Inverted Integer Reduces phase noise in the 2.4GHz LO. CLK6 SMA Port P2 10 MHz 8mA Normal Integer Sync output for external gear. CLK7 Reserved Off N/A N/A N/A Disabled to save power/reduce EMI.

* Ran format-code.sh
2026-02-22 21:31:46 -05:00
stafur 85eaa9d800 Updated praline low and high band tuning (#3030)
* Updated harckrf_gpio methods to more closely reflect hackrf_usb. Added some ui debug updates to RFFC5072 Status View.

* Updated tuning tables for tuning.cpp. Remnoved 15MHz lower limit in max2831.cpp since lower bandwidths don't seem to be causing lower band issues. Added more opportunities for clocks to stabalize at startup in board.cpp. Added/amended UI to help with addresssing low band tuning issues. Cleaned up stale comments in radio.cpp.

* Ran format-code.sh

* Updated to remove commented lines as part of clean up addressing review comments.
2026-02-23 13:40:49 +13:00
Sandbox 1ad092f341 ACARS Rx App using libacars (#3029)
* Using same decode as libacrars
* Enable ACARS RX
* indent + fix warning
* fixed CRC calculations, length validation, message print
Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
2026-02-22 21:29:20 +01:00
E.T. 0fe51fa7e3 Move flashsize.h to build directory to avoid conflicts when switching between different builds (#3021)
* Move flashsize.h to build directory to avoid conflicts when switching builds

plus small fix in praline image generation

* Update hackrf submodule to latest next

* fix fpga append comments

* Update firmware/CMakeLists.txt

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update firmware/CMakeLists.txt

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* remove ls dependency from build

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
2026-02-22 21:21:03 +01:00
Sandbox 4cc2ba690b Add 12k5 RXBW to NFM Mode (#3023)
* Add 12k5 option to NFM
* Updated freqman_db
* Add 12k5 RXBW to NFM
* Add 12k5 RXBW
* formating
2026-02-22 20:53:26 +01:00
gullradriel abee022000 update submodule, revert lz4 bufs M0/M4 allocation (#3022) 2026-02-21 19:54:48 +01:00
Totoo 430c8e5e79 Enhance ADSB details view with map trail functionality and update gro… (#3020)
* Enhance ADSB details view with map trail functionality and update ground speed calculation
2026-02-21 14:32:20 +01:00
stafur 7ea3eec016 Update to additional gpio definitions for praline (#3018)
* Initial commit and pr for HackRF Pro (praline) arch-port to mayhem-firmware. Please see https://github.com/portapack-mayhem/mayhem-firmware/issues/2957. Added flash specifics for -DBOARD=PRALINE. This firmware only builds with toolchain v9.2.1 if hackrf codebase has -B arm in firmware/hackrf_usb/CMakeLists.txt.

* Updated CMakeLists.txt per coordination with @HtoToo. For -DBOARD=PRALINE FLASH_MB_SIZE and FLASH_MB_LIMIT_SIZE are now 4. Removed praline specific variable for FLASH limits.

* Updated chibios-portapack's board.cpp to support initialization of the HachRF-Pro (praline) FPGA. Added append_fpga_bitstream.py tool to ensure that praline_fgpa.bin bitstream can be appended to -DBOARD=PRALINE produced firmware. In order to ensure successful execution of append_fpga_bitstream.py to append the fpga bitstream we should expect that the bistsream will be located at 0x180000 in flash. This requires that FLASH_MB_LIMIT_SIZE must be 1.5, and FLASH_BYTES_LIMIT_SIZE must be 1535 * 1024. If we want to allow more or less space for the base firmware image sans the fpga bitstream the location of the bistream must be moved to a location other than 0x180000.

* Updated location of praline_fpga.bin bitstream to 0x380000 to allow more room for firmware. Firmware now has 3.5MB, or 2MB more available than before as coordinated with @HTotoo.

* Expanded #ifndef PRALINE to include og and r9 gpio and pin setup as coordinated with @HTotoo.

* Added note for PRALINE FLASH_MB_LIMIT_SIZE and FLASH_BYTES_LIMIT_SIZE to explain why we are using the 3.5 and 3584 values respectively as coordinated with @HTotoo.

* Next round of modifications derived heavily, if not entirely  from work done by @banandana at https://github.com/Banandana/mayhem-firmware. This commit should power on the HackRF Pro (praline) display, power on the fpga, and enable gpio, and provide debug utilties. There is still a lot of work to be done to fully enable the new praline board with this build and firmware architectural porting effort. However, hackrf-one boards do not seem to be adversely impacted by the #ifdef PRALINE statements, and CMakeLists updates, as far as I have been able to test.

* Ran format-code.sh. Updates for this commit are only due to formatting. Tested builds and they seem to work as exptected.

* Addressed fixes in firmware/application and firmware/baseband. Stream now flows to capture and looking glass. Issues were related to thread management. Issues were originally addressed by @banandana.

* Ran format-code.sh to allow for consistency with autoamted clang checks.

* Update hackrf ref repo to mayhem-portapack-hackrf next from https://github.com/portapack-mayhem/hackrf

* Addressed format edits necessary to pass clang-format check.

* Starting addressing Si5351 Clocks for radio sampling. These updates correctly set the Si5351 clock at start up. There appears to be an issue during runtime when testing with RX Test Init, Capture and Looking glass.

* Updated clock_manager.cpp to restore correct function introduced by @banandana when testing with Rx Test Init.

* Switched to using decimation for setting the sample rate without changing the Si5351 clock. This assumes that for the praline board Si5351 CLK0 runs at fixed 8 MHz (constant) and the FPGA decimates to get the desired sample rate. For example, for a 1 MHz sample rate -> Si5351 outputs 8 MHz, FPGA decimates by 8. There is still more work needed here, and potential verification that this is the correct way to operate with this new archteitecture.

* After deliberating on hackrf_usb hackrf_core.c and radio.c, and reviewing firmware/application/hw/si5351.cpp the original approach of using the aproach detailed in hackrf_core.c sample_rate_frac_set() lines 580-582, via the implementation in firmware/application/hw/si5351.cpp seems like the best place to continue testing efforts.

* Tested at ~2.4GHz (2.3 - 2.5) with lookgin glass and was able to receive signals. Added a Signal Path debug app to test gains, and readio mode (receive/transmit).

* Added two debug apps for the RFFC507x. Status View and Tuning View. This helped debug some of the potential issues with tuning.

* update submodule

* format code

* Small touch up merging latest next and ensuring build for HackRF One.

* Fix ui addition of max2831 debug display.

* Reverted edits to re: firmware/baseband/sd_over_usb/scsi.c and firmware/application/portapack.cpp. Source now builds, had to pull latest hackrf submodule.

* Skipped detect hardware for praline board to avoid backscreen in HackRF Pro praline board.

* Added UI debug display for max2831 like the rffc507x. Added Filter Band display and Mixer status to Signal Path Status debug display.

* Added ability to set Q: INV, or Q:NOR in Signal Path Status Debug view for testing. Also added display entries for the FGPA Ctrl register fir debugging.

* Added System Diagnostics which allows testing sample rate, q-inv, and dc blk

* Corrected LP - GPIO4[8], and GPIO4[9] issue which was preventing RF Amp, and LPF from chaning state. HackRF Pro (praline) now correctly changes state of LPF and RF Amp as expected.

* Corrected LP - GPIO4[8], and GPIO4[9] issue which was preventing RF Amp, and LPF from chaning state. HackRF Pro (praline) now correctly changes state of LPF and RF Amp as expected.

* Added consistency for testing.

* Added ui to debug whether rffc5072 is locking correctly. Also addressed rf_amp fixed in on state, such that it may now be able to be toggled in HackRF Pro praline setups.

* Updated format to support automated tests.

* format code

* Updated rffc5072 status view in ui_debug to help with debugging. Made updated recommendtions for merge from PR comments. Made updates to ensure resetx isn't reconfigured for output in rffc507x.cpp.

* Ran ./format-code.sh

* Added reference comment that addresses debugging in PRALINE to detail that when the capture app was requesting 15 MHz, it matched 15100000 which resulted in the 8.5M setting. To get the actual 15M setting (22.6 MHz bandwidth), I had to force a request at least 22 MHz while debugging.

* Debugging tunning ENX and frequency locking in low band.

* Addressed pin differences between HackRF One and HackRF Pro (praline), resolved ENX configuration.

* Cirrected pins, and debugging tuning for low band. High band now goes past 2.7GHz into 3.3 GHz.

* Updated ui_debug to track ENX updates and support tracing which calls may be changing ENX.

* Removed clkin reference in ui_debug.cpp to allow space for more information about CLK0, CLK1, CLK4, and CLK5.

* Removed clkin reference in ui_debug.cpp to allow space for more information about CLK0, CLK1, CLK4, and CLK5.

* Ran format-code.sh

* Updated rffc507xx.cpp, and ensured hackrf submodule at f1dcd554.

---------

Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
2026-02-21 16:48:23 +13:00
Totoo eb524f7110 fix dino hiscore position (#3017) 2026-02-20 22:09:55 +01:00
Totoo 3413d71bb3 Refactor marker addition logic in ADSBRxView to eliminate shadow markers and optimize RAM usage (#3013) 2026-02-20 15:18:15 +01:00
E.T. c64dddf5cc Dockerize docu update (#3014) 2026-02-20 14:49:35 +01:00
Totoo 3d56bccd49 Fix sd_over_usb serial command (#3015) 2026-02-20 14:43:20 +01:00
gullradriel 705e4f125f Update submodule, fix warnings for PRALINE (#3012)
* update submodule
* remove pragma, remove unused variable
* fix bad external decl, signed vs unsigned comparison
* fix unused: display computed flags
* fix max2881 info mess
* code format
* fix gui positions
* use constexpr for min and max lo_frequencies
2026-02-20 11:08:41 +00:00
qwer123 363b27efe8 fix RX AUDIO baseband async error for PRALINE (#3010) 2026-02-20 10:35:19 +01:00
E.T. f8ed7489c9 update docker entrypoint to support setting build directory via -B or --workdir arguments (#3011) 2026-02-20 10:29:22 +01:00
Totoo 0685fb7a9f Add altitude-based color coding for map markers in adsb (#3004)
* Add altitude-based color coding for map markers in adsb
2026-02-19 20:50:49 +01:00
Totoo 6498f5a1b2 Notifications (#3002) 2026-02-19 14:33:01 +01:00
jLynx 77f747aab2 Add HackRF Pro (PRALINE) Board Detection and Info Display (#3006) 2026-02-19 08:56:22 +01:00
Jeff Laflamme 819b4d0fed Add restaurant pager (EV1527-variant) to SubGhzD (#2998)
* Add restaurant pager protocol to SubGhzD receiver

EV1527-variant 25-bit OOK PWM decoder for restaurant pager
systems (JianTao JT-913 and similar). Decodes system ID,
pager address, and function code (buzz/sync).

* Show friendly pager details in SubGhzD view
2026-02-18 07:47:41 +01:00
jLynx 15df51f976 TPMS TX Application with Enhanced RX Integration (#3001)
* Add TPMS transmit application with editable fields and update linker script

* Fix formatting in application information structure for TPMS TX

* Implement TPMS recent entry detail view and enhance TPMS TX encoding logic

* Refactor TPMS TX UI layout and streamline packet display updates

* Fix formatting by removing unnecessary blank line in TPMSTXView constructor

* Enhance TPMS transmission logic with signal type handling and update UI components

* Add advanced mode toggle and auto-select signal type based on packet type

* Enhance packet display and encoding logic with protocol-specific notes for temperature and ID handling

* Implement baseband switching logic for TPMS transmission based on signal type

* Implement application-level FSK repeat handling and initialize repeat counter

* Add FSK termination function and improve transmission handling

* Remove unused kill_fsk function and clean up whitespace in TPMS transmission logic

* Add pressure and temperature unit conversion functionality in TPMSTXView

* Add temperature and function field visibility handling in TPMSTXView

* Add signal type handling and improve data loading in TPMSTXView

* Fix formatting of pressure unit string in TPMSRecentEntryDetailView

* Add pressure overflow checks and enhance transponder ID handling in TPMSTXView

* Update application information and change icon color to green in TPMS TX

* Update desired menu position for TPMS TX application
2026-02-17 22:02:27 -08:00
zxkmm e9e78609b7 init (#3000) 2026-02-17 16:06:38 +08:00
Totoo 785bd06938 fix random splash file selection logic in SplashScreenView (#2999) 2026-02-17 20:52:08 +13:00
zxkmm 300a4b03c6 fix the FLASH ERR warn on hackrf pro plus PP H1/2/3/4 (#2997)
* init

* remove mbt
2026-02-17 12:31:03 +08:00
jLynx eaa07f8369 Fix HackRF Pro firmware compatibility check failure (#2996)
* fix: update SUPPORTED_PLATFORM definition to align with official HackRF firmware logic

* fix: align SUPPORTED_PLATFORM macro formatting with coding standards
2026-02-17 11:35:12 +08:00
stafur c31a978e6f Next pralinetcv9.2.1 archport (#2991)
* Initial commit and pr for HackRF Pro (praline) arch-port to mayhem-firmware. Please see https://github.com/portapack-mayhem/mayhem-firmware/issues/2957. Added flash specifics for -DBOARD=PRALINE. This firmware only builds with toolchain v9.2.1 if hackrf codebase has -B arm in firmware/hackrf_usb/CMakeLists.txt.

* Updated CMakeLists.txt per coordination with @HtoToo. For -DBOARD=PRALINE FLASH_MB_SIZE and FLASH_MB_LIMIT_SIZE are now 4. Removed praline specific variable for FLASH limits.

* Updated chibios-portapack's board.cpp to support initialization of the HachRF-Pro (praline) FPGA. Added append_fpga_bitstream.py tool to ensure that praline_fgpa.bin bitstream can be appended to -DBOARD=PRALINE produced firmware. In order to ensure successful execution of append_fpga_bitstream.py to append the fpga bitstream we should expect that the bistsream will be located at 0x180000 in flash. This requires that FLASH_MB_LIMIT_SIZE must be 1.5, and FLASH_BYTES_LIMIT_SIZE must be 1535 * 1024. If we want to allow more or less space for the base firmware image sans the fpga bitstream the location of the bistream must be moved to a location other than 0x180000.

* Updated location of praline_fpga.bin bitstream to 0x380000 to allow more room for firmware. Firmware now has 3.5MB, or 2MB more available than before as coordinated with @HTotoo.

* Expanded #ifndef PRALINE to include og and r9 gpio and pin setup as coordinated with @HTotoo.

* Added note for PRALINE FLASH_MB_LIMIT_SIZE and FLASH_BYTES_LIMIT_SIZE to explain why we are using the 3.5 and 3584 values respectively as coordinated with @HTotoo.

* Next round of modifications derived heavily, if not entirely  from work done by @banandana at https://github.com/Banandana/mayhem-firmware. This commit should power on the HackRF Pro (praline) display, power on the fpga, and enable gpio, and provide debug utilties. There is still a lot of work to be done to fully enable the new praline board with this build and firmware architectural porting effort. However, hackrf-one boards do not seem to be adversely impacted by the #ifdef PRALINE statements, and CMakeLists updates, as far as I have been able to test.

* Ran format-code.sh. Updates for this commit are only due to formatting. Tested builds and they seem to work as exptected.

* Addressed fixes in firmware/application and firmware/baseband. Stream now flows to capture and looking glass. Issues were related to thread management. Issues were originally addressed by @banandana.

* Ran format-code.sh to allow for consistency with autoamted clang checks.

* Update hackrf ref repo to mayhem-portapack-hackrf next from https://github.com/portapack-mayhem/hackrf

* Addressed format edits necessary to pass clang-format check.

* Starting addressing Si5351 Clocks for radio sampling. These updates correctly set the Si5351 clock at start up. There appears to be an issue during runtime when testing with RX Test Init, Capture and Looking glass.

* Updated clock_manager.cpp to restore correct function introduced by @banandana when testing with Rx Test Init.

* Switched to using decimation for setting the sample rate without changing the Si5351 clock. This assumes that for the praline board Si5351 CLK0 runs at fixed 8 MHz (constant) and the FPGA decimates to get the desired sample rate. For example, for a 1 MHz sample rate -> Si5351 outputs 8 MHz, FPGA decimates by 8. There is still more work needed here, and potential verification that this is the correct way to operate with this new archteitecture.

* After deliberating on hackrf_usb hackrf_core.c and radio.c, and reviewing firmware/application/hw/si5351.cpp the original approach of using the aproach detailed in hackrf_core.c sample_rate_frac_set() lines 580-582, via the implementation in firmware/application/hw/si5351.cpp seems like the best place to continue testing efforts.

* Tested at ~2.4GHz (2.3 - 2.5) with lookgin glass and was able to receive signals. Added a Signal Path debug app to test gains, and readio mode (receive/transmit).

* Added two debug apps for the RFFC507x. Status View and Tuning View. This helped debug some of the potential issues with tuning.

* update submodule

* format code

* Small touch up merging latest next and ensuring build for HackRF One.

* Fix ui addition of max2831 debug display.

* Reverted edits to re: firmware/baseband/sd_over_usb/scsi.c and firmware/application/portapack.cpp. Source now builds, had to pull latest hackrf submodule.

* Skipped detect hardware for praline board to avoid backscreen in HackRF Pro praline board.

* Added UI debug display for max2831 like the rffc507x. Added Filter Band display and Mixer status to Signal Path Status debug display.

* Added ability to set Q: INV, or Q:NOR in Signal Path Status Debug view for testing. Also added display entries for the FGPA Ctrl register fir debugging.

* Added System Diagnostics which allows testing sample rate, q-inv, and dc blk

* Corrected LP - GPIO4[8], and GPIO4[9] issue which was preventing RF Amp, and LPF from chaning state. HackRF Pro (praline) now correctly changes state of LPF and RF Amp as expected.

* Corrected LP - GPIO4[8], and GPIO4[9] issue which was preventing RF Amp, and LPF from chaning state. HackRF Pro (praline) now correctly changes state of LPF and RF Amp as expected.

* Added consistency for testing.

* Added ui to debug whether rffc5072 is locking correctly. Also addressed rf_amp fixed in on state, such that it may now be able to be toggled in HackRF Pro praline setups.

* Updated format to support automated tests.

* format code

* Updated rffc5072 status view in ui_debug to help with debugging. Made updated recommendtions for merge from PR comments. Made updates to ensure resetx isn't reconfigured for output in rffc507x.cpp.

* Ran ./format-code.sh

* Added reference comment that addresses debugging in PRALINE to detail that when the capture app was requesting 15 MHz, it matched 15100000 which resulted in the 8.5M setting. To get the actual 15M setting (22.6 MHz bandwidth), I had to force a request at least 22 MHz while debugging.

---------

Co-authored-by: gullradriel <gullradriel@users.noreply.github.com>
2026-02-17 15:27:29 +13:00
87 changed files with 4097 additions and 555 deletions
-2
View File
@@ -83,5 +83,3 @@ venv/
# generated bitmap arr file
# TODO: generate bitmap during build, since we use python during build anyway, lemme know if this is a bad idea @zxkmm
/firmware/tools/bitmap.hpp
# flashsize is generated by cmake
/firmware/flashsize.h
+1 -4
View File
@@ -43,7 +43,7 @@ if(NOT DEFINED FLASH_MB_LIMIT_SIZE)
set(FLASH_MB_LIMIT_SIZE 3.5) #PRALINE 4 MB = 3.5 firmware + 0.5 MB fpga bitstream.
else()
set(FLASH_MB_LIMIT_SIZE 1) #TODO: should be ${FLASH_MB_SIZE} remove once we got a stable build for all devices we support with bigger than 1 mb flash
endif()
endif()
endif()
message("Configuring for FLASH_MB_LIMIT_SIZE=${FLASH_MB_LIMIT_SIZE}MB")
@@ -58,9 +58,6 @@ else()
math(EXPR FLASH_BYTES_LIMIT_SIZE "${FLASH_MB_LIMIT_SIZE} * 1024 * 1024")
endif()
#generate h files
configure_file(flashsize.h.in ${CMAKE_CURRENT_SOURCE_DIR}/firmware/flashsize.h)
option(USE_CCACHE "Enable ccache, please keep an eye on this because sometimes it's not quite stable and generated unusable binary" OFF)
project(portapack-h1)
+5 -2
View File
@@ -15,8 +15,11 @@
# - Get a shell inside the build image to
# inspect problems: ./dockerize.sh shell
# - Give additional parameters to the container:
# ./dockerize.sh -j10
# ./dockerize.sh ninja -j10
# Additional parameters to make: ./dockerize.sh -j10
# Use ninja instead of make: ./dockerize.sh ninja -j10
# Addotopnal CMake parameters: ./dockerize.sh -DBOARD=PRALINE
# Change the default build directory: ./dockerize.sh -B build-alt
# (Alternatively --workdir works as well)
# - Use a different dockerfile:
# ./dockerize.sh build dockerfile-other
# - Use a different cpu architecture:
+33 -26
View File
@@ -48,43 +48,50 @@ if(NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_EQUAL ${EXPECTED_GCC_VERSION})
set(GCC_VERSION_MISMATCH 1)
endif()
#generate h files
configure_file(flashsize.h.in flashsize.h)
add_compile_options(-include ${CMAKE_CURRENT_BINARY_DIR}/flashsize.h)
add_subdirectory(application)
add_subdirectory(baseband)
add_subdirectory(standalone)
add_subdirectory(test)
# NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
add_custom_command(
OUTPUT ${FIRMWARE_FILENAME}
COMMAND ${MAKE_SPI_IMAGE} ${application_BINARY_DIR}/application.bin ${baseband_BINARY_DIR}/baseband.img ${FIRMWARE_FILENAME} ${FLASH_BYTES_LIMIT_SIZE}
DEPENDS baseband application ${MAKE_SPI_IMAGE}
${baseband_BINARY_DIR}/baseband.img ${application_BINARY_DIR}/application.bin
VERBATIM
)
if(BOARD STREQUAL "PRALINE")
math(EXPR PRALINE_FINAL_SIZE "4 * 1024 * 1024")
set(PRALINE_FPGA_BIN ${CMAKE_CURRENT_SOURCE_DIR}/../hackrf/firmware/fpga/build/praline_fpga.bin)
set(APPEND_FPGA_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tools/append_fpga_bitstream.py)
# NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
add_custom_command(
OUTPUT ${FIRMWARE_FILENAME}
COMMAND ${MAKE_SPI_IMAGE} ${application_BINARY_DIR}/application.bin ${baseband_BINARY_DIR}/baseband.img ${FIRMWARE_FILENAME} ${FLASH_BYTES_LIMIT_SIZE}
# PRALINE: Append FPGA bitstream to firmware at offset 0x380000
# The base firmware is 3.5MB, FPGA bitstream gets appended at the end of it, final size is 4MB
COMMAND ${CMAKE_COMMAND} -E echo "Appending PRALINE FPGA bitstream to firmware..."
COMMAND python3 ${APPEND_FPGA_SCRIPT} ${FIRMWARE_FILENAME} ${PRALINE_FPGA_BIN} ${FIRMWARE_FILENAME}.tmp ${PRALINE_FINAL_SIZE}
COMMAND ${CMAKE_COMMAND} -E rename ${FIRMWARE_FILENAME}.tmp ${FIRMWARE_FILENAME}
DEPENDS baseband application ${MAKE_SPI_IMAGE}
${baseband_BINARY_DIR}/baseband.img ${application_BINARY_DIR}/application.bin
${PRALINE_FPGA_BIN} ${APPEND_FPGA_SCRIPT}
VERBATIM
)
else() # Sadly this part had to be duplicated (or at least I couldn't find a better way to do it)
# NOTE: Dependencies break if the .bin files aren't included in DEPENDS. WTF, CMake?
add_custom_command(
OUTPUT ${FIRMWARE_FILENAME}
COMMAND ${MAKE_SPI_IMAGE} ${application_BINARY_DIR}/application.bin ${baseband_BINARY_DIR}/baseband.img ${FIRMWARE_FILENAME} ${FLASH_BYTES_LIMIT_SIZE}
DEPENDS baseband application ${MAKE_SPI_IMAGE}
${baseband_BINARY_DIR}/baseband.img ${application_BINARY_DIR}/application.bin
VERBATIM
)
endif()
add_custom_target(
firmware
DEPENDS ${FIRMWARE_FILENAME} ${HACKRF_FIRMWARE_DFU_FILENAME} ${HACKRF_FIRMWARE_FILENAME}
)
# PRALINE: Append FPGA bitstream to firmware at offset 0x180000
# The base firmware is 1MB, FPGA goes at 1MB offset, final size is 2MB
if(BOARD STREQUAL "PRALINE")
math(EXPR PRALINE_FINAL_SIZE "4 * 1024 * 1024")
set(PRALINE_FPGA_BIN ${CMAKE_CURRENT_SOURCE_DIR}/../hackrf/firmware/fpga/build/praline_fpga.bin)
set(APPEND_FPGA_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/tools/append_fpga_bitstream.py)
add_custom_command(
TARGET firmware POST_BUILD
COMMAND ${CMAKE_COMMAND} -E echo "Appending PRALINE FPGA bitstream to firmware..."
COMMAND python3 ${APPEND_FPGA_SCRIPT} ${FIRMWARE_FILENAME} ${PRALINE_FPGA_BIN} ${FIRMWARE_FILENAME}.tmp ${PRALINE_FINAL_SIZE}
COMMAND ${CMAKE_COMMAND} -E rename ${FIRMWARE_FILENAME}.tmp ${FIRMWARE_FILENAME}
COMMAND ${CMAKE_COMMAND} -E echo "PRALINE firmware with FPGA bitstream created:"
COMMAND ls -la ${FIRMWARE_FILENAME}
COMMENT "Appending PRALINE FPGA bitstream"
VERBATIM
)
endif()
if(${GCC_VERSION_MISMATCH})
set(COMPILER_MISMATCH_MESSAGE "WARNING: Compiler version mismatch, please use the official compiler version ${EXPECTED_GCC_VERSION} when sharing builds! Current compiler version: ${CMAKE_CXX_COMPILER_VERSION}")
message(${COMPILER_MISMATCH_MESSAGE})
+1 -1
View File
@@ -258,6 +258,7 @@ set(CPPSRC
ook_file.cpp
ui_baseband_stats_view.cpp
ui_navigation.cpp
ui_notifications.cpp
ui_record_view.cpp
ui_sd_card_status_view.cpp
ui/ui_alphanum.cpp
@@ -304,7 +305,6 @@ set(CPPSRC
apps/ui_mictx.cpp
apps/ui_modemsetup.cpp
apps/ui_playlist.cpp
apps/ui_pocsag_tx.cpp
apps/ui_rds.cpp
apps/ui_recon_settings.cpp
apps/ui_recon.cpp
+1 -1
View File
@@ -225,7 +225,7 @@ void BLETxView::send_packet() {
uint8_t min = 0x00;
uint8_t max = 0x0F;
hexDigit = min + std::rand() % (max - min + 1);
hexDigit = min + rand() % (max - min + 1);
} break;
default:
hexDigit = 0;
+112 -9
View File
@@ -271,10 +271,17 @@ ADSBRxDetailsView::ADSBRxDetailsView(
&text_frame_pos_even,
&text_frame_pos_odd,
&button_aircraft_details,
&button_see_map});
&button_see_map,
&opt_map_list});
text_icao_address.set(entry_.icao_str);
opt_map_list.on_change = [this](size_t, uint32_t mf) {
map_filter = mf;
clear_map_markers(); // reset them
pos_history.clear(); // erase the trail
};
button_aircraft_details.on_select = [this, &nav](Button&) {
aircraft_details_view_ = nav.push<ADSBRxAircraftDetailsView>(entry_);
nav.set_on_pop([this]() {
@@ -288,7 +295,7 @@ ADSBRxDetailsView::ADSBRxDetailsView(
get_map_tag(entry_),
entry_.pos.altitude,
GeoPos::alt_unit::FEET,
GeoPos::spd_unit::HIDDEN,
GeoPos::spd_unit::KNOTS,
entry_.pos.latitude,
entry_.pos.longitude,
entry_.velo.heading);
@@ -312,17 +319,107 @@ void ADSBRxDetailsView::update(const AircraftRecentEntry& entry) {
// AC Details view is showing, nothing to update.
} else if (geomap_view_) {
// Map is showing, update the current item.
if (map_filter == 1) {
// add to map trail history
add_map_trail(entry);
}
geomap_view_->update_tag(get_map_tag(entry_));
geomap_view_->update_position(entry.pos.latitude, entry.pos.longitude, entry.velo.heading, entry.pos.altitude, entry.velo.speed);
geomap_view_->update_position(entry.pos.latitude, entry.pos.longitude, entry.velo.heading, entry.pos.altitude, entry.get_ground_speed());
} else {
// Details is showing, update details.
refresh_ui();
}
}
void ADSBRxDetailsView::get_altitude_color(int32_t alt_ft, uint8_t* r, uint8_t* g, uint8_t* b) {
static const struct {
int32_t alt;
uint8_t r, g, b;
} stops[] = {
{0, 220, 220, 220}, // 0 ft: White/Grey (Ground)
{2000, 255, 255, 0}, // 2k ft: Yellow
{10000, 0, 255, 0}, // 10k ft: Green
{20000, 0, 255, 255}, // 20k ft: Cyan
{30000, 60, 60, 255}, // 30k ft: Blue (Lightened for visibility on Black)
{40000, 255, 0, 255} // 40k+ ft: Magenta
};
if (alt_ft <= stops[0].alt) {
*r = stops[0].r;
*g = stops[0].g;
*b = stops[0].b;
return;
}
const int count = sizeof(stops) / sizeof(stops[0]);
if (alt_ft >= stops[count - 1].alt) {
*r = stops[count - 1].r;
*g = stops[count - 1].g;
*b = stops[count - 1].b;
return;
}
for (int i = 0; i < count - 1; i++) {
if (alt_ft < stops[i + 1].alt) {
float t = (float)(alt_ft - stops[i].alt) / (stops[i + 1].alt - stops[i].alt);
*r = (uint8_t)(stops[i].r + (stops[i + 1].r - stops[i].r) * t);
*g = (uint8_t)(stops[i].g + (stops[i + 1].g - stops[i].g) * t);
*b = (uint8_t)(stops[i].b + (stops[i + 1].b - stops[i].b) * t);
return;
}
}
// Fallback: in case no interval matched, default to ground color.
*r = stops[0].r;
*g = stops[0].g;
*b = stops[0].b;
}
void ADSBRxDetailsView::clear_map_markers() {
if (geomap_view_)
geomap_view_->clear_markers();
if (map_filter == 1)
refresh_trail_markers(); // re add trail
}
void ADSBRxDetailsView::refresh_trail_markers() {
if (!geomap_view_)
return;
geomap_view_->clear_markers();
for (const auto& pos : pos_history) {
GeoMarker marker{};
marker.lon = pos.lon;
marker.lat = pos.lat;
marker.angle = pos.heading;
marker.tag = ""; // No tag for trail points
uint8_t r, g, b;
get_altitude_color(pos.altitude, &r, &g, &b);
marker.color = Color(r, g, b);
geomap_view_->store_marker(marker);
}
}
void ADSBRxDetailsView::add_map_trail(const AircraftRecentEntry& entry) {
if (!geomap_view_)
return;
if (entry.pos.pos_valid == false)
return;
if (!pos_history.empty()) {
const auto& last_pos = pos_history.back();
const float THRESH_DEG = 0.009f;
const float THRESH_SQ = THRESH_DEG * THRESH_DEG; // 0.00002025f
float d_lat = entry.pos.latitude - last_pos.lat;
float d_lon = entry.pos.longitude - last_pos.lon;
if ((d_lat * d_lat) + (d_lon * d_lon) < THRESH_SQ) {
return; // Moved less than ~1000m, skip (rough estimate, varies with latitude but good enough for our purposes). This prevents adding too many points when the plane is circling or taxiing.
}
}
// Only keep the last 30 positions in the trail.
if (pos_history.size() >= 30)
pos_history.erase(pos_history.begin());
pos_history.push_back({entry.pos.latitude, entry.pos.longitude, entry.velo.heading, entry.pos.altitude});
refresh_trail_markers();
}
bool ADSBRxDetailsView::add_map_marker(const AircraftRecentEntry& entry) {
@@ -330,11 +427,16 @@ bool ADSBRxDetailsView::add_map_marker(const AircraftRecentEntry& entry) {
if (!geomap_view_)
return false;
if (map_filter == 1) return false; // this is the 'only me' option, so skip all others
GeoMarker marker{};
marker.lon = entry.pos.longitude;
marker.lat = entry.pos.latitude;
marker.angle = entry.velo.heading;
marker.tag = get_map_tag(entry);
uint8_t r, g, b;
get_altitude_color(entry.pos.altitude, &r, &g, &b);
marker.color = Color(r, g, b);
auto markerStored = geomap_view_->store_marker(marker);
return markerStored == MARKER_STORED;
@@ -651,14 +753,15 @@ void ADSBRxView::refresh_ui() {
// Process the entries list.
for (const auto& entry : recent) {
// Found the entry being shown in details view. Update it.
if (entry.key() == detail_key) {
if (entry.key() == detail_key) { // we don't add it to the markers, since this is the currently selected and shown in the middle one. This eliminates the "shadow" marker, and saves ram
details_view->update(entry);
current_updated = true;
}
// NB: current entry also gets a marker so it shows up if map is panned.
if (map_needs_update && entry.pos.pos_valid && entry.state <= ADSBAgeState::Recent) {
map_needs_update = details_view->add_map_marker(entry);
} else {
// Add others only
// NB: current entry also gets a marker so it shows up if map is panned.
if (map_needs_update && entry.pos.pos_valid && entry.state <= ADSBAgeState::Recent) {
map_needs_update = details_view->add_map_marker(entry);
}
}
// Any work left to do?
+70 -39
View File
@@ -64,9 +64,9 @@ namespace ui {
#define VEL_AIR_SUBSONIC 3
#define VEL_AIR_SUPERSONIC 4
#define O_E_FRAME_TIMEOUT 20 // timeout between odd and even frames
#define MARKER_UPDATE_SECONDS_OSM 10 // "other" map marker redraw interval for osm
#define MARKER_UPDATE_SECONDS_BIN 5 // "other" map marker redraw interval for bin map
#define O_E_FRAME_TIMEOUT 20 // timeout between odd and even frames
#define MARKER_UPDATE_SECONDS_OSM 8 // "other" map marker redraw interval for osm
#define MARKER_UPDATE_SECONDS_BIN 5 // "other" map marker redraw interval for bin map
/* Thresholds (in seconds) that define the transition between ages. */
struct ADSBAgeLimit {
@@ -150,6 +150,19 @@ struct AircraftRecentEntry {
age = 0;
}
int32_t get_ground_speed() const {
if (velo.valid == false) return 0;
if (velo.type == SPD_GND)
return velo.speed;
else if (velo.type == SPD_IAS) {
if (!pos.alt_valid) return velo.speed; // can't correct without altitude, so just return IAS
return (int32_t)(velo.speed * (1.0f + (0.02f * (pos.altitude / 1000.0f))));
} else if (velo.type == SPD_TAS)
return velo.speed; // We don't know the wind speed
else
return 0;
}
void inc_age(int delta) {
age += delta;
@@ -208,50 +221,50 @@ class ADSBRxAircraftDetailsView : public View {
private:
Labels labels{
{{UI_POS_X(0), 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 2 * 16}, "Registration:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 3 * 16}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 5 * 16}, "Model:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 7 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 8 * 16}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 9 * 16}, "Engine type:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 11 * 16}, "Owner:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 13 * 16}, "Operator:", Theme::getInstance()->fg_light->foreground}};
{{UI_POS_X(0), UI_POS_Y(1)}, "ICAO:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(2)}, "Registration:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(3)}, "Manufacturer:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(5)}, "Model:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(7)}, "Type:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(8)}, "Number of engines:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(9)}, "Engine type:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(11)}, "Owner:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(13)}, "Operator:", Theme::getInstance()->fg_light->foreground}};
Text text_icao_address{
{5 * 8, 1 * 16, 6 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(5), UI_POS_Y(1), 6 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_registration{
{13 * 8, 2 * 16, 8 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(13), UI_POS_Y(2), 8 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_manufacturer{
{UI_POS_X(0), 4 * 16, 19 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(4), 19 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_model{
{UI_POS_X(0), 6 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(6), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_type{
{5 * 8, 7 * 16, 22 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(5), UI_POS_Y(7), 22 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_number_of_engines{
{18 * 8, 8 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(18), UI_POS_Y(8), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_engine_type{
{UI_POS_X(0), 10 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(10), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_owner{
{UI_POS_X(0), 12 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(12), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_operator{
{UI_POS_X(0), 14 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(14), screen_width, UI_POS_HEIGHT(1)},
"-"};
Button button_close{
@@ -270,11 +283,14 @@ class ADSBRxDetailsView : public View {
void focus() override;
void update(const AircraftRecentEntry& entry);
void get_altitude_color(int32_t alt_ft, uint8_t* r, uint8_t* g, uint8_t* b);
/* Calls forwarded to map view if shown. */
bool map_active() const { return geomap_view_; }
void clear_map_markers();
/* Adds a marker for the entry to the map. Returns true on success. */
bool add_map_marker(const AircraftRecentEntry& entry);
void add_map_trail(const AircraftRecentEntry& entry);
void refresh_trail_markers();
std::string title() const override { return "Details"; }
@@ -297,57 +313,72 @@ class ADSBRxDetailsView : public View {
// if removed from the recent entries list.
AircraftRecentEntry entry_{AircraftRecentEntry::invalid_key};
bool airline_checked{false};
uint8_t map_filter{0}; // 0: all, 1: only this, set by opt_map_list.
struct PosHistory {
float lat;
float lon;
uint16_t heading;
int32_t altitude;
};
std::vector<PosHistory> pos_history{};
Labels labels{
{{UI_POS_X(0), 1 * 16}, "ICAO:", Theme::getInstance()->fg_light->foreground},
{{13 * 8, 1 * 16}, "Callsign:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 2 * 16}, "Last seen:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 3 * 16}, "Airline:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 5 * 16}, "Country:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 13 * 16}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), 15 * 16}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};
{{UI_POS_X(0), UI_POS_Y(0)}, "ICAO:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(13), UI_POS_Y(0)}, "Callsign:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(1)}, "Last seen:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(2)}, "Airline:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(4)}, "Country:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(7)}, "Map filter:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(13)}, "Even position frame:", Theme::getInstance()->fg_light->foreground},
{{UI_POS_X(0), UI_POS_Y(15)}, "Odd position frame:", Theme::getInstance()->fg_light->foreground}};
Text text_icao_address{
{5 * 8, 1 * 16, 6 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(5), UI_POS_Y(0), 6 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_callsign{
{22 * 8, 1 * 16, 8 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(22), UI_POS_Y(0), 8 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_last_seen{
{11 * 8, 2 * 16, 19 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(11), UI_POS_Y(1), 19 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_airline{
{UI_POS_X(0), 4 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(3), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_country{
{8 * 8, 5 * 16, 22 * 8, UI_POS_HEIGHT(1)},
{UI_POS_X(8), UI_POS_Y(4), 22 * 8, UI_POS_HEIGHT(1)},
"-"};
Text text_infos{
{UI_POS_X(0), 6 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(5), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_info2{
{UI_POS_X(0), 7 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(6), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_frame_pos_even{
{UI_POS_X(0), 14 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(14), screen_width, UI_POS_HEIGHT(1)},
"-"};
Text text_frame_pos_odd{
{UI_POS_X(0), 16 * 16, screen_width, UI_POS_HEIGHT(1)},
{UI_POS_X(0), UI_POS_Y(16), screen_width, UI_POS_HEIGHT(1)},
"-"};
Button button_aircraft_details{
{UI_POS_X_CENTER(12) - UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
{UI_POS_X_CENTER(12) - UI_POS_X(8), UI_POS_Y(8), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
"A/C details"};
OptionsField opt_map_list{
{UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(7)},
12,
{{"All", 0},
{"Only this", 1}}};
Button button_see_map{
{UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(9), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
{UI_POS_X_CENTER(12) + UI_POS_X(8), UI_POS_Y(8), UI_POS_WIDTH(12), UI_POS_HEIGHT(3)},
"See on map"};
MessageHandlerRegistration message_handler_gps{
File diff suppressed because it is too large Load Diff
+244 -54
View File
@@ -643,34 +643,36 @@ class Si5351DebugView : public View {
private:
NavigationView& nav_;
Text text_title{{8, 16, 200, 16}, "Si5351 Clock Generator"};
Text text_title{{0, 0, 200, 16}, "Si5351 Clock Generator"};
Text text_status_label{{8, 40, 80, 16}, "Status Reg:"};
Text text_status_value{{96, 40, 144, 16}, ""};
Text text_status_label{{0, 16, 80, 16}, "Status Reg:"};
Text text_status_value{{96, 16, 144, 16}, ""};
Text text_pll_a_label{{8, 60, 80, 16}, "PLL A:"};
Text text_pll_a_status{{96, 60, 144, 16}, ""};
Text text_pll_a_label{{0, 32, 80, 16}, "PLL A:"};
Text text_pll_a_status{{96, 32, 144, 16}, ""};
Text text_pll_b_label{{8, 80, 80, 16}, "PLL B:"};
Text text_pll_b_status{{96, 80, 144, 16}, ""};
Text text_pll_b_label{{0, 48, 80, 16}, "PLL B:"};
Text text_pll_b_status{{96, 48, 144, 16}, ""};
Text text_sys_init_label{{8, 100, 80, 16}, "SYS_INIT:"};
Text text_sys_init_status{{96, 100, 144, 16}, ""};
Text text_sys_init_label{{0, 64, 80, 16}, "SYS_INIT:"};
Text text_sys_init_status{{96, 64, 144, 16}, ""};
Text text_xtal_cap_label{{8, 120, 80, 16}, "XTAL Cap:"};
Text text_xtal_cap_value{{96, 120, 144, 16}, ""};
Text text_xtal_cap_label{{0, 80, 80, 16}, "XTAL Cap:"};
Text text_xtal_cap_value{{96, 80, 144, 16}, ""};
Text text_clk0_label{{8, 150, 72, 16}, "CLK0:"};
Text text_clk0_status{{88, 150, 152, 16}, ""};
Text text_clk0_label{{0, 96, 48, 16}, "CLK0:"};
Text text_clk0_status{{50, 96, 28, 16}, ""};
Text text_clk0_freq_value{{80, 96, 160, 16}, ""};
Text text_clk0_div_value{{50, 112, 190, 16}, ""};
Text text_clk0_freq_label{{8, 170, 72, 16}, " Freq:"};
Text text_clk0_freq_value{{88, 170, 152, 16}, ""};
Text text_clk1_label{{0, 128, 96, 16}, "CLK1 (SCT):"};
Text text_clk1_status{{112, 128, 128, 16}, ""};
Text text_clk0_div_label{{8, 190, 72, 16}, " Div:"};
Text text_clk0_div_value{{88, 190, 152, 16}, ""};
Text text_clk4_label{{0, 144, 96, 16}, "CLK4 (MAX):"};
Text text_clk4_status{{112, 144, 128, 16}, ""};
Text text_clk1_label{{8, 210, 96, 16}, "CLK1 (SCT):"};
Text text_clk1_status{{112, 210, 128, 16}, ""};
Text text_clk5_label{{0, 160, 96, 16}, "CLK5 (RFFC):"};
Text text_clk5_status{{112, 160, 128, 16}, ""};
Button button_refresh{{8, 240, 72, 24}, "Refresh"};
Button button_reset_pll{{88, 240, 72, 24}, "Reset PLL"};
@@ -694,7 +696,7 @@ class SignalPathStatusView : public View {
Text text_title{{0, 0, 240, 16}, "=== Signal Path Status ==="};
Text text_lbl_max_enable{{0, 20, 1114, 16}, "MAX2831:"};
Text text_lbl_max_enable{{0, 20, 114, 16}, "MAX2831:"};
Text text_max_enable{{116, 20, 124, 16}, "---"};
Text text_lbl_max_mode{{0, 36, 114, 16}, "RX Mode:"};
@@ -703,20 +705,88 @@ class SignalPathStatusView : public View {
Text text_lbl_rf_path{{0, 52, 114, 16}, "RF Path:"};
Text text_rf_path{{116, 52, 124, 16}, "---"};
Text text_lbl_rf_amp{{0, 68, 114, 16}, "RF Amp:"};
Text text_rf_amp{{116, 68, 124, 16}, "---"};
Text text_lbl_filter{{0, 68, 114, 16}, "Filter Band:"};
Text text_filter{{116, 68, 124, 16}, "---"};
Text text_lbl_lna{{0, 84, 114, 16}, "LNA Gain:"};
Text text_lna{{116, 84, 124, 16}, "---"};
Text text_lbl_mixer{{0, 84, 114, 16}, "Mixer Enable:"};
Text text_mixer{{116, 84, 124, 16}, "---"};
Text text_lbl_vga{{0, 100, 114, 16}, "VGA Gain:"};
Text text_vga{{116, 100, 124, 16}, "---"};
Text text_lbl_rf_amp{{0, 100, 114, 16}, "RF Amp:"};
Text text_rf_amp{{116, 100, 124, 16}, "---"};
Text text_lbl_fpga_decim{{0, 116, 114, 16}, "FPGA Decim:"};
Text text_fpga_decim{{116, 116, 124, 16}, "---"};
Text text_lbl_lna{{0, 116, 114, 16}, "LNA Gain:"};
Text text_lna{{116, 116, 124, 16}, "---"};
Text text_status{{0, 140, 240, 32}, ""};
Text text_lbl_vga{{0, 132, 114, 16}, "VGA Gain:"};
Text text_vga{{116, 132, 124, 16}, "---"};
Text text_lbl_fpga_decim{{0, 148, 114, 16}, "FPGA Decim:"};
Text text_fpga_decim{{116, 148, 124, 16}, "---"};
Text text_lbl_fpga_ctrl_dc_q{{0, 164, 114, 16}, "FPGA Ctrl:"};
Text text_fpga_ctrl_dc_q{{116, 164, 124, 16}, "---"};
Text text_lbl_fpga_ctrl_qs{{0, 180, 114, 16}, ""};
Text text_fpga_ctrl_qs{{116, 180, 124, 16}, "---"};
Text text_status{{0, 200, 240, 32}, ""};
Button button_refresh{{0, 280, 72, 24}, "Refresh"};
Button button_toggle_q{{88, 280, 72, 24}, "Q Inv"};
Button button_done{{176, 280, 64, 24}, "Done"};
};
#endif
#ifdef PRALINE
class GPIODebugView : public View {
public:
GPIODebugView(NavigationView& nav);
void focus() override;
std::string title() const override { return "GPIO Debug"; };
private:
void refresh();
// GPIO4 (LPF and RF Amp)
Text text_lbl_gpio4{{0, 0, 240, 16}, "Pin Diag: GPIO4 (LPF|Amp|Mix)"};
Text text_lbl_mixr1{{0, 18, 56, 16}, "MixR1:"};
Text text_mixr1{{58, 18, 180, 16}, "---"};
Text text_lbl_pin4{{0, 36, 114, 16}, "PIN[4] (read):"};
Text text_pin4{{116, 36, 124, 16}, "---"};
Text text_lbl_set4{{0, 54, 114, 16}, "SET[4] (write):"};
Text text_set4{{116, 54, 124, 16}, "---"};
// Bit 8 (LPF)
Text text_lbl_lpf_bit{{0, 78, 240, 16}, "Bit 8 (LPF - GPIO4[8]):"};
Text text_lpf_dir{{0, 96, 80, 16}, "DIR: ?"};
Text text_lpf_pin{{82, 96, 78, 16}, "PIN: ?"};
Text text_lpf_set{{162, 96, 78, 16}, "SET: ?"};
Button button_lpf_toggle{{8, 114, 110, 24}, "Toggle LPF"};
Button button_lpf_on{{122, 114, 50, 24}, "ON"};
Button button_lpf_off{{176, 114, 50, 24}, "OFF"};
// Bit 9 (RF Amp)
Text text_lbl_amp_bit{{0, 146, 240, 16}, "Bit 9 (Amp - GPIO4[9]):"};
Text text_amp_dir{{0, 164, 80, 16}, "DIR: ?"};
Text text_amp_pin{{82, 164, 78, 16}, "PIN: ?"};
Text text_amp_set{{162, 164, 78, 16}, "SET: ?"};
Button button_amp_toggle{{8, 182, 110, 24}, "Toggle Amp"};
Button button_amp_on{{122, 182, 50, 24}, "ON"};
Button button_amp_off{{176, 182, 50, 24}, "OFF"};
// GPIO3 (Mixer)
Text text_lbl_gpio3{{0, 214, 240, 16}, "--- GPIO3 (Mixer) ---"};
Text text_lbl_mix_bit{{0, 232, 240, 16}, "Bit 2 (MIX - GPIO3[2]):"};
Text text_mix_dir{{0, 250, 80, 16}, "DIR: ?"};
Text text_mix_pin{{82, 250, 78, 16}, "PIN: ?"};
Text text_mix_set{{162, 250, 78, 16}, "SET: ?"};
// Controls
Button button_refresh{{8, 280, 72, 24}, "Refresh"};
Button button_done{{168, 280, 64, 24}, "Done"};
};
@@ -734,44 +804,50 @@ class RFFC5072StatusView : public View {
NavigationView& nav_;
void refresh_status();
Text text_title{{0, 0, 240, 16}, "=== RFFC5072 (1st IF) ==="};
Text text_status{{0, 0, 240, 16}, "---"};
Text text_lbl_enabled{{0, 20, 114, 16}, "Status:"};
Text text_enabled{{116, 20, 124, 16}, "---"};
Text text_gpio4{{0, 16, 240, 16}, "---"};
Text text_lbl_freq{{0, 36, 114, 16}, "LO Freq:"};
Text text_freq{{116, 36, 124, 16}, "---"};
Text text_ctrl{{0, 32, 240, 16}, "---"};
Text text_lbl_path{{0, 52, 114, 16}, "Path:"};
Text text_path{{116, 52, 124, 16}, "---"};
Text text_lbl_enabled{{0, 48, 114, 16}, "Status:"};
Text text_enabled{{116, 48, 124, 16}, "---"};
Text text_lbl_mixer{{0, 68, 114, 16}, "Mixer:"};
Text text_mixer{{116, 68, 124, 16}, "---"};
Text text_lbl_freq{{0, 64, 114, 16}, "LO Freq:"};
Text text_freq{{116, 64, 124, 16}, "---"};
Text text_lbl_r0{{0, 92, 114, 16}, "Reg 0:"};
Text text_r0{{116, 92, 124, 16}, "---"};
Text text_lbl_path{{0, 80, 114, 16}, "Path:"};
Text text_path{{116, 80, 124, 16}, "---"};
Text text_lbl_r1{{0, 108, 114, 16}, "Reg 1 (N):"};
Text text_r1{{116, 108, 124, 16}, "---"};
Text text_lbl_mixer{{0, 96, 114, 16}, "Mixer:"};
Text text_mixer{{116, 96, 124, 16}, "---"};
Text text_lbl_r2{{0, 124, 114, 16}, "Reg 2:"};
Text text_r2{{116, 124, 124, 16}, "---"};
Text text_lbl_r0{{0, 112, 114, 16}, "Reg 0:"};
Text text_r0{{116, 112, 124, 16}, "---"};
Text text_lbl_decode{{0, 148, 240, 16}, "--- Decoded Values ---"};
Text text_lbl_r1{{0, 128, 114, 16}, "Reg 1 (N):"};
Text text_r1{{116, 128, 124, 16}, "---"};
Text text_lbl_n{{0, 168, 114, 16}, "N divider:"};
Text text_n{{116, 168, 124, 16}, "---"};
Text text_lbl_r2{{0, 144, 114, 16}, "Reg 2:"};
Text text_r2{{116, 144, 124, 16}, "---"};
Text text_lbl_lodiv{{0, 184, 114, 16}, "LO divider:"};
Text text_lodiv{{116, 184, 124, 16}, "---"};
Text text_lbl_n{{0, 160, 114, 16}, "N divider:"};
Text text_n{{116, 160, 124, 16}, "---"};
Text text_lbl_calc{{0, 200, 114, 16}, "Calc freq:"};
Text text_calc{{116, 200, 124, 16}, "---"};
Text text_lbl_lodiv{{0, 176, 114, 16}, "LO divider:"};
Text text_lodiv{{116, 176, 124, 16}, "---"};
Text text_status{{0, 224, 240, 32}, ""};
Text text_lbl_calc{{0, 192, 114, 16}, "Calc freq:"};
Text text_calc{{116, 192, 124, 16}, "---"};
Button button_refresh{{8, 280, 72, 24}, "Refresh"};
Button button_done{{168, 280, 64, 24}, "Done"};
Text text_regs_status{{0, 208, 240, 16}, "---"};
Text text_status2{{0, 224, 240, 16}, ""};
Text text_status3{{0, 240, 240, 16}, ""};
Button button_refresh{{2, 280, 72, 24}, "Refresh"};
Button button_force{{98, 280, 60, 24}, "SPI"};
Button button_done{{182, 280, 56, 24}, "Done"};
};
#ifdef PRALINE
@@ -828,6 +904,120 @@ class RFFCTuningDebugView : public View {
#endif
#ifdef PRALINE
/* MAX2831DebugView *************************************************/
class MAX2831DebugView : public View {
public:
MAX2831DebugView(NavigationView& nav);
void focus() override;
std::string title() const override { return "MAX2831 Debug"; };
private:
void refresh();
Text text_title{{0, 0, 240, 16}, "MAX2831 (2nd IF) Debug"};
Text text_lbl_called{{0, 24, 120, 16}, "Freq Set:"};
Text text_called{{122, 24, 118, 16}, "NO"};
Text text_lbl_valid{{0, 42, 120, 16}, "In Range:"};
Text text_valid{{122, 42, 118, 16}, "---"};
Text text_lbl_req{{0, 60, 120, 16}, "Requested:"};
Text text_req{{122, 60, 118, 16}, "---"};
Text text_lbl_calc_n{{0, 78, 120, 16}, "Calc N:"};
Text text_calc_n{{122, 78, 118, 16}, "---"};
Text text_lbl_calc_frac{{0, 96, 120, 16}, "Calc Frac:"};
Text text_calc_frac{{122, 96, 118, 16}, "---"};
Text text_spacer{{0, 114, 240, 16}, "--- Hardware Regs ---"};
Text text_lbl_r3{{0, 132, 120, 16}, "Reg 3:"};
Text text_r3{{122, 132, 118, 16}, "---"};
Text text_lbl_r4{{0, 150, 120, 16}, "Reg 4:"};
Text text_r4{{122, 150, 118, 16}, "---"};
Text text_lbl_act_n{{0, 168, 120, 16}, "Actual N:"};
Text text_act_n{{122, 168, 118, 16}, "---"};
Text text_lbl_act_frac{{0, 186, 120, 16}, "Actual Frac:"};
Text text_act_frac{{122, 186, 118, 16}, "---"};
Text text_lbl_calc_freq{{0, 204, 120, 16}, "Calc Freq:"};
Text text_calc_freq{{122, 204, 118, 16}, "---"};
Text text_status{{0, 228, 240, 44}, ""};
Button button_refresh{{8, 280, 72, 24}, "Refresh"};
Button button_done{{168, 280, 64, 24}, "Done"};
};
#endif
#ifdef PRALINE
class SystemDiagnosticsView : public View {
public:
SystemDiagnosticsView(NavigationView& nav);
void focus() override;
std::string title() const override { return "System Diagnostics"; };
private:
void refresh();
void read_gpio_states();
void set_sample_rate(uint32_t rate);
Text text_title{{0, 0, 240, 16}, "System Diagnostics"};
// Sample Rate Section
Text text_lbl_sample{{0, 24, 42, 16}, "Rate:"};
Text text_sample_rate{{44, 24, 50, 16}, "---"};
Text text_lbl_fpga_decode{{96, 24, 144, 16}, "DC:? Q:? QS:?"};
Button button_sample_2m{{2, 44, 56, 24}, "2 MSPS"};
Button button_sample_4m{{62, 44, 56, 24}, "4 MSPS"};
Button button_sample_8m{{122, 44, 56, 24}, "8 MSPS"};
Button button_sample_20m{{182, 44, 56, 24}, "20 MSPS"};
// Baseband Filter Section
Text text_lbl_bb_filter{{0, 76, 114, 16}, "BB Filter BW:"};
Text text_bb_filter{{116, 76, 124, 16}, "---"};
Text text_lbl_reg8{{0, 94, 114, 16}, "MAX2831 R8:"};
Text text_reg8{{116, 94, 124, 16}, "---"};
// GPIO States Section
Text text_lbl_gpio{{0, 118, 240, 16}, "--- GPIO Pin States ---"};
Text text_lbl_lpf{{0, 136, 56, 16}, "LPF:"};
Text text_gpio_lpf{{58, 136, 181, 16}, "---"};
Text text_lbl_mix{{0, 154, 56, 16}, "Mixer:"};
Text text_gpio_mix{{58, 154, 181, 16}, "---"};
Text text_lbl_amp{{0, 172, 56, 16}, "RF Amp:"};
Text text_gpio_amp{{58, 172, 181, 16}, "---"};
// FPGA Control Section
Text text_lbl_fpga{{0, 196, 240, 16}, "--- FPGA Control ---"};
Text text_lbl_fpga_ctrl{{0, 214, 114, 16}, "FPGA Reg 1:"};
Text text_fpga_ctrl{{116, 214, 124, 16}, "---"};
Text text_lbl_band{{0, 232, 48, 16}, "Band:"};
Text text_band{{50, 232, 190, 16}, "---"};
Button button_toggle_q{{2, 252, 110, 24}, "Toggle Q Inv"};
Button button_toggle_dc{{122, 252, 110, 24}, "Toggle DC Blk"};
// Control Buttons
Button button_refresh{{2, 280, 72, 24}, "Refresh"};
Button button_done{{168, 280, 64, 24}, "Done"};
};
#endif
#endif
class DebugPeripheralsMenuView : public BtnGridView {
@@ -46,11 +46,10 @@ bool valid_firmware_file(std::filesystem::path::string_type path) {
auto result = firmware_file.open(path.c_str());
if (!result.is_valid()) {
uint64_t file_size = firmware_file.size();
if (portapack::device_type == portapack::DeviceType::DEV_PORTAPACK && file_size > 1 * 1024 * 1024) {
// Portapack firmware files must not be larger than 1MB
if (file_size > FLASH_ROM_SIZE) {
// Firmware file is larger than the flash size for this device
return false;
}
// May need to add a check to portarf and portarf pro too.
checksum = 0;
for (uint64_t offset = 0; offset < FLASH_ROM_SIZE && offset < file_size; offset += sizeof(read_buffer)) {
auto readResult = firmware_file.read(&read_buffer, sizeof(read_buffer));
@@ -32,8 +32,6 @@
#include "untar.hpp"
#include <cstdint>
#include "../../flashsize.h"
#define FLASH_ROM_SIZE (FLASH_SIZE_MB * 1024 * 1024)
#define FLASH_STARTING_ADDRESS 0x00000000
#define FLASH_EXPECTED_CHECKSUM 0x00000000
+2 -1
View File
@@ -304,7 +304,8 @@ class MicTXView : public View {
{
{" 8k5 ", 0}, // Initial dynamic values when we start Mic App.
{" 11k ", 1},
{" 16k ", 2},
{" 12k5 ", 2},
{" 16k ", 3},
}};
NumberField field_squelch{
+30 -1
View File
@@ -61,6 +61,19 @@ void SubGhzDRecentEntryDetailView::update_data() {
if (entry_.data != 0) console.writeln("Data: " + to_string_hex(entry_.data));
if (entry_.sensorType == FPS_RESTAURANT_PAGER) {
uint8_t pager_addr = (entry_.data >> 5) & 0x0F;
uint8_t func_code = (entry_.data >> 1) & 0x0F;
console.writeln("Station: 0x" + to_string_hex(serial) + " (" + to_string_dec_uint(serial) + ")");
console.writeln("Pager: " + to_string_dec_uint(pager_addr));
if (func_code == 0x0D)
console.writeln("Action: Buzz");
else if (func_code == 0x0F)
console.writeln("Action: Sync");
else
console.writeln("Action: 0x" + to_string_hex(func_code));
}
if (entry_.sensorType == FPS_KEELOQ) {
console.writeln("Fix: " + to_string_hex(fix));
console.writeln("Encrypted: " + to_string_hex(encrypted));
@@ -280,6 +293,8 @@ const char* SubGhzDView::getSensorTypeName(FPROTO_SUBGHZD_SENSOR type) {
return "Marantec24";
case FPS_HOLTEKHT6P20B:
return "Holtek HT6P20B";
case FPS_RESTAURANT_PAGER:
return "Rest. Pager";
case FPS_Invalid:
default:
return "Unknown";
@@ -306,7 +321,14 @@ void RecentEntriesTable<ui::SubGhzDRecentEntries>::draw(
line.reserve(30);
line = SubGhzDView::getSensorTypeName((FPROTO_SUBGHZD_SENSOR)entry.sensorType);
line = line + " " + to_string_hex(entry.data << 32);
if (entry.sensorType == FPS_RESTAURANT_PAGER) {
uint8_t pgr = (entry.data >> 5) & 0x0F;
uint8_t func = (entry.data >> 1) & 0x0F;
line += " P:" + to_string_dec_uint(pgr) + (func == 0x0D ? " Buzz" : func == 0x0F ? " Sync"
: "");
} else {
line = line + " " + to_string_hex(entry.data << 32);
}
line.resize(columns.at(0).second, ' ');
std::string ageStr = to_string_dec_uint(entry.age);
std::string bitsStr = to_string_dec_uint(entry.bits);
@@ -873,5 +895,12 @@ void SubGhzDRecentEntryDetailView::parseProtocol() {
btn = (entry_.data >> 4) & 0xF;
return;
}
if (entry_.sensorType == FPS_RESTAURANT_PAGER) {
// 25-bit EV1527-variant: [sysid:16][pager:4][func:4][stop:1]
serial = (entry_.data >> 9) & 0xFFFF; // System ID
// btn/cnt left as SD_NO values; friendly output in update_data()
return;
}
}
} // namespace ui
+6 -1
View File
@@ -473,7 +473,12 @@ void shutdown() {
send_message(&message);
shared_memory.application_queue.reset();
// Allow time for the shutdown message to be processed and for the baseband
// core to stop before starting another image. Otherwise, the M4 may still be
// running and cause a crash when the next image is started.
#ifdef PRALINE
chThdSleepMilliseconds(20);
#endif
baseband_image_running = false;
}
+26 -3
View File
@@ -237,19 +237,40 @@ constexpr ClockControls si5351c_clock_control_common{{
}};
constexpr ClockControls si5351a_clock_control_common{{
#ifndef PRALINE
#ifdef PRALINE
// CLK0: MAX5864 (ADC)
{ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK1: SCT_CLK - iCE40 FPGA timing clock
{ClockControl::ClockCurrentDrive::_6mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK2: LPC43xx MCU
{ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK3: CLKOUT (optional) SMA Port P1
{ClockControl::ClockCurrentDrive::_8mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK4: PRALINE RFFC5072 reference (40 MHz) - INVERTED, 6mA, Integer mode
// This matches HackRF One OG configuration for RFFC5072
{ClockControl::ClockCurrentDrive::_6mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Invert, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK5: PRALINE MAX2831 reference (40 MHz) - INVERTED per hackrf_usb, 4mA, Integer mode
{ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Invert, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK6: SMA Port P2
{ClockControl::ClockCurrentDrive::_8mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
#else
{ClockControl::ClockCurrentDrive::_6mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Fractional, ClockControl::ClockPowerDown::Power_Off}, // CLK0: MUST be Fractional for 8 MHz!
#endif
{ClockControl::ClockCurrentDrive::_6mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
{ClockControl::ClockCurrentDrive::_4mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Fractional, ClockControl::ClockPowerDown::Power_Off},
{ClockControl::ClockCurrentDrive::_8mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
{ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK4: HackRF r9 - not inverted
{ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK5: HackRF r9 - not used
{ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
// CLK6: Not used
{ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
#endif
// CLK7: Not used
{ClockControl::ClockCurrentDrive::_2mA, ClockControl::ClockSource::MS_Self, ClockControl::ClockInvert::Normal, ClockControl::MultiSynthSource::PLLA, ClockControl::MultiSynthMode::Integer, ClockControl::ClockPowerDown::Power_Off},
}};
ClockManager::Reference ClockManager::get_reference() const {
return reference;
}
@@ -659,6 +680,8 @@ void ClockManager::set_sampling_frequency(const uint32_t frequency) {
/* PRALINE: Match HackRF USB sample_rate_frac_set()
* Reference: hackrf_usb radio.c lines 29-91, hackrf_core.c lines 501-685 */
_base_band_frequency = frequency;
// Set FPGA decimation to 0 (no decimation) for direct passthrough
fpga_debug_register_write(2, 0);
radio::invalidate_spi_config();
+6
View File
@@ -70,6 +70,10 @@ class ClockManager {
void set_sampling_frequency(const uint32_t frequency);
uint32_t get_sampling_frequency() const {
return _base_band_frequency;
};
void set_reference_ppb(const int32_t ppb);
#ifdef PRALINE
@@ -92,6 +96,8 @@ class ClockManager {
si5351::Si5351& clock_generator;
Reference reference;
uint32_t _base_band_frequency{20000000};
void set_gp_clkin_to_clkin_direct();
void start_frequency_monitor_measurement(const cgu::CLK_SEL clk_sel);
+3 -1
View File
@@ -256,7 +256,9 @@ ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent ev
if (!w->hidden()) {
// To achieve reverse depth ordering (last object drawn is
// considered "top"), descend first.
for (const auto child : w->children()) {
auto& children = w->children();
for (auto it = children.rbegin(); it != children.rend(); ++it) { // reverse, bc the lastly added will be "top" if overlaps
const auto& child = *it;
const auto touched_widget = touch_widget(child, event);
if (touched_widget) {
return touched_widget;
+73 -4
View File
@@ -33,6 +33,76 @@ using namespace portapack;
namespace ui::external_app::acars_rx {
// ACARS frame field layout (0-based byte offsets):
// [0] SOH framing byte (skipped)
// [1..7] Aircraft registration (7 chars)
// [8] STX framing byte (skipped)
// [9..10] Label (2 chars)
// [11] Block ID (1 char)
// [12..14] Message number (3 chars)
// [15..20] Flight ID (6 chars)
// [21..N-3] Free-text payload (variable)
// [N-2..N-1] CRC-16/CCITT (2 bytes, MSB first, NOT part of payload)
//
// Minimum valid frame: 21-byte fixed header + 2 CRC bytes = 23 bytes.
// (A zero-length payload is legal per spec; we require at least 23 bytes.)
static constexpr std::string::size_type kAcarsCrcLen = 2;
static constexpr std::string::size_type kAcarsHeaderLen = 21;
static constexpr std::string::size_type kAcarsMinLen = kAcarsHeaderLen + kAcarsCrcLen;
// CRC-16/CCITT: poly 0x1021, init 0x0000, no reflection, no final XOR.
// This is the variant used by ACARS (same as XMODEM CRC).
static uint16_t acars_crc16(const std::string& data, std::string::size_type len) {
uint16_t crc = 0x0000;
for (std::string::size_type i = 0; i < len; ++i) {
crc ^= static_cast<uint16_t>(static_cast<uint8_t>(data[i])) << 8;
for (int bit = 0; bit < 8; ++bit) {
if (crc & 0x8000)
crc = static_cast<uint16_t>((crc << 1) ^ 0x1021);
else
crc = static_cast<uint16_t>(crc << 1);
}
}
return crc;
}
AcarsDecoded acars_decode(const std::string& raw) {
AcarsDecoded result;
if (raw.size() < kAcarsMinLen) {
result.txt = "ACARS message too short (" + std::to_string(raw.size()) +
" bytes, need " + std::to_string(kAcarsMinLen) + ")";
return result;
}
// Verify CRC: computed over everything except the last 2 bytes,
// then compared against those 2 bytes (MSB first).
const std::string::size_type payload_len = raw.size() - kAcarsCrcLen;
const uint16_t computed = acars_crc16(raw, payload_len);
const uint16_t received = (static_cast<uint16_t>(static_cast<uint8_t>(raw[raw.size() - 2])) << 8) |
static_cast<uint16_t>(static_cast<uint8_t>(raw[raw.size() - 1]));
result.crc_ok = (computed == received);
result.reg = raw.substr(1, 7);
result.label = raw.substr(9, 2);
result.block_id = raw[11];
result.msg_num = raw.substr(12, 3);
result.flight_id = raw.substr(15, 6);
// Payload sits between end of fixed header and the 2 trailing CRC bytes.
if (payload_len > kAcarsHeaderLen)
result.txt = raw.substr(kAcarsHeaderLen, payload_len - kAcarsHeaderLen);
return result;
}
std::string acars_format(const AcarsDecoded& msg) {
return std::string("ACARS Decoded Result\nCRC: ") + (msg.crc_ok ? "OK" : "FAIL") +
"\nRegistration: " + msg.reg +
"\nLabel: " + msg.label +
"\nBlockID: " + msg.block_id +
"\nMsgNum: " + msg.msg_num +
"\nFlightID: " + msg.flight_id +
"\nMessage: " + msg.txt;
}
void ACARSLogger::log_str(std::string msg) {
log_file.write_entry(msg);
}
@@ -77,17 +147,16 @@ void ACARSAppView::focus() {
void ACARSAppView::on_packet(const ACARSPacketMessage* packet) {
std::string console_info;
if (packet->state == 255) {
// got a packet, parse it, and display
rtc::RTC datetime;
rtc_time::now(datetime);
// todo parity error recovery
console_info = to_string_datetime(datetime, HMS);
console_info += ": ";
console_info += packet->message;
std::string message{packet->message, packet->message + packet->msg_len};
AcarsDecoded decoded = acars_decode(message);
console_info += acars_format(decoded);
console.writeln(console_info);
// Log raw data whatever it contains
if (logger && logging)
logger->log_str(console_info);
} else {
+21 -1
View File
@@ -33,6 +33,26 @@
namespace ui::external_app::acars_rx {
// Decoded ACARS message fields extracted from a raw frame.
// CRC-16/CCITT (poly 0x1021, init 0x0000) is verified against the two
// trailing bytes of the raw frame; crc_ok reflects that result.
struct AcarsDecoded {
bool crc_ok{false};
std::string reg{};
std::string label{};
std::string flight_id{};
std::string msg_num{};
char block_id{'\0'};
std::string txt{};
};
// Decode a raw ACARS frame: verify CRC-16/CCITT and extract fixed-offset fields.
// Returns a partially-filled AcarsDecoded (txt error only) if the frame is too short.
AcarsDecoded acars_decode(const std::string& raw);
// Format a decoded ACARS message for display or logging.
std::string acars_format(const AcarsDecoded& msg);
class ACARSLogger {
public:
Optional<File::Error> append(const std::filesystem::path& filename) {
@@ -106,4 +126,4 @@ class ACARSAppView : public View {
} // namespace ui::external_app::acars_rx
#endif /*__ACARS_APP_H__*/
#endif /*__ACARS_APP_H__*/
+83 -83
View File
@@ -1,83 +1,83 @@
/*
* Copyright (C) 2023 Bernd Herzog
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#include "ui.hpp"
#include "acars_app.hpp"
#include "ui_navigation.hpp"
#include "external_app.hpp"
namespace ui::external_app::acars_rx {
void initialize_app(ui::NavigationView& nav) {
nav.push<ACARSAppView>();
}
} // namespace ui::external_app::acars_rx
extern "C" {
__attribute__((section(".external_app.app_acars_rx.application_information"), used)) application_information_t _application_information_acars_rx = {
/*.memory_location = */ (uint8_t*)0x00000000,
/*.externalAppEntry = */ ui::external_app::acars_rx::initialize_app,
/*.header_version = */ CURRENT_HEADER_VERSION,
/*.app_version = */ VERSION_MD5,
/*.app_name = */ "ACARS",
/*.bitmap_data = */ {
0x80,
0x01,
0xC0,
0x03,
0xC0,
0x03,
0xC0,
0x03,
0xC0,
0x03,
0xE0,
0x07,
0xF8,
0x1F,
0xFE,
0x7F,
0xFF,
0xFF,
0xFF,
0xFF,
0xC0,
0x03,
0xC0,
0x03,
0xC0,
0x03,
0xE0,
0x07,
0xF0,
0x0F,
0xF8,
0x1F,
},
/*.icon_color = */ ui::Color::orange().v,
/*.menu_location = */ app_location_t::RX,
/*.desired_menu_position = */ -1,
/*.m4_app_tag = portapack::spi_flash::image_tag_acars */ {'P', 'A', 'C', 'A'},
/*.m4_app_offset = */ 0x00000000, // will be filled at compile time
};
}
/*
* Copyright (C) 2023 Bernd Herzog
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#include "ui.hpp"
#include "acars_app.hpp"
#include "ui_navigation.hpp"
#include "external_app.hpp"
namespace ui::external_app::acars_rx {
void initialize_app(ui::NavigationView& nav) {
nav.push<ACARSAppView>();
}
} // namespace ui::external_app::acars_rx
extern "C" {
__attribute__((section(".external_app.app_acars_rx.application_information"), used)) application_information_t _application_information_acars_rx = {
/*.memory_location = */ (uint8_t*)0x00000000,
/*.externalAppEntry = */ ui::external_app::acars_rx::initialize_app,
/*.header_version = */ CURRENT_HEADER_VERSION,
/*.app_version = */ VERSION_MD5,
/*.app_name = */ "ACARS",
/*.bitmap_data = */ {
0x80,
0x01,
0xC0,
0x03,
0xC0,
0x03,
0xC0,
0x03,
0xC0,
0x03,
0xE0,
0x07,
0xF8,
0x1F,
0xFE,
0x7F,
0xFF,
0xFF,
0xFF,
0xFF,
0xC0,
0x03,
0xC0,
0x03,
0xC0,
0x03,
0xE0,
0x07,
0xF0,
0x0F,
0xF8,
0x1F,
},
/*.icon_color = */ ui::Color::orange().v,
/*.menu_location = */ app_location_t::RX,
/*.desired_menu_position = */ -1,
/*.m4_app_tag = portapack::spi_flash::image_tag_acars */ {'P', 'A', 'C', 'A'},
/*.m4_app_offset = */ 0x00000000, // will be filled at compile time
};
}
@@ -339,7 +339,7 @@ void AdultToysView::randomizeMac() {
}
void AdultToysView::randomChn() {
channel_number = 37 + std::rand() % (39 - 37 + 1);
channel_number = 37 + rand() % (39 - 37 + 1);
field_frequency.set_value(get_freq_by_channel_number(channel_number));
}
+1 -1
View File
@@ -72,7 +72,7 @@ void BlackjackView::paint(Painter& painter) {
if (!initialized) {
initialized = true;
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
init_deck();
}
}
+1 -1
View File
@@ -132,7 +132,7 @@ void BLESpamView::reset() {
}
void BLESpamView::randomChn() {
channel_number = 37 + std::rand() % (39 - 37 + 1);
channel_number = 37 + rand() % (39 - 37 + 1);
field_frequency.set_value(get_freq_by_channel_number(channel_number));
}
+1 -1
View File
@@ -655,7 +655,7 @@ void BreakoutView::paint(Painter& painter) {
if (!initialized) {
initialized = true;
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
init_game();
}
}
+3 -3
View File
@@ -125,7 +125,7 @@ void DinoGameView::paint(Painter& painter) {
if (!initialized) {
initialized = true;
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
init_game();
}
}
@@ -789,8 +789,8 @@ void DinoGameView::draw_current_score() {
void DinoGameView::draw_high_score() {
auto style = *ui::Theme::getInstance()->fg_light;
painter.fill_rectangle({UI_POS_X_RIGHT(90), 28, 90, 18}, Color::black());
painter.draw_string({UI_POS_X_RIGHT(90), 30}, style, "HI " + score_to_string(highScore));
painter.fill_rectangle({UI_POS_X_RIGHT(10), 28, 90, 18}, Color::black());
painter.draw_string({UI_POS_X_RIGHT(10), 30}, style, "HI " + score_to_string(highScore));
}
void DinoGameView::jump() {
+15 -15
View File
@@ -204,11 +204,11 @@ void spawn_entity(uint8_t type, uint8_t x, uint8_t y) {
void spawn_random_entity(uint8_t type) {
if (num_entities >= MAX_ENTITIES) return;
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
uint8_t spawn_x, spawn_y;
do {
spawn_x = std::rand() % LEVEL_WIDTH;
spawn_y = std::rand() % LEVEL_HEIGHT;
spawn_x = rand() % LEVEL_WIDTH;
spawn_y = rand() % LEVEL_HEIGHT;
} while (get_block_at(spawn_x, spawn_y) == 0xF ||
(spawn_x == (uint8_t)player.pos.x && spawn_y == (uint8_t)player.pos.y));
@@ -227,9 +227,9 @@ void remove_entity(uint8_t index) {
bool spawned = false;
while (!spawned && attempts < 50) {
std::srand(LPC_RTC->CTIME0 + attempts);
uint8_t spawn_x = std::rand() % LEVEL_WIDTH;
uint8_t spawn_y = std::rand() % LEVEL_HEIGHT;
srand(LPC_RTC->CTIME0 + attempts);
uint8_t spawn_x = rand() % LEVEL_WIDTH;
uint8_t spawn_y = rand() % LEVEL_HEIGHT;
int16_t dx = (int16_t)spawn_x - (int16_t)player.pos.x;
int16_t dy = (int16_t)spawn_y - (int16_t)player.pos.y;
@@ -270,9 +270,9 @@ void initialize_level() {
uint8_t attempts = 0;
while (initial_enemies < 2 && num_entities < MAX_ENTITIES && attempts < 50) {
std::srand(LPC_RTC->CTIME0 + attempts);
int8_t offset_x = (std::rand() % 11) - 5;
int8_t offset_y = (std::rand() % 11) - 5;
srand(LPC_RTC->CTIME0 + attempts);
int8_t offset_x = (rand() % 11) - 5;
int8_t offset_y = (rand() % 11) - 5;
if (abs(offset_x) < 3 && abs(offset_y) < 3) {
attempts++;
@@ -307,10 +307,10 @@ void initialize_level() {
attempts = 0;
while (num_entities < MIN_ENTITIES && attempts < 100) {
std::srand(LPC_RTC->CTIME0 + attempts + 100);
srand(LPC_RTC->CTIME0 + attempts + 100);
uint8_t spawn_x = std::rand() % LEVEL_WIDTH;
uint8_t spawn_y = std::rand() % LEVEL_HEIGHT;
uint8_t spawn_x = rand() % LEVEL_WIDTH;
uint8_t spawn_y = rand() % LEVEL_HEIGHT;
int16_t dx = (int16_t)spawn_x - (int16_t)player.pos.x;
int16_t dy = (int16_t)spawn_y - (int16_t)player.pos.y;
@@ -1045,7 +1045,7 @@ void DoomView::on_show() {
void DoomView::paint(Painter& painter) {
if (!initialized) {
initialized = true;
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
scene = 0;
up = down = left = right = fired = false;
jogging = view_height = 0;
@@ -1081,7 +1081,7 @@ void DoomView::paint(Painter& painter) {
int hud_y = RENDER_HEIGHT + 5;
painter.draw_string({5, hud_y}, style_yellow, "Health: " + std::to_string(player.health));
painter.draw_string({UI_POS_X_CENTER(15), hud_y}, style_red, "Kills: " + std::to_string(kills));
painter.draw_string({UI_POS_X_RIGHT(80), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
painter.draw_string({UI_POS_X_RIGHT(10), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
prev_velocity_moving = (player.velocity != 0);
needs_redraw = false;
@@ -1113,7 +1113,7 @@ void DoomView::paint(Painter& painter) {
int hud_y = RENDER_HEIGHT + 5;
painter.draw_string({5, hud_y}, style_yellow, "Health: " + std::to_string(player.health));
painter.draw_string({UI_POS_X_CENTER(15), hud_y}, style_red, "Kills: " + std::to_string(kills));
painter.draw_string({UI_POS_X_RIGHT(80), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
painter.draw_string({UI_POS_X_RIGHT(10), hud_y}, style_blue, "Ammo: " + std::to_string(player.ammo));
needs_gun_redraw = false;
}
+13 -3
View File
@@ -83,6 +83,10 @@ set(EXTCPPSRC
external/tpmsrx/main.cpp
external/tpmsrx/tpms_app.cpp
#tpmstx 800 bytes - TPMS transmit with editable fields
external/tpmstx/main.cpp
external/tpmstx/tpms_tx_app.cpp
#protoview 8 byte
external/protoview/main.cpp
external/protoview/ui_protoview.cpp
@@ -109,8 +113,8 @@ set(EXTCPPSRC
external/random_password/sha512.cpp
#acars
#external/acars_rx/main.cpp
#external/acars_rx/acars_app.cpp
external/acars_rx/main.cpp
external/acars_rx/acars_app.cpp
#wefax_rx 192 bytes
external/wefax_rx/main.cpp
@@ -304,6 +308,10 @@ set(EXTCPPSRC
external/rtty_tx/main.cpp
external/rtty_tx/ui_rtty_tx.cpp
external/rtty_tx/baudot.cpp
#pocsag_tx
external/pocsag_tx/main.cpp
external/pocsag_tx/ui_pocsag_tx.cpp
)
set(EXTAPPLIST
@@ -326,13 +334,14 @@ set(EXTAPPLIST
audio_test
wardrivemap
tpmsrx
tpmstx
protoview
adsbtx
#morse_tx
sstvtx
sstvrx
random_password
# acars_rx --not working
acars_rx
wefax_rx
noaaapt_rx
shoppingcart_lock
@@ -380,6 +389,7 @@ set(EXTAPPLIST
keeloqtx
rtty_rx
rtty_tx
pocsag_tx
)
# sdusb has type conflicts with PRALINE (HackRF Pro) - add only for non-PRALINE builds
+14
View File
@@ -97,6 +97,8 @@ MEMORY
ram_external_app_keeloqtx (rwx) : org = 0xADF80000, len = 32k
ram_external_app_rtty_rx (rwx) : org = 0xADF90000, len = 32k
ram_external_app_rtty_tx (rwx) : org = 0xADFA0000, len = 32k
ram_external_app_tpmstx (rwx) : org = 0xADFB0000, len = 32k
ram_external_app_pocsag_tx (rwx) : org = 0xADFC0000, len = 32k
}
SECTIONS
@@ -215,6 +217,12 @@ SECTIONS
*(*ui*external_app*tpmsrx*);
} > ram_external_app_tpmsrx
.external_app_tpmstx : ALIGN(4) SUBALIGN(4)
{
KEEP(*(.external_app.app_tpmstx.application_information));
*(*ui*external_app*tpmstx*);
} > ram_external_app_tpmstx
.external_app_protoview : ALIGN(4) SUBALIGN(4)
{
KEEP(*(.external_app.app_protoview.application_information));
@@ -545,5 +553,11 @@ SECTIONS
KEEP(*(.external_app.app_rtty_tx.application_information));
*(*ui*external_app*rtty_tx*);
} > ram_external_app_rtty_tx
.external_app_pocsag_tx : ALIGN(4) SUBALIGN(4)
{
KEEP(*(.external_app.app_pocsag_tx.application_information));
*(*ui*external_app*pocsag_tx*);
} > ram_external_app_pocsag_tx
}
+1 -1
View File
@@ -33,7 +33,7 @@ Game2048View::Game2048View(NavigationView& nav)
void Game2048View::on_show() {
if (!initialized) {
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
reset_game();
initialized = true;
}
+83
View File
@@ -0,0 +1,83 @@
/*
* Copyright (C) 2023 Bernd Herzog
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#include "ui.hpp"
#include "ui_pocsag_tx.hpp"
#include "ui_navigation.hpp"
#include "external_app.hpp"
namespace ui::external_app::pocsag_tx {
void initialize_app(ui::NavigationView& nav) {
nav.push<POCSAGTXView>();
}
} // namespace ui::external_app::pocsag_tx
extern "C" {
__attribute__((section(".external_app.app_pocsag_tx.application_information"), used)) application_information_t _application_information_pocsag_tx = {
/*.memory_location = */ (uint8_t*)0x00000000,
/*.externalAppEntry = */ ui::external_app::pocsag_tx::initialize_app,
/*.header_version = */ CURRENT_HEADER_VERSION,
/*.app_version = */ VERSION_MD5,
/*.app_name = */ "POCSG TX",
/*.bitmap_data = */ {
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0xFC,
0x3F,
0xFE,
0x7F,
0x02,
0x40,
0xBA,
0x45,
0x02,
0x40,
0xFE,
0x7F,
0xFE,
0x7F,
0x92,
0x7C,
0x92,
0x7C,
0xFC,
0x3F,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
},
/*.icon_color = */ ui::Color::green().v,
/*.menu_location = */ app_location_t::TX,
/*.desired_menu_position = */ -1,
/*.m4_app_tag = portapack::spi_flash::image_tag_fsktx */ {'P', 'F', 'S', 'K'},
/*.m4_app_offset = */ 0x00000000, // will be filled at compile time
};
}
@@ -31,7 +31,7 @@
using namespace portapack;
using namespace pocsag;
namespace ui {
namespace ui::external_app::pocsag_tx {
#define MAX_POCSAG_LENGTH 80
@@ -159,7 +159,7 @@ void POCSAGTXView::on_set_text(NavigationView& nav) {
POCSAGTXView::POCSAGTXView(
NavigationView& nav)
: nav_(nav) {
baseband::run_image(portapack::spi_flash::image_tag_fsktx);
baseband::run_prepared_image(portapack::memory::map::m4_code.base());
add_children({&labels,
&options_bitrate,
@@ -205,4 +205,4 @@ POCSAGTXView::POCSAGTXView(
};
}
} /* namespace ui */
} /* namespace ui::external_app::pocsag_tx */
@@ -37,7 +37,7 @@
using namespace pocsag;
namespace ui {
namespace ui::external_app::pocsag_tx {
class POCSAGTXView : public View {
public:
@@ -155,6 +155,6 @@ class POCSAGTXView : public View {
}};
};
} /* namespace ui */
} /* namespace ui::external_app::pocsag_tx */
#endif /*__POCSAG_TX_H__*/
@@ -239,10 +239,10 @@ void RandomPasswordView::on_freqchg(int64_t freq) {
}
void RandomPasswordView::set_random_freq() {
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
// this is only for seed to visit random freq, the radio is still real random
auto random_freq = 100000000 + (std::rand() % 900000000); // 100mhz to 1ghz
auto random_freq = 100000000 + (rand() % 900000000); // 100mhz to 1ghz
receiver_model.set_target_frequency(random_freq);
field_frequency.set_value(random_freq);
}
@@ -297,12 +297,12 @@ void RandomPasswordView::new_password() {
/// roll worker
for (int i = 0; i < password_length * 2; i += 2) {
unsigned int seed = seeds_deque[i];
std::srand(seed);
srand(seed);
uint8_t rollnum = (uint8_t)(seeds_deque[i + 1] % 128);
uint8_t nu = 0;
for (uint8_t o = 0; o < rollnum; ++o) nu = std::rand();
for (uint8_t o = 0; o < rollnum; ++o) nu = rand();
nu++;
char c = charset[std::rand() % charset.length()];
char c = charset[rand() % charset.length()];
initial_password += c;
}
+1 -1
View File
@@ -221,7 +221,7 @@ void SnakeView::paint(Painter& painter) {
(void)painter;
if (!initialized) {
initialized = true;
std::srand(LPC_RTC->CTIME0);
srand(LPC_RTC->CTIME0);
init_game();
}
}
+1 -1
View File
@@ -605,7 +605,7 @@ void pause_game() {
}
int main() {
std::srand(GenerateRandomSeed());
srand(GenerateRandomSeed());
Init();
ShowLevelMenu();
joystick.attach(&ReadJoystickForLevel, 0.3);
+1 -1
View File
@@ -75,7 +75,7 @@ __attribute__((section(".external_app.app_tpmsrx.application_information"), used
},
/*.icon_color = */ ui::Color::green().v,
/*.menu_location = */ app_location_t::RX,
/*.desired_menu_position = */ -1,
/*.desired_menu_position = */ 7,
/*.m4_app_tag = portapack::spi_flash::image_tag_tpms */ {'P', 'T', 'P', 'M'},
/*.m4_app_offset = */ 0x00000000, // will be filled at compile time
+137 -1
View File
@@ -42,6 +42,25 @@ std::string type(tpms::Reading::Type type) {
return to_string_dec_uint(toUType(type), 2);
}
std::string type_name(tpms::Reading::Type type) {
switch (type) {
case tpms::Reading::Type::None:
return "None";
case tpms::Reading::Type::FLM_64:
return "FLM_64";
case tpms::Reading::Type::FLM_72:
return "FLM_72";
case tpms::Reading::Type::FLM_80:
return "FLM_80";
case tpms::Reading::Type::Schrader:
return "Schrader";
case tpms::Reading::Type::GMC_96:
return "GMC_96";
default:
return "Unknown";
}
}
std::string id(tpms::TransponderID id) {
return to_string_hex(id.value(), 8);
}
@@ -101,7 +120,8 @@ void TPMSRecentEntry::update(const tpms::Reading& reading) {
}
}
TPMSAppView::TPMSAppView(NavigationView&) {
TPMSAppView::TPMSAppView(NavigationView& nav)
: nav_{nav} {
// baseband::run_image(portapack::spi_flash::image_tag_tpms);
baseband::run_prepared_image(portapack::memory::map::m4_code.base());
@@ -135,6 +155,11 @@ TPMSAppView::TPMSAppView(NavigationView&) {
};
options_temperature.set_by_value(format::temp_unit);
// Add on_select handler for entries
recent_entries_view.on_select = [this](const TPMSRecentEntry& entry) {
on_show_detail(entry);
};
logger = std::make_unique<TPMSLogger>();
if (logger) {
logger->append(logs_dir / u"TPMS.TXT");
@@ -178,6 +203,7 @@ void TPMSAppView::on_packet(const tpms::Packet& packet) {
const auto reading = reading_opt.value();
auto& entry = ::on_packet(recent, TPMSRecentEntry::Key{reading.type(), reading.id()});
entry.update(reading);
entry.signal_type = packet.signal_type();
recent_entries_view.set_dirty();
}
@@ -191,6 +217,116 @@ void TPMSAppView::on_show_list() {
recent_entries_view.focus();
}
void TPMSAppView::on_show_detail(const TPMSRecentEntry& entry) {
nav_.push<TPMSRecentEntryDetailView>(entry);
}
// Detail view implementation
TPMSRecentEntryDetailView::TPMSRecentEntryDetailView(NavigationView& nav, const TPMSRecentEntry& entry)
: nav_{nav},
entry_{entry} {
add_children({&labels,
&text_type,
&text_id,
&text_pressure,
&text_temperature,
&text_flags,
&text_count,
&button_done,
&button_save});
// Display entry data
text_type.set(format::type_name(entry.type));
text_id.set(to_string_hex(entry.id.value(), 8));
if (entry.last_pressure.is_valid()) {
std::string pressure_str = format::pressure(entry.last_pressure.value());
std::string unit_str = format::pressure_unit == PRESSURE_UNIT_PSI ? " PSI" : format::pressure_unit == PRESSURE_UNIT_BAR ? " BAR"
: " kPa";
text_pressure.set(pressure_str + unit_str);
} else {
text_pressure.set("---");
}
if (entry.last_temperature.is_valid()) {
text_temperature.set(to_string_dec_int(entry.last_temperature.value().celsius(), 3) + " C");
} else {
text_temperature.set("---");
}
if (entry.last_flags.is_valid()) {
text_flags.set(to_string_hex(entry.last_flags.value(), 2));
} else {
text_flags.set("--");
}
text_count.set(to_string_dec_uint(entry.received_count, 4));
button_done.on_select = [&nav](Button&) {
nav.pop();
};
button_save.on_select = [this](Button&) {
on_save();
};
}
void TPMSRecentEntryDetailView::focus() {
button_done.focus();
}
void TPMSRecentEntryDetailView::set_entry(const TPMSRecentEntry& entry) {
entry_ = entry;
}
void TPMSRecentEntryDetailView::on_save() {
auto timestamp = to_string_timestamp(rtc_time::now());
std::string file_name = "TPMS_" + timestamp + ".TXT";
ensure_directory(tpms_dir);
auto file_path = tpms_dir / file_name;
if (save_file(file_path)) {
nav_.display_modal("Saved", "Packet saved to:\n" + file_name);
} else {
nav_.display_modal("Error", "Failed to save\npacket");
}
}
bool TPMSRecentEntryDetailView::save_file(const std::filesystem::path& path) {
File f;
auto error = f.create(path);
if (error.is_valid())
return false;
// Save in format compatible with TX app
std::string content = "Type=" + to_string_dec_uint(toUType(entry_.type), 1) + "\n";
content += "ID=" + to_string_hex(entry_.id.value(), 8) + "\n";
if (entry_.last_pressure.is_valid()) {
content += "Pressure=" + to_string_dec_int(entry_.last_pressure.value().kilopascal(), 1) + "\n";
} else {
content += "Pressure=240\n"; // Default value
}
if (entry_.last_temperature.is_valid()) {
content += "Temperature=" + to_string_dec_int(entry_.last_temperature.value().celsius(), 1) + "\n";
} else {
content += "Temperature=25\n"; // Default value
}
if (entry_.last_flags.is_valid()) {
content += "Flags=" + to_string_hex(entry_.last_flags.value(), 2) + "\n";
} else {
content += "Flags=00\n";
}
// Save signal type for proper retransmission
content += "SignalType=" + to_string_dec_uint(toUType(entry_.signal_type), 1) + "\n";
f.write(content.c_str(), content.length());
return true;
}
} // namespace ui::external_app::tpmsrx
namespace ui {
+62
View File
@@ -53,6 +53,7 @@ struct TPMSRecentEntry {
tpms::Reading::Type type{invalid_key.first};
tpms::TransponderID id{invalid_key.second};
tpms::SignalType signal_type{tpms::SignalType::OOK_8k192_Schrader};
size_t received_count{0};
@@ -89,6 +90,64 @@ class TPMSLogger {
using TPMSRecentEntriesView = RecentEntriesView<TPMSRecentEntries>;
class TPMSRecentEntryDetailView : public View {
public:
TPMSRecentEntryDetailView(NavigationView& nav, const TPMSRecentEntry& entry);
void set_entry(const TPMSRecentEntry& entry);
const TPMSRecentEntry& entry() const { return entry_; }
void focus() override;
private:
NavigationView& nav_;
TPMSRecentEntry entry_;
void on_save();
bool save_file(const std::filesystem::path& path);
Labels labels{
{{0 * 8, 1 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 3 * 16}, "ID:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 5 * 16}, "Pressure:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 7 * 16}, "Temperature:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 9 * 16}, "Flags:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 11 * 16}, "Count:", Theme::getInstance()->fg_light->foreground},
};
Text text_type{
{8 * 8, 1 * 16, 20 * 8, 16},
""};
Text text_id{
{8 * 8, 3 * 16, 20 * 8, 16},
""};
Text text_pressure{
{12 * 8, 5 * 16, 16 * 8, 16},
""};
Text text_temperature{
{14 * 8, 7 * 16, 14 * 8, 16},
""};
Text text_flags{
{8 * 8, 9 * 16, 20 * 8, 16},
""};
Text text_count{
{8 * 8, 11 * 16, 20 * 8, 16},
""};
Button button_save{
{0 * 8, 13 * 16, 14 * 8, 32},
"Save"};
Button button_done{
{16 * 8, 13 * 16, 14 * 8, 32},
"Done"};
};
class TPMSAppView : public View {
public:
TPMSAppView(NavigationView& nav);
@@ -105,6 +164,8 @@ class TPMSAppView : public View {
std::string title() const override { return "TPMS RX"; };
private:
NavigationView& nav_;
RxRadioState radio_state_{
314900000 /* frequency*/
,
@@ -188,6 +249,7 @@ class TPMSAppView : public View {
void on_packet(const tpms::Packet& packet);
void on_show_list();
void on_show_detail(const TPMSRecentEntry& entry);
void update_view();
};
+83
View File
@@ -0,0 +1,83 @@
/*
* Copyright (C) 2026
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#include "ui.hpp"
#include "tpms_tx_app.hpp"
#include "ui_navigation.hpp"
#include "external_app.hpp"
namespace ui::external_app::tpmstx {
void initialize_app(ui::NavigationView& nav) {
nav.push<TPMSTXView>();
}
} // namespace ui::external_app::tpmstx
extern "C" {
__attribute__((section(".external_app.app_tpmstx.application_information"), used)) application_information_t _application_information_tpmstx = {
/*.memory_location = */ (uint8_t*)0x00000000, // will be filled at compile time
/*.externalAppEntry = */ ui::external_app::tpmstx::initialize_app,
/*.header_version = */ CURRENT_HEADER_VERSION,
/*.app_version = */ VERSION_MD5,
/*.app_name = */ "TPMS TX",
/*.bitmap_data = */ {
0xC0,
0x03,
0xF0,
0x0F,
0x18,
0x18,
0xEC,
0x37,
0x36,
0x6D,
0x3A,
0x59,
0x4B,
0xD5,
0x8B,
0xD3,
0xCB,
0xD1,
0xAB,
0xD2,
0x9A,
0x5C,
0xB6,
0x6C,
0xEC,
0x37,
0x18,
0x18,
0xF0,
0x0F,
0xC0,
0x03,
},
/*.icon_color = */ ui::Color::green().v,
/*.menu_location = */ app_location_t::TX,
/*.desired_menu_position = */ 6,
/*.m4_app_tag = portapack::spi_flash::image_tag_ook */ {'P', 'O', 'O', 'K'},
/*.m4_app_offset = */ 0x00000000, // will be filled at compile time
};
}
+812
View File
@@ -0,0 +1,812 @@
/*
* Copyright (C) 2026
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#include "tpms_tx_app.hpp"
#include "baseband_api.hpp"
#include "portapack.hpp"
#include "spi_image.hpp"
#include "ui_fileman.hpp"
#include "ui_freqman.hpp"
#include "manchester.hpp"
#include "rtc_time.hpp"
#include "file_path.hpp"
#include "encoders.hpp"
#include "crc.hpp"
using namespace portapack;
using namespace tpms;
namespace ui::external_app::tpmstx {
void TPMSTXView::focus() {
options_packet_type.focus();
}
void TPMSTXView::update_signal_type_from_packet() {
// Auto-select signal type based on packet type
switch (packet_type_) {
case tpms::Reading::Type::Schrader:
signal_type_ = tpms::SignalType::OOK_8k192_Schrader;
break;
case tpms::Reading::Type::FLM_64:
case tpms::Reading::Type::FLM_72:
case tpms::Reading::Type::FLM_80:
signal_type_ = tpms::SignalType::FSK_19k2_Schrader;
break;
case tpms::Reading::Type::GMC_96:
signal_type_ = tpms::SignalType::OOK_8k4_Schrader;
break;
default:
signal_type_ = tpms::SignalType::OOK_8k192_Schrader;
break;
}
// Note: Don't call switch_baseband() here - it's called when needed
}
void TPMSTXView::switch_baseband() {
// Switch baseband image based on signal type
// Must shutdown first to avoid BBRunning error
baseband::shutdown();
chThdSleepMilliseconds(100);
if (signal_type_ == tpms::SignalType::FSK_19k2_Schrader) {
baseband::run_image(portapack::spi_flash::image_tag_fsktx);
} else {
baseband::run_image(portapack::spi_flash::image_tag_ook);
}
chThdSleepMilliseconds(100);
}
void TPMSTXView::update_packet_display() {
// Only update status text - field values are already set by user interaction
// or by explicit set_value calls when loading from file
std::string status = "ID:" + to_string_hex(transponder_id_, 8);
// Note protocol-specific limitations
if (packet_type_ == tpms::Reading::Type::Schrader) {
status = "ID:" + to_string_hex(transponder_id_ & 0x00FFFFFF, 6) + " (24bit)";
}
status += " " + to_string_dec_uint(pressure_kpa_) + "kPa";
// Check for pressure overflow and warn user
if (packet_type_ == tpms::Reading::Type::GMC_96) {
if (pressure_kpa_ > 701) {
status += " !MAX"; // GMC_96 max is 701 kPa (101.7 PSI)
}
} else {
if (pressure_kpa_ > 340) {
status += " !MAX"; // Schrader/FLM max is 340 kPa (49.3 PSI)
}
}
// Temperature note for protocols that support it
if (packet_type_ == tpms::Reading::Type::GMC_96 ||
packet_type_ == tpms::Reading::Type::FLM_64 ||
packet_type_ == tpms::Reading::Type::FLM_72 ||
packet_type_ == tpms::Reading::Type::FLM_80) {
status += " " + to_string_dec_int(temperature_c_) + "C";
} else {
status += " (no temp)";
}
text_status.set(status);
}
void TPMSTXView::update_field_visibility() {
// Schrader: Show Func, Hide Temp (no temperature support)
// GMC_96, FLM_xx: Hide Func, Show Temp (temperature supported, no func field)
if (packet_type_ == tpms::Reading::Type::Schrader) {
// Show Func field and label
label_flags.hidden(false);
field_flags.hidden(false);
// Hide Temp field, label, and unit selector
label_temperature.hidden(true);
field_temperature.hidden(true);
options_temperature.hidden(true);
// Show 24-bit ID field, hide 32-bit ID field
field_transponder_id_24.hidden(false);
field_transponder_id_32.hidden(true);
} else {
// Hide Func field and label
label_flags.hidden(true);
field_flags.hidden(true);
// Show Temp field, label, and unit selector
label_temperature.hidden(false);
field_temperature.hidden(false);
options_temperature.hidden(false);
// Show 32-bit ID field, hide 24-bit ID field
field_transponder_id_24.hidden(true);
field_transponder_id_32.hidden(false);
}
// Force screen refresh to clear hidden widgets
set_dirty();
}
void TPMSTXView::on_pressure_unit_change() {
// Convert displayed pressure to new unit and update field
units::Pressure pressure(pressure_kpa_);
int display_value = 0;
if (format::pressure_unit == PRESSURE_UNIT_PSI) {
display_value = pressure.psi();
} else if (format::pressure_unit == PRESSURE_UNIT_BAR) {
display_value = pressure.bar();
} else {
display_value = pressure.kilopascal();
}
field_pressure.set_value(display_value);
}
void TPMSTXView::on_temperature_unit_change() {
// Convert displayed temperature to new unit and update field
units::Temperature temperature(temperature_c_);
int display_value = 0;
if (format::temp_unit == TEMP_UNIT_FAHRENHEIT) {
display_value = temperature.fahrenheit();
} else {
display_value = temperature.celsius();
}
field_temperature.set_value(display_value);
}
void TPMSTXView::encode_and_transmit() {
if (!is_transmitting_) return;
// Build TPMS packet based on signal type
std::string binary_string;
uint32_t symbol_rate;
uint32_t sample_rate;
// Set sample rate based on signal type to match transmitter config
if (signal_type_ == tpms::SignalType::FSK_19k2_Schrader) {
sample_rate = 2280000; // 2.28 MHz for FSK (matches transmitter_model config)
} else {
sample_rate = 2000000; // 2 MHz for OOK
}
if (signal_type_ == tpms::SignalType::OOK_8k192_Schrader) {
// Schrader OOK 8k192 format (Type = Schrader)
// Preamble: 11*2, 01*14, 11, 10
// Data: 3 bits function code, 24 bits ID, 8 bits pressure, 2 bits checksum
// Total: 37 Manchester symbols (74 bits after encoding)
// NOTE: This protocol does NOT support temperature transmission
// NOTE: Only lower 24 bits of ID are transmitted
// NOTE: Function code (flags_) is stored as 3-bit value (0-7)
// RX will display it combined with checksum in upper nibble
symbol_rate = 8192;
// Preamble as expected by RX decoder
binary_string = "1111"; // 11*2
for (int i = 0; i < 14; i++) {
binary_string += "01";
}
binary_string += "1110"; // 11, 10
// Build data bits (pre-Manchester)
uint64_t data = 0;
// 3-bit flags (0-7, stored directly)
uint8_t flags_3bit = flags_ & 0x07;
data |= ((uint64_t)flags_3bit << 34);
// 24-bit ID (only use lower 24 bits - protocol limitation)
uint32_t id_24bit = transponder_id_ & 0x00FFFFFF;
data |= ((uint64_t)id_24bit << 10);
// 8-bit pressure (convert kPa to raw: kPa * 3/4)
// Clamp to prevent overflow: max raw = 255, max kPa = 255 * 4/3 = 340 (49.3 PSI)
uint16_t pressure_clamped = (pressure_kpa_ > 340) ? 340 : pressure_kpa_;
uint8_t pressure_raw = (pressure_clamped * 3 / 4);
data |= ((uint64_t)pressure_raw << 2);
// Calculate 2-bit checksum: sum all 2-bit pairs, result & 3 must equal 3
uint32_t checksum_calc = (data >> 36) & 1; // First bit
for (size_t i = 1; i < 37; i += 2) {
checksum_calc += (data >> (37 - i - 2)) & 3;
}
uint8_t checksum_2bit = (3 - (checksum_calc & 3)) & 3;
data |= checksum_2bit;
// Manchester encode the 37 data bits
for (int i = 36; i >= 0; i--) {
if ((data >> i) & 1) {
binary_string += "10"; // '1' = 10 in Manchester
} else {
binary_string += "01"; // '0' = 01 in Manchester
}
}
} else if (signal_type_ == tpms::SignalType::OOK_8k4_Schrader) {
// GMC_96 OOK 8k4 format
symbol_rate = 8400;
// Preamble: 01*40
for (int i = 0; i < 40; i++) {
binary_string += "01";
}
// First nibble of System ID (0x4) - part of preamble pattern match
// RX looks for pattern ending with: 01010101...01100101
// The "01100101" = Manchester for 0x4, and is consumed by pattern matcher
binary_string += "01"; // 0
binary_string += "10"; // 1
binary_string += "01"; // 0
binary_string += "01"; // 0 (0100 = 0x4)
// Remaining 20 bits of system ID (padding with zeros)
// These are the first 20 bits of the 76-bit payload
for (int i = 0; i < 20; i++) {
binary_string += "01"; // All zeros for padding
}
// 32-bit ID (Manchester encoded)
for (int i = 31; i >= 0; i--) {
if ((transponder_id_ >> i) & 1) {
binary_string += "10";
} else {
binary_string += "01";
}
}
// Pressure: kPa * 4/11
// Clamp to prevent overflow: max raw = 255, max kPa = 255 * 11/4 = 701.25 (101.7 PSI)
uint16_t pressure_clamped = (pressure_kpa_ > 701) ? 701 : pressure_kpa_;
uint8_t pressure_gmc = (pressure_clamped * 4 / 11);
for (int i = 7; i >= 0; i--) {
if ((pressure_gmc >> i) & 1) {
binary_string += "10";
} else {
binary_string += "01";
}
}
// Temperature: temp + 61
uint8_t temp_gmc = (temperature_c_ + 61) & 0xFF;
for (int i = 7; i >= 0; i--) {
if ((temp_gmc >> i) & 1) {
binary_string += "10";
} else {
binary_string += "01";
}
}
// Checksum: sum of all data bytes (system ID + ID + pressure + temp)
// System ID byte 0: (0x4 << 4) | 0x0 = 0x40
// System ID byte 1: 0x00
// System ID byte 2: 0x00
uint8_t checksum = 0x40; // First byte of system ID
checksum += 0x00; // Second byte of system ID
checksum += 0x00; // Third byte of system ID
// Add all 4 bytes of the ID
checksum += (transponder_id_ >> 24) & 0xFF;
checksum += (transponder_id_ >> 16) & 0xFF;
checksum += (transponder_id_ >> 8) & 0xFF;
checksum += transponder_id_ & 0xFF;
// Add pressure and temperature
checksum += pressure_gmc;
checksum += temp_gmc;
for (int i = 7; i >= 0; i--) {
if ((checksum >> i) & 1) {
binary_string += "10";
} else {
binary_string += "01";
}
}
} else if (signal_type_ == tpms::SignalType::FSK_19k2_Schrader) {
// FSK 19.2k for FLM variants
// Data is Manchester encoded: each data bit becomes two FSK symbols
// Preamble: 14 x '01' + '10' = 30 bits (matches RX pattern exactly)
// Payload: 160 Manchester-encoded bits (80 data bits max)
symbol_rate = 19200;
// Build preamble: 14 pairs of "01" followed by "10"
for (int i = 0; i < 14; i++) {
binary_string += "01";
}
binary_string += "10";
std::array<uint8_t, 20> data_bytes = {0}; // 160 bits = 20 bytes max
size_t num_data_bits = 0;
if (packet_type_ == tpms::Reading::Type::FLM_64) {
// FLM_64: 64 bits (8 bytes)
// Bytes 0-3: ID (32 bits)
// Byte 4: Pressure (8 bits)
// Byte 5: Temperature (8 bits, LSB 7 bits used)
// Byte 6: Padding
// Byte 7: Sum checksum of bytes 0-6 (low 8 bits)
num_data_bits = 64;
data_bytes[0] = (transponder_id_ >> 24) & 0xFF;
data_bytes[1] = (transponder_id_ >> 16) & 0xFF;
data_bytes[2] = (transponder_id_ >> 8) & 0xFF;
data_bytes[3] = transponder_id_ & 0xFF;
// Clamp pressure to prevent overflow: max 340 kPa (49.3 PSI)
uint16_t pressure_clamped_flm64 = (pressure_kpa_ > 340) ? 340 : pressure_kpa_;
data_bytes[4] = (pressure_clamped_flm64 * 3 / 4);
data_bytes[5] = ((temperature_c_ + 56) & 0x7F); // LSB 7 bits only
data_bytes[6] = 0x00; // Padding
// Addition checksum over bytes 0-6
uint32_t checksum = 0;
for (int i = 0; i < 7; i++) {
checksum += data_bytes[i];
}
data_bytes[7] = checksum & 0xFF;
} else if (packet_type_ == tpms::Reading::Type::FLM_72) {
// FLM_72: 72 bits (9 bytes)
// Bytes 0-3: ID (32 bits)
// Byte 4: Padding
// Byte 5: Pressure (8 bits)
// Byte 6: Temperature (8 bits)
// Bytes 7-8: CRC field - RX processes ALL 9 bytes and expects CRC result = 0
num_data_bits = 72;
data_bytes[0] = (transponder_id_ >> 24) & 0xFF;
data_bytes[1] = (transponder_id_ >> 16) & 0xFF;
data_bytes[2] = (transponder_id_ >> 8) & 0xFF;
data_bytes[3] = transponder_id_ & 0xFF;
data_bytes[4] = 0x00; // Padding
// Clamp pressure to prevent overflow: max 340 kPa (49.3 PSI)
uint16_t pressure_clamped_flm = (pressure_kpa_ > 340) ? 340 : pressure_kpa_;
data_bytes[5] = (pressure_clamped_flm * 3 / 4);
data_bytes[6] = (temperature_c_ + 56) & 0xFF;
data_bytes[7] = 0x00; // Set to 0 initially
// Calculate CRC over bytes 0-7, place result in byte 8
// When RX calculates CRC over bytes 0-8, it should get residual 0
CRC<8> crc{0x01, 0x00};
for (int i = 0; i < 8; i++) {
crc.process_byte(data_bytes[i]);
}
data_bytes[8] = crc.checksum() & 0xFF;
} else if (packet_type_ == tpms::Reading::Type::FLM_80) {
// FLM_80: 80 bits (10 bytes)
// Byte 0: Padding
// Bytes 1-4: ID (32 bits)
// Byte 5: Padding
// Byte 6: Pressure (8 bits)
// Byte 7: Temperature (8 bits)
// Bytes 8-9: CRC field - RX processes bytes 1-9 and expects CRC result = 0
num_data_bits = 80;
data_bytes[0] = 0x00; // Padding (not included in CRC)
data_bytes[1] = (transponder_id_ >> 24) & 0xFF;
data_bytes[2] = (transponder_id_ >> 16) & 0xFF;
data_bytes[3] = (transponder_id_ >> 8) & 0xFF;
data_bytes[4] = transponder_id_ & 0xFF;
data_bytes[5] = 0x00; // Padding
// Clamp pressure to prevent overflow: max 340 kPa (49.3 PSI)
uint16_t pressure_clamped_flm80 = (pressure_kpa_ > 340) ? 340 : pressure_kpa_;
data_bytes[6] = (pressure_clamped_flm80 * 3 / 4);
data_bytes[7] = (temperature_c_ + 56) & 0xFF;
data_bytes[8] = 0x00; // Padding/Reserved
data_bytes[9] = 0x00; // CRC byte
// Calculate CRC over bytes 1-8 (all bytes except 0 and 9)
// When RX calculates CRC over bytes 1-9, it should get residual 0
CRC<8> crc{0x01, 0x00};
for (int i = 1; i <= 8; i++) {
crc.process_byte(data_bytes[i]);
}
data_bytes[9] = crc.checksum() & 0xFF;
}
// Manchester-encode data bits for FSK
// RX ManchesterDecoder with sense=0: '1' = "10", '0' = "01"
size_t num_bytes = num_data_bits / 8;
for (size_t byte_idx = 0; byte_idx < num_bytes; byte_idx++) {
uint8_t byte_val = data_bytes[byte_idx];
for (int bit_idx = 7; bit_idx >= 0; bit_idx--) {
if ((byte_val >> bit_idx) & 1) {
binary_string += "10"; // Manchester '1'
} else {
binary_string += "01"; // Manchester '0'
}
}
}
// Pad payload to 160 bits with valid Manchester pairs ("01" = 0)
// Using proper Manchester encoding maintains clock recovery sync
while (binary_string.length() < 190) { // 30 preamble + 160 payload
binary_string += "01"; // Manchester-encoded zero
}
} else {
text_status.set("Unknown signal type");
stop_tx();
return;
}
// Convert binary string to bitstream
size_t bitstream_length = encoders::make_bitstream(binary_string);
// Calculate samples per bit (round to nearest for best timing accuracy)
uint32_t samples_per_bit = (sample_rate + symbol_rate / 2) / symbol_rate;
// Update status to show we're sending
text_status.set("TX: " + to_string_dec_uint(binary_string.length()) + " bits");
// Send via appropriate baseband (OOK or FSK)
if (signal_type_ == tpms::SignalType::FSK_19k2_Schrader) {
// FSK mode: 19.2 kbaud, 38.4 kHz shift
baseband::set_fsk_data(
bitstream_length,
samples_per_bit,
38400, // 38.4 kHz shift
256); // Progress notice interval
} else {
// OOK mode
baseband::set_ook_data(
bitstream_length,
samples_per_bit,
repeat_count_,
pause_duration_);
}
}
void TPMSTXView::handle_tx_complete() {
// For FSK (FLM packets), handle repeats at application level
// OOK repeats are handled by the baseband processor
if (signal_type_ == tpms::SignalType::FSK_19k2_Schrader) {
fsk_repeat_counter_++;
if (fsk_repeat_counter_ < repeat_count_) {
// More repeats needed - send the next one
// Update progress bar
progressbar.set_value(fsk_repeat_counter_);
// Wait for FSK processor to fully complete and reset
// This allows the shared memory bitstream to be safely rewritten
chThdSleepMilliseconds(50);
encode_and_transmit();
} else {
// All FSK repeats complete
stop_tx();
}
} else {
// OOK repeats are handled by baseband, just stop here
stop_tx();
}
}
void TPMSTXView::start_tx() {
if (is_transmitting_)
return;
is_transmitting_ = true;
progressbar.set_max(repeat_count_);
progressbar.set_value(0);
button_transmit.set_text("STOP TX");
text_status.set("Transmitting...");
// Initialize FSK repeat counter for application-level repeat handling
fsk_repeat_counter_ = 0;
// Switch to appropriate baseband before transmission
switch_baseband();
// Configure transmitter based on modulation type
if (signal_type_ == tpms::SignalType::FSK_19k2_Schrader) {
// FSK configuration
transmitter_model.set_sampling_rate(2280000); // 2.28 MHz for FSK
transmitter_model.set_baseband_bandwidth(1750000);
} else {
// OOK configuration
transmitter_model.set_sampling_rate(2000000); // 2 MHz for OOK
transmitter_model.set_baseband_bandwidth(1750000);
}
transmitter_model.enable();
// Start transmission
encode_and_transmit();
}
void TPMSTXView::stop_tx() {
if (!is_transmitting_)
return;
is_transmitting_ = false;
transmitter_model.disable();
button_transmit.set_text("START TX");
text_status.set("Transmission complete");
progressbar.set_value(0);
}
TPMSTXView::TPMSTXView(NavigationView& nav)
: nav_{nav} {
// Start with OOK baseband (will switch if needed)
baseband::run_image(portapack::spi_flash::image_tag_ook);
add_children({&labels,
&label_temperature,
&label_flags,
&options_frequency,
&options_packet_type,
&field_transponder_id_24,
&field_transponder_id_32,
&field_pressure,
&options_pressure,
&field_temperature,
&options_temperature,
&field_flags,
&field_repeat,
&button_load,
&button_save,
&tx_view,
&button_transmit,
&text_status,
&progressbar});
// Set label styles to match other labels (light grey)
label_temperature.set_style(Theme::getInstance()->fg_light);
label_flags.set_style(Theme::getInstance()->fg_light);
// Initialize values
options_frequency.set_by_value(transmitter_model.target_frequency());
options_packet_type.set_selected_index(0);
field_repeat.set_value(repeat_count_);
// Set initial signal type based on packet type
update_signal_type_from_packet();
// Initialize unit selection
options_pressure.set_by_value(format::pressure_unit);
options_temperature.set_by_value(format::temp_unit);
// Initialize field values from default member variables
// For pressure and temperature, use unit conversion to display in selected units
field_transponder_id_24.set_value(transponder_id_ & 0x00FFFFFF);
field_transponder_id_32.set_value(transponder_id_);
on_pressure_unit_change();
on_temperature_unit_change();
field_flags.set_value(flags_);
update_field_visibility();
update_packet_display();
// Event handlers
options_frequency.on_change = [this](size_t, OptionsField::value_t v) {
transmitter_model.set_target_frequency(v);
};
options_packet_type.on_change = [this](size_t, int32_t value) {
packet_type_ = static_cast<tpms::Reading::Type>(value);
update_signal_type_from_packet();
// Sync field values when switching packet types
if (packet_type_ == tpms::Reading::Type::Schrader) {
// Switching to Schrader: copy from 32-bit field to 24-bit field (masked)
transponder_id_ = field_transponder_id_32.to_integer() & 0x00FFFFFF;
field_transponder_id_24.set_value(transponder_id_);
} else {
// Switching from Schrader: copy from 24-bit field to 32-bit field
transponder_id_ = field_transponder_id_24.to_integer();
field_transponder_id_32.set_value(transponder_id_);
}
update_field_visibility();
update_packet_display();
};
options_pressure.on_change = [this](size_t, int32_t i) {
format::pressure_unit = (uint8_t)i;
on_pressure_unit_change();
};
options_temperature.on_change = [this](size_t, int32_t i) {
format::temp_unit = (uint8_t)i;
on_temperature_unit_change();
};
field_transponder_id_24.on_change = [this](SymField&) {
transponder_id_ = field_transponder_id_24.to_integer() & 0x00FFFFFF;
update_packet_display();
};
field_transponder_id_32.on_change = [this](SymField&) {
transponder_id_ = field_transponder_id_32.to_integer();
update_packet_display();
};
field_pressure.on_change = [this](int32_t value) {
// Convert from displayed unit to kPa for internal storage
if (format::pressure_unit == PRESSURE_UNIT_PSI) {
pressure_kpa_ = value * 6895 / 1000;
} else if (format::pressure_unit == PRESSURE_UNIT_BAR) {
pressure_kpa_ = value * 100;
} else {
pressure_kpa_ = value;
}
update_packet_display();
};
field_temperature.on_change = [this](int32_t value) {
// Convert from displayed unit to Celsius for internal storage
if (format::temp_unit == TEMP_UNIT_FAHRENHEIT) {
temperature_c_ = (value - 32) * 5 / 9;
} else {
temperature_c_ = value;
}
update_packet_display();
};
field_flags.on_change = [this](int32_t value) {
flags_ = value & 0x07;
update_packet_display();
};
field_repeat.on_change = [this](int32_t value) {
repeat_count_ = value;
};
button_transmit.on_select = [this](Button&) {
if (is_transmitting_) {
stop_tx();
} else {
start_tx();
}
};
button_load.on_select = [this, &nav](Button&) {
auto open_view = nav.push<FileLoadView>(".TXT");
open_view->on_changed = [this](std::filesystem::path file_path) {
// Load TPMS packet from file
File f;
auto error = f.open(file_path);
if (!error.is_valid()) {
char buffer[512];
auto result = f.read(buffer, sizeof(buffer) - 1);
if (result.is_ok()) {
buffer[result.value()] = 0;
// Parse the file format (key=value format, one per line)
std::string content(buffer);
size_t pos = 0;
auto parse_line = [&content, &pos](const std::string& key) -> std::string {
size_t key_pos = content.find(key + "=", pos);
if (key_pos != std::string::npos) {
size_t value_start = key_pos + key.length() + 1;
size_t value_end = content.find('\n', value_start);
if (value_end == std::string::npos) value_end = content.length();
return content.substr(value_start, value_end - value_start);
}
return "";
};
std::string type_str = parse_line("Type");
std::string id_str = parse_line("ID");
std::string pressure_str = parse_line("Pressure");
std::string temp_str = parse_line("Temperature");
std::string flags_str = parse_line("Flags");
std::string signal_type_str = parse_line("SignalType");
if (!type_str.empty()) {
int type = std::stoi(type_str);
if (type >= static_cast<int>(tpms::Reading::Type::FLM_64) &&
type <= static_cast<int>(tpms::Reading::Type::GMC_96)) {
packet_type_ = static_cast<tpms::Reading::Type>(type);
options_packet_type.set_by_value(type);
}
}
if (!id_str.empty()) {
transponder_id_ = std::stoul(id_str, nullptr, 16);
field_transponder_id_24.set_value(transponder_id_ & 0x00FFFFFF);
field_transponder_id_32.set_value(transponder_id_);
}
if (!pressure_str.empty()) {
pressure_kpa_ = std::stoi(pressure_str);
on_pressure_unit_change();
}
if (!temp_str.empty()) {
temperature_c_ = std::stoi(temp_str);
field_temperature.set_value(temperature_c_);
}
if (!flags_str.empty()) {
uint8_t loaded_flags = std::stoul(flags_str, nullptr, 16);
// Handle old format files: extract bits 6-4 if value > 7
flags_ = (loaded_flags > 7) ? ((loaded_flags >> 4) & 0x07) : (loaded_flags & 0x07);
field_flags.set_value(flags_);
}
// Load signal type if available, otherwise auto-select based on packet type
if (!signal_type_str.empty()) {
int signal_type = std::stoi(signal_type_str);
if (signal_type >= 1 && signal_type <= 3) {
signal_type_ = static_cast<tpms::SignalType>(signal_type);
} else {
// Fall back to auto-detect
update_signal_type_from_packet();
}
} else {
// Fall back to auto-detect for backwards compatibility
update_signal_type_from_packet();
}
update_packet_display();
update_field_visibility();
text_status.set("Loaded: " + file_path.filename().string());
} else {
text_status.set("Error reading file");
}
} else {
text_status.set("Error opening file");
}
};
};
button_save.on_select = [this](Button&) {
// Save current TPMS packet to file
auto timestamp = to_string_timestamp(rtc_time::now());
std::string file_name = "TPMS_" + timestamp + ".TXT";
ensure_directory(tpms_dir);
auto file_path = tpms_dir / file_name;
File f;
auto error = f.create(file_path);
if (!error.is_valid()) {
std::string content = "Type=" + to_string_dec_uint(toUType(packet_type_), 1) + "\n";
content += "ID=" + to_string_hex(transponder_id_, 8) + "\n";
content += "Pressure=" + to_string_dec_uint(pressure_kpa_) + "\n";
content += "Temperature=" + to_string_dec_int(temperature_c_) + "\n";
content += "Flags=" + to_string_hex(flags_ & 0x07, 1) + "\n";
f.write(content.c_str(), content.length());
text_status.set("Saved: " + file_name);
} else {
text_status.set("Error saving file");
}
};
}
TPMSTXView::~TPMSTXView() {
stop_tx();
transmitter_model.disable();
baseband::shutdown();
}
} // namespace ui::external_app::tpmstx
+226
View File
@@ -0,0 +1,226 @@
/*
* Copyright (C) 2026
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef __TPMS_TX_APP_H__
#define __TPMS_TX_APP_H__
#include "ui_widget.hpp"
#include "ui_navigation.hpp"
#include "ui_transmitter.hpp"
#include "transmitter_model.hpp"
#include "app_settings.hpp"
#include "radio_state.hpp"
#include "portapack.hpp"
#include "message.hpp"
#include "tpms_packet.hpp"
#include "file_path.hpp"
#include "string_format.hpp"
#include "units.hpp"
namespace ui::external_app::tpmstx {
namespace format {
static uint8_t pressure_unit{PRESSURE_UNIT_PSI};
static uint8_t temp_unit{TEMP_UNIT_CELSIUS};
} // namespace format
class TPMSTXView : public View {
public:
TPMSTXView(NavigationView& nav);
~TPMSTXView();
void focus() override;
std::string title() const override { return "TPMS TX"; };
private:
NavigationView& nav_;
TxRadioState radio_state_{
314900000, /* frequency */
1750000, /* bandwidth */
2457600 /* sampling rate */
};
app_settings::SettingsManager settings_{
"tx_tpms",
app_settings::Mode::TX,
{
{"pressure_unit"sv, &format::pressure_unit},
{"temp_unit"sv, &format::temp_unit},
}};
// TPMS packet data
tpms::Reading::Type packet_type_{tpms::Reading::Type::Schrader};
uint32_t transponder_id_{0x12345678};
uint16_t pressure_kpa_{240}; // Default ~35 PSI
int16_t temperature_c_{25}; // Default 25°C
uint8_t flags_{0x00}; // 3-bit function code (0-7), checksum is auto-calculated
tpms::SignalType signal_type_{tpms::SignalType::FSK_19k2_Schrader};
uint8_t repeat_count_{5};
uint32_t pause_duration_{50}; // ms between repeats
bool is_transmitting_{false};
// FSK-specific repeat tracking (OOK repeats are handled by baseband)
uint8_t fsk_repeat_counter_{0};
uint32_t fsk_repeat_timer_id_{0};
void update_signal_type_from_packet();
void switch_baseband();
void start_tx();
void stop_tx();
void send_packet();
void encode_and_transmit();
void update_packet_display();
void on_pressure_unit_change();
void on_temperature_unit_change();
void update_field_visibility();
MessageHandlerRegistration message_handler_tx_progress{
Message::ID::TXProgress,
[this](const Message* const p) {
const auto message = *reinterpret_cast<const TXProgressMessage*>(p);
progressbar.set_value(message.progress);
if (message.done) {
handle_tx_complete();
}
}};
void handle_tx_complete();
Labels labels{
{{0 * 8, 0 * 16}, "Freq:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 1 * 16}, "Type:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 2 * 16}, "ID:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 3 * 16}, "Pres:", Theme::getInstance()->fg_light->foreground},
{{0 * 8, 5 * 16}, "Rpt:", Theme::getInstance()->fg_light->foreground},
};
Text label_temperature{
{0 * 8, 4 * 16, 5 * 8, 16},
"Temp:"};
Text label_flags{
{0 * 8, 4 * 16, 5 * 8, 16},
"Func:"};
OptionsField options_frequency{
{6 * 8, 0 * 16},
5,
{
{"314.9", 314900000},
{"315.0", 315000000},
{"433.9", 433920000},
}};
OptionsField options_packet_type{
{6 * 8, 1 * 16},
10,
{
{"Schrader", (int32_t)tpms::Reading::Type::Schrader},
{"FLM_64", (int32_t)tpms::Reading::Type::FLM_64},
{"FLM_72", (int32_t)tpms::Reading::Type::FLM_72},
{"FLM_80", (int32_t)tpms::Reading::Type::FLM_80},
{"GMC_96", (int32_t)tpms::Reading::Type::GMC_96},
}};
OptionsField options_pressure{
{11 * 8, 3 * 16},
4,
{{"kPa", PRESSURE_UNIT_KPA},
{"PSI", PRESSURE_UNIT_PSI},
{"BAR", PRESSURE_UNIT_BAR}}};
OptionsField options_temperature{
{11 * 8, 4 * 16},
2,
{{STR_DEGREES_C, TEMP_UNIT_CELSIUS},
{STR_DEGREES_F, TEMP_UNIT_FAHRENHEIT}}};
SymField field_transponder_id_24{
{6 * 8, 2 * 16},
6,
SymField::Type::Hex};
SymField field_transponder_id_32{
{6 * 8, 2 * 16},
8,
SymField::Type::Hex};
NumberField field_pressure{
{6 * 8, 3 * 16},
4,
{0, 9999},
1,
' '};
NumberField field_temperature{
{6 * 8, 4 * 16},
4,
{-99, 999},
1,
' '};
NumberField field_flags{
{6 * 8, 4 * 16},
1,
{0, 7},
1,
' '};
NumberField field_repeat{
{6 * 8, 5 * 16},
3,
{1, 100},
1,
' '};
Button button_load{
{0 * 8, 8 * 16 + 4, 7 * 8, 24},
"Load"};
Button button_save{
{8 * 8, 8 * 16 + 4, 7 * 8, 24},
"Save"};
TransmitterView2 tx_view{
{16 * 8, 0 * 16},
true // Short UI format
};
Button button_transmit{
{0 * 8, 11 * 16, 15 * 8, 32},
"START TX"};
Text text_status{
{0 * 8, 13 * 16 + 4, 30 * 8, 16},
"Ready"};
ProgressBar progressbar{
{0 * 8, 14 * 16 + 8, 30 * 8, 16}};
};
} // namespace ui::external_app::tpmstx
#endif /*__TPMS_TX_APP_H__*/
+1
View File
@@ -51,6 +51,7 @@ const std::filesystem::path whipcalc_dir = u"WHIPCALC";
const std::filesystem::path ook_editor_dir = u"OOKFILES";
const std::filesystem::path hopper_dir = u"HOPPER";
const std::filesystem::path subghz_dir = u"SUBGHZ";
const std::filesystem::path tpms_dir = u"TPMS";
const std::filesystem::path waterfalls_dir = u"WATERFALLS";
const std::filesystem::path macaddress_dir = u"MACADDRESS";
const std::filesystem::path splash_dot_bmp = u"/splash.bmp";
+1
View File
@@ -53,6 +53,7 @@ extern const std::filesystem::path whipcalc_dir;
extern const std::filesystem::path ook_editor_dir;
extern const std::filesystem::path hopper_dir;
extern const std::filesystem::path subghz_dir;
extern const std::filesystem::path tpms_dir;
extern const std::filesystem::path waterfalls_dir;
extern const std::filesystem::path macaddress_dir;
extern const std::filesystem::path keeloq_keys_dir;
+12
View File
@@ -1,7 +1,19 @@
#include "../../hackrf/firmware/common/firmware_info.h"
#include "../../hackrf/firmware/common/platform_detect.h"
// Use the same logic as official HackRF firmware
#ifdef JAWBREAKER
#define SUPPORTED_PLATFORM PLATFORM_JAWBREAKER
#elif HACKRF_ONE
#define SUPPORTED_PLATFORM (PLATFORM_HACKRF1_OG | PLATFORM_HACKRF1_R9)
#elif RAD1O
#define SUPPORTED_PLATFORM PLATFORM_RAD1O
#elif PRALINE
#define SUPPORTED_PLATFORM PLATFORM_PRALINE
#else
#define SUPPORTED_PLATFORM 0
#endif
#define DFU_MODE_VALUE 0
__attribute__((section(".firmware_info"))) const struct firmware_info_t firmware_info = {
+2 -1
View File
@@ -66,7 +66,8 @@ options_t freqman_bandwidths[6] = {
// NFM
{"8k5", 0},
{"11k", 1},
{"16k", 2},
{"12k5", 2},
{"16k", 3},
},
{
// WFM
+40 -2
View File
@@ -42,6 +42,17 @@ namespace max2831 {
using namespace max283x;
static MAX2831Info max2831_info = {0, 0, 0, false, false};
MAX2831Info get_max2831_info() {
return {
max2831_info.requested_freq_mhz,
max2831_info.calculated_n,
max2831_info.calculated_frac,
max2831_info.set_frequency_called,
max2831_info.frequency_valid};
}
/*
* MAX2831 uses 9-bit SPI transfers.
* An 18-bit word is sent as two 9-bit transfers:
@@ -120,7 +131,8 @@ void MAX2831::init() {
// set_reg_field(11, REG11_RXVGA_GAIN_MASK, 0x1F); // 62 dB VGA = MAX
/* Configure baseband filter for 8 MHz TX - matches GSG reference */
set_reg_field(8, REG8_LPF_COARSE_MASK, REG8_RX_LPF_7_5M);
// set_reg_field(8, REG8_LPF_COARSE_MASK, REG8_RX_LPF_7_5M);
set_reg_field(8, REG8_LPF_COARSE_MASK, REG8_RX_LPF_15M);
set_reg_field(7, REG7_RX_LPF_FINE_MASK, REG7_RX_LPF_FINE_100);
set_reg_field(7, REG7_TX_LPF_FINE_MASK, REG7_TX_LPF_FINE_100);
@@ -329,9 +341,18 @@ uint32_t MAX2831::set_lpf_bandwidth_internal(const uint32_t bandwidth_hz) {
void MAX2831::set_lpf_rf_bandwidth_rx(const uint32_t bandwidth_minimum) {
_desired_lpf_bw = bandwidth_minimum;
#ifdef PRALINE
uint32_t actual_bw = bandwidth_minimum;
_desired_lpf_bw = actual_bw;
if (_mode == Mode::Receive || _mode == Mode::Rx_Calibration) {
set_lpf_bandwidth_internal(actual_bw);
}
#else
if (_mode == Mode::Receive || _mode == Mode::Rx_Calibration) {
set_lpf_bandwidth_internal(bandwidth_minimum);
}
#endif
}
void MAX2831::set_lpf_rf_bandwidth_tx(const uint32_t bandwidth_minimum) {
@@ -355,7 +376,20 @@ bool MAX2831::set_frequency(const rf::Frequency lo_frequency) {
*/
/* MAX2831 supports 2.3-2.6 GHz */
if (lo_frequency < 2300000000ULL || lo_frequency > 2600000000ULL) {
// if (lo_frequency < MAX2831_MIN_LO_FREQUENCY_HZ || lo_frequency > MAX2831_MAX_LO_FREQUENCY_HZ) {
// return false;
// }
bool valid = (lo_frequency >= MAX2831_MIN_LO_FREQUENCY_HZ && lo_frequency <= MAX2831_MAX_LO_FREQUENCY_HZ);
// TRACK REQUEST IMMEDIATELY
max2831_info.requested_freq_mhz = lo_frequency / 1000000;
max2831_info.set_frequency_called = true;
max2831_info.frequency_valid = valid;
if (!valid) {
max2831_info.calculated_n = 0;
max2831_info.calculated_frac = 0;
return false;
}
@@ -377,6 +411,10 @@ bool MAX2831::set_frequency(const rf::Frequency lo_frequency) {
}
}
// TRACK CALCULATED VALUES
max2831_info.calculated_n = div_int;
max2831_info.calculated_frac = div_frac;
/* Write order matters - matches GSG reference */
/* REG 3: SYN_INT (bits 7:0) and SYN_FRAC_LO (bits 13:8) */
uint16_t reg3_val = (div_int & 0xFF) | ((div_frac & 0x3F) << 8);
+15
View File
@@ -38,6 +38,21 @@ namespace max2831 {
using namespace max283x;
// Global debug tracking for MAX2831
struct MAX2831Info {
uint32_t requested_freq_mhz;
uint32_t calculated_n;
uint32_t calculated_frac;
bool set_frequency_called;
bool frequency_valid;
};
MAX2831Info get_max2831_info();
/* minumum and maximum lo_frequencies supported by max2831 */
constexpr rf::Frequency MAX2831_MIN_LO_FREQUENCY_HZ = 2300000000LL;
constexpr rf::Frequency MAX2831_MAX_LO_FREQUENCY_HZ = 2600000000LL;
/* MAX2831 has 16 registers, each containing 14 bits of data */
constexpr size_t reg_count = 16;
+1
View File
@@ -287,6 +287,7 @@ void RFFC507x::set_frequency(const rf::Frequency lo_frequency) {
const SynthConfig synth_config = SynthConfig::calculate(lo_frequency);
#ifdef PRALINE
// Calculate VCO frequency from LO frequency and divider
const size_t lo_divider = 1U << synth_config.lo_divider_log2; // 2^lodiv_log2
const rf::Frequency vco_freq = lo_frequency * lo_divider;
Executable → Regular
+17
View File
@@ -145,6 +145,21 @@ Continuous (Fox-oring)
rffc507x::RFFC507x first_if;
ui::SystemView* system_view_ptr;
static uint32_t random_seed_state = 123456789;
extern "C" int rand(void) {
random_seed_state ^= random_seed_state << 13;
random_seed_state ^= random_seed_state >> 17;
random_seed_state ^= random_seed_state << 5;
return (int)(random_seed_state & 0x7FFFFFFF);
}
extern "C" void srand(unsigned int seed) {
if (seed == 0) {
random_seed_state = 123456789;
} else {
random_seed_state = seed;
}
}
static void event_loop() {
static ui::Context context;
static ui::SystemView system_view{
@@ -166,7 +181,9 @@ static void event_loop() {
}
int main(void) {
#ifndef PRALINE // Do not perform quick set up of GP01_RFF507X = 1 for PRALINE
first_if.init(); /* To avoid initial short Ant_DC_Bias pulse ,we need quick set up GP01_RFF507X =1 */
#endif
if (config_mode_should_enter()) {
config_mode_clear();
-4
View File
@@ -56,11 +56,9 @@ using asahi_kasei::ak4951::AK4951;
#include "i2cdevmanager.hpp"
#include "battery.hpp"
#ifndef PRALINE
extern "C" {
#include "platform_detect.h"
}
#endif
namespace portapack {
@@ -555,12 +553,10 @@ init_status_t init() {
chThdSleepMilliseconds(100);
#ifndef PRALINE
detect_hardware_platform();
finalize_detect_hardware_platform();
chThdSleepMilliseconds(100);
#endif
configure_pins_portapack();
+54 -41
View File
@@ -32,10 +32,11 @@
extern "C" {
#include "fpga_bridge.h"
}
#else
#include "baseband_cpld.hpp"
#endif
#include "max5864.hpp"
#include "baseband_cpld.hpp"
#include "tuning.hpp"
@@ -116,9 +117,10 @@ max2837::MAX2837 second_if_max2837{ssp1_target_max283x};
max2839::MAX2839 second_if_max2839{ssp1_target_max283x};
#ifdef PRALINE
max2831::MAX2831 second_if_max2831{ssp1_target_max283x};
#else
static baseband::CPLD baseband_cpld;
#endif
static max5864::MAX5864 baseband_codec{ssp1_target_max5864};
static baseband::CPLD baseband_cpld;
// load_sram() is called at boot in portapack.cpp, including verify CPLD part, so default direction is Receive
static rf::Direction direction{rf::Direction::Receive};
@@ -145,15 +147,13 @@ void init() {
? (max283x::MAX283x*)&second_if_max2839
: (max283x::MAX283x*)&second_if_max2837;
#endif
rf_path.init();
first_if.init();
second_if->init();
baseband_codec.init();
#ifndef PRALINE
/* HackRF One uses CPLD for Q inversion control.
* PRALINE uses FPGA and the pin (P2_3) is used for LCD_TE on H4M. */
baseband_cpld.init();
#else
#ifdef PRALINE
/* Initialize FPGA registers - DC_BLOCK must be enabled for RX */
// debug::fpga::init();
fpga_debug_register_write(1, 0x01); // DC_BLOCK=1, QUARTER_SHIFT=0, Q_INVERT=0
@@ -164,6 +164,10 @@ void init() {
ssp1_arbiter.invalidate();
chThdSleepMilliseconds(10); // Let FPGA registers settle
#else
/* HackRF One uses CPLD for Q inversion control.
* PRALINE uses FPGA and the pin (P2_3) is used for LCD_TE on H4M. */
baseband_cpld.init();
#endif
}
@@ -202,17 +206,23 @@ void set_direction(const rf::Direction new_direction) {
*/
baseband_invert = false;
}
#ifndef PRALINE
baseband_cpld.set_invert(mixer_invert ^ baseband_invert);
#else
// Praline: Control Q inversion via FPGA register
// Assuming register 1 bit 1 controls Q inversion
uint8_t ctrl_reg = 0x01; // DC_BLOCK enabled
if (mixer_invert ^ baseband_invert) {
ctrl_reg |= 0x02; // Set Q_INVERT bit
#ifdef PRALINE
// CORRECT: FPGA register 1 only controls DC_BLOCK
fpga_debug_register_write(1, 0x01); // DC_BLOCK only, no QUARTER_SHIFT!
// Q inversion controlled by GPIO0[13] (SGPIO12), not FPGA register
bool q_invert = mixer_invert ^ baseband_invert;
if (q_invert) {
LPC_GPIO->SET[0] = (1 << 13); // SGPIO12 = 1 (Q inverted)
} else {
LPC_GPIO->CLR[0] = (1 << 13); // SGPIO12 = 0 (Q normal)
}
fpga_debug_register_write(1, ctrl_reg);
ssp1_arbiter.invalidate();
#else
baseband_cpld.set_invert(mixer_invert ^ baseband_invert);
#endif
second_if->set_mode((direction == rf::Direction::Transmit) ? max283x::Mode::Transmit : max283x::Mode::Receive);
@@ -224,16 +234,6 @@ void set_direction(const rf::Direction new_direction) {
led_rx.on();
else
led_tx.on();
// #ifdef PRALINE
// Try with Q inversion OFF
// fpga_debug_register_write(1, 0x01); // DC_BLOCK=1, Q_INVERT=0
// ssp1_arbiter.invalidate();
// If no signals, try with Q inversion ON
// fpga_debug_register_write(1, 0x03); // DC_BLOCK=1, Q_INVERT=1
// ssp1_arbiter.invalidate();
// #endif
}
bool set_tuning_frequency(const rf::Frequency frequency) {
@@ -269,6 +269,10 @@ bool set_tuning_frequency(const rf::Frequency frequency) {
if (tuning_config.first_lo_frequency) {
first_if.set_frequency(tuning_config.first_lo_frequency);
first_if.enable();
#ifdef PRALINE
first_if.flush(); // Force register write with reference clock present
chThdSleepMilliseconds(10); // Allow PLL to settle
#endif
}
// Program second local oscillator frequency into MAX283x
@@ -276,7 +280,24 @@ bool set_tuning_frequency(const rf::Frequency frequency) {
rf_path.set_band(tuning_config.rf_path_band);
mixer_invert = tuning_config.mixer_invert;
#ifndef PRALINE
#ifdef PRALINE
// TEST: Force baseband invert for Praline (like r9)
// baseband_invert = (direction == rf::Direction::Receive);
// CORRECT: FPGA register 1 only controls DC_BLOCK
fpga_debug_register_write(1, 0x01); // DC_BLOCK only, no QUARTER_SHIFT!
// Q inversion controlled by GPIO0[13] (SGPIO12), not FPGA register
bool q_invert = mixer_invert ^ baseband_invert;
if (q_invert) {
LPC_GPIO->SET[0] = (1 << 13); // SGPIO12 = 1 (Q inverted)
} else {
LPC_GPIO->CLR[0] = (1 << 13); // SGPIO12 = 0 (Q normal)
}
ssp1_arbiter.invalidate();
#else
baseband_cpld.set_invert(mixer_invert ^ baseband_invert);
#endif
@@ -347,20 +368,6 @@ void set_rx_max283x_iq_phase_calibration(const size_t v) {
second_if->set_rx_LO_iq_phase_calibration(v);
}
/*void enable(Configuration configuration) {
configure(configuration);
}
void configure(Configuration configuration) {
set_tuning_frequency(configuration.tuning_frequency);
set_rf_amp(configuration.rf_amp);
set_lna_gain(configuration.lna_gain);
set_vga_gain(configuration.vga_gain);
set_baseband_rate(configuration.baseband_rate);
set_baseband_filter_bandwidth(configuration.baseband_filter_bandwidth);
set_direction(configuration.direction);
}*/
void disable() {
set_antenna_bias(false);
baseband_codec.set_mode(max5864::Mode::Shutdown);
@@ -468,6 +475,12 @@ int8_t temp_sense() {
} /* namespace second_if */
namespace rf_path_info {
rf::path::Band get_current_band() {
return radio::rf_path.get_band();
}
} /* namespace rf_path_info */
#ifdef PRALINE
namespace fpga {
+6
View File
@@ -103,6 +103,12 @@ int8_t temp_sense();
} /* namespace second_if */
namespace rf_path_info {
rf::path::Band get_current_band();
} /* namespace rf_path_info */
#ifdef PRALINE
namespace fpga {
+2 -1
View File
@@ -63,9 +63,10 @@ static constexpr std::array<baseband::AMConfig, 12> am_configs{{
{taps_6k0_narrow_decim_1, taps_6k0_decim_2, taps_2k6_usb_wefax_channel, AMConfigureMessage::Modulation::SSB_FM, apt_audio_12k_lpf_1500hz_config, (int)AMConfigureMessage::Zoom_waterfall::ZOOM_x_2}, // SSB USB+FM to demod. Subcarrier FM Audio Tones to get APT Weather Fax with waterfall zoom x 2 (we need taps_6k0_narrow_decim_1 to minimize aliasing)
}};
static constexpr std::array<baseband::NBFMConfig, 3> nbfm_configs{{
static constexpr std::array<baseband::NBFMConfig, 4> nbfm_configs{{
{taps_4k25_decim_0, taps_4k25_decim_1, taps_4k25_channel, 2500},
{taps_11k0_decim_0, taps_11k0_decim_1, taps_11k0_channel, 2500},
{taps_12k5_decim_0, taps_12k5_decim_1, taps_12k5_channel, 2500},
{taps_16k0_decim_0, taps_16k0_decim_1, taps_16k0_channel, 5000},
}};
+10 -7
View File
@@ -41,14 +41,14 @@ namespace {
*/
struct PralineConfig {
bool tx_en;
bool mix_en_n; // Inverted: 0 = mixer enabled
bool mix_bypass; // RF path mixer bypass (GPIO3[2])
bool lpf_en;
bool rf_amp_en;
bool ant_bias_en_n; // Inverted: 0 = bias enabled
static void gpio_init() {
gpio_tx_enable.output();
gpio_mix_enable_n.output();
gpio_mix_bypass.output();
gpio_lpf_enable.output();
gpio_rf_amp_enable.output();
gpio_ant_bias_disable.output();
@@ -56,7 +56,7 @@ struct PralineConfig {
void apply() const {
gpio_tx_enable.write(tx_en);
gpio_mix_enable_n.write(mix_en_n);
gpio_mix_bypass.write(mix_bypass); // Control RF path mixer
gpio_lpf_enable.write(lpf_en);
gpio_rf_amp_enable.write(rf_amp_en);
gpio_ant_bias_disable.write(ant_bias_en_n);
@@ -239,7 +239,7 @@ void Path::init() {
/* Set safe initial state: RX mode, mixer enabled, LPF on, amp off, no bias */
PralineConfig config = {
.tx_en = false,
.mix_en_n = false, // Mixer enabled (inverted)
.mix_bypass = false, // RF path mixer bypass (GPIO3[2])
.lpf_en = true, // LPF on for low band
.rf_amp_en = false, // Amp off
.ant_bias_en_n = true // Bias off (inverted)
@@ -258,6 +258,7 @@ void Path::set_direction(const Direction new_direction) {
void Path::set_band(const Band new_band) {
band = new_band;
_band = new_band;
update();
}
@@ -275,7 +276,7 @@ void Path::update() {
#ifdef PRALINE
/* PRALINE RF path control:
* - tx_en: 1 for TX, 0 for RX
* - mix_en_n: 0 to enable mixer (inverted), 1 to bypass
* - mix_bypass: 0 to enable RF path mixer bypass (GPIO3[2])
* - lpf_en: 1 for low band (< 2.4 GHz), 0 for high band
* - rf_amp_en: 1 to enable RF amplifier
* - ant_bias_en_n: 0 to enable antenna bias (inverted)
@@ -293,11 +294,12 @@ void Path::update() {
config.tx_en = (direction == Direction::Transmit);
/* Mixer bypass for mid band (2.3-2.7 GHz direct to MAX2831) */
config.mix_en_n = (band == Band::Mid); // 1 = bypass (disabled)
// RF path mixer bypass: 0=enabled, 1=bypassed
config.mix_bypass = (band == Band::Mid);
/* Move to the final state by turning on required signals. */
/* LPF for low band */
config.lpf_en = (band == Band::Low);
/* RF amp when amplification requested */
@@ -307,6 +309,7 @@ void Path::update() {
config.ant_bias_en_n = true;
config.apply();
#else
/* HackRF One RF path control */
const auto config = get_config(direction, band, rf_amp);
+12
View File
@@ -39,9 +39,17 @@ enum class Direction {
namespace path {
#ifdef PRALINE
/* PRALINE: MAX2831 direct path is 2320-2740 MHz */
constexpr FrequencyRange band_low{0, 2320'000'000};
constexpr FrequencyRange band_high{2740'000'000, 7250'000'000};
constexpr FrequencyRange band_mid{band_low.maximum, band_high.minimum};
#else
/* HackRF One: Original band boundaries */
constexpr FrequencyRange band_low{0, 2170'000'000};
constexpr FrequencyRange band_high{2740'000'000, 7250'000'000};
constexpr FrequencyRange band_mid{band_low.maximum, band_high.minimum};
#endif
enum class Band {
/* Zero-based, used as index into frequency_bands table */
@@ -58,12 +66,16 @@ class Path {
void set_band(const Band band);
void set_rf_amp(const bool rf_amp);
Band get_band() const { return _band; } //_band is used solely for debugging purposes.
private:
Direction direction{Direction::Receive};
Band band{Band::Mid};
bool rf_amp{false};
void update();
Band _band{Band::Mid}; //_band is solely used of debugging purposes
};
} // namespace path
+46
View File
@@ -93,6 +93,22 @@ static const char* get_board_revision_string(board_rev_t rev) {
return "GSG HackRF R9";
case BOARD_REV_GSG_HACKRF1_R10:
return "GSG HackRF R10";
case BOARD_REV_PRALINE_R0_1:
case BOARD_REV_PRALINE_R0_2:
case BOARD_REV_PRALINE_R0_3:
return "HackRF Pro R0";
case BOARD_REV_PRALINE_R1_0:
case BOARD_REV_PRALINE_R1_1:
case BOARD_REV_PRALINE_R1_2:
return "HackRF Pro R1";
case BOARD_REV_GSG_PRALINE_R0_1:
case BOARD_REV_GSG_PRALINE_R0_2:
case BOARD_REV_GSG_PRALINE_R0_3:
return "GSG HackRF Pro R0";
case BOARD_REV_GSG_PRALINE_R1_0:
case BOARD_REV_GSG_PRALINE_R1_1:
case BOARD_REV_GSG_PRALINE_R1_2:
return "GSG HackRF Pro R1";
case BOARD_REV_UNRECOGNIZED:
return "Unrecognized";
case BOARD_REV_UNDETECTED:
@@ -134,6 +150,36 @@ static void cmd_info(BaseSequentialStream* chp, int argc, char* argv[]) {
board_rev_t revision = detected_revision();
const char* revision_string = get_board_revision_string(revision);
chprintf(chp, "HackRF Board Rev: %s\r\n", revision_string);
// Determine device type string
const char* device_str;
#ifdef PRALINE
device_str = "HackRF Pro";
#else
if (portapack::device_type == portapack::DEV_PORTARF) {
device_str = "PortaRF";
} else {
device_str = "HackRF One";
}
#endif
chprintf(chp, "Device: %s\r\n", device_str);
// Flash info: build-time allowed MB, runtime-detected limit, current firmware size
// Use explicit uint32_t cast: FLASH_SIZE_LIMIT_MB may be a float (e.g. 3.5 for HPro)
uint8_t flash_allowrun;
#ifdef PRALINE
flash_allowrun = 4; // HackRF Pro
#else
if (portapack::device_type == portapack::DeviceType::DEV_PORTAPACK) {
flash_allowrun = 1; // PortaPack classic
} else {
flash_allowrun = FLASH_SIZE_MB; // PortaRF
}
#endif
chprintf(chp, "Flash Allowed: %dMB\r\n", (uint32_t)FLASH_SIZE_MB);
chprintf(chp, "Flash Runtime: %dMB\r\n", (uint32_t)flash_allowrun);
chprintf(chp, "Flash Current: %dMB\r\n", (uint32_t)FLASH_SIZE_LIMIT_MB);
chprintf(chp, "Reference Source: %s\r\n", portapack::clock_manager.get_source().c_str());
chprintf(chp, "Reference Freq: %s\r\n", portapack::clock_manager.get_freq().c_str());
#ifdef __DATE__
+104 -13
View File
@@ -31,18 +31,86 @@ Config low_band(const rf::Frequency target_frequency);
Config mid_band(const rf::Frequency target_frequency);
Config high_band(const rf::Frequency target_frequency);
// Low band <2170 Mhz:
#ifdef PRALINE
/*
* PRALINE Tuning Configuration
* ============================
*
* Reference: hackrf_usb/common/tune_config.h praline_tune_config_rx[]
*
* The hackrf_usb firmware uses a table-driven approach where each entry
* specifies:
* - rf_range_end_mhz: Upper frequency limit for this config
* - if_mhz: IF frequency (what MAX2831 tunes to)
* - high_lo: true = high-side injection, false = low-side
* - shift: FPGA quarter-shift mode (not implemented in Mayhem yet)
*
* Key insight: The IF frequency varies to keep the RFFC5072 VCO in a
* safe operating range (ideally 3500-5000 MHz, avoiding extremes).
*
* RFFC5072 VCO calculation:
* High-side injection: LO = IF + RF, VCO = LO × lodiv
* Low-side injection: LO = IF - RF, VCO = LO × lodiv
* Where lodiv = 2 for frequencies where VCO > 2700 MHz
*
* From hackrf_usb tune_config_rx (simplified):
* 0-2100 MHz: IF=2375, high_lo=true VCO = (2375+RF)×2
* 2105-2115: IF=2375, high_lo=false VCO = (2375-RF)×2
* 2115-2130: IF=2425, high_lo=false VCO = (2425-RF)×2
* ... (more entries for fine-grained control)
* 2320-2580: IF=0 (bypass mode, no mixer)
* 2580+: High-pass mode
*/
// Simplified tune_config lookup for Mayhem
// Returns the IF frequency in Hz for a given target frequency
constexpr rf::Frequency praline_get_if_frequency(const rf::Frequency target_frequency) {
const uint32_t freq_mhz = target_frequency / 1'000'000;
// Based on hackrf_usb tune_config_rx table
if (freq_mhz < 2100) {
// Most low-band frequencies: use 2375 MHz IF
// This keeps VCO around 4750-4950 MHz for FM band
return 2375'000'000;
} else if (freq_mhz < 2320) {
// Transition zone: use varying IF to avoid VCO edges
// These frequencies are tricky - near MAX2831 minimum
// Use 2425 MHz to give some margin
return 2425'000'000;
} else {
// Bypass mode or high-band - IF not used for mixer
return 0;
}
}
// Returns true for high-side injection, false for low-side
constexpr bool praline_use_high_side_injection(const rf::Frequency target_frequency) {
const uint32_t freq_mhz = target_frequency / 1'000'000;
// Based on hackrf_usb tune_config_rx table
if (freq_mhz < 2100) {
// Standard low-band: high-side injection
// LO = IF + RF, mixer inverts spectrum
return true;
} else if (freq_mhz < 2105) {
// Narrow transition: still high-side
return true;
} else if (freq_mhz < 2320) {
// Near MAX2831 minimum: use low-side injection
// LO = IF - RF, no spectrum inversion
return false;
} else {
// Bypass/high-band - doesn't matter, mixer bypassed
return false;
}
}
#endif // PRALINE
// Low band <2170 Mhz (HackRF One) or <2320 MHz (PRALINE):
constexpr rf::Frequency low_band_second_lo_frequency(const rf::Frequency target_frequency) {
#ifdef PRALINE
// Praline-specific formula for MAX2831 (2.3-2.6 GHz range)
// Use a fixed second_lo that:
// 1. Falls in MAX2831's sweet spot (2.3-2.6 GHz)
// 2. Gives RFFC5072 a VCO frequency in its range (2700-5400 MHz)
// For most low-band frequencies, use 2500 MHz as second_lo
// This gives RFFC5072 plenty of headroom
(void)target_frequency; // Unused in fixed formula
return 2500'000'000;
// Use the tune_config lookup for PRALINE
return praline_get_if_frequency(target_frequency);
#else
return 2650'000'000 - (target_frequency / 7);
#endif
@@ -50,18 +118,36 @@ constexpr rf::Frequency low_band_second_lo_frequency(const rf::Frequency target_
Config low_band(const rf::Frequency target_frequency) {
const rf::Frequency second_lo_frequency = low_band_second_lo_frequency(target_frequency);
#ifdef PRALINE
rf::Frequency first_lo_frequency;
bool mixer_invert;
if (praline_use_high_side_injection(target_frequency)) {
// High-side injection: LO = IF + RF
first_lo_frequency = second_lo_frequency + target_frequency;
mixer_invert = true;
} else {
// Low-side injection: LO = IF - RF
first_lo_frequency = second_lo_frequency - target_frequency;
mixer_invert = false;
}
return {first_lo_frequency, second_lo_frequency, rf::path::Band::Low, mixer_invert};
#else
const rf::Frequency first_lo_frequency = target_frequency + second_lo_frequency;
const bool mixer_invert = true;
return {first_lo_frequency, second_lo_frequency, rf::path::Band::Low, mixer_invert};
#endif
}
// Mid band 2170-2740 Mhz:
// Mid band 2170-2740 Mhz (HackRF One) or 2320-2580 MHz (PRALINE):
Config mid_band(const rf::Frequency target_frequency) {
#ifdef PRALINE
// For Praline with MAX2831 (2.3-2.6 GHz range)
// Frequencies 2170-2300 MHz need upconversion since they're below MAX2831 minimum
if (target_frequency < 2300'000'000) {
// Treat as low band
// Treat as low band - need mixer
return low_band(target_frequency);
}
// Frequencies 2300-2600 MHz can go direct (no RFFC5072)
@@ -84,11 +170,16 @@ Config mid_band(const rf::Frequency target_frequency) {
#endif
}
// High band >2740 Mhz:
// High band >2740 Mhz (HackRF One) or >2580 MHz (PRALINE):
constexpr rf::Frequency high_band_second_lo_frequency(const rf::Frequency target_frequency) {
#ifdef PRALINE
// Praline formula tuned for MAX2831 (2.3-2.6 GHz range)
// Keep second_lo in MAX2831's range while allowing RFFC5072 to work
//
// For high-band, we use LOW-side injection: LO = RF - IF
// So IF should be chosen to keep LO (and thus VCO) in a good range
//
// Based on hackrf_usb tune_config_tx patterns:
if (target_frequency < 3600'000'000)
return 2400'000'000 + ((target_frequency - 2740'000'000) / 4);
else if (target_frequency < 5100'000'000)
+6 -4
View File
@@ -265,7 +265,7 @@ void GeoMap::map_read_line_bin(ui::Color* buffer, uint16_t pixels) {
void GeoMap::draw_markers(Painter& painter) {
for (int i = 0; i < markerListLen; ++i) {
draw_marker_item(painter, markerList[i], Color::blue(), Color::blue(), Color::magenta());
draw_marker_item(painter, markerList[i], markerList[i].color, markerList[i].color, Color::black());
}
}
@@ -826,7 +826,7 @@ void GeoMap::update_my_position(float lat, float lon, int32_t altitude) {
my_pos.lat = lat;
my_pos.lon = lon;
my_altitude = altitude;
redraw_map = is_changed;
redraw_map |= is_changed;
set_dirty();
}
@@ -876,8 +876,10 @@ void GeoMapView::update_position(float lat, float lon, uint16_t angle, int32_t a
geopos.set_report_change(true);
geomap.set_angle(angle);
if (is_changed) geomap.move(lon_, lat_);
geomap.set_dirty();
if (is_changed) {
geomap.move(lon_, lat_);
geomap.set_dirty();
}
}
void GeoMapView::update_tag(const std::string tag) {
+3 -2
View File
@@ -62,13 +62,14 @@ struct GeoMarker {
float lon{0};
uint16_t angle{0};
std::string tag{""};
Color color{Color::blue()};
GeoMarker& operator=(GeoMarker& rhs) {
GeoMarker& operator=(const GeoMarker& rhs) {
lat = rhs.lat;
lon = rhs.lon;
angle = rhs.angle;
tag = rhs.tag;
color = rhs.color;
return *this;
}
};
+11 -18
View File
@@ -45,11 +45,8 @@
#include "ui_mictx.hpp"
#include "ui_playlist.hpp"
#include "ui_pocsag_tx.hpp"
#include "ui_rds.hpp"
#include "ui_recon.hpp"
// #include "ui_scanner.hpp"
// #include "ui_sd_over_usb.hpp"
#include "ui_search.hpp"
#include "ui_settings.hpp"
#include "ui_sonde.hpp"
@@ -64,7 +61,6 @@
#include "ais_app.hpp"
#include "analog_audio_app.hpp"
// #include "ble_comm_app.hpp"
#include "ble_rx_app.hpp"
#include "ble_tx_app.hpp"
#include "capture_app.hpp"
@@ -136,7 +132,6 @@ const NavigationView::AppList NavigationView::appList = {
{"aprstx", "APRS TX", TX, ui::Color::green(), &bitmap_icon_aprs, new ViewFactory<APRSTXView>()},
{"bletx", "BLE Tx", TX, ui::Color::green(), &bitmap_icon_btle, new ViewFactory<BLETxView>()},
{"ooktx", "OOK", TX, ui::Color::yellow(), &bitmap_icon_remote, new ViewFactory<EncodersView>()},
{"pocsagtx", "POCSAG TX", TX, ui::Color::green(), &bitmap_icon_pocsag, new ViewFactory<POCSAGTXView>()},
{"rdstx", "RDS", TX, ui::Color::green(), &bitmap_icon_rds, new ViewFactory<RDSView>()},
{"touchtune", "TouchTune", TX, ui::Color::green(), &bitmap_icon_touchtunes, new ViewFactory<TouchTunesView>()},
/* TRX ********************************************************************/
@@ -146,7 +141,6 @@ const NavigationView::AppList NavigationView::appList = {
{"freqman", "Freq. Manager", UTILITIES, Color::green(), &bitmap_icon_freqman, new ViewFactory<FrequencyManagerView>()},
{"iqtrim", "IQ Trim", UTILITIES, Color::orange(), &bitmap_icon_trim, new ViewFactory<IQTrimView>()},
{"notepad", "Notepad", UTILITIES, Color::dark_cyan(), &bitmap_icon_notepad, new ViewFactory<TextEditorView>()},
//{nullptr, "SD Over USB", UTILITIES, Color::yellow(), &bitmap_icon_hackrf, new ViewFactory<SdOverUsbView>()},
{nullptr, "Debug", UTILITIES, Color::light_grey(), &bitmap_icon_debug, new ViewFactory<DebugMenuView>()},
//{"testapp", "Test App", UTILITIES, Color::dark_grey(), nullptr, new ViewFactory<TestView>()},
// Dangerous apps.
@@ -607,7 +601,14 @@ bool InformationView::firmware_checksum_error() {
// only checking firmware checksum once per boot
if (!fw_checksum_checked) {
#ifdef PRALINE
fw_checksum_error = (simple_checksum(FLASH_STARTING_ADDRESS, 4 * 1024 * 1024) != FLASH_EXPECTED_CHECKSUM);
// TODO: This is a minimal workaround to fix the FLASH ERR checksum, bc GSG's cmake doesn't define the PortaRF board,
// so if we do, we need to patch many codes. so we can't define the PortaRF board currently in our cmake.
// discuss needed to find a better way but currently we need CI works and make hackrf pro works as much as possible.
#else
fw_checksum_error = (simple_checksum(FLASH_STARTING_ADDRESS, FLASH_SIZE_LIMIT_MB * 1024 * 1024) != FLASH_EXPECTED_CHECKSUM);
#endif
}
return fw_checksum_error;
}
@@ -969,6 +970,8 @@ SystemView::SystemView(
navigation_view.push<SystemMenuView>();
add_child(&notification_view);
if (pmem::config_splash()) {
navigation_view.push<SplashScreenView>();
}
@@ -1054,20 +1057,10 @@ SplashScreenView::SplashScreenView(NavigationView& nav)
};
}
uint32_t SplashScreenView::myrand(uint32_t* state) {
uint32_t x = *state;
x ^= x << 13;
x ^= x >> 17;
x ^= x << 5;
*state = x;
return x;
}
void SplashScreenView::get_random_splash_file(std::filesystem::path& path) {
path = u"";
uint32_t rng_state = LPC_RTC->CTIME0;
if (rng_state == 0) rng_state = 0xABBACAFE;
srand(LPC_RTC->CTIME0);
DIR dir;
FILINFO fno;
@@ -1089,7 +1082,7 @@ void SplashScreenView::get_random_splash_file(std::filesystem::path& path) {
(ext[3] == 'P' || ext[3] == 'p')) {
valid_count++;
// Reservoir Sampling:
if ((myrand(&rng_state) % valid_count) == 0) {
if ((rand() % valid_count) == 0) {
path = splash_dir / fno.fname;
}
}
+3 -3
View File
@@ -42,7 +42,7 @@
#include "ui_audio.hpp"
#include "ui_sd_card_status_view.hpp"
#include "ui_dfu_menu.hpp"
#include "ui_notifications.hpp"
#include "bitmap.hpp"
#include "ui_bmpview.hpp"
#include "ff.h"
@@ -366,7 +366,6 @@ class SplashScreenView : public View {
Button button_done{
{screen_width, 0, 1, 1},
""};
uint32_t myrand(uint32_t* state);
void get_random_splash_file(std::filesystem::path& path);
};
@@ -447,11 +446,12 @@ class SystemView : public View {
private:
uint8_t overlay_active{0};
NavigationView navigation_view{};
SystemStatusView status_view{navigation_view};
InformationView info_view{navigation_view};
NotificationView notification_view{navigation_view};
DfuMenu overlay{navigation_view};
DfuMenu2 overlay2{navigation_view};
NavigationView navigation_view{};
Context& context_;
};
+131
View File
@@ -0,0 +1,131 @@
#include "ui_notifications.hpp"
#include "ui_navigation.hpp"
extern ui::SystemView* system_view_ptr;
namespace ui {
NotificationEntryView::NotificationEntryView(const NotificationEntry& entry, NotificationView* notifhandler)
: entry_(entry), notifhandler_(notifhandler) {
add_children({&background, &border, &title_text, &message_text, &close_button});
border.set_outline(true);
if (entry_.icon != NOTIF_ICON_NONE) {
add_child(&icon_image);
icon_image.set_parent_rect({UI_POS_X(0) + 2, UI_POS_Y(1), UI_POS_WIDTH(2), UI_POS_HEIGHT(1)});
message_text.set_parent_rect({UI_POS_X(2) + 2, UI_POS_Y(1), UI_POS_WIDTH_REMAINING(6) - 2, UI_POS_HEIGHT(2)});
if (entry_.icon == NOTIF_ICON_MESSAGE) {
icon_image.set_bitmap(&bitmap_icon_pocsag);
}
} else {
message_text.set_parent_rect({UI_POS_X(1), UI_POS_Y(1), UI_POS_WIDTH_REMAINING(5) - 1, UI_POS_HEIGHT(2)});
}
title_text.set_style(Theme::getInstance()->bg_dark);
title_text.set(entry_.title);
message_text.set_style(Theme::getInstance()->bg_darkest);
message_text.set(entry_.message);
close_button.on_select = [this](Button&) {
if (notifhandler_) {
notifhandler_->remove_notification(entry_.id);
}
};
message_text.on_select = [this](Text&) {
if (!entry_.source_app.empty() && notifhandler_) {
notifhandler_->open_notification(entry_.source_app);
// notifhandler_->remove_notification(entry_.id);
}
};
title_text.on_select = message_text.on_select;
}
NotificationView::NotificationView(NavigationView& nav)
: nav_(nav) {
signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
this->on_tick_second();
};
}
NotificationView::~NotificationView() {
rtc_time::signal_tick_second -= signal_token_tick_second;
}
void NotificationView::on_tick_second() {
bool changed = false;
for (size_t i = 0; i < notification_views_.size();) {
if (notification_views_[i]->entry()->increase_time(1000)) {
notification_views_.erase(notification_views_.begin() + i);
changed = true;
} else {
i++;
}
}
if (changed) {
rearrange_notifications();
}
}
void NotificationView::rearrange_notifications() {
size_t count = children().size();
while (children().size() > 0) {
remove_child(children().back());
}
const int entry_height = UI_POS_HEIGHT(3) + 1;
int index = 0;
for (auto& view_ptr : notification_views_) {
view_ptr->set_parent_rect({UI_POS_X(0),
(Coord)(UI_POS_Y(0) + (index * entry_height)),
UI_POS_MAXWIDTH,
entry_height});
add_child(view_ptr.get());
index++;
}
set_parent_rect({UI_POS_X(0), UI_POS_Y(0), UI_POS_MAXWIDTH, (Coord)(notification_views_.size() * entry_height)});
set_dirty();
if (count != children().size()) {
// refresh screen!!!
system_view_ptr->set_dirty();
}
}
void NotificationView::add_notification(NotificationEntry& entry) {
if (notification_views_.size() >= max_notifications) {
notification_views_.erase(notification_views_.begin());
}
entry.id = ++curr_not_id;
notification_views_.push_back(std::make_unique<NotificationEntryView>(entry, this));
rearrange_notifications();
}
void NotificationView::remove_notification(uint16_t id) {
bool found = false;
size_t found_index = 0;
for (size_t i = 0; i < notification_views_.size(); i++) {
if (notification_views_[i]->id() == id) {
found = true;
found_index = i;
break;
}
}
if (found) {
notification_views_.erase(notification_views_.begin() + found_index);
rearrange_notifications();
}
}
void NotificationView::open_notification(std::string app_name) {
if (app_name.empty()) return;
nav_.StartAppByName(app_name.c_str());
}
} // namespace ui
+101
View File
@@ -0,0 +1,101 @@
#pragma once
#include <vector>
#include <string>
#include <memory>
#include "ui.hpp"
#include "ui_widget.hpp"
#include "signal.hpp"
#include "rtc_time.hpp"
#include "event_m0.hpp"
namespace ui {
class NotificationView;
class NavigationView;
enum notification_icon_t : uint8_t {
NOTIF_ICON_NONE = 0,
NOTIF_ICON_MESSAGE
};
class NotificationEntry {
public:
std::string source_app{};
std::string title{};
std::string message{};
notification_icon_t icon = NOTIF_ICON_NONE;
uint16_t timeout = 10000;
uint16_t id = 0;
NotificationEntry() = default;
NotificationEntry(const std::string& source_app, const std::string& title, const std::string& message, notification_icon_t icon = NOTIF_ICON_NONE, uint16_t timeout = 10000, uint16_t id = 0)
: source_app(source_app), title(title), message(message), icon(icon), timeout(timeout), id(id) {}
static NotificationEntry build(const std::string& source_app, const std::string& title, const std::string& message, notification_icon_t icon = NOTIF_ICON_NONE, uint16_t timeout = 10000) {
return NotificationEntry{source_app, title, message, icon, timeout, 0};
}
bool increase_time(uint16_t delta) {
current_time += delta;
return (current_time >= timeout);
}
private:
uint16_t current_time = 0;
};
class NotificationEntryView : public View {
public:
NotificationEntryView(const NotificationEntry& entry, NotificationView* notifhandler);
NotificationEntryView(const NotificationEntryView&) = delete;
NotificationEntryView& operator=(const NotificationEntryView&) = delete;
ui::Rectangle background{{1, 1, UI_POS_MAXWIDTH - 2, UI_POS_HEIGHT(3) - 2}, Theme::getInstance()->bg_darkest->background};
ui::Rectangle border{{0, 0, UI_POS_MAXWIDTH, UI_POS_HEIGHT(3) + 1}, Theme::getInstance()->bg_light->background};
ui::Text title_text{{UI_POS_X(0) + 1, UI_POS_Y(0) + 1, UI_POS_WIDTH_REMAINING(4) - 3, UI_POS_HEIGHT(1)}, ""};
ui::Text message_text{{UI_POS_X(1), UI_POS_Y(1), UI_POS_WIDTH_REMAINING(5) - 1, UI_POS_HEIGHT(2)}, ""};
ui::Image icon_image{}; // 16*16 bitmap
ui::Button close_button{{UI_POS_X_RIGHT(4) - 2, UI_POS_Y(0) + 1, UI_POS_WIDTH(4), UI_POS_HEIGHT(2)}, "X"};
uint16_t id() const { return entry_.id; }
NotificationEntry* entry() { return &entry_; }
private:
NotificationEntry entry_;
NotificationView* notifhandler_;
};
class NotificationView : public View {
public:
NotificationView(NavigationView& nav);
~NotificationView();
void add_notification(NotificationEntry& entry);
void remove_notification(uint16_t id);
void open_notification(std::string app_name);
private:
void on_tick_second();
void rearrange_notifications();
NavigationView& nav_;
// Changed to unique_ptr to handle non-copyable Views safely
std::vector<std::unique_ptr<NotificationEntryView>> notification_views_{};
SignalToken signal_token_tick_second{};
uint16_t curr_not_id = 0;
constexpr static uint8_t max_notifications = 4;
MessageHandlerRegistration message_handler_notifs{
Message::ID::NotificationData, [this](Message* const p) {
const auto message = static_cast<const NotificationDataMessage*>(p);
NotificationEntry entry = NotificationEntry::build(message->source_app, message->title, message->message, static_cast<notification_icon_t>(message->icon), message->timeout);
this->add_notification(entry);
}};
};
} // namespace ui
+76 -24
View File
@@ -105,26 +105,23 @@ static void cmd_sd_over_usb(BaseSequentialStream* chp, int argc, char* argv[]) {
(void)chp;
(void)argc;
(void)argv;
ui::Painter painter;
painter.fill_rectangle(
{0, 0, portapack::display.width(), portapack::display.height()},
Theme::getInstance()->fg_yellow->background);
painter.draw_bitmap(
{portapack::display.width() / 2 - 8, portapack::display.height() / 2 - 8},
ui::bitmap_icon_hackrf,
Theme::getInstance()->fg_yellow->foreground,
Theme::getInstance()->fg_yellow->background);
sdcDisconnect(&SDCD1);
sdcStop(&SDCD1);
m4_request_shutdown();
chThdSleepMilliseconds(50);
portapack::shutdown(true);
m4_init(portapack::spi_flash::image_tag_usb_sd, portapack::memory::map::m4_code, false);
m0_halt();
auto evtd = getEventDispatcherInstance();
if (!evtd) return;
auto top_widget = evtd->getTopWidget();
if (!top_widget) return;
auto nav = static_cast<ui::SystemView*>(top_widget)->get_navigation_view();
if (!nav) return;
nav->home(false);
std::string appwithpath = "/" + apps_dir.string() + "/";
appwithpath += "sdusb.ppma";
bool ret = ui::ExternalItemsMenuLoader::run_external_app(*nav, path_from_string8((char*)appwithpath.c_str()));
if (ret) {
chprintf(chp, "ok\r\n");
} else {
chprintf(chp, "Failed to start SD over USB\r\n");
}
evtd->wait_finish_frame();
evtd->emulateKeyboard('\n');
}
bool strEndsWith(const std::u16string& str, const std::u16string& suffix) {
@@ -1386,22 +1383,76 @@ static void cmd_getres(BaseSequentialStream* chp, int argc, char* argv[]) {
static void cmd_getflash(BaseSequentialStream* chp, int argc, char* argv[]) {
(void)argc;
(void)argv;
uint8_t allowrun = FLASH_SIZE_MB;
// FLASH_SIZE_LIMIT_MB may be a float (e.g. 3.5 for HPro), always cast explicitly.
uint8_t allowrun;
#ifdef PRALINE
allowrun = 4; // HackRF Pro
#else
if (portapack::device_type == portapack::DeviceType::DEV_PORTAPACK) {
allowrun = 1;
allowrun = 1; // PortaPack classic
} else {
allowrun = FLASH_SIZE_MB; // PortaRF
}
std::string res = "ALLOWEDFW:" + to_string_dec_uint(FLASH_SIZE_MB) + "\r\nALLOWEDRUNTIME:" + to_string_dec_uint(allowrun) + "\r\nCURRENT:" + to_string_dec_uint(FLASH_SIZE_LIMIT_MB) + "\r\nok\r\n";
#endif
std::string res = "ALLOWEDFW:" + to_string_dec_uint((uint32_t)FLASH_SIZE_MB) + "\r\nALLOWEDRUNTIME:" + to_string_dec_uint((uint32_t)allowrun) + "\r\nCURRENT:" + to_string_dec_uint((uint32_t)FLASH_SIZE_LIMIT_MB) + "\r\nok\r\n";
chprintf(chp, res.c_str());
}
static void cmd_getdevtype(BaseSequentialStream* chp, int argc, char* argv[]) {
(void)argc;
(void)argv;
std::string res = portapack::device_type == portapack::DeviceType::DEV_PORTARF ? "PORTARF" : "PORTAPACK";
std::string res;
#ifdef PRALINE
res = "HPRO";
#else
if (portapack::device_type == portapack::DeviceType::DEV_PORTARF) {
res = "PORTARF";
} else {
res = "PORTAPACK";
}
#endif
res += "\r\nok\r\n";
chprintf(chp, res.c_str());
}
static void cmd_notification(BaseSequentialStream* chp, int argc, char* argv[]) {
const char* usage = "usage: notif <iconindex> [appname]\r\n";
if (argc < 1) {
chprintf(chp, usage);
return;
}
int iconindex = atoi(argv[0]);
std::string appname = (argc > 1) ? argv[1] : "";
chprintf(chp, "Send title, and a <CR>\r\n");
std::string title{};
uint8_t msg[1]{0};
do {
size_t bytes_read = chSequentialStreamRead(chp, &msg[0], 1);
if (bytes_read != 1)
break;
if (msg[0] == '\r') // end of title
break;
if (msg[0] == '\n') continue;
title += (char)msg[0];
} while (title.size() < 48);
std::string message{};
chprintf(chp, "Send message, and a <CR>\r\n");
do {
size_t bytes_read = chSequentialStreamRead(chp, &msg[0], 1);
if (bytes_read != 1)
break;
if (msg[0] == '\r') // end of message
break;
if (msg[0] == '\n') continue;
message += (char)msg[0];
} while (message.size() < 298);
NotificationDataMessage msgn{appname.c_str(), title.c_str(), message.c_str(), (uint8_t)iconindex};
EventDispatcher::send_message(msgn);
chprintf(chp, "ok\r\n");
}
static const ShellCommand commands[] = {
{"reboot", cmd_reboot},
{"dfu", cmd_dfu},
@@ -1440,6 +1491,7 @@ static const ShellCommand commands[] = {
{"getres", cmd_getres},
{"getflash", cmd_getflash},
{"getdevtype", cmd_getdevtype},
{"notif", cmd_notification},
{NULL, NULL}};
static const ShellConfig shell_cfg1 = {
@@ -0,0 +1,75 @@
#ifndef __FPROTO_RESTAURANT_PAGER_H__
#define __FPROTO_RESTAURANT_PAGER_H__
#include "subghzdbase.hpp"
typedef enum : uint8_t {
RestaurantPagerDecoderStepReset = 0,
RestaurantPagerDecoderStepSaveDuration,
RestaurantPagerDecoderStepCheckDuration,
} RestaurantPagerDecoderStep;
class FProtoSubGhzDRestaurantPager : public FProtoSubGhzDBase {
public:
FProtoSubGhzDRestaurantPager() {
sensorType = FPS_RESTAURANT_PAGER;
te_short = 204;
te_long = 636;
te_delta = 100;
min_count_bit_for_found = 25;
}
void feed(bool level, uint32_t duration) {
switch (parser_step) {
case RestaurantPagerDecoderStepReset:
if ((!level) && (DURATION_DIFF(duration, te_short * 36) < te_delta * 36)) {
// Found preamble
parser_step = RestaurantPagerDecoderStepSaveDuration;
decode_data = 0;
decode_count_bit = 0;
}
break;
case RestaurantPagerDecoderStepSaveDuration:
if (level) {
te_last = duration;
parser_step = RestaurantPagerDecoderStepCheckDuration;
}
break;
case RestaurantPagerDecoderStepCheckDuration:
if (!level) {
if (duration >= ((uint32_t)te_long * 2)) {
parser_step = RestaurantPagerDecoderStepSaveDuration;
if (decode_count_bit == min_count_bit_for_found) {
// Skip all-ones preamble frames
if ((decode_data >> 1) != 0xFFFFFF) {
data_count_bit = decode_count_bit;
if (callback) callback(this);
}
}
decode_data = 0;
decode_count_bit = 0;
break;
}
if ((DURATION_DIFF(te_last, te_short) < te_delta) &&
(DURATION_DIFF(duration, te_long) < te_delta * 3)) {
subghz_protocol_blocks_add_bit(0);
parser_step = RestaurantPagerDecoderStepSaveDuration;
} else if (
(DURATION_DIFF(te_last, te_long) < te_delta * 3) &&
(DURATION_DIFF(duration, te_short) < te_delta)) {
subghz_protocol_blocks_add_bit(1);
parser_step = RestaurantPagerDecoderStepSaveDuration;
} else {
parser_step = RestaurantPagerDecoderStepReset;
}
} else {
parser_step = RestaurantPagerDecoderStepReset;
}
break;
}
}
};
#endif
@@ -55,6 +55,7 @@ So include here the .hpp, and add a new element to the protos vector in the cons
#include "s-marantec24.hpp"
// GENIE FROM PR
#include "s-holtek_ht6p20b.hpp"
#include "s-restaurant_pager.hpp"
#ifndef __FPROTO_PROTOLISTSGZ_H__
#define __FPROTO_PROTOLISTSGZ_H__
@@ -109,6 +110,7 @@ class SubGhzDProtos : public FProtoListGeneral {
protos[FPS_GANGQI] = new FProtoSubGhzDGangqi();
protos[FPS_MARANTEC24] = new FProtoSubGhzDMarantec24();
protos[FPS_HOLTEKHT6P20B] = new FProtoSubGhzDHoltekHt6p20b();
protos[FPS_RESTAURANT_PAGER] = new FProtoSubGhzDRestaurantPager();
for (uint8_t i = 0; i < FPS_COUNT; ++i) {
if (protos[i] != NULL) protos[i]->setCallback(callbackTarget);
@@ -59,6 +59,7 @@ enum FPROTO_SUBGHZD_SENSOR : uint8_t {
FPS_GANGQI,
FPS_MARANTEC24,
FPS_HOLTEKHT6P20B,
FPS_RESTAURANT_PAGER,
FPS_COUNT
};
-2
View File
@@ -28,8 +28,6 @@
#include "debug.hpp"
#include "portapack_shared_memory.hpp"
#include "../flashsize.h"
#define PAGE_LEN 256U
#define NUM_PAGES (4096U * FLASH_SIZE_MB)
@@ -61,7 +61,11 @@ const PALConfig pal_default_config = {
.P = {
{ // GPIO0
.data
#ifdef PRALINE
= (0 << 15) // P1_20: CLKIN_CTRL - start low
#else
= (1 << 15) // P1_20: CS_XCVR
#endif
| (1 << 14) // P2_10: AMP_BYPASS
| (0 << 13) // P1_18: SGPIO12, HOST_Q_INVERT
| (0 << 12) // P1_17: SGPIO11, HOST_DIRECTION
@@ -79,8 +83,12 @@ const PALConfig pal_default_config = {
| (1 << 0) // P0_0: SGPIO0, HOST_DATA0
,
.dir
#ifdef PRALINE
= (1 << 15) // P1_20: CLKIN_CTRL - output
#else
= (1 << 15) // P1_20: CS_XCVR
| (1 << 14) // P2_10: AMP_BYPASS
#endif
| (1 << 14) // P2_10: AMP_BYPASS
| (1 << 13) // P1_18: SGPIO12, HOST_Q_INVERT
| (0 << 12) // P1_17: SGPIO11, HOST_DIRECTION
| (0 << 11) // P1_4: SSP1_MOSI
@@ -137,7 +145,11 @@ const PALConfig pal_default_config = {
.data
= (0 << 15) // P5_6: TX_AMP
| (1 << 14) // P5_5: MIXER_RESETX, 10K PU
#ifdef PRALINE
| (0 << 13) // P5_4: MIXER_ENX, 10K PU
#else
| (1 << 13) // P5_4: MIXER_ENX, 10K PU
#endif
| (1 << 12) // P5_3: RX_MIX_BP
| (0 << 11) // P5_2: TX_MIX_BP
| (0 << 10) // P5_1: LP
@@ -154,11 +166,19 @@ const PALConfig pal_default_config = {
,
.dir
= (1 << 15) // P5_6: TX_AMP
| (1 << 14) // P5_5: MIXER_RESETX, 10K PU
| (1 << 13) // P5_4: MIXER_ENX, 10K PU
#ifdef PRALINE
| (0 << 14) // P5_5: MIXER_RESETX, 10K PU
| (1 << 13) // P5_4: MIXER_ENX - OUTPUT (MCU controlled)
| (0 << 12) // P5_3: RX_MIX_BP - unused on PRALINE
| (0 << 11) // P5_2: FPGA_CRESET - INPUT initially
| (0 << 10) // P5_1: FPGA_SPI_CS - INPUT initially
#else
| (1 << 14) // P5_5: MIXER_RESETX, 10K PU
| (1 << 13) // P5_4: MIXER_ENX, 10K PU
| (1 << 12) // P5_3: RX_MIX_BP
| (1 << 11) // P5_2: TX_MIX_BP
| (1 << 10) // P5_1: LP
#endif
| (0 << 9) // P5_0: Varies by revision, float until detection
| (1 << 8) // P6_12: LED3 (TX)
| (1 << 7) // P5_7: CS_AD
@@ -306,7 +326,13 @@ const PALConfig pal_default_config = {
{ 1, 7, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* !MIX_BYPASS/P35: U1.VCTL1(I), U11.VCTL2(I), U9.V2(I) */
{ 1, 19, scu_config_normal_drive_t { .mode=1, .epd=0, .epun=0, .ehs=0, .ezi=0, .zif=0 } }, /* SSP1_SCK/P39: MAX2837.SCLK(I), MAX5864.SCLK(I) */
{ 1, 20, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* CS_XCVR/P53: MAX2837.CS(I) */
#ifdef PRALINE
{ 2, 6, scu_config_normal_drive_t { .mode=4, .epd=0, .epun=1, .ehs=1, .ezi=0, .zif=1 } }, /* TRIGGER_OUT / MIX_EN_N_R1_0: GPIO5[6] - PRALINE */
#else
/* HackRF One RFFC5072 SPI pins */
{ 2, 6, scu_config_normal_drive_t { .mode=4, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* MIXER_SCLK/P31: 33pF, RFFC5072.SCLK(I) */
#endif
{ 2, 10, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* AMP_BYPASS/P50: U14.V2(I), U12.V2(I) */
{ 2, 11, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* RX_AMP/P49: U12.V1(I), U14.V3(I) */
{ 2, 12, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* !RX_AMP_PWR/P52: 10K PU, Q1.G(I), power to U13 (RX amp) */
@@ -319,8 +345,16 @@ const PALConfig pal_default_config = {
{ 5, 4, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* MIXER_ENX/P32: 10K PU, 33pF, RFFC5072.ENX(I) */
{ 5, 5, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* MIXER_RESETX/P33: 10K PU, 33pF, RFFC5072.RESETX(I) */
{ 5, 6, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* TX_AMP/P48: U12.V3(I), U14.V1(I) */
#ifdef PRALINE
/* PRALINE RFFC5072 SPI pins - different from HackRF One */
{ 5, 7, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* P5_7: GPIO2[7], RFFC5072 CS */
{ 9, 5, scu_config_normal_drive_t { .mode=4, .epd=0, .epun=0, .ehs=1, .ezi=0, .zif=0 } }, /* P9_5: GPIO5[18], RFFC5072 SCLK */
{ 9, 2, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=0, .ehs=1, .ezi=1, .zif=0 } }, /* P9_2: GPIO4[14], RFFC5072 SDATA (bidirectional) */
#else
/* HackRF One RFFC5072 SPI pins - NOT used on PRALINE */
{ 5, 7, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* CS_AD/P54: MAX5864.CS(I) */
{ 6, 4, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=0, .ehs=0, .ezi=1, .zif=0 } }, /* MIXER_SDATA/P27: 33pF, RFFC5072.SDATA(IO) */
#endif
{ 6, 8, scu_config_normal_drive_t { .mode=4, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* MIX_BYPASS/P34: U1.VCTL2(I), U11.VCTL1(I) */
{ 6, 9, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* !TX_AMP_PWR/P51: 10K PU, Q2.G(I), power to U25 (TX amp) */
@@ -346,7 +380,9 @@ const PALConfig pal_default_config = {
{ 6, 1, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* CPLD_TCK: PortaPack CPLD.TCK(I) */
{ 6, 2, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=1, .zif=0 } }, /* CPLD_TDI: PortaPack CPLD.TDI(I), I2S0_RX_SDA(O) */
{ 6, 5, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=1, .ehs=0, .ezi=0, .zif=0 } }, /* CPLD_TMS: HackRF CPLD.TMS(I) */
#ifndef PRALINE
{ 9, 5, scu_config_normal_drive_t { .mode=4, .epd=0, .epun=0, .ehs=0, .ezi=1, .zif=0 } }, /* CPLD_TDO: HackRF CPLD.TDO(O) */
#endif
/* PortaPack CPLD */
{ 1, 5, scu_config_normal_drive_t { .mode=0, .epd=0, .epun=0, .ehs=0, .ezi=1, .zif=0 } }, /* SD_POW: PortaPack CPLD.TDO(O) */
@@ -870,40 +906,55 @@ extern "C" void boardInit(void) {
LPC_SCU->SFSP[6][7] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_GPIO->DIR[5] |= (1 << 15);
LPC_GPIO->CLR[5] = (1 << 15); /* Clear = enable 3.3V aux */
{ volatile uint32_t delay = 100000; while(delay--); }
{ volatile uint32_t delay = 200000; while(delay--); }
/* Enable 1.2V for FPGA - P8_7 = GPIO4[7], active high */
LPC_SCU->SFSP[8][7] = 0x10;
LPC_GPIO->DIR[4] |= (1 << 7);
LPC_GPIO->SET[4] = (1 << 7);
{ volatile uint32_t delay = 100000; while(delay--); }
{ volatile uint32_t delay = 200000; while(delay--); }
/* Enable VAA for RF - P8_1 = GPIO4[1], active low */
LPC_SCU->SFSP[8][1] = 0x10;
LPC_GPIO->DIR[4] |= (1 << 1);
LPC_GPIO->CLR[4] = (1 << 1);
{ volatile uint32_t delay = 100000; while(delay--); }
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure RFFC5072 pins for PRALINE */
/* P9_2 = GPIO4[14] RFFC5072 data (SCU_GPIO_FAST | FUNCTION0 = 0xF0) */
LPC_SCU->SFSP[9][2] = 0xF0;
/* P9_5 = GPIO5[18] RFFC5072 clock (SCU_GPIO_FAST | FUNCTION4 = 0xF4) */
LPC_SCU->SFSP[9][5] = 0xF4;
LPC_GPIO->DIR[5] |= (1 << 18); /* Clock as output */
/* Set GPIO directions for RFFC5072 SPI pins */
/* P5_7 = GPIO2[7] RFFC5072 CS */
LPC_GPIO->SET[2] = (1 << 7); /* CS high (deselected) */
LPC_GPIO->DIR[2] |= (1 << 7); /* CS as output */
/* P9_5 = GPIO5[18] RFFC5072 SCLK */
LPC_GPIO->CLR[5] = (1 << 18); /* CLK low */
LPC_GPIO->DIR[5] |= (1 << 18); /* CLK as output */
/* P9_2 = GPIO4[14] RFFC5072 DATA (bidirectional) */
LPC_GPIO->DIR[4] |= (1 << 14); /* DATA as output initially */
/* P2_6 = GPIO5[6] TRIGGER_OUT / MIX_EN_N_R1_0 (PRALINE R1.0 mixer bypass) */
/* SCU configured in PAL array above with mode=4 */
LPC_GPIO->CLR[5] = (1 << 6); /* Default low (mixer enabled) */
LPC_GPIO->DIR[5] |= (1 << 6); /* Output */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure Port D pins for PRALINE (use SFSPD registers) */
/* PD_14 = GPIO6[28] MAX2831 chip select */
LPC_SCU->SFSPD[14] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_GPIO->SET[6] = (1 << 28); /* CS high (inactive) */
LPC_GPIO->DIR[6] |= (1 << 28); /* Output */
/* PD_15 = GPIO6[29] MAX2831 RXHP control */
LPC_SCU->SFSPD[15] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_GPIO->CLR[6] = (1 << 29); /* RXHP low = 100 Hz HPF */
LPC_GPIO->DIR[6] |= (1 << 29); /* Output */
/* PD_16 = GPIO6[30] MAX5864 chip select */
LPC_SCU->SFSPD[16] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_GPIO->SET[6] |= (1 << 30); /* CS high (inactive) */
LPC_GPIO->DIR[6] |= (1 << 30); /* Output */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure Port E pins for MAX2831 control (use SFSPE registers) */
/* PE_1 = GPIO7[1] MAX2831 ENABLE */
@@ -914,6 +965,7 @@ extern "C" void boardInit(void) {
LPC_SCU->SFSPE[2] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_GPIO->CLR[7] = (1 << 2); /* Start in shutdown mode */
LPC_GPIO->DIR[7] |= (1 << 2); /* Output */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure Port 6 pins for RF path control */
/* P6_3 = GPIO3[2] Mixer enable (inverted: 0 = mixer ON) */
@@ -924,16 +976,41 @@ extern "C" void boardInit(void) {
LPC_SCU->SFSP[6][5] = 0xF0; /* SCU_GPIO_FAST | FUNCTION0 */
LPC_GPIO->CLR[3] = (1 << 4); /* TX off by default (RX mode) */
LPC_GPIO->DIR[3] |= (1 << 4); /* Output */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure Port A pins for RF path control */
/* PA_1 = GPIO4[8] LPF enable */
LPC_SCU->SFSP[0xA][1] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_SCU->SFSP[0xA][1] = 0xF0; /* SCU_GPIO_FAST | FUNCTION0 */
LPC_GPIO->SET[4] = (1 << 8); /* LPF enabled by default (low band) */
LPC_GPIO->DIR[4] |= (1 << 8); /* Output */
/* PA_2 = GPIO4[9] RF amp enable */
LPC_SCU->SFSP[0xA][2] = 0xF4; /* SCU_GPIO_FAST | FUNCTION4 */
LPC_SCU->SFSP[0xA][2] = 0xF0; /* SCU_GPIO_FAST | FUNCTION0 */
LPC_GPIO->CLR[4] = (1 << 9); /* RF amp off by default */
LPC_GPIO->DIR[4] |= (1 << 9); /* Output */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure RFFC5072 control pins for PRALINE */
/* P5_4 = GPIO2[13] RFFC5072 ENX - SPI chip select (managed by SPI driver) */
LPC_SCU->SFSP[5][4] = 0x10; /* FUNCTION0 (GPIO), pull-up, slow mode (matches HackRF USB) */
LPC_GPIO->DIR[2] |= (1 << 13); /* ENX: OUTPUT */
LPC_GPIO->SET[2] = (1 << 13); /* ENX = 1 (deselected initially) */
{ volatile uint32_t delay = 200000; while(delay--); }
/* P5_5 = GPIO2[14] RFFC5072 RESETX (active high: 1=running) */
LPC_SCU->SFSP[5][5] = 0x10; /* FUNCTION0 (GPIO), pull-up, slow mode (matches HackRF USB) */
LPC_GPIO->DIR[2] |= (1 << 14); /* RESETX: OUTPUT */
LPC_GPIO->SET[2] = (1 << 14); /* RESETX = 1 (RUNNING) */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Ensure RESETX is stable */
for (volatile int i = 0; i < 10; i++) {
LPC_GPIO->W2[14] = 1;
}
/* PD_11 = GPIO6[25] RFFC5072 Lock Detect (input) */
LPC_SCU->SFSPD[11] = 0x10; /* FUNCTION0 (GPIO), pull-up (matches HackRF USB) */
LPC_GPIO->DIR[6] &= ~(1 << 25); /* LD: INPUT */
{ volatile uint32_t delay = 200000; while(delay--); }
/* Configure PRALINE-specific SGPIO pins for FPGA sample interface.
* These override the HackRF One pin config from pins_setup.
@@ -953,6 +1030,7 @@ extern "C" void boardInit(void) {
LPC_SCU->SFSP[8][2] = 0xF4; /* SCU_GPIO_FAST | func 4 */
/* SGPIO11 = P1_17 function 6 (HOST_DIRECTION - output to FPGA, tells FPGA TX vs RX) */
LPC_SCU->SFSP[1][17] = 0xF6; /* SCU_GPIO_FAST | func 6 */
{ volatile uint32_t delay = 200000; while(delay--); }
/* SGPIO data pins (SGPIO0-7) - all 8 bits required for sample data */
LPC_SCU->SFSP[0][0] = 0xF3; /* SGPIO0: P0_0 function 3, HOST_DATA0 */
@@ -963,9 +1041,7 @@ extern "C" void boardInit(void) {
LPC_SCU->SFSP[6][6] = 0xF2; /* SGPIO5: P6_6 function 2, HOST_DATA5 */
LPC_SCU->SFSP[2][2] = 0xF0; /* SGPIO6: P2_2 function 0, HOST_DATA6 */
LPC_SCU->SFSP[1][0] = 0xF6; /* SGPIO7: P1_0 function 6, HOST_DATA7 */
/* NOTE: P9_5 is RFFC5072 mixer clock (SCU_MIXER_SCLK), NOT SGPIO!
* Do NOT override P9_5 here. */
{ volatile uint32_t delay = 200000; while(delay--); }
// Trigger FPGA bitstream loading via fpga bridge
// Attempt to load the FPGA bitstream
@@ -979,11 +1055,13 @@ extern "C" void boardInit(void) {
// Turn off all LEDs to start
// PRALINE LEDs are active-low: SET (HIGH) = OFF, CLR (LOW) = ON
LPC_GPIO->SET[2] = (1 << 1) | (1 << 2) | (1 << 8);
{ volatile uint32_t delay = 200000; while(delay--); }
// Call fpga_bridge_init and continue boot regardless of result
// (Watchdog was resetting device when we halted with while(1))
int load_result = fpga_bridge_init();
(void)load_result; // Ignore result for now, just let boot continue
{ volatile uint32_t delay = 200000; while(delay--); }
// Keep LEDs off after FPGA load
LPC_GPIO->SET[2] = (1 << 1) | (1 << 2) | (1 << 8);
@@ -3,7 +3,6 @@
// Check if PRALINE was passed from CMake
#ifdef PRALINE
#warning "Building for HackRF_PRO with FPGA."
// Necessary headers
#include "lz4_blk.h"
@@ -297,7 +296,6 @@
// Cached register values for debug reads (since reads may require mode switch)
static uint8_t fpga_reg_cache[6] = {0, 0x01, 0x00, 0x00, 0x00, 0x00};
static uint8_t fpga_reg_cache_valid = 0;
// Public function to read FPGA register (callable from C++ application code)
// Switches SPI mode, reads register, switches back
+20
View File
@@ -213,6 +213,24 @@ CpldUpdateStatus update_autodetect(const Config config_rev_20150901, const Confi
namespace hackrf {
namespace cpld {
#ifdef PRALINE
/* PRALINE has no HackRF CPLD - stub these functions out */
bool load_sram() {
return true;
}
void load_sram_no_verify() {
return;
}
bool verify_eeprom() {
return true;
}
void init_from_eeprom() {
return;
}
#else
static jtag::GPIOTarget jtag_target_hackrf() {
return {
hackrf::one::gpio_cpld_tck,
@@ -262,5 +280,7 @@ void init_from_eeprom() {
hackrf_cpld.init_from_eeprom();
}
#endif // PRALINE
} /* namespace cpld */
} /* namespace hackrf */
+31
View File
@@ -278,6 +278,37 @@ constexpr fir_taps_real<32> taps_11k0_channel{
}},
};
// NBFM 12K5F3E emission type /////////////////////////////////////////////
// IFIR image-reject filter: fs=3072000, pass=6250, stop=342250, decim=8, fout=384000
constexpr fir_taps_real<24> taps_12k5_decim_0{
.low_frequency_normalized = -6250.0f / 3072000.0f,
.high_frequency_normalized = 6250.0f / 3072000.0f,
.transition_normalized = 336000.0f / 3072000.0f,
.taps = {{42, 108, 226, 412, 672, 1004, 1391, 1807, 2211, 2565, 2828, 2969,
2969, 2828, 2565, 2211, 1807, 1391, 1004, 672, 412, 226, 108, 42}},
};
// IFIR prototype filter: fs=384000, pass=6250, stop=42500, decim=8, fout=48000
constexpr fir_taps_real<32> taps_12k5_decim_1{
.low_frequency_normalized = -6250.0f / 384000.0f,
.high_frequency_normalized = 6250.0f / 384000.0f,
.transition_normalized = 36250.0f / 384000.0f,
.taps = {{-38, -85, -162, -245, -315, -338, -275, -85, 255, 752, 1378, 2088,
2807, 3452, 3939, 4202, 4202, 3939, 3452, 2807, 2088, 1378, 752, 255,
-85, -275, -338, -315, -245, -162, -85, -38}},
};
// Channel filter: fs=48000, pass=6250, stop=9250, decim=1, fout=48000
constexpr fir_taps_real<32> taps_12k5_channel{
.low_frequency_normalized = -6250.0f / 48000.0f,
.high_frequency_normalized = 6250.0f / 48000.0f,
.transition_normalized = 3000.0f / 48000.0f,
.taps = {{-75, -362, -712, -908, -592, 268, 1324, 1720, 684, -1522, -3541, -3385,
342, 7150, 14642, 19541, 19541, 14642, 7150, 342, -3385, -3541, -1522, 684,
1720, 1324, 268, -592, -908, -712, -362, -75}},
};
// NBFM 8K50F3E emission type /////////////////////////////////////////////
// IFIR image-reject filter: fs=3072000, pass=4250, stop=340250, decim=8, fout=384000
+26 -6
View File
@@ -52,7 +52,12 @@ constexpr GPIO gpio_r9_vaa_disable = gpio[GPIO3_6];
constexpr GPIO gpio_rx_mix_bp = gpio[GPIO2_12];
constexpr GPIO gpio_tx_mix_bp = gpio[GPIO2_11];
#ifdef PRALINE
constexpr GPIO gpio_mix_bypass = gpio[GPIO3_2]; // P6_3: PRALINE RF path mixer bypass inverted
constexpr GPIO gpio_mix_en_n_r1_0 = gpio[GPIO5_6]; // P2_6: R1.0 board mixer bypass
#else
constexpr GPIO gpio_mix_bypass = gpio[GPIO5_16];
#endif
constexpr GPIO gpio_not_mix_bypass = gpio[GPIO1_0];
constexpr GPIO gpio_og_rx = gpio[GPIO5_5];
@@ -68,8 +73,15 @@ constexpr GPIO gpio_amp_bypass = gpio[GPIO0_14];
constexpr GPIO gpio_not_rx_amp_pwr = gpio[GPIO1_12];
constexpr GPIO gpio_not_tx_amp_pwr = gpio[GPIO3_5];
constexpr GPIO gpio_rffc5072_resetx = gpio[GPIO2_14];
#ifdef PRALINE
// PRALINE: GPIO2[13] is SPI CS only, FPGA controls ENX/RESETX
constexpr GPIO gpio_rffc5072_select = gpio[GPIO2_13]; // P5_4: SPI CS (ENX)
constexpr GPIO gpio_rffc5072_resetx = gpio[GPIO2_14]; // P5_5: LPC43xx controls directly
#else
constexpr GPIO gpio_rffc5072_select = gpio[GPIO2_13];
constexpr GPIO gpio_rffc5072_resetx = gpio[GPIO2_14];
#endif
#ifdef PRALINE
constexpr GPIO gpio_rffc5072_clock = gpio[GPIO5_18];
constexpr GPIO gpio_rffc5072_data = gpio[GPIO4_14];
@@ -103,8 +115,8 @@ constexpr GPIO gpio_max2839_rxtx = gpio[GPIO2_5];
#endif
#ifdef PRALINE
constexpr GPIO gpio_max5864_select = gpio[GPIO6_30];
constexpr GPIO gpio_fpga_select = gpio[GPIO2_10]; // FPGA SPI CS (P5_1)
constexpr GPIO gpio_max5864_select = gpio[GPIO6_30]; // PD_16: PRALINE MAX5864 CS
constexpr GPIO gpio_fpga_select = gpio[GPIO2_10]; // FPGA SPI CS (P5_1)
#else
constexpr GPIO gpio_max5864_select = gpio[GPIO2_7];
#endif
@@ -118,8 +130,8 @@ constexpr GPIO gpio_1v2_enable = gpio[GPIO4_7]; // 1V2 enable (P8_7)
constexpr GPIO gpio_3v3aux_disable = gpio[GPIO5_15]; // 3V3 aux disable (P6_7)
// PRALINE RF path control
constexpr GPIO gpio_tx_enable = gpio[GPIO3_4]; // TX enable (P6_5)
constexpr GPIO gpio_mix_enable_n = gpio[GPIO3_2]; // Mixer enable inverted (P6_3)
constexpr GPIO gpio_tx_enable = gpio[GPIO3_4]; // TX enable (P6_5)
// constexpr GPIO gpio_mix_enable_n = gpio[GPIO3_2]; // Mixer enable inverted (P6_3)
constexpr GPIO gpio_lpf_enable = gpio[GPIO4_8]; // LPF enable (PA_1)
constexpr GPIO gpio_rf_amp_enable = gpio[GPIO4_9]; // RF amp enable (PA_2)
constexpr GPIO gpio_ant_bias_disable = gpio[GPIO1_12]; // Antenna bias disable (P2_12)
@@ -144,9 +156,17 @@ constexpr GPIO gpio_trigger_out = gpio[GPIO5_6]; // Trigger output (P2_6)
constexpr GPIO gpio_pps_out = gpio[GPIO5_5]; // PPS output (P2_5)
#endif
#ifdef PRALINE
/* PRALINE has no HackRF CPLD. These pins are used for RFFC5072 and TX_EN instead.
* Dummy assignments here allow cpld_update.cpp to compile; the functions
* that use them are never called on PRALINE. */
constexpr GPIO gpio_cpld_tdo = gpio[GPIO3_0]; // dummy: reuse TCK pin
constexpr GPIO gpio_cpld_tms = gpio[GPIO3_1]; // dummy: reuse TDI pin
#else
constexpr GPIO gpio_cpld_tdo = gpio[GPIO5_18];
constexpr GPIO gpio_cpld_tck = gpio[GPIO3_0];
constexpr GPIO gpio_cpld_tms = gpio[GPIO3_4];
#endif
constexpr GPIO gpio_cpld_tck = gpio[GPIO3_0];
constexpr GPIO gpio_cpld_tdi = gpio[GPIO3_1];
constexpr GPIO gpio_r9_clkin_en = gpio[GPIO5_15];
-1
View File
@@ -29,7 +29,6 @@
using namespace lpc43xx;
#include "utility.hpp"
#include "../flashsize.h"
namespace portapack {
namespace memory {
+30
View File
@@ -154,6 +154,7 @@ class Message {
MorseTXkey = 96,
StreamTXConfiguration = 97,
RTTYData = 98,
NotificationData = 99,
MAX
};
@@ -1793,4 +1794,33 @@ class RTTYDataMessage : public Message {
static constexpr uint16_t max_len = 490;
};
class NotificationDataMessage : public Message {
public:
constexpr NotificationDataMessage(const char* source_app, const char* title, const char* message, uint8_t icon = 0, uint16_t timeout = 10000)
: Message{ID::NotificationData},
icon(icon),
timeout(timeout) {
if (source_app) {
size_t len = std::min(strlen(source_app), (size_t)19);
memcpy(this->source_app, source_app, len);
this->source_app[len] = '\0';
}
if (title) {
size_t len = std::min(strlen(title), (size_t)49);
memcpy(this->title, title, len);
this->title[len] = '\0';
}
if (message) {
size_t len = std::min(strlen(message), (size_t)299);
memcpy(this->message, message, len);
this->message[len] = '\0';
}
}
char source_app[20]{0}; // source application name, null-terminated, max 19 chars + null
char title[50]{0}; // title, null-terminated, max 49 chars + null
char message[300]{0}; // message, null-terminated, max 299 chars + null
uint8_t icon = 0;
uint16_t timeout = 10000;
};
#endif /*__MESSAGE_H__*/
+27 -10
View File
@@ -397,18 +397,35 @@ void Text::getWidgetName(std::string& result) {
void Text::paint(Painter& painter) {
const auto rect = screen_rect();
auto s = has_focus() ? style().invert() : style();
auto max_len = (unsigned)rect.width() / s.font.char_width();
auto text_view = std::string_view{text};
painter.fill_rectangle(rect, s.background);
const int char_width = s.font.char_width();
const int line_height = s.font.line_height();
if (char_width == 0 || line_height == 0) return;
const size_t chars_per_line = rect.width() / char_width;
if (chars_per_line == 0) return;
size_t lines_capacity = rect.height() / line_height;
if (lines_capacity == 0) lines_capacity = 1; // at least one line, even if it overflows vertically
auto text_view = std::string_view{text};
size_t current_offset = 0;
for (size_t line_idx = 0; line_idx < lines_capacity; ++line_idx) {
if (current_offset >= text_view.length()) break;
size_t chunk_len = std::min(chars_per_line, text_view.length() - current_offset);
painter.draw_string(
rect.location() + Point(0, line_idx * line_height),
s,
text_view.substr(current_offset, chunk_len));
current_offset += chunk_len;
}
}
if (text_view.length() > max_len)
text_view = text_view.substr(0, max_len);
painter.draw_string(
rect.location(),
s,
text_view);
bool Text::on_touch(const TouchEvent event) {
if (event.type == TouchEvent::Type::Start) {
if (on_select) {
on_select(*this);
return true;
}
}
return false;
}
/* Labels ****************************************************************/
+3
View File
@@ -209,6 +209,7 @@ class Rectangle : public Widget {
class Text : public Widget {
public:
std::function<void(Text&)> on_select{};
Text()
: text{""} {
}
@@ -223,6 +224,8 @@ class Text : public Widget {
void getAccessibilityText(std::string& result) override;
void getWidgetName(std::string& result) override;
bool on_touch(const TouchEvent event) override;
protected:
// NB: Don't truncate this string. The UI will only render
// as many characters as will fit in its rectange.
+9
View File
@@ -0,0 +1,9 @@
#pragma once
// DO NOT EDIT: IT IS AUTO GENERATED BY CMAKE!!!!
// clang-format off
//Allowed fw size in MB
#define FLASH_SIZE_MB 2
//Current compiled fw size in MB
#define FLASH_SIZE_LIMIT_MB 1
// clang-format on
+30 -11
View File
@@ -386,7 +386,9 @@ void Text::set(std::string_view value) {
text = std::string{value};
set_dirty();
}
std::string Text::get() {
return text;
}
void Text::getAccessibilityText(std::string& result) {
result = text;
}
@@ -396,18 +398,35 @@ void Text::getWidgetName(std::string& result) {
void Text::paint(Painter& painter) {
const auto rect = screen_rect();
auto s = has_focus() ? style().invert() : style();
auto max_len = (unsigned)rect.width() / s.font.char_width();
auto text_view = std::string_view{text};
painter.fill_rectangle(rect, s.background);
const int char_width = s.font.char_width();
const int line_height = s.font.line_height();
if (char_width == 0 || line_height == 0) return;
const size_t chars_per_line = rect.width() / char_width;
if (chars_per_line == 0) return;
size_t lines_capacity = rect.height() / line_height;
if (lines_capacity == 0) lines_capacity = 1; // at least one line, even if it overflows vertically
auto text_view = std::string_view{text};
size_t current_offset = 0;
for (size_t line_idx = 0; line_idx < lines_capacity; ++line_idx) {
if (current_offset >= text_view.length()) break;
size_t chunk_len = std::min(chars_per_line, text_view.length() - current_offset);
painter.draw_string(
rect.location() + Point(0, line_idx * line_height),
s,
text_view.substr(current_offset, chunk_len));
current_offset += chunk_len;
}
}
if (text_view.length() > max_len)
text_view = text_view.substr(0, max_len);
painter.draw_string(
rect.location(),
s,
text_view);
bool Text::on_touch(const TouchEvent event) {
if (event.type == TouchEvent::Type::Start) {
if (on_select) {
on_select(*this);
return true;
}
}
return false;
}
/* Labels ****************************************************************/
@@ -210,6 +210,7 @@ class Rectangle : public Widget {
class Text : public Widget {
public:
std::function<void(Text&)> on_select{};
Text()
: text{""} {
}
@@ -218,11 +219,14 @@ class Text : public Widget {
Text(Rect parent_rect);
void set(std::string_view value);
std::string get();
void paint(Painter& painter) override;
void getAccessibilityText(std::string& result) override;
void getWidgetName(std::string& result) override;
bool on_touch(const TouchEvent event) override;
protected:
// NB: Don't truncate this string. The UI will only render
// as many characters as will fit in its rectange.
@@ -125,7 +125,7 @@ class DigitalRain {
public:
DigitalRain() {
std::srand(0);
srand(0);
WIDTH = screen_width;
HEIGHT = screen_height + 5;
COLS = WIDTH / CHAR_WIDTH;
+1 -1
View File
@@ -6996,7 +6996,7 @@ int Context::run() {
} else if (p->order_by.compare("name", true) == 0) {
std::sort(testArray.begin(), testArray.end(), nameOrderComparator);
} else if (p->order_by.compare("rand", true) == 0) {
std::srand(p->rand_seed);
srand(p->rand_seed);
// random_shuffle implementation
const auto first = &testArray[0];
+36 -32
View File
@@ -23,63 +23,67 @@
set -e # exit immediately on any failure
# 1. PARSE ARGUMENTS
# We separate arguments into two lists:
# - CMAKE_OPTS: Anything starting with -D (e.g., -DFLASH_MB_SIZE=4)
# - BUILD_ARGS: Everything else (e.g., make, ninja, -j20)
CMAKE_OPTS=()
BUILD_DIR="build"
CMAKE_ARGS=()
BUILD_ARGS=()
for arg in "$@"; do
if [[ "$arg" == -D* ]]; then
CMAKE_OPTS+=("$arg")
else
BUILD_ARGS+=("$arg")
fi
done
parse_build_args() {
# 1. PARSE BUILD ARGUMENTS
# We separate arguments into two lists, and possibly get an override for the build dir:
# - BUILD_DIR: Defaults to build, can be overriden (e.g., -B build-4mb, --workdir build-praline)
# - CMAKE_ARGS: Anything starting with -D (e.g., -DFLASH_MB_SIZE=4)
# - BUILD_ARGS: Everything else (e.g., make, ninja, -j20)
# Reset the script arguments ($1, $2...) to contain only the BUILD_ARGS. This allows the original logic below to work exactly as before.
set -- "${BUILD_ARGS[@]}"
while [[ $# -gt 0 ]]; do
if [[ "$1" == -B ]] || [[ "$1" == "--workdir" ]]; then
shift
BUILD_DIR=$1
shift
elif [[ "$1" == -D* ]]; then
CMAKE_ARGS+=("$1")
shift
else
BUILD_ARGS+=("$1")
shift
fi
done
}
build_make() {
parse_build_args "$@"
echo "Building in workdir: \"$BUILD_DIR\" using CMake options: \"${CMAKE_ARGS[@]}\" and make options: \"${BUILD_ARGS[@]}\""
cd ..
mkdir -p build
cd build
cmake "${CMAKE_OPTS[@]}" ..
make "$@"
mkdir -p "$BUILD_DIR"
cd "$BUILD_DIR"
cmake "${CMAKE_ARGS[@]}" ..
make "${BUILD_ARGS[@]}"
exit 0
}
build_ninja() {
parse_build_args "$@"
echo "Building in workdir: \"$BUILD_DIR\" using CMake options: \"${CMAKE_ARGS[@]}\" and ninja options: \"${BUILD_ARGS[@]}\""
cd ..
mkdir -p build
cd build
cmake -G Ninja "${CMAKE_OPTS[@]}" ..
ninja "$@"
mkdir -p "$BUILD_DIR"
cd "$BUILD_DIR"
cmake -G Ninja "${CMAKE_ARGS[@]}" ..
ninja "${BUILD_ARGS[@]}"
exit 0
}
if [ "$1" = 'make' ]; then
# User explicitly typed 'make'
shift
build_make "$@"
elif [[ $1 == -j* ]]; then
# User passed -j20 directly (Implied make)
elif [[ $1 == -* ]]; then
# User passed a switch not a command as first argument. Assuming make. (e.g., -j20)
build_make "$@"
elif [ "$1" = 'ninja' ]; then
# User explicitly typed 'ninja'
shift
build_ninja "$@"
elif [ ${#CMAKE_OPTS[@]} -gt 0 ] && [ ${#BUILD_ARGS[@]} -eq 0 ]; then
# User passed ONLY CMake flags (e.g. "-DFLASH_MB_SIZE=4")
# We assume they want to run a default 'make' build.
build_make
fi
# Fallback for other commands (e.g. /bin/bash)
+1 -1
View File
@@ -24,4 +24,4 @@
# external app address ranges below must match those in linker file "external.ld"
maximum_application_size = 32*1024
external_apps_address_start = 0xADB00000
external_apps_address_end = 0xADF00000
external_apps_address_end = 0xADFC0000
+1 -1
Submodule hackrf updated: 8a416fc913...7d16b954ad