# HG changeset patch # User Ethan Zonca # Date 2017-09-24 16:58:46 # Node ID 639ea4c6e941c52bab687470b4eb233b4d666259 # Parent 8e3cff0b603cf78ff4579e69d2a45c1cf0157d75 Altitude seems to work correctly now! diff --git a/src/wspr.c b/src/wspr.c --- a/src/wspr.c +++ b/src/wspr.c @@ -72,8 +72,9 @@ void wspr_transmit(uint8_t* grid_locator ///////////////////////////////////////////////// // Composite altitude and sub-maidenhead locator ///////////////////////////////////////////////// - uint16_t maiden_ext = (loc[4] - 'A') + ((loc[5] - 'A') * 24); // 0-575 - uint16_t altitude_mod = gps_getdata()->altitude / 20; + // Use untrimmed locator + uint32_t maiden_ext = (grid_locator[4] - 'A') + ((grid_locator[5] - 'A') * 24); // 0-575 + uint32_t altitude_mod = gps_getdata()->altitude / 20; // Ciel at 21,340 meters if(altitude_mod > 1067) @@ -231,6 +232,9 @@ void wspr_transmit(uint8_t* grid_locator HAL_NVIC_EnableIRQ(TIM1_BRK_UP_TRG_COM_IRQn); + + // TODO: Bring up TCXO sooner! Gotta let it warm up or something + HAL_GPIO_WritePin(OSC_NOTEN, 0); HAL_GPIO_WritePin(TCXO_EN, 1); HAL_Delay(100);