Merge pull request #46 from dvhdr/adc-improvements

ADC improvements & new API features

5 files changed, 47 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 4436af4..cfb7766 100644
--- a/Makefile
+++ b/Makefile
@@ -24,15 +24,15 @@ CC = arm-none-eabi-gcc
 LD = arm-none-eabi-gcc
 OBJCOPY = arm-none-eabi-objcopy
 
-CFLAGS  = -Os -g -Wall -I.\
+CFLAGS  = -Os -Wall -I.\
 -D_STM32F103RBT6_  -D_STM3x_  -D_STM32x_ -mthumb -mcpu=cortex-m3 \
 -fsigned-char  -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -DHSE_VALUE=6000000UL \
--DCMSIS -DUSE_GLOBAL_CONFIG   -g3 -ffunction-sections -std=c99  -mlittle-endian \
+-DCMSIS -DUSE_GLOBAL_CONFIG -ffunction-sections -std=c99  -mlittle-endian \
 $(INCLUDES) -o
 
 LDSCRIPT = stm32_flash.ld
 
-LDFLAGS += -T$(LDSCRIPT) -u _start -u _Minimum_Stack_Size  -mcpu=cortex-m3 -mthumb -specs=nano.specs -specs=nosys.specs -nostdlib -Wl,-static  -g3 -N -nostartfiles -Wl,--gc-sections
+LDFLAGS += -T$(LDSCRIPT) -u _start -u _Minimum_Stack_Size  -mcpu=cortex-m3 -mthumb -specs=nano.specs -specs=nosys.specs -nostdlib -Wl,-static -N -nostartfiles -Wl,--gc-sections
 
 all: $(SYX)
 
diff --git a/include/app.h b/include/app.h
index 96801eb..6752b62 100644
--- a/include/app.h
+++ b/include/app.h
@@ -71,6 +71,19 @@
 void hal_plot_led(u8 type, u8 index, u8 red, u8 green, u8 blue);
 
 /**
+ * Read the RGB value of an LED.  This function is safe to call from any
+ * of the app functions below, at any time. Result is undefined if an invalid address is passed
+ * for any of the red, green or blue components.
+ *
+ * @param type - TYPEPAD to address any pad or button, TYPESETUP to address the Setup LED
+ * @param index - The index of the button, as above
+ * @param red - address to read red colour value, in [0, MAXLED].
+ * @param green - address to read green colour value, in [0, MAXLED]
+ * @param blue - address to read blue colour value, in [0, MAXLED]
+ */
+void hal_read_led(u8 type, u8 index, u8 *red, u8 *green, u8 *blue);
+
+/**
  * Send a MIDI message to either USB port or to the DIN output.
  * 
  * @param port - which port to send the message to - can be USBSTANDALONE, USBMIDI or DINMIDI.
@@ -126,6 +139,26 @@ void hal_read_flash(u32 offset, u8 *data, u32 length);
  */
 void hal_write_flash(u32 offset,const u8 *data, u32 length);
 
+/**
+ * Retrieve the device ID bootloader option
+ *
+ * Users can set a unique ID from 1-16 in the bootloader. This is useful
+ * for USB apps, as it helps multi-Launchpad setups behave predictably.
+ *
+ * @result the zero-based device ID [0-15] assigned to this Launchpad Pro.
+ */
+u8 hal_read_device_id();
+
+/**
+ * Retrieve the "layout text" bootloader option
+ *
+ * This setting determines whether the factory firmware will scroll text on changing
+ * layouts. This may be useful as a preference for open firmware apps as well.
+ *
+ * @result 1 to scroll text on layout changes, 0 not to.
+ */
+u8 hal_read_layout_text();
+
 // ____________________________________________________________________________
 //
 // Callbacks from the hardware (implemented in your app.c)
diff --git a/lib/launchpad_pro.a b/lib/launchpad_pro.a
index f3af9bb..c2afa5a 100644
--- a/lib/launchpad_pro.a
+++ b/lib/launchpad_pro.a
diff --git a/src/app.c b/src/app.c
index 8117a18..4ce908e 100644
--- a/src/app.c
+++ b/src/app.c
@@ -155,7 +155,6 @@ void app_timer_event()
         hal_send_midi(USBSTANDALONE, MIDITIMINGCLOCK, 0, 0);
     }
     
-/*
         // alternative example - show raw ADC data as LEDs
         for (int i=0; i < PAD_COUNT; ++i)
         {
@@ -173,18 +172,17 @@ void app_timer_event()
                 }
                 else if (x >= MAXLED && x < (2*MAXLED))
                 {
-                        r = MAXLED - x;
+                        r = 2*MAXLED - x;
                         g = x - MAXLED;
                 }
                 else
                 {
-                        g = MAXLED - x;
-                        b = x - MAXLED;
+                        g = 3*MAXLED - x;
+                        b = x - 2*MAXLED;
                 }
                 
                 hal_plot_led(TYPEPAD, ADC_MAP[i], r, g, b);
         }
- */
 }
 
 //______________________________________________________________________________
diff --git a/tools/simulator.c b/tools/simulator.c
index 138277e..cec1ede 100644
--- a/tools/simulator.c
+++ b/tools/simulator.c
@@ -41,8 +41,11 @@
 
 void hal_plot_led(u8 type, u8 index, u8 red, u8 green, u8 blue)
 {
-        // wire this up to MIDI out...
-        printf("...hal_plot_led(%d, %d, %d, %d, %d);\n", type, index, red, green, blue);
+    // wire this up to MIDI out...?
+}
+
+void hal_read_led(u8 type, u8 index, u8 *red, u8 *green, u8 *blue)
+{
 }
 
 void hal_send_midi(u8 port, u8 status, u8 d1, u8 d2)
@@ -59,12 +62,12 @@ void hal_send_sysex(u8 port, const u8* data, u16 length)
 
 void hal_read_flash(u32 offset, u8 *data, u32 length)
 {
-        printf("...hal_read_flash(%d, (data), %d);\n", offset, length);
+        printf("...hal_read_flash(%lu, (data), %lu);\n", offset, length);
 }
 
 void hal_write_flash(u32 offset,const u8 *data, u32 length)
 {
-        printf("...hal_write_flash(%d, (data), %d);\n", offset, length);
+        printf("...hal_write_flash(%lu, (data), %lu);\n", offset, length);
 }
 
 // ____________________________________________________________________________
@@ -123,4 +126,4 @@ int main(int argc, char * argv[])
                 sim_app_timer_event();
         }
         return 0;
-}
\ No newline at end of file
+}