From 4161c3674bc75015dafb0656849a79ed386e3d0d Mon Sep 17 00:00:00 2001 From: Mateusz Lubecki Date: Sat, 16 Jul 2022 15:01:10 +0200 Subject: [PATCH] daily --- STM32F100_ParaTNC/makefile | 1 + STM32F100_ParaTNC/sources.mk | 1 + STM32F100_ParaTNC/src/subdir.mk | 5 +-- STM32F100_ParaTNC/system/src/aprs/subdir.mk | 2 +- STM32F100_ParaTNC/system/src/cmsis/subdir.mk | 2 +- .../system/src/cortexm/subdir.mk | 2 +- .../system/src/davis_vantage/subdir.mk | 2 +- STM32F100_ParaTNC/system/src/diag/subdir.mk | 2 +- .../system/src/drivers/subdir.mk | 2 +- .../system/src/modbus_rtu/subdir.mk | 2 +- STM32F100_ParaTNC/system/src/newlib/subdir.mk | 4 +-- .../system/src/stm32f1-stdperiph/subdir.mk | 2 +- .../system/src/umb_master/subdir.mk | 2 +- .../system/src/ve_direct_protocol/subdir.mk | 2 +- STM32L476_ParaMETEO/makefile | 13 +++++-- STM32L476_ParaMETEO/sources.mk | 1 + include/api/api_content.h | 3 +- include/{station_config.h~ => backups/abakus} | 34 +++++++++---------- include/io.h | 6 ++++ include/main.h | 4 +-- include/station_config_target_hw.h | 1 + src/io.c | 3 +- src/it_handlers.c | 4 +-- src/main.c | 8 +++-- system/src/aprs/afsk.c | 2 ++ system/src/aprs/telemetry.c | 8 +++-- 26 files changed, 72 insertions(+), 46 deletions(-) rename include/{station_config.h~ => backups/abakus} (93%) diff --git a/STM32F100_ParaTNC/makefile b/STM32F100_ParaTNC/makefile index 33fc6e2..35d402d 100644 --- a/STM32F100_ParaTNC/makefile +++ b/STM32F100_ParaTNC/makefile @@ -10,6 +10,7 @@ RM := rm -rf -include sources.mk -include system/src/ve_direct_protocol/subdir.mk -include system/src/umb_master/subdir.mk +-include system/src/tiny-aes/subdir.mk -include system/src/stm32f1-stdperiph/subdir.mk -include system/src/newlib/subdir.mk -include system/src/modbus_rtu/subdir.mk diff --git a/STM32F100_ParaTNC/sources.mk b/STM32F100_ParaTNC/sources.mk index c4dc3c4..f7291d3 100644 --- a/STM32F100_ParaTNC/sources.mk +++ b/STM32F100_ParaTNC/sources.mk @@ -39,6 +39,7 @@ system/src/http_client \ system/src/modbus_rtu \ system/src/newlib \ system/src/stm32f1-stdperiph \ +system/src/tiny-aes \ system/src/umb_master \ system/src/ve_direct_protocol \ diff --git a/STM32F100_ParaTNC/src/subdir.mk b/STM32F100_ParaTNC/src/subdir.mk index 41301ee..7f6730a 100644 --- a/STM32F100_ParaTNC/src/subdir.mk +++ b/STM32F100_ParaTNC/src/subdir.mk @@ -9,7 +9,6 @@ C_SRCS += \ ../src/PathConfig.c \ ../src/TimerConfig.c \ ../src/_write.c \ -../src/aprsis.c \ ../src/config_data_default.c \ ../src/config_data_first.c \ ../src/config_data_second.c \ @@ -38,7 +37,6 @@ OBJS += \ ./src/PathConfig.o \ ./src/TimerConfig.o \ ./src/_write.o \ -./src/aprsis.o \ ./src/config_data_default.o \ ./src/config_data_first.o \ ./src/config_data_second.o \ @@ -67,7 +65,6 @@ C_DEPS += \ ./src/PathConfig.d \ ./src/TimerConfig.d \ ./src/_write.d \ -./src/aprsis.d \ ./src/config_data_default.d \ ./src/config_data_first.d \ ./src/config_data_second.d \ @@ -95,7 +92,7 @@ C_DEPS += \ src/%.o: ../src/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/aprs/subdir.mk b/STM32F100_ParaTNC/system/src/aprs/subdir.mk index a102e5f..788cebf 100644 --- a/STM32F100_ParaTNC/system/src/aprs/subdir.mk +++ b/STM32F100_ParaTNC/system/src/aprs/subdir.mk @@ -44,7 +44,7 @@ C_DEPS += \ system/src/aprs/%.o: ../system/src/aprs/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/cmsis/subdir.mk b/STM32F100_ParaTNC/system/src/cmsis/subdir.mk index c9ea0ee..7764e8e 100644 --- a/STM32F100_ParaTNC/system/src/cmsis/subdir.mk +++ b/STM32F100_ParaTNC/system/src/cmsis/subdir.mk @@ -20,7 +20,7 @@ C_DEPS += \ system/src/cmsis/%.o: ../system/src/cmsis/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/cortexm/subdir.mk b/STM32F100_ParaTNC/system/src/cortexm/subdir.mk index 37da44e..4972b06 100644 --- a/STM32F100_ParaTNC/system/src/cortexm/subdir.mk +++ b/STM32F100_ParaTNC/system/src/cortexm/subdir.mk @@ -23,7 +23,7 @@ C_DEPS += \ system/src/cortexm/%.o: ../system/src/cortexm/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/davis_vantage/subdir.mk b/STM32F100_ParaTNC/system/src/davis_vantage/subdir.mk index 5f943b8..88da1d7 100644 --- a/STM32F100_ParaTNC/system/src/davis_vantage/subdir.mk +++ b/STM32F100_ParaTNC/system/src/davis_vantage/subdir.mk @@ -20,7 +20,7 @@ C_DEPS += \ system/src/davis_vantage/%.o: ../system/src/davis_vantage/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/diag/subdir.mk b/STM32F100_ParaTNC/system/src/diag/subdir.mk index a58588e..9fc1033 100644 --- a/STM32F100_ParaTNC/system/src/diag/subdir.mk +++ b/STM32F100_ParaTNC/system/src/diag/subdir.mk @@ -20,7 +20,7 @@ C_DEPS += \ system/src/diag/%.o: ../system/src/diag/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/drivers/subdir.mk b/STM32F100_ParaTNC/system/src/drivers/subdir.mk index 20bb1e3..db96781 100644 --- a/STM32F100_ParaTNC/system/src/drivers/subdir.mk +++ b/STM32F100_ParaTNC/system/src/drivers/subdir.mk @@ -29,7 +29,7 @@ C_DEPS += \ system/src/drivers/%.o: ../system/src/drivers/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/modbus_rtu/subdir.mk b/STM32F100_ParaTNC/system/src/modbus_rtu/subdir.mk index 1e00724..d0ed274 100644 --- a/STM32F100_ParaTNC/system/src/modbus_rtu/subdir.mk +++ b/STM32F100_ParaTNC/system/src/modbus_rtu/subdir.mk @@ -26,7 +26,7 @@ C_DEPS += \ system/src/modbus_rtu/%.o: ../system/src/modbus_rtu/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/newlib/subdir.mk b/STM32F100_ParaTNC/system/src/newlib/subdir.mk index 726cdd3..2c5417d 100644 --- a/STM32F100_ParaTNC/system/src/newlib/subdir.mk +++ b/STM32F100_ParaTNC/system/src/newlib/subdir.mk @@ -36,14 +36,14 @@ CPP_DEPS += \ system/src/newlib/%.o: ../system/src/newlib/%.cpp @echo 'Building file: $<' @echo 'Invoking: Cross ARM C++ Compiler' - arm-none-eabi-g++ -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu++11 -fabi-version=0 -fno-exceptions -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics -Wunused-function -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-g++ -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu++11 -fabi-version=0 -fno-exceptions -fno-rtti -fno-use-cxa-atexit -fno-threadsafe-statics -Wunused-function -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' system/src/newlib/%.o: ../system/src/newlib/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/stm32f1-stdperiph/subdir.mk b/STM32F100_ParaTNC/system/src/stm32f1-stdperiph/subdir.mk index 0a20f0b..8b0f363 100644 --- a/STM32F100_ParaTNC/system/src/stm32f1-stdperiph/subdir.mk +++ b/STM32F100_ParaTNC/system/src/stm32f1-stdperiph/subdir.mk @@ -53,7 +53,7 @@ C_DEPS += \ system/src/stm32f1-stdperiph/%.o: ../system/src/stm32f1-stdperiph/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/umb_master/subdir.mk b/STM32F100_ParaTNC/system/src/umb_master/subdir.mk index 52cd3df..b619e99 100644 --- a/STM32F100_ParaTNC/system/src/umb_master/subdir.mk +++ b/STM32F100_ParaTNC/system/src/umb_master/subdir.mk @@ -26,7 +26,7 @@ C_DEPS += \ system/src/umb_master/%.o: ../system/src/umb_master/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32F100_ParaTNC/system/src/ve_direct_protocol/subdir.mk b/STM32F100_ParaTNC/system/src/ve_direct_protocol/subdir.mk index 833bc60..99fd9ea 100644 --- a/STM32F100_ParaTNC/system/src/ve_direct_protocol/subdir.mk +++ b/STM32F100_ParaTNC/system/src/ve_direct_protocol/subdir.mk @@ -17,7 +17,7 @@ C_DEPS += \ system/src/ve_direct_protocol/%.o: ../system/src/ve_direct_protocol/%.c @echo 'Building file: $<' @echo 'Invoking: Cross ARM C Compiler' - arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" + arm-none-eabi-gcc -mcpu=cortex-m3 -mthumb -Og -fmessage-length=0 -fsigned-char -ffunction-sections -fdata-sections -ffreestanding -fno-move-loop-invariants -g3 -DDEBUG -DTRACE -DSTM32F10X_MD_VL -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=8000000 -I"../include" -I"../include/etc" -I"../system/include/tiny-aes" -I"../system/include/aprs" -I"../system/include" -I"../system/include/cmsis" -I"../system/include/stm32f1-stdperiph" -std=gnu11 -Wunused-function -Wall -Wa,-adhlns="$@.lst" -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -c -o "$@" "$<" @echo 'Finished building: $<' @echo ' ' diff --git a/STM32L476_ParaMETEO/makefile b/STM32L476_ParaMETEO/makefile index c39532f..7c62800 100644 --- a/STM32L476_ParaMETEO/makefile +++ b/STM32L476_ParaMETEO/makefile @@ -58,6 +58,9 @@ endif SECONDARY_FLASH += \ ParaTNC.hex \ +SECONDARY_LIST += \ +ParaTNC.lst \ + SECONDARY_SIZE += \ ParaTNC.siz \ @@ -79,6 +82,12 @@ ParaTNC.hex: ParaTNC.elf @echo 'Finished building: $@' @echo ' ' +ParaTNC.lst: ParaTNC.elf + @echo 'Invoking: Cross ARM GNU Create Listing' + arm-none-eabi-objdump --source --all-headers --demangle --line-numbers --wide "ParaTNC.elf" > "ParaTNC.lst" + @echo 'Finished building: $@' + @echo ' ' + ParaTNC.siz: ParaTNC.elf @echo 'Invoking: Cross ARM GNU Print Size' arm-none-eabi-size --format=berkeley "ParaTNC.elf" @@ -87,10 +96,10 @@ ParaTNC.siz: ParaTNC.elf # Other Targets clean: - -$(RM) $(CC_DEPS)$(C++_DEPS)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(SECONDARY_FLASH)$(SECONDARY_SIZE)$(ASM_DEPS)$(S_UPPER_DEPS)$(C_DEPS)$(CPP_DEPS) ParaTNC.elf + -$(RM) $(CC_DEPS)$(C++_DEPS)$(OBJS)$(C_UPPER_DEPS)$(CXX_DEPS)$(SECONDARY_FLASH)$(SECONDARY_LIST)$(SECONDARY_SIZE)$(ASM_DEPS)$(S_UPPER_DEPS)$(C_DEPS)$(CPP_DEPS) ParaTNC.elf -@echo ' ' -secondary-outputs: $(SECONDARY_FLASH) $(SECONDARY_SIZE) +secondary-outputs: $(SECONDARY_FLASH) $(SECONDARY_LIST) $(SECONDARY_SIZE) .PHONY: all clean dependents diff --git a/STM32L476_ParaMETEO/sources.mk b/STM32L476_ParaMETEO/sources.mk index 18f2fac..a6c6c65 100644 --- a/STM32L476_ParaMETEO/sources.mk +++ b/STM32L476_ParaMETEO/sources.mk @@ -19,6 +19,7 @@ OBJS := C_UPPER_DEPS := CXX_DEPS := SECONDARY_FLASH := +SECONDARY_LIST := SECONDARY_SIZE := ASM_DEPS := S_UPPER_DEPS := diff --git a/include/api/api_content.h b/include/api/api_content.h index 6086a50..e608257 100644 --- a/include/api/api_content.h +++ b/include/api/api_content.h @@ -7,6 +7,7 @@ #ifndef API_STATUS_CONTENT_H_ #define API_STATUS_CONTENT_H_ +#ifdef STM32L471xx #include "api_xmacro_helpers.h" @@ -65,7 +66,7 @@ #define ENTRIES_STRING_WEATHER(ENTRY) \ ENTRY(api_mac, api_mac) \ - +#endif #endif /* API_STATUS_CONTENT_H_ */ /** diff --git a/include/station_config.h~ b/include/backups/abakus similarity index 93% rename from include/station_config.h~ rename to include/backups/abakus index d19d141..7faa923 100644 --- a/include/station_config.h~ +++ b/include/backups/abakus @@ -8,19 +8,19 @@ #ifndef STATION_CONFIG_H_ #define STATION_CONFIG_H_ -//#define _POWERSAVE_NORMAL +#define _POWERSAVE_NORMAL //#define _POWERSAVE_AGGRESIVE /* ------------------ */ /* MODES OF OPERATION */ #define _METEO // Enable meteo station -#define _DIGI // Enable WIDE1-1 digipeater -#define _DIGI_VISCOUS -//#define _DIGI_ONLY_789 // Limit digipeater to handle only -7, -8 and -9 SSIDs +//#define _DIGI // Enable WIDE1-1 digipeater +//#define _DIGI_VISCOUS +#define _DIGI_ONLY_789 // Limit digipeater to handle only -7, -8 and -9 SSIDs -//#define _GSM // only for ParaMETEO -//#define _GSM_KEEP_MODEM_ALWAYS_ON +#define _GSM // only for ParaMETEO +#define _GSM_KEEP_MODEM_ALWAYS_ON #define _WX_DOUBLE_TRANSMIT @@ -81,9 +81,9 @@ /*************** DATA SOURCES CONFIG ***********************/ -#define _TEMPERATURE_INTERNAL +//#define _TEMPERATURE_INTERNAL //#define _TEMPERATURE_UMB -//#define _TEMPERATURE_RTU +#define _TEMPERATURE_RTU //#define _TEMPERATURE_DAVIS // #define _PRESSURE_INTERNAL @@ -113,21 +113,21 @@ // and switch device to "pure" kiss TNC operation. Packets from PC will be transmitted normally. // Coordines should be in APRS decimal format DDDMM.SS for Longitude and DDMM.SS for latitude -#define _CALL "SR9WXP" -#define _SSID 0 -#define _LAT 4932.18 +#define _CALL "ABAKUS" +#define _SSID 1 +#define _LAT 4948.11 #define _LATNS 'N' -#define _LON 01919.18 +#define _LON 01903.22 #define _LONWE 'E' -#define _COMMENT "DigiW1 + WX = TXPower 1W = Pilsko, wyciag orczykowy VII, 1400m AMSL = sp8ebc@interia.pl" +#define _COMMENT "Set Your configuration in this file and rename to station_config.h" // You can use only one of these below defines to choose symbol. Meteo data are are always transmitted with blue WX symbol //#define _SYMBOL_DIGI // uncomment if you want digi symbol(green star with D inside) -#define _SYMBOL_WIDE1_DIGI // uncomment if you want 'little' digi symbol (green star with digit 1 overlaid) +//#define _SYMBOL_WIDE1_DIGI // uncomment if you want 'little' digi symbol (green star with digit 1 overlaid) //#define _SYMBOL_HOUSE // uncomment if you want house symbol //#define _SYMBOL_RXIGATE // uncomment if you want rxigate symbol (black diamond with R) //#define _SYMBOL_IGATE // uncomment if you want igate symol (black diamond with I) -//#define _SYMBOL_SAILBOAT +#define _SYMBOL_SAILBOAT // Or you can keep commented all symbol defines and choose custom one based on data from APRS symbols table //#define _SYMBOL_F '/' @@ -142,7 +142,7 @@ #define _BCN_ON_STARTUP #define _WX_INTERVAL 4 // WX packet interval in minutes -#define _BCN_INTERVAL 124 // Own beacon interval in minutes +#define _BCN_INTERVAL 125 // Own beacon interval in minutes #define _PTT_PUSHPULL // Uncomment this if you want PTT line to work as Push-pull instead of Open Drain #define _SERIAL_BAUDRATE 9600 @@ -150,7 +150,7 @@ #define _DIGI_VISCOUS_DEALY 2 // Transmitting delay -#define _DELAY_BASE 14 // * 50ms. For example setting 10 gives 500msec delay. Maximum value is 20 +#define _DELAY_BASE 20 // * 50ms. For example setting 10 gives 500msec delay. Maximum value is 20 //#define _RANDOM_DELAY // adds random delay TO fixed time set by _DELAY_BASE. This additional time can be // from 100ms up to 1 sec in 100ms steps. Values are drawn from samples going from ADC // so it is better to use Unsquelched output in radio to provide much more randomness diff --git a/include/io.h b/include/io.h index b87b31b..a30656f 100644 --- a/include/io.h +++ b/include/io.h @@ -79,6 +79,7 @@ inline uint8_t io_get_12v_sw___cntrl_vbat_g(void) { } } +#ifdef STM32L471xx inline void io___cntrl_vbat_g_enable(void) { GPIOA->BSRR |= GPIO_BSRR_BS6; } @@ -153,6 +154,11 @@ inline uint8_t io_get_cntrl_vbat_s(void) { return out; } +#else +inline uint8_t io_get_cntrl_vbat_s(void) { + return 0; +} +#endif #endif /* IO_H_ */ diff --git a/include/main.h b/include/main.h index 6d29810..a5e2f44 100644 --- a/include/main.h +++ b/include/main.h @@ -7,8 +7,8 @@ #include "drivers/serial.h" #include "config_data.h" -#define SW_VER "EA10" -#define SW_DATE "08072022" +#define SW_VER "EA14" +#define SW_DATE "15072022" #define SYSTICK_TICKS_PER_SECONDS 100 #define SYSTICK_TICKS_PERIOD 10 diff --git a/include/station_config_target_hw.h b/include/station_config_target_hw.h index 89f2175..7c482d8 100644 --- a/include/station_config_target_hw.h +++ b/include/station_config_target_hw.h @@ -8,5 +8,6 @@ #ifndef STATION_CONFIG_TARGET_HW_H_ #define STATION_CONFIG_TARGET_HW_H_ +//#define PARATNC_HWREV_C #endif /* STATION_CONFIG_TARGET_HW_H_ */ diff --git a/src/io.c b/src/io.c index 045d9e7..7d1e2b5 100644 --- a/src/io.c +++ b/src/io.c @@ -378,6 +378,7 @@ uint16_t io_vbat_meas_get() { uint16_t io_vbat_meas_average(uint16_t sample) { uint16_t out = 0; +#ifdef PARAMETEO int i = 0; @@ -410,7 +411,7 @@ uint16_t io_vbat_meas_average(uint16_t sample) { out = (uint16_t)(average_acc / VBATT_HISTORY_LN); } - +#endif return out; } diff --git a/src/it_handlers.c b/src/it_handlers.c index 7963296..1f8eb33 100644 --- a/src/it_handlers.c +++ b/src/it_handlers.c @@ -19,8 +19,6 @@ #include #include "cmsis/stm32l4xx/system_stm32l4xx.h" #include "pwr_save.h" - -uint8_t it_handlers_inhibit_radiomodem_dcd_led = 0; #endif #include "drivers/dallas.h" @@ -69,6 +67,8 @@ short int AdcValue; uint8_t it_handlers_cpu_load_pool = 0; +uint8_t it_handlers_inhibit_radiomodem_dcd_led = 0; + // this function will set all iterrupt priorities except systick void it_handlers_set_priorities(void) { NVIC_SetPriority(TIM2_IRQn, 1); // one-wire delay diff --git a/src/main.c b/src/main.c index 3a9111c..577296d 100644 --- a/src/main.c +++ b/src/main.c @@ -959,7 +959,7 @@ int main(int argc, char* argv[]){ if ((main_config_data_mode->wx & WX_ENABLED) == 0) { - beacon_send_own(); + beacon_send_own(0); } else { @@ -1026,7 +1026,9 @@ int main(int argc, char* argv[]){ ax25_new_msg_rx_flag = 0; rx10m++; +#ifdef STM32L471xx rte_main_rx_total++; +#endif } #ifdef STM32L471xx @@ -1142,7 +1144,7 @@ int main(int argc, char* argv[]){ // get all meteo measuremenets each 65 seconds. some values may not be // downloaded from sensors if _METEO and/or _DALLAS_AS_TELEM aren't defined if (main_wx_sensors_pool_timer < 10) { - +#ifdef PARAMETEO // get current battery voltage. for non parameteo this will return 0 rte_main_battery_voltage = io_vbat_meas_get(); @@ -1153,7 +1155,7 @@ int main(int argc, char* argv[]){ if (rte_main_average_battery_voltage == 0) { rte_main_average_battery_voltage = rte_main_battery_voltage; } - +#endif if ((main_config_data_mode->wx & WX_ENABLED) == 1) { // notice: UMB-master and Modbus-RTU uses the same UART diff --git a/system/src/aprs/afsk.c b/system/src/aprs/afsk.c index a37c559..918ec64 100644 --- a/system/src/aprs/afsk.c +++ b/system/src/aprs/afsk.c @@ -310,7 +310,9 @@ void afsk_txStart(Afsk *af) { if (!af->sending) { tx10m++; + #ifdef STM32L471xx rte_main_tx_total++; + #endif af->phase_inc = MARK_INC; af->phase_acc = 0; diff --git a/system/src/aprs/telemetry.c b/system/src/aprs/telemetry.c index 8bc7daf..aa6318b 100644 --- a/system/src/aprs/telemetry.c +++ b/system/src/aprs/telemetry.c @@ -345,7 +345,7 @@ void telemetry_send_chns_description(const config_data_basic_t * const config_ba /** * This function sends telemetry values in 'typical configuration' when VICTRON VE.direct protocol parser is not enabled. */ -#ifdef STM32L471xx +#ifdef PARAMETEO void telemetry_send_values( uint8_t rx_pkts, uint8_t tx_pkts, uint8_t digi_pkts, @@ -466,10 +466,12 @@ void telemetry_send_values( uint8_t rx_pkts, humidity_qf_navaliable = '0'; } +#ifdef PARAMETEO // telemetry won't be sent during cutoff anyway so this simplification is correct here if (cutoff_and_vbat_low > 0) { vbatt_low = '1'; } +#endif // reset the buffer where the frame will be contructed and stored for transmission memset(main_own_aprs_msg, 0x00, sizeof(main_own_aprs_msg)); @@ -559,7 +561,9 @@ void telemetry_send_status_raw_values_modbus(void) { #endif } + void telemetry_send_status_powersave_cutoff(uint16_t battery_voltage, int8_t previous_cutoff, int8_t current_cutoff) { +#ifdef PARAMETEO const char *p, *c; // telemetry_vbatt_unknown @@ -598,7 +602,7 @@ void telemetry_send_status_powersave_cutoff(uint16_t battery_voltage, int8_t pre //while (main_ax25.dcd == 1); afsk_txStart(&main_afsk); main_wait_for_tx_complete(); - +#endif } void telemetry_send_status_powersave_registers(uint32_t register_last_sleep, uint32_t register_last_wakeup, uint32_t register_counters, uint32_t monitor, uint32_t last_sleep_time) {