altos/telelco-v3.0: Add some real drawing stuff

This required enabling devices with 128kB flash.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/draw/ao_draw.h b/src/draw/ao_draw.h
index 74d5dc09e654fc53a525d038a95244d23ecfb495..b5cc19c45a99ab402e6286ae242435149072dc77 100644 (file)
--- a/src/draw/ao_draw.h
+++ b/src/draw/ao_draw.h
@@ -165,7 +165,7 @@ ao_text(struct ao_bitmap    *dst,
        const struct ao_font    *font,
        int16_t                 x,
        int16_t                 y,
-       char                    *string,
+       const char              *string,
        uint32_t                fill,
        uint8_t                 rop);
 

diff --git a/src/draw/ao_text.c b/src/draw/ao_text.c
index c20f2399d97849d7d3f4dcbf8005fe39bd2d8481..718f3374b10f1d2a64d947e9f1d8daa52f028867 100644 (file)
--- a/src/draw/ao_text.c
+++ b/src/draw/ao_text.c
@@ -29,7 +29,7 @@ ao_text(struct ao_bitmap      *dst,
        const struct ao_font    *font,
        int16_t                 x,
        int16_t                 y,
-       char                    *string,
+       const char              *string,
        uint32_t                fill,
        uint8_t                 rop)
 {

diff --git a/src/stm32f1/Makefile.defs b/src/stm32f1/Makefile.defs
index 98b331890fca38162ebb61a46dc0c9e5dfbd7d37..5ff75081fc6102d251bf265214660aee1990c4bc 100644 (file)
--- a/src/stm32f1/Makefile.defs
+++ b/src/stm32f1/Makefile.defs
@@ -4,7 +4,7 @@ endif
 
 include $(TOPDIR)/stm32f1/Makefile-stm32f1.defs
 
-STM32F1_LINKER_SCRIPT=altos.ld
+STM32F1_LINKER_SCRIPT?=altos.ld
 
 LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stm32f1 -T$(STM32F1_LINKER_SCRIPT) -n -Wl,--gc-sections
 

diff --git a/src/stm32f1/altos-128.ld b/src/stm32f1/altos-128.ld
new file mode 100644 (file)
index 0000000..106e74e
--- /dev/null
+++ b/src/stm32f1/altos-128.ld
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2024 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+__flash       = 0x08001000;
+__eeprom_base = 0x0801f800;
+__flash_size = 122K;
+__ram = 0x20000000;
+__ram_size = 20k;
+__stack_size = 512;
+
+INCLUDE registers.ld
+INCLUDE picolibc.ld

diff --git a/src/telelco-v3.0/Makefile b/src/telelco-v3.0/Makefile
index d091b57b4134c3e606223ac1f55596d3e85fcb34..6005762257e8a0e72fefb395fd5012f6b01bdf76 100644 (file)
--- a/src/telelco-v3.0/Makefile
+++ b/src/telelco-v3.0/Makefile
@@ -3,6 +3,8 @@
 #
 #
 
+STM32F1_LINKER_SCRIPT=altos-128.ld
+
 include ../stm32f1/Makefile.defs
 
 INC = \
@@ -97,7 +99,7 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG) $(HEX)
 
-$(PROG): Makefile $(OBJ) altos.ld
+$(PROG): Makefile $(OBJ) altos-128.ld
        $(call quiet,CC) $(LDFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)

diff --git a/src/telelco-v3.0/ao_lco_v3.c b/src/telelco-v3.0/ao_lco_v3.c
index 90334602fd2f9cfdacc3847d2fca47291423be03..998dbc3af452c823eb65d4ba63d667ecc57abbcd 100644 (file)
--- a/src/telelco-v3.0/ao_lco_v3.c
+++ b/src/telelco-v3.0/ao_lco_v3.c
@@ -21,6 +21,49 @@
 #include <ao_event.h>
 #include <ao_quadrature.h>
 #include <ao_radio_cmac.h>
+#include <ao_st7565.h>
+
+#define WIDTH  AO_ST7565_WIDTH
+#define HEIGHT AO_ST7565_HEIGHT
+#define STRIDE AO_BITMAP_STRIDE(WIDTH)
+
+static uint32_t        image[STRIDE * HEIGHT];
+
+static struct ao_bitmap fb = {
+       .base = image,
+       .stride = STRIDE,
+       .width = WIDTH,
+       .height = HEIGHT,
+       .damage = AO_BOX_INIT,
+};
+
+static const struct ao_transform logo_transform = {
+       .x_scale = 48, .x_off = 2,
+       .y_scale = 48, .y_off = 0,
+};
+
+#define BIG_FONT BitstreamVeraSans_Roman_58_font
+#define VOLT_FONT BitstreamVeraSans_Roman_58_font
+#define SMALL_FONT BitstreamVeraSans_Roman_12_font
+#define TINY_FONT BitstreamVeraSans_Roman_10_font
+#define LOGO_FONT BenguiatGothicStd_Bold_26_font
+
+#define LABEL_Y                (int16_t) (SMALL_FONT.ascent)
+#define VALUE_Y                (int16_t) (LABEL_Y + BIG_FONT.ascent + 5)
+#define BOX_X          2
+#define PAD_X          90
+#define BOX_LABEL_X    30
+#define VOLT_LABEL_X   25
+#define RSSI_LABEL_X   15
+#define PAD_LABEL_X    95
+#define SEP_X          (PAD_X - 8)
+#define SCAN_X         (WIDTH - 100) / 2
+#define SCAN_Y         50
+#define SCAN_HEIGHT    3
+#define FOUND_Y                63
+#define FOUND_X                6
+#define FOUND_WIDTH    17
+#define MAX_VALID      (WIDTH / FOUND_WIDTH)
 
 #define AO_LCO_DRAG_RACE_START_TIME    AO_SEC_TO_TICKS(5)
 #define AO_LCO_DRAG_RACE_STOP_TIME     AO_SEC_TO_TICKS(2)
@@ -38,37 +81,38 @@ static uint8_t      ao_lco_display_mutex;
 void
 ao_lco_show_pad(uint8_t pad)
 {
+       char    str[5];
+
        ao_mutex_get(&ao_lco_display_mutex);
-       (void) pad;
-//     ao_seven_segment_set(AO_LCO_PAD_DIGIT, (uint8_t) (pad | (ao_lco_drag_race << 4)));
+       snprintf(str, sizeof(str), "%d", pad);
+       ao_text(&fb, &BIG_FONT, PAD_X, VALUE_Y, str, AO_BLACK, AO_COPY);
+       ao_text(&fb, &SMALL_FONT, PAD_LABEL_X, LABEL_Y, "Pad", AO_BLACK, AO_COPY);
+       ao_rect(&fb, SEP_X, 0, 2, HEIGHT, AO_BLACK, AO_COPY);
        ao_mutex_put(&ao_lco_display_mutex);
 }
 void
 ao_lco_show_box(uint16_t box)
 {
+       char    str[7];
+
        ao_mutex_get(&ao_lco_display_mutex);
-       (void) box;
-//     ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, (uint8_t) (box % 10 | (ao_lco_drag_race << 4)));
-//     ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, (uint8_t) (box / 10 | (ao_lco_drag_race << 4)));
+       snprintf(str, sizeof(str), "%2d", box);
+       ao_text(&fb, &BIG_FONT, BOX_X, VALUE_Y, str, AO_BLACK, AO_COPY);
+       ao_text(&fb, &SMALL_FONT, BOX_LABEL_X, LABEL_Y, "Box", AO_BLACK, AO_COPY);
        ao_mutex_put(&ao_lco_display_mutex);
 }
 
 static void
-ao_lco_show_voltage(uint16_t decivolts)
+ao_lco_show_voltage(uint16_t decivolts, const char *label)
 {
-       uint8_t tens, ones, tenths;
+       char    str[7];
 
        PRINTD("voltage %d\n", decivolts);
-       tenths = (uint8_t) (decivolts % 10);
-       ones = (uint8_t) ((decivolts / 10) % 10);
-       tens = (uint8_t) ((decivolts / 100) % 10);
+       snprintf(str, sizeof(str), "%2d.%d", decivolts / 10, decivolts % 10);
        ao_mutex_get(&ao_lco_display_mutex);
-       (void) tenths;
-       (void) ones;
-       (void) tens;
-//     ao_seven_segment_set(AO_LCO_PAD_DIGIT, tenths);
-//     ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, ones | 0x10);
-//     ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, tens);
+       ao_rect(&fb, 0, 0, WIDTH, HEIGHT, AO_WHITE, AO_COPY);
+       ao_text(&fb, &VOLT_FONT, BOX_X, VALUE_Y, str, AO_BLACK, AO_COPY);
+       ao_text(&fb, &SMALL_FONT, VOLT_LABEL_X, LABEL_Y, label, AO_BLACK, AO_COPY);
        ao_mutex_put(&ao_lco_display_mutex);
 }
 
@@ -76,7 +120,7 @@ void
 ao_lco_show(void)
 {
        if (ao_lco_pad == AO_LCO_PAD_VOLTAGE) {
-               ao_lco_show_voltage(ao_pad_query.battery);
+               ao_lco_show_voltage(ao_pad_query.battery, "Pad battery");
        } else {
                ao_lco_show_pad(ao_lco_pad);
                ao_lco_show_box(ao_lco_box);
@@ -223,9 +267,8 @@ static void
 ao_lco_display_test(void)
 {
        ao_mutex_get(&ao_lco_display_mutex);
-//     ao_seven_segment_set(AO_LCO_PAD_DIGIT, 8 | 0x10);
-//     ao_seven_segment_set(AO_LCO_BOX_DIGIT_1, 8 | 0x10);
-//     ao_seven_segment_set(AO_LCO_BOX_DIGIT_10, 8 | 0x10);
+       ao_rect(&fb, 0, 0, WIDTH, HEIGHT, AO_WHITE, AO_COPY);
+       ao_logo(&fb, &logo_transform, &LOGO_FONT, AO_BLACK, AO_COPY);
        ao_mutex_put(&ao_lco_display_mutex);
        ao_led_on(AO_LEDS_AVAILABLE);
        ao_delay(AO_MS_TO_TICKS(1000));
@@ -241,7 +284,7 @@ ao_lco_batt_voltage(void)
 //     ao_adc_single_get(&packet);
        packet.v_batt = 0;
        decivolt = ao_battery_decivolt(packet.v_batt);
-       ao_lco_show_voltage((uint16_t) decivolt);
+       ao_lco_show_voltage((uint16_t) decivolt, "LCO battery");
        ao_delay(AO_MS_TO_TICKS(1000));
 }