Merge branch 'master' of github.com:DL7AD/pecanpico10

tracker/software/.settings/language.settings.xml

@@ -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.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="461136237790816521" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="138446027592133826" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${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>

tracker/software/config.c

@@ -40,7 +40,7 @@ const conf_t conf_flash_default = {
 		.radio_conf = {
 			.pwr			= 0x7F,
 			.freq			= FREQ_APRS_DYNAMIC,
-			.step           = 12500,
+			.step           = 0,
 			.chan           = 0,
 			.mod			= MOD_AFSK,
 			.preamble		= 200
@@ -64,7 +64,7 @@ const conf_t conf_flash_default = {
 		.radio_conf = {
 			.pwr			= 0x7F,
 			.freq			= FREQ_APRS_DYNAMIC,
-			.step           = 12500,
+			.step           = 0,
 			.chan           = 0,
 			.mod			= MOD_AFSK,
 			.preamble		= 200,
@@ -88,7 +88,7 @@ const conf_t conf_flash_default = {
 		.radio_conf = {
 			.pwr			= 0x7F,
 			.freq			= FREQ_APRS_DYNAMIC,
-			.step           = 12500,
+			.step           = 0,
 			.chan           = 0,
 			.mod			= MOD_AFSK,
 			.preamble		= 200
@@ -112,7 +112,7 @@ const conf_t conf_flash_default = {
 		.radio_conf = {
 			.pwr			= 0x7F,
 			.freq			= FREQ_APRS_DYNAMIC,
-			.step           = 12500,
+			.step           = 0,
 			.chan           = 0,
 			.mod			= MOD_AFSK,
 			.preamble		= 200

tracker/software/drivers/ublox.c

@@ -237,7 +237,7 @@ bool gps_get_fix(gpsFix_t *fix) {
 	}
 
 	TRACE_INFO("GPS  > Polling OK time=%04d-%02d-%02d %02d:%02d:%02d lat=%d.%05d lon=%d.%05d alt=%dm sats=%d fixOK=%d pDOP=%d.%02d",
-		fix->time.year, fix->time.month, fix->time.day, fix->time.hour, fix->time.minute, fix->time.day,
+		fix->time.year, fix->time.month, fix->time.day, fix->time.hour, fix->time.minute, fix->time.second,
 		fix->lat/10000000, (fix->lat > 0 ? 1:-1)*(fix->lat/100)%100000, fix->lon/10000000, (fix->lon > 0 ? 1:-1)*(fix->lon/100)%100000,
 		fix->alt, fix->num_svs, fix->fixOK, fix->pdop/100, fix->pdop%100
 	);

tracker/software/frequency_setting.txt

@@ -0,0 +1,21 @@
+Why does PP10 have frequency, step and channel parameters in config.c?
+
+Firstly the ability to specify a frequency directly in the freq parameter of config.c has not changed.
+Simply set freq in Hz to a desired frequency and leave step and channel set to 0.
+Geofence frequencies remain unaffected as well since step and chan are set to 0 when using geofence.
+
+Q: So why add step and chan?
+A: The addition of step and chan is aimed at providing additional functionality in future features as follows...
+
+A) A table of channels may be specified for scanning/seeking packet signals under software control.
+
+B) The feature of the Si446x to automatically scan using a channel table is being investigated
+ - This reduces the amount of control from the host MCU required to manage such a channel scanning application.
+ - Automatic detection of packet channels would enable operation where GPS location is inactive.
+ 
+C) The software base may be used for other than balloon projects or incorporate other bands, protocols and radios
+ - It can be envisaged that a step and channel format could be useful in such instances.
+ 
+D) Configuring the radio(s) won't usually be done by editing config.c directly.
+ - In over the air or command line configuration changes the UI would not require user knowledge of the structure of config.c
+ - Some settings may be better described by a band base frequency, a step size and a channel.

tracker/software/pkt/devices/si446x.c

@@ -58,7 +58,7 @@ static void (*rx_cb)(uint8_t*, uint32_t);
 
 static packet_svc_t *packetHandler;
 
-static int16_t Si446x_getTemperature(void);
+//static int16_t Si446x_getTemperature(void);
 
 /* =================================================================== SPI communication ==================================================================== */
 

tracker/software/threads/radio/radio.c

@@ -61,6 +61,10 @@ bool transmitOnRadio(packet_t pp, uint32_t freq, uint16_t step, uint8_t chan,
 		chan = 0;
 	}
 
+	if(freq == FREQ_APRS_RECEIVE) {
+	  /* TODO: Get current RX frequency (if valid) and use that. */
+	}
+
 	uint8_t *c;
 	uint32_t len = ax25_get_info(pp, &c);
 

tracker/software/types.h

@@ -5,6 +5,10 @@
 #include "ax25_pad.h"
 
 #define FREQ_APRS_DYNAMIC	0
+#define FREQ_APRS_SCAN      1
+#define FREQ_APRS_RECEIVE   2
+#define FREQ_CNC_RECEIVE    3
+
 #define CYCLE_CONTINUOUSLY	0
 
 #define TYPE_NULL			0