3 files changed, 85 insertions, 6 deletions

diff --git a/examples/test-bkp.cpp b/examples/test-bkp.cpp
new file mode 100644
index 0000000..d0aa564
--- /dev/null
+++ b/examples/test-bkp.cpp
@@ -0,0 +1,80 @@
+#include <stdio.h>
+
+#include "wirish.h"
+#include "bkp.h"
+#include "iwdg.h"
+
+void print_bkp_contents();
+void write_to_bkp(uint16 val);
+
+#define comm Serial2
+
+void setup() {
+    pinMode(BOARD_BUTTON_PIN, INPUT);
+
+    comm.begin(9600);
+    comm.println("*** Beginning BKP test");
+
+    comm.println("Init...");
+    bkp_init();
+    comm.println("Done.");
+
+    print_bkp_contents();
+    write_to_bkp(10);
+    print_bkp_contents();
+
+    comm.println("Enabling backup writes.");
+    bkp_enable_writes();
+    write_to_bkp(20);
+    print_bkp_contents();
+
+    comm.println("Disabling backup writes.");
+    bkp_disable_writes();
+    write_to_bkp(30);
+    print_bkp_contents();
+
+    comm.println("Done testing backup registers; press button to enable "
+                    "independent watchdog (in order to cause a reset).");
+    waitForButtonPress(0);
+    iwdg_init(IWDG_PRE_4, 1);
+    comm.println();
+}
+
+void loop() {
+}
+
+void print_bkp_contents() {
+    comm.println("Backup data register contents:");
+    char buf[100];
+    for (int i = 1; i <= BKP_NR_DATA_REGS; i++) {
+        snprintf(buf, sizeof buf, "DR%d: %d ", i, bkp_read(i));
+        comm.print(buf);
+        if (i % 5 == 0) comm.println();
+    }
+    comm.println();
+}
+
+void write_to_bkp(uint16 val) {
+    comm.print("Attempting to write ");
+    comm.print(val);
+    comm.println(" to backup registers...");
+    for (int i = 1; i <= BKP_NR_DATA_REGS; i++) {
+        bkp_write(i, val);
+    }
+    comm.println("Done.");
+}
+
+__attribute__((constructor)) void premain() {
+    init();
+}
+
+int main(void) {
+    init();
+    setup();
+
+    while (1) {
+        loop();
+    }
+    return 0;
+}
+
diff --git a/examples/test-dac.cpp b/examples/test-dac.cpp
index 3a699e2..62f40eb 100644
--- a/examples/test-dac.cpp
+++ b/examples/test-dac.cpp
@@ -16,7 +16,7 @@ void setup() {
     Serial1.println("**** Beginning DAC test");

 

     Serial1.print("Init... ");

-    dac_init();

+    dac_init(DAC_CH1 | DAC_CH2);

     Serial1.println("Done.");

 }

 

@@ -29,8 +29,8 @@ void loop() {
         count = 0;

     }

 

-    dac_write(1, 2048);

-    dac_write(2, count);

+    dac_write_channel(1, 4095 - count);

+    dac_write_channel(2, count);

 }

 

 int main(void) {

diff --git a/examples/test-session.cpp b/examples/test-session.cpp
index 845547d..72d64d6 100644
--- a/examples/test-session.cpp
+++ b/examples/test-session.cpp
@@ -512,7 +512,7 @@ void cmd_sequential_gpio_writes(void) {
     // make sure to skip the TX/RX headers
     for(uint32 i = 2; i<NR_GPIO_PINS; i++) {
         COMM.print("GPIO write out on header D");
-        COMM.print(i, DEC);
+        COMM.print((int)i, DEC);
         COMM.println("...");
         pinMode(i, OUTPUT);
         do {
@@ -614,9 +614,8 @@ void init_all_timers(uint16 prescale) {
     timer_init(TIMER1, prescale);
     timer_init(TIMER2, prescale);
     timer_init(TIMER3, prescale);
-#if NR_TIMERS >= 4
     timer_init(TIMER4, prescale);
-#elif NR_TIMERS >= 8 // TODO test this on maple native
+#ifdef STM32_HIGH_DENSITY
     timer_init(TIMER5, prescale);
     timer_init(TIMER6, prescale);
     timer_init(TIMER7, prescale);