some cleanups

CMakeLists.txt

@@ -9,7 +9,7 @@ if(UNIX)
   CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc GNU)
   CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++ GNU)
 else()
-  set(TOOLCHAIN_DIR "D:/Programy/arm_gcc/bin/")
+  set(TOOLCHAIN_DIR "D:/Programy/GNU Tools ARM Embedded/5.4 2016q3/bin")
   CMAKE_FORCE_C_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-gcc.exe GNU)
   CMAKE_FORCE_CXX_COMPILER(${TOOLCHAIN_DIR}/arm-none-eabi-g++.exe GNU)
 endif()
@@ -26,7 +26,7 @@ add_definitions(-D__ASSEMBLY__)
 
 
 SET(LINKER_SCRIPT ${PROJECT_SOURCE_DIR}/arm-gcc-link.ld)
-SET(COMMON_FLAGS " -mcpu=cortex-m3 -mthumb -Wall -ffunction-sections -g -O3  -g -nostartfiles ")
+SET(COMMON_FLAGS " -mcpu=cortex-m3 -mthumb -Wall -ffunction-sections -g -O3 -g -nostartfiles ")
 SET(CMAKE_CXX_FLAGS "${COMMON_FLAGS} -std=c++11")
 SET(CMAKE_C_FLAGS "${COMMON_FLAGS} -std=gnu99")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-Map=${CMAKE_BINARY_DIR}/${PROJECT_NAME}.map -lstdc++ -O3 -Wl,--gc-sections --specs=nano.specs -T ${LINKER_SCRIPT}")

README.md

@@ -13,6 +13,7 @@ Have a nice day ;)
  * 14.12.2016 - Reverse engineeded connections, initial hard work, resulting in working RTTY by SQ7FJB
  * 07.01.2017 - GPS now using proprietiary UBLOX protocol, more elastic code to set working frequency by SQ5RWU
  * 23.01.2017 - Test APRS code, small fixes in GPS code by SQ5RWU
+ * 06.06.2017 - APRS code fix, some code cleanup
 
 
 #TODO
@@ -25,6 +26,7 @@ Shift 450Hz
 
 * ```CALLSIGN``` RTTY callsign
 * ```APRS_CALLSIGN``` APRS callsign
+* ```APRS_COMMENT``` APRS comment
 * ```APRS_SSID``` APRS SSID - '1' -> 1, 'A' -> 10 etc.
 * ```RTTY_TO_APRS_RATIO``` number of RTTY frames between each APRS frame
 * ```RTTY_FREQUENCY``` RTTY frequency in MHz

config.h

@@ -13,7 +13,7 @@
 #define CALLSIGN "DF8OE" // put your callsign here
 #define APRS_CALLSIGN "DF8OE-10"
 #define APRS_SSID 'B'
-#define APRS_COMMENT "Hello from the sky!"
+#define APRS_COMMENT " Hello from the sky!"
 #define RTTY_TO_APRS_RATIO 5
 
 //*************frequency********************

main.c

@@ -36,6 +36,7 @@ int napiecie;
 volatile char flaga = 0;//((((tx_delay / 1000) & 0x0f) << 3) | Smoc);
 uint16_t CRC_rtty = 0x12ab;  //checksum
 char buf_rtty[200];
+
 volatile unsigned char pun = 0;
 volatile unsigned int cun = 10;
 volatile unsigned char tx_on = 0;
@@ -75,7 +76,7 @@ void TIM2_IRQHandler(void) {
             GPIO_SetBits(GPIOB, RED);
             if (*(++rtty_buf) == 0) {
               tx_on = 0;
-              tx_on_delay = tx_delay / (1000/RTTY_SPEED);//2500;
+              tx_on_delay = tx_delay / (1000/RTTY_SPEED);
               tx_enable = 0;
               radio_disable_tx();
             }
@@ -168,6 +169,7 @@ int main(void) {
   radio_enable_tx();
 
   uint8_t rtty_before_aprs_left = RTTY_TO_APRS_RATIO;
+
   while (1) {
     if (tx_on == 0 && tx_enable) {
       if (rtty_before_aprs_left){