FeatherHAB/wsprhab Changeset - 30ab6b66325f

Changeset - 30ab6b66325f

Parent rev.

Child rev.

[Not reviewed]

default

0 12 0

Ethan Zonca - 7 years ago 2019-09-01 19:12:19
ez@ethanzonca.com

Add pilot tone and some power-saving stuff that really doesn't help at all

12 files changed with 168 insertions and 117 deletions:

.cproject

.settings/language.settings.xml

Makefile

inc/config.h

inc/wspr.h

lib/si5351/si5351.h

src/adc.c

src/gpio.c

src/main.c

src/rtc.c

src/system.c

src/wspr.c

0 comments (0 inline, 0 general)

.cproject

➞

Show inline comments

@@ @@ -11,12 +11,14 @@ @@
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration buildProperties="" id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1766192373" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1766192373" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1766192373.916722003" name="/" resourcePath="">
-						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1146369181" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1146369181" name="Cross ARM GCC">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.1198449147" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.1554715887" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.suffix.1885501034" name="Suffix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.suffix"/>
@@ @@ -87,40 +89,8 @@ @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.prof.1656054194" name="Generate prof information (-p)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.prof"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.gprof.854647627" name="Generate gprof information (-pg)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.gprof"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other.1915699559" name="Other debugging flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.other"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.971030964" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
 							<builder id="ilg.gnuarmeclipse.managedbuild.cross.builder.2082002245" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1134351891" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1814170446" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1976458517" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.66269454" name="Cross ARM C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1877426653" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.31521072" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.538112757" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.695260548" name="Cross ARM C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections.1175234160" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.95766250" name="Cross ARM C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.1934782132" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input.2063228079" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
 								</inputType>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.943394393" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.1947850374" name="Cross ARM GNU Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting.995734243" name="Cross ARM GNU Create Listing" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createlisting">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source.363398502" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.source" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders.2134601491" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.allheaders" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle.1315779547" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.demangle" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers.75607248" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.linenumbers" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide.1656042397" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.createlisting.wide" useByScannerDiscovery="false" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize.1698996853" name="Cross ARM GNU Print Size" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.1148857532" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format" useByScannerDiscovery="false"/>
 							</tool>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.971030964" isAbstract="false" osList="all"/>
 							<builder id="ilg.gnuarmeclipse.managedbuild.cross.builder.2082002245" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder.Default"/>
 						</toolChain>
 					</folderInfo>
 				</configuration>
@@ @@ -153,4 +123,6 @@ @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope"/>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>

.settings/language.settings.xml

➞

Show inline comments

@@ @@ -5,7 +5,7 @@ @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1836845659980131172" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1122202595071" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Makefile

➞

Show inline comments

@@ @@ -38,7 +38,7 @@ JTENCODE_INCLUDES = -Ilib/jtencode @@
 # USER_CFLAGS: user C flags (enable warnings, enable debug info)
 USER_CFLAGS = -Wall -g -ffunction-sections -fdata-sections -Os -fno-common --function-sections -fdata-sections
 USER_CFLAGS += -flto
+#USER_CFLAGS += -flto
 # USER_LDFLAGS:  user LD flags
 USER_LDFLAGS = -fno-exceptions -ffunction-sections -fdata-sections -Wl,--gc-sections

inc/config.h

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ @@
 // Transmitter config
 // --------------------------------------------------------------------------
+//#define LED_DISABLE
 // --------------------------------------------------------------------------
 // ADC config (adc.c)
 // --------------------------------------------------------------------------
-// Temperature sensor offset (die temperature from ambient, esimate, in Celcius)
+// Temperature sensor offset (die temperature from ambient, estimate, in Celcius)
 #define ADC_TEMPERATURE_OFFSET -10

inc/wspr.h

➞

Show inline comments

@@ @@ -6,6 +6,6 @@ void wspr_init(void); @@
 void wspr_sleep(void);
 void wspr_wakeup(void);
 void wspr_transmit(uint8_t* grid_locator, uint8_t send_alternate);
+void wspr_pilot_tone(void);
 #endif

lib/si5351/si5351.h

➞

Show inline comments

@@ @@ -35,7 +35,7 @@ @@
 /* Define definitions */
 #define SI5351_BUS_BASE_ADDR				((0x60 & 0x7f) << 1)
-#define SI5351_XTAL_FREQ					25000000
+#define SI5351_XTAL_FREQ					26000000
 #define SI5351_PLL_FIXED					90000000000ULL
 #define SI5351_FREQ_MULT					100ULL
 #define SI5351_DEFAULT_CLK					1000000000ULL

src/adc.c

➞

Show inline comments

@@ @@ -72,6 +72,9 @@ void adc_init(void) @@
 void adc_start(void)
+{
 	// TODO: Is stopping the clocks enough? Might need to disable periph?
     __ADC1_CLK_ENABLE();
 	__DMA1_CLK_ENABLE();
     HAL_ADC_Start_DMA(&hadc, adc_buffer, ADC_BUF_LEN);
+}
@@ @@ -79,6 +82,9 @@ void adc_start(void) @@
 void adc_stop(void)
+{
     HAL_ADC_Stop_DMA(&hadc);
     __DMA1_CLK_DISABLE();
     __ADC1_CLK_DISABLE();
+}

src/gpio.c

➞

Show inline comments

 #include "gpio.h"
 #include "config.h"
 // Initialize GPIOs
 void gpio_init(void)
+{
@@ @@ -67,11 +69,13 @@ void gpio_init(void) @@
 void led_blink(uint8_t n)
+{
     for(int i = 0; i < n; i++)
+    {
         HAL_GPIO_WritePin(LED_BLUE, 1);
         HAL_Delay(100);
         HAL_GPIO_WritePin(LED_BLUE, 0);
         HAL_Delay(100);
+    }
 	#ifndef LED_DISABLE
 		for(int i = 0; i < n; i++)
+		{
 			HAL_GPIO_WritePin(LED_BLUE, 1);
 			HAL_Delay(100);
 			HAL_GPIO_WritePin(LED_BLUE, 0);
 			HAL_Delay(100);
+		}
 	#endif
+}

src/main.c

➞

Show inline comments

@@ @@ -11,6 +11,7 @@ @@
 #include "wspr.h"
 #include "rtc.h"
 #include "gps.h"
 #include "config.h"
 // We have access to the 1PPS pin of the gps... could have trim routine for internal oscillator based on this when we have a fix
@@ @@ -63,16 +64,23 @@ int main(void) @@
     uint8_t packet_type = 0;
     // Transmit pilot tone to test TX on bootup
     HAL_Delay(1000);
     wspr_pilot_tone();
     adc_stop();
     HAL_Delay(1000);
     while (1)
+    {
     	// TODO: Disable GPIO port clocking when not needed!
     	// Every 10 minutes, wake up and try to wspr
     	if(state == SYSTEM_IDLE && (HAL_GetTick() - last_wspr_tx_time > 60000 * 10))
+    	{
     		state = SYSTEM_GPSACQ;
+    	}
 //    	if(state == SYSTEM_IDLE && (HAL_GetTick() - last_wspr_tx_time > 60000 * 10))
 //    	{
 //    		state = SYSTEM_GPSACQ;
 //    	}
         // Update fix status every 2 seconds
+        // Update fix status every 2 seconds, only if the GPS is powered on
         if(HAL_GetTick() - gps_polltimer > 2000)
+        {
             if(gps_ison())
@@ @@ -142,6 +150,9 @@ int main(void) @@
                     gps_poweron(); // power on and initialize GPS module
+                }
                 // TODO: Move GPS processing into here from above!
                 // If 3d fix with a decent enough precision
                 if( ((gps_getdata()->fixtype == 2) || (gps_getdata()->fixtype == 3)) && gps_getdata()->pdop < 10 && nextwspr_time_valid == 1)
+                {
@@ @@ -213,25 +224,26 @@ int main(void) @@
                     HAL_PWR_EnterSLEEPMode(0, PWR_SLEEPENTRY_WFI);
+            	}
-                // Schedule next wakeup (maybe 2mins prior ot timeslot if no osc trim)
+                // Schedule next wakeup (maybe 2mins prior to timeslot if no osc trim)
                 // Next wakeup should enter SYSTEM_GPSACQ state...
             } break;
+        }
 		#ifndef LED_DISABLE
 			if(HAL_GetTick() - led_timer > blink_rate)
+			{
 				ledpulse();
 				led_timer = HAL_GetTick();
+			}
         if(HAL_GetTick() - led_timer > blink_rate)
+        {
             ledpulse();
             led_timer = HAL_GetTick();
+        }
         if(statled_ontime && HAL_GetTick() - statled_ontime > 10)
+        {
             HAL_GPIO_WritePin(LED_BLUE, 0);
             statled_ontime = 0;
+        }
 			if(statled_ontime && HAL_GetTick() - statled_ontime > 10)
+			{
 				HAL_GPIO_WritePin(LED_BLUE, 0);
 				statled_ontime = 0;
+			}
 		#endif
+    }
+}

src/rtc.c

➞

Show inline comments

@@ @@ -19,66 +19,66 @@ void rtc_init(void) @@
 	__HAL_RCC_RTC_ENABLE();
   RTC_TimeTypeDef sTime;
   RTC_DateTypeDef sDate;
   RTC_AlarmTypeDef sAlarm;
 	RTC_TimeTypeDef sTime;
 	RTC_DateTypeDef sDate;
 	RTC_AlarmTypeDef sAlarm;
   hrtc.Instance = RTC;
   hrtc.Init.HourFormat = RTC_HOURFORMAT_24;
   hrtc.Init.AsynchPrediv = 124;
   hrtc.Init.SynchPrediv = 322; // if this has enough bits should be 1.0018Hz based on 40kHz LSI
   hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
   hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
   hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
 	hrtc.Instance = RTC;
 	hrtc.Init.HourFormat = RTC_HOURFORMAT_24;
 	hrtc.Init.AsynchPrediv = 124;
 	hrtc.Init.SynchPrediv = 322; // if this has enough bits should be 1.0018Hz based on 40kHz LSI
 	hrtc.Init.OutPut = RTC_OUTPUT_DISABLE;
 	hrtc.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
 	hrtc.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
   if (HAL_RTC_Init(&hrtc) != HAL_OK)
+  {
     Error_Handler();
+  }
 	if (HAL_RTC_Init(&hrtc) != HAL_OK)
+	{
 		Error_Handler();
+	}
   sTime.Hours = 0x0;
   sTime.Minutes = 0x0;
   sTime.Seconds = 0x0;
   sTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
   sTime.StoreOperation = RTC_STOREOPERATION_RESET;
   if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
+  {
     Error_Handler();
+  }
 	sTime.Hours = 0x0;
 	sTime.Minutes = 0x0;
 	sTime.Seconds = 0x0;
 	sTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
 	sTime.StoreOperation = RTC_STOREOPERATION_RESET;
 	if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
+	{
 		Error_Handler();
+	}
   sDate.WeekDay = RTC_WEEKDAY_MONDAY;
   sDate.Month = RTC_MONTH_JANUARY;
   sDate.Date = 0x1;
   sDate.Year = 0x0;
 	sDate.WeekDay = RTC_WEEKDAY_MONDAY;
 	sDate.Month = RTC_MONTH_JANUARY;
 	sDate.Date = 0x1;
 	sDate.Year = 0x0;
   if (HAL_RTC_SetDate(&hrtc, &sDate, RTC_FORMAT_BCD) != HAL_OK)
+  {
     Error_Handler();
+  }
 	if (HAL_RTC_SetDate(&hrtc, &sDate, RTC_FORMAT_BCD) != HAL_OK)
+	{
 		Error_Handler();
+	}
     /**Enable the Alarm A
     */
   sAlarm.AlarmTime.Hours = 0x0;
   sAlarm.AlarmTime.Minutes = 0x0;
   sAlarm.AlarmTime.Seconds = 0x0;
   sAlarm.AlarmTime.SubSeconds = 0x0;
   sAlarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
   sAlarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_RESET;
 	/**Enable the Alarm A
 	*/
 	sAlarm.AlarmTime.Hours = 0x0;
 	sAlarm.AlarmTime.Minutes = 0x0;
 	sAlarm.AlarmTime.Seconds = 0x0;
 	sAlarm.AlarmTime.SubSeconds = 0x0;
 	sAlarm.AlarmTime.DayLightSaving = RTC_DAYLIGHTSAVING_NONE;
 	sAlarm.AlarmTime.StoreOperation = RTC_STOREOPERATION_RESET;
   // Alarm will trigger on the Xth second of every minute
   sAlarm.AlarmMask = RTC_ALARMMASK_DATEWEEKDAY | RTC_ALARMMASK_HOURS | RTC_ALARMMASK_MINUTES;
   sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDMASK_ALL;
   sAlarm.AlarmDateWeekDaySel = RTC_ALARMDATEWEEKDAYSEL_DATE;
   sAlarm.AlarmDateWeekDay = 0x1;
   sAlarm.Alarm = RTC_ALARM_A;
   if (HAL_RTC_SetAlarm(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+  {
     Error_Handler();
+  }
 	// Alarm will trigger on the Xth second of every minute
 	sAlarm.AlarmMask = RTC_ALARMMASK_DATEWEEKDAY | RTC_ALARMMASK_HOURS | RTC_ALARMMASK_MINUTES;
 	sAlarm.AlarmSubSecondMask = RTC_ALARMSUBSECONDMASK_ALL;
 	sAlarm.AlarmDateWeekDaySel = RTC_ALARMDATEWEEKDAYSEL_DATE;
 	sAlarm.AlarmDateWeekDay = 0x1;
 	sAlarm.Alarm = RTC_ALARM_A;
 	if (HAL_RTC_SetAlarm(&hrtc, &sAlarm, RTC_FORMAT_BCD) != HAL_OK)
+	{
 		Error_Handler();
+	}
   HAL_NVIC_SetPriority(RTC_IRQn, 0, 0);
   HAL_NVIC_EnableIRQ(RTC_IRQn);
 	HAL_NVIC_SetPriority(RTC_IRQn, 0, 0);
 	HAL_NVIC_EnableIRQ(RTC_IRQn);
+}
 void rtc_cal(void)

src/system.c

➞

Show inline comments

@@ @@ -32,6 +32,7 @@ void sysclk_init(void) @@
     RCC_ClkInitTypeDef RCC_ClkInitStruct;
     RCC_PeriphCLKInitTypeDef PeriphClkInit;
     // TODO: Probably disable HSI14? This only drives the ADC
     RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_HSI14|RCC_OSCILLATORTYPE_LSI;
     RCC_OscInitStruct.HSIState = RCC_HSI_ON;
     RCC_OscInitStruct.HSI14State = RCC_HSI14_ON;

src/wspr.c

➞

Show inline comments

@@ @@ -5,6 +5,7 @@ @@
 #include "wspr.h"
 #include "i2c.h"
 #include "gps.h"
 #include "adc.h"
 #include "config.h"
@@ @@ -304,3 +305,58 @@ void wspr_transmit(uint8_t* grid_locator @@
+}
 // Transmit boot-up test tones to check tx
 void wspr_pilot_tone(void)
+{
 	// Bring up TCXO
     HAL_GPIO_WritePin(OSC_NOTEN, 0);
     HAL_GPIO_WritePin(TCXO_EN, 1);
     HAL_Delay(100);
     // Bring up the chip
     i2c_init();
     si5351_init(i2c_get(), SI5351_CRYSTAL_LOAD_8PF, 0);
     si5351_set_correction(0);
     si5351_set_freq(WSPR_DEFAULT_FREQ * 100, 0, SI5351_CLK0);
     si5351_drive_strength(SI5351_CLK0, SI5351_DRIVE_6MA); // Set for max power if desired (8ma max)
     si5351_output_enable(SI5351_CLK0, 1);
     // Make sure the other outputs of the SI5351 are disabled
     si5351_output_enable(SI5351_CLK1, 0); // Disable the clock initially
     si5351_output_enable(SI5351_CLK2, 0); // Disable the clock initially
     // disable clock powers
     si5351_set_clock_pwr(SI5351_CLK1, 0);
     si5351_set_clock_pwr(SI5351_CLK2, 0);
     // Key transmitter
     si5351_output_enable(SI5351_CLK0, 1);
     uint8_t tone_table[7] = {50, 100, 70, 50, 0, 10, 0};
     // Boot-up pilot tones
     for(uint8_t i=0; i<7; i++)
+    {
         uint32_t freq2 = (WSPR_DEFAULT_FREQ + 10*tone_table[i]) * 100;
         si5351_set_freq(freq2, 0, SI5351_CLK0);
 		#ifndef LED_DISABLE
         	HAL_GPIO_TogglePin(LED_BLUE);
 		#endif
         HAL_Delay(500);
+    }
     // Disable transmitter
     si5351_output_enable(SI5351_CLK0, 0);
     HAL_GPIO_WritePin(OSC_NOTEN, 1);
     HAL_GPIO_WritePin(TCXO_EN, 0);
     i2c_deinit();
     // Make sure LED is off if we had an odd number of toggles above
 	HAL_GPIO_WritePin(LED_BLUE, 0);
+}

0 comments (0 inline, 0 general)