summaryrefslogtreecommitdiff
path: root/src/cc1111
diff options
context:
space:
mode:
Diffstat (limited to 'src/cc1111')
-rw-r--r--src/cc1111/Makefile.cc11112
-rw-r--r--src/cc1111/ao_arch.h2
-rw-r--r--src/cc1111/ao_pins.h49
-rw-r--r--src/cc1111/ao_timer.c40
-rw-r--r--src/cc1111/ao_usb.c14
5 files changed, 99 insertions, 8 deletions
diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index 78b653b3..0ea30e1d 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -3,7 +3,7 @@ CC=$(SDCC)
CFLAGS=--model-small --debug --opt-code-speed -DCODESIZE=$(CODESIZE)
-CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../core -I../cc1111 -I../drivers -I../product
+CFLAGS += $(PRODUCT_DEF) -I. -I.. -I../kernel -I../cc1111 -I../drivers -I../product
CODESIZE ?= 0x8000
diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 34235b08..fcac331b 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -326,4 +326,6 @@ void
ao_p0_isr(void) __interrupt(13);
#endif
+#define AO_ADC_MAX 32767
+
#endif /* _AO_ARCH_H_ */
diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index 2f0e2884..2b19f1f6 100644
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -18,12 +18,16 @@
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
-#define HAS_RADIO 1
+#define HAS_RADIO 1
+#define DISABLE_LOG_SPACE 1
#if defined(TELEMETRUM_V_1_0)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 1
#define HAS_USB 1
#define HAS_BEEP 1
+ #define HAS_BEEP_CONFIG 0
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_ADC 1
@@ -55,9 +59,13 @@
#endif
#if defined(TELEMETRUM_V_1_1)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 1
#define HAS_USB 1
#define HAS_BEEP 1
+ #define HAS_BEEP_CONFIG 0
+ #define HAS_BATTERY_REPORT 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_ADC 1
@@ -91,9 +99,13 @@
#endif
#if defined(TELEMETRUM_V_1_2)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 1
#define HAS_USB 1
#define HAS_BEEP 1
+ #define HAS_BEEP_CONFIG 0
+ #define HAS_BATTERY_REPORT 1
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_ADC 1
@@ -155,6 +167,8 @@
#endif
#if defined(TELEMINI_V_1_0)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 1
#define HAS_USB 0
#define HAS_BEEP 0
@@ -182,6 +196,8 @@
#endif
#if defined(TELENANO_V_0_1)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 1
#define HAS_USB 0
#define HAS_BEEP 0
@@ -207,9 +223,12 @@
#endif
#if defined(TELEMETRUM_V_0_1)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 1
#define HAS_USB 1
#define HAS_BEEP 1
+ #define HAS_BEEP_CONFIG 0
#define HAS_GPS 1
#define HAS_SERIAL_1 1
#define HAS_ADC 1
@@ -237,6 +256,8 @@
#endif
#if defined(TELEDONGLE_V_0_1)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 0
#define HAS_USB 1
#define HAS_BEEP 0
@@ -265,6 +286,8 @@
#endif
#if defined(TIDONGLE)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 0
#define HAS_USB 1
#define HAS_BEEP 0
@@ -292,6 +315,8 @@
#endif
#if defined(TELEBT_V_0_0)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 0
#define HAS_USB 1
#define HAS_BEEP 0
@@ -328,9 +353,12 @@
#endif
#if defined(TELEBT_V_0_1)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 0
#define HAS_USB 1
#define HAS_BEEP 1
+ #define HAS_BEEP_CONFIG 0
#define HAS_SERIAL_1 1
#define HAS_SERIAL_1_ALT_1 1
#define HAS_SERIAL_1_ALT_2 0
@@ -371,6 +399,8 @@
#endif
#if defined(TELELAUNCH_V_0_1)
+ /* Discontinued and was never built with CC1111 chips needing this */
+ #define NEEDS_CC1111_CLOCK_HACK 0
#define HAS_FLIGHT 0
#define HAS_USB 1
#define HAS_BEEP 1
@@ -572,4 +602,21 @@ struct ao_adc {
#endif
};
+/*
+ * Voltage divider on ADC battery sampler
+ */
+#define AO_BATTERY_DIV_PLUS 5 /* 5k */
+#define AO_BATTERY_DIV_MINUS 10 /* 10k */
+
+/*
+ * Voltage divider on ADC igniter samplers
+ */
+#define AO_IGNITE_DIV_PLUS 100 /* 100k */
+#define AO_IGNITE_DIV_MINUS 27 /* 27k */
+
+/*
+ * ADC reference in decivolts
+ */
+#define AO_ADC_REFERENCE_DV 33
+
#endif /* _AO_PINS_H_ */
diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index 75cc4ce8..2fbc6621 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -83,25 +83,57 @@ ao_timer_init(void)
T1CTL = T1CTL_MODE_MODULO | T1CTL_DIV_8;
}
+#ifndef NEEDS_CC1111_CLOCK_HACK
+#define NEEDS_CC1111_CLOCK_HACK 1
+#endif
+
+#if NEEDS_CC1111_CLOCK_HACK
+static void
+ao_clock_delay(void)
+{
+ uint16_t i = 0;
+
+ while (--i)
+ ao_arch_nop();
+}
+#endif
+
/*
* AltOS always cranks the clock to the max frequency
*/
void
ao_clock_init(void)
{
+#if NEEDS_CC1111_CLOCK_HACK
+ /* Power up both oscillators */
+ SLEEP &= ~(SLEEP_OSC_PD);
+
+ /* Switch to the HFRC oscillator */
+ CLKCON = (CLKCON & ~CLKCON_OSC_MASK) | (CLKCON_OSC_RC);
+
+ /* Wait for the HFRC oscillator to be stable */
+ while (!(SLEEP & SLEEP_HFRC_STB))
+ ;
+
+ /* Delay for 'a while' waiting for the crystal to
+ * stabilize -- the XOSC_STB bit isn't reliable
+ *
+ * http://www.ti.com/lit/er/swrz022c/swrz022c.pdf
+ */
+
+ ao_clock_delay();
+#endif
+
/* Switch system clock to crystal oscilator */
CLKCON = (CLKCON & ~CLKCON_OSC_MASK) | (CLKCON_OSC_XTAL);
+ /* Wait for the HFRC oscillator to be stable */
while (!(SLEEP & SLEEP_XOSC_STB))
;
/* Power down the unused HFRC oscillator */
SLEEP |= SLEEP_OSC_PD;
- /* Wait for HFRC to power down */
- while ((SLEEP & SLEEP_HFRC_STB) != 0)
- ;
-
/* Crank up the timer tick and system clock speed */
CLKCON = ((CLKCON & ~(CLKCON_TICKSPD_MASK | CLKCON_CLKSPD_MASK)) |
(CLKCON_TICKSPD_1 | CLKCON_CLKSPD_1));
diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index b0ab409d..d9d255f8 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -24,7 +24,7 @@ static __xdata uint16_t ao_usb_in_bytes;
static __pdata uint16_t ao_usb_in_bytes_last;
static __xdata uint16_t ao_usb_out_bytes;
static __pdata uint8_t ao_usb_iif;
-static __pdata uint8_t ao_usb_running;
+__pdata uint8_t ao_usb_running;
static void
ao_usb_set_interrupts(void)
@@ -274,7 +274,7 @@ ao_usb_ep0_setup(void)
ao_usb_ep0_in_len = ao_usb_setup.length;
ao_usb_ep0_flush();
} else if (ao_usb_ep0_out_len) {
-
+
/* Receiving data from the host
*/
ao_usb_ep0_state = AO_USB_EP0_DATA_OUT;
@@ -448,6 +448,9 @@ ao_usb_enable(void)
USBCIF = 0;
USBOIF = 0;
USBIIF = 0;
+#if HAS_USB_PULLUP
+ ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
}
void
@@ -459,6 +462,10 @@ ao_usb_disable(void)
USBCIE = 0;
IEN2 &= ~IEN2_USBIE;
+#if HAS_USB_PULLUP
+ ao_gpio_set(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
+
/* Clear any pending interrupts */
USBCIF = 0;
USBOIF = 0;
@@ -471,6 +478,9 @@ ao_usb_disable(void)
void
ao_usb_init(void)
{
+#if HAS_USB_PULLUP
+ ao_enable_output(AO_USB_PULLUP_PORT, AO_USB_PULLUP_PIN, AO_USB_PULLUP, 0);
+#endif
ao_usb_enable();
ao_add_task(&ao_usb_task, ao_usb_ep0, "usb");
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-03 21:11:19 +0000