From d19f4b4179a1411a64017294a366dd78b1adee22 Mon Sep 17 00:00:00 2001
From: Kevin Townsend <kevin@ktownsend.com>
Date: Tue, 13 Sep 2011 07:58:37 +0200
Subject: [PATCH] Fixed typos

---
 ChangeLog.txt                                 |  5 ++++
 .../LPC1343 Workspace.workspace.session       |  2 +-
 build/crossworks/LPC1343_CodeBase.hzp         | 23 ++++++++++++++-----
 build/crossworks/LPC1343_CodeBase.hzs         | 16 ++++++++-----
 drivers/lcd/tft/drawing.c                     |  6 ++---
 .../pn532/helpers/pn532_mifare_classic.c      |  6 ++---
 .../pn532/helpers/pn532_mifare_ultralight.c   |  2 +-
 projectconfig.h                               | 17 +++++++-------
 8 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f638087..0cb02bc 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+v0.9.8 - Ongoing
+================
+- Added driver for Sharp Memory Display
+  /drivers/lcd/bitmap/sharpmem
+
 v0.9.5 - 3 August 2011
 ======================
 
diff --git a/build/codelite/LPC1343 Workspace.workspace.session b/build/codelite/LPC1343 Workspace.workspace.session
index 3fd69dd..413664f 100644
--- a/build/codelite/LPC1343 Workspace.workspace.session	
+++ b/build/codelite/LPC1343 Workspace.workspace.session	
@@ -5,7 +5,7 @@
   <TabInfoArray Name="TabInfoArray">
     <TabInfo>
       <wxString Value="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" Name="FileName"/>
-      <int Value="50" Name="FirstVisibleLine"/>
+      <int Value="40" Name="FirstVisibleLine"/>
       <int Value="41" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
diff --git a/build/crossworks/LPC1343_CodeBase.hzp b/build/crossworks/LPC1343_CodeBase.hzp
index 36f5af9..b4ad348 100644
--- a/build/crossworks/LPC1343_CodeBase.hzp
+++ b/build/crossworks/LPC1343_CodeBase.hzp
@@ -171,10 +171,11 @@
             <file file_name="../../drivers/sensors/pn532/pn532.c">
               <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
             </file>
-            <file file_name="../../drivers/sensors/pn532/pn532_drvr_uart.c">
-              <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-            </file>
-            <file file_name="../../drivers/sensors/pn532/pn532_drvr_spi.c"/>
+            <file file_name="../../drivers/sensors/pn532/pn532_bus_uart.c"/>
+            <folder Name="helpers">
+              <file file_name="../../drivers/sensors/pn532/helpers/pn532_mifare_classic.c"/>
+              <file file_name="../../drivers/sensors/pn532/helpers/pn532_mifare_ultralight.c"/>
+            </folder>
           </folder>
           <folder Name="tsl2561">
             <file file_name="../../drivers/sensors/tsl2561/tsl2561.c">
@@ -193,6 +194,9 @@
             <folder Name="ssd1306">
               <file file_name="../../drivers/lcd/bitmap/ssd1306/ssd1306.c"/>
             </folder>
+            <folder Name="sharpmem">
+              <file file_name="../../drivers/lcd/bitmap/sharpmem/sharpmem.c"/>
+            </folder>
           </folder>
           <folder Name="tft">
             <folder Name="hw">
@@ -209,14 +213,15 @@
                 <configuration Name="THUMB Flash Debug" build_exclude_from_build="Yes"/>
               </file>
               <file file_name="../../drivers/lcd/tft/hw/ILI9328.c">
-                <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
-                <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
+                <configuration Name="THUMB Flash Release" build_exclude_from_build="Yes"/>
+                <configuration Name="THUMB Flash Debug" build_exclude_from_build="Yes"/>
                 <configuration Name="Release" gcc_optimization_level="Level 1"/>
               </file>
               <file file_name="../../drivers/lcd/tft/hw/ssd1331.c">
                 <configuration Name="THUMB Flash Release" build_exclude_from_build="Yes"/>
                 <configuration Name="THUMB Flash Debug" build_exclude_from_build="Yes"/>
               </file>
+              <file file_name="../../drivers/lcd/tft/hw/ssd1351.c"/>
             </folder>
             <folder Name="fonts">
               <file file_name="../../drivers/lcd/tft/fonts/dejavusansmono8.c">
@@ -291,6 +296,12 @@
             <file file_name="../../drivers/rtc/isl12022m/isl12022m.c"/>
           </folder>
         </folder>
+        <folder Name="spiflash">
+          <folder Name="w25q16bv">
+            <file file_name="../../drivers/spiflash/w25q16bv/w25q16bv.c"/>
+          </folder>
+          <file file_name="../../drivers/spiflash/spiflash.h"/>
+        </folder>
       </folder>
       <file file_name="../../sysinit.c"/>
       <folder Name="project">
diff --git a/build/crossworks/LPC1343_CodeBase.hzs b/build/crossworks/LPC1343_CodeBase.hzs
index da75ee1..3193043 100644
--- a/build/crossworks/LPC1343_CodeBase.hzs
+++ b/build/crossworks/LPC1343_CodeBase.hzs
@@ -33,9 +33,13 @@
   <ProjectSessionItem path="LPC1343_CodeBase" name="unnamed" />
   <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase" name="unnamed" />
   <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files" name="unnamed" />
+  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers" name="unnamed" />
+  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers;lcd" name="unnamed" />
+  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers;lcd;tft" name="unnamed" />
+  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers;lcd;tft;hw" name="unnamed" />
  </Project>
  <Register1>
-  <RegisterWindow openNodes="USB;USB/USBDevIntSt;USB/USBDevIntEn;USB/USBRxPLen;USB/USBTxPLen;USB/USBCtrl" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="CPU;USB" decimalNodes="" octalNodes="" asciiNodes="" />
+  <RegisterWindow openNodes="USB;USB/USBRxPLen;USB/USBTxPLen;USB/USBCtrl" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="CPU;USB" decimalNodes="" octalNodes="" asciiNodes="" />
  </Register1>
  <Register2>
   <RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
@@ -52,10 +56,10 @@
  </TraceWindow>
  <Watch1>
   <Watches active="1" update="Each Second" >
-   <Watchpoint linenumber="155" radix="16" name="Tick" expression="Tick" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
-   <Watchpoint linenumber="155" radix="-1" name="xTickCount" expression="xTickCount" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
-   <Watchpoint linenumber="138" radix="16" name="timer32_0_counter" expression="timer32_0_counter" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/timer32/timer32.c" />
    <Watchpoint linenumber="66" radix="10" name="msTicks" expression="msTicks" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/systick/systick.c" />
+   <Watchpoint linenumber="138" radix="16" name="timer32_0_counter" expression="timer32_0_counter" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/core/timer32/timer32.c" />
+   <Watchpoint linenumber="155" radix="-1" name="xTickCount" expression="xTickCount" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
+   <Watchpoint linenumber="155" radix="16" name="Tick" expression="Tick" filename="c:/documents and settings/kevin/my documents/my dropbox/microbuilder/code/lpc1343/lpc1343_codebase/freertos/tasks.c" />
   </Watches>
  </Watch1>
  <Watch2>
@@ -68,7 +72,7 @@
   <Watches active="0" update="Never" />
  </Watch4>
  <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="72" debugPath="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" y="18" path="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" left="0" selected="1" name="unnamed" top="0" />
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="52" debugPath="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" y="65" path="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" left="0" selected="1" name="unnamed" top="46" />
  </Files>
- <ARMCrossStudioWindow activeProject="LPC1343_CodeBase" autoConnectTarget="Segger J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\drivers\lcd\tft\fonts" fileDialogDefaultFilter="" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Flash Release" />
+ <ARMCrossStudioWindow activeProject="LPC1343_CodeBase" autoConnectTarget="Segger J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\drivers\lcd\tft\hw" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Flash Release" />
 </session>
diff --git a/drivers/lcd/tft/drawing.c b/drivers/lcd/tft/drawing.c
index fe8956a..a6701ab 100644
--- a/drivers/lcd/tft/drawing.c
+++ b/drivers/lcd/tft/drawing.c
@@ -71,7 +71,7 @@ void drawSwap(uint32_t a, uint32_t b)
     @brief  Draws a single bitmap character
 */
 /**************************************************************************/
-void drawCharBitmap(const uint16_t xPixel, const uint16_t yPixel, uint16_t color, const uint8_t *glyph, uint8_t cols, uint8_t rows)
+void drawCharBitmap(const uint16_t xPixel, const uint16_t yPixel, uint16_t color, const char *glyph, uint8_t cols, uint8_t rows)
 {
   uint16_t currentY, currentX, indexIntoGlyph;
   uint16_t _row, _col, _colPages;
@@ -399,8 +399,8 @@ uint16_t drawGetStringWidth(const FONT_INFO *fontInfo, char *str)
     }
   }
 
-  /* return the wdith */
-  return width;
+  /* return the width */
+  return width > 0 ? width - 1 : width;
 }
 
 /**************************************************************************/
diff --git a/drivers/sensors/pn532/helpers/pn532_mifare_classic.c b/drivers/sensors/pn532/helpers/pn532_mifare_classic.c
index b30156a..ece672e 100644
--- a/drivers/sensors/pn532/helpers/pn532_mifare_classic.c
+++ b/drivers/sensors/pn532/helpers/pn532_mifare_classic.c
@@ -345,7 +345,7 @@ pn532_error_t pn532_mifareclassic_AuthenticateBlock (byte_t * pbtCUID, size_t sz
     return error;
   }
 
-  /* Read the authentification response */
+  /* Read the authentication response */
   memset(abtResponse, 0, PN532_RESPONSELEN_INDATAEXCHANGE);
   do
   {
@@ -435,8 +435,8 @@ pn532_error_t pn532_mifareclassic_ReadDataBlock (uint8_t uiBlockNumber, byte_t *
   if (szLen == 26)
   {
     /* Copy the 16 data bytes to the output buffer        */
-    /* Block content starts at byte 8 of a valid response */
-    memcpy (pbtData, abtResponse+7, 16);    
+    /* Block content starts at byte 9 of a valid response */
+    memcpy (pbtData, abtResponse+8, 16);
   }
   else
   {
diff --git a/drivers/sensors/pn532/helpers/pn532_mifare_ultralight.c b/drivers/sensors/pn532/helpers/pn532_mifare_ultralight.c
index f22f4c6..1b4007a 100644
--- a/drivers/sensors/pn532/helpers/pn532_mifare_ultralight.c
+++ b/drivers/sensors/pn532/helpers/pn532_mifare_ultralight.c
@@ -259,7 +259,7 @@ pn532_error_t pn532_mifareultralight_ReadPage (uint8_t page, byte_t * pbtBuffer)
   if (szLen == 26)
   {
     /* Copy the 4 data bytes to the output buffer         */
-    /* Block content starts at byte 8 of a valid response */
+    /* Block content starts at byte 9 of a valid response */
     /* Note that the command actually reads 16 byte or 4  */
     /* pages at a time ... we simply discard the last 12  */
     /* bytes                                              */
diff --git a/projectconfig.h b/projectconfig.h
index edee264..90259ae 100644
--- a/projectconfig.h
+++ b/projectconfig.h
@@ -75,6 +75,7 @@
     ILI9325/8   X X  X  X     X X X X X X X X X     . . . X
     ST7565      X X  X  X     X X X X X X X X X     . . . X
     ST7735      . .  .  .     X X X X X X . . .     . . . .
+    SHARPMEM    . .  .  .     X X X X . . . . .     . . . .
     SSD1306     . .  .  .     X X X . X X . . .     . . . .
     MCP121      . .  .  .     . . . . . . . . .     . X . .
 
@@ -91,6 +92,7 @@
     ILI9325/8   .     .     .     .       .       X X X X     .
     ST7565      .     .     .     .       .       X X X X     .
     ST7535      .     .     .     .       .       . . . .     .
+    SHARPMEM    .     .     .     .       .       . . . .     .
     SSD1306     .     .     .     .       .       . . . .     .
     INTERFACE   .     .     .     .       .       . . . .     X[2]
 
@@ -129,7 +131,7 @@
     -----------------------------------------------------------------------*/
     #define CFG_FIRMWARE_VERSION_MAJOR            (0)
     #define CFG_FIRMWARE_VERSION_MINOR            (9)
-    #define CFG_FIRMWARE_VERSION_REVISION         (5)
+    #define CFG_FIRMWARE_VERSION_REVISION         (8)
 /*=========================================================================*/
 
 
@@ -389,9 +391,7 @@
                               "\n" for *nix
 
     Note: If no printf redirection definitions are present, all printf
-    output will be ignored, though this will also save ~350 bytes flash.
-
-    NOTE: PRINTF Support =    ~350 bytes Flash (-Os)
+    output will be ignored.
     -----------------------------------------------------------------------*/
     #ifdef CFG_BRD_LPC1343_REFDESIGN
       // #define CFG_PRINTF_UART
@@ -768,7 +768,7 @@
 
 
 /*=========================================================================
-    128x64 Graphic LCDs
+    Monochrome/Bitmap Graphic LCDs
     -----------------------------------------------------------------------
 
     CFG_ST7565                If defined, this will cause drivers for
@@ -776,15 +776,16 @@
     CFG_SSD1306               If defined, this will cause drivers for
                               the 128x64 pixel SSD1306 OLED display to be
                               included
-
-    Note:                     LPC1114 @ 36MHz and the ST7565 with the
-                              backlight enabled consumes ~35mA
+    CFG_SHARPMEM              If defined, this will cause drivers for
+                              Sharp Memory Displays to be included
 
     DEPENDENCIES:             ST7565 requires the use of pins 2.1-6.
     DEPENDENCIES:             SSD1306 requires the use of pins 2.1-6.
+    DEPENDENCIES:             SHARPMEM requires the use of pins 2.1-4.
     -----------------------------------------------------------------------*/
     // #define CFG_ST7565
     // #define CFG_SSD1306
+    // #define CFG_SHARPMEM
 /*=========================================================================*/
 
 
-- 
2.20.1