Mis SLCD-related cleanup, documentation, bugfixes

4 files changed, 17 insertions, 13 deletions

diff --git a/nuttx/configs/pcblogic-pic32mx/README.txt b/nuttx/configs/pcblogic-pic32mx/README.txt
index fa11750af..baa0763ee 100644
--- a/nuttx/configs/pcblogic-pic32mx/README.txt
+++ b/nuttx/configs/pcblogic-pic32mx/README.txt
@@ -340,7 +340,7 @@ LCD1602
                                         1.  Vss    --> Powerpoint GND
                                         2.  Vdd    --> Powerpoint USB+5V
                                         3.  Vee    N/C To ground via 10K potentiometer
-      4  AN15/OCFB/PMALL/PMA0/CN12/RB15 4.  RS       4 PMA0, Selects registers
+     44  AN15/OCFB/PMALL/PMA0/CN12/RB15 4.  RS       4 PMA0, Selects registers
      82  PMRD/CN14/RD5                  5.  RW      82 PMRD/PMWR, Selects read or write
      81  OC5/PMWR/CN13/RD4              6.  E       81 PMENB, Starts data read/write
      93  PMD0/RE0                       7.  D0      93 PMD0
@@ -669,8 +669,10 @@ Configuration sub-directories
          CONFIG_DEBUG=y                          : Enable debug features
          CONFIG_DEBUG_VERBOSE=y                  : Enable LCD debug
 
-       NOTE:  At this point in time, testing of the SLCD is very limited because
-       there is not much in apps/examples/slcd.  Certainly there are more bugs
-       to be found.  But there is a basically functional driver with a working
-       test setup that can be extended if you want a fully functional LCD1602
-       driver.
+       NOTES:
+       a. I do not have the LCD1602 working.  I may just be getting lost in the
+          tangle of wires or perhaps there is something fundamentally wrong with
+          the code.
+       b. At this point in time, testing of the SLCD is very limited because
+          there is not much in apps/examples/slcd.  Basically  driver with a working
+          test setup and ready to be tested and debugged.
diff --git a/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c b/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
index bf564cf96..e2be0a243 100644
--- a/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
+++ b/nuttx/configs/pcblogic-pic32mx/src/pic32mx_lcd1602.c
@@ -46,7 +46,7 @@
  *                                      1.  Vss    --> Powerpoint GND
  *                                      2.  Vdd    --> Powerpoint USB+5V
  *                                      3.  Vee    N/C To ground via 10K potentiometer
- *    4  AN15/OCFB/PMALL/PMA0/CN12/RB15 4.  RS       4 PMA0, Selects registers
+ *   44  AN15/OCFB/PMALL/PMA0/CN12/RB15 4.  RS       4 PMA0, Selects registers
  *   82  PMRD/CN14/RD5                  5.  RW      82 PMRD/PMWR, Selects read or write
  *   81  OC5/PMWR/CN13/RD4              6.  E       81 PMENB, Starts data read/write
  *   93  PMD0/RE0                       7.  D0      93 PMD0
diff --git a/nuttx/configs/stm32ldiscovery/README.txt b/nuttx/configs/stm32ldiscovery/README.txt
index 88234b761..2da098cc6 100644
--- a/nuttx/configs/stm32ldiscovery/README.txt
+++ b/nuttx/configs/stm32ldiscovery/README.txt
@@ -788,13 +788,13 @@ Configuration sub-directories
     4. To enable SLCD support:
 
        Board Selection:
-         CONFIG_ARCH_LEDS=n                      : Disable LED support
+         CONFIG_ARCH_LEDS=n                      : Disable board LED support
 
        Library Routines:
          CONFIG_LIB_SLCDCODEC=y                  : Enable the SLCD CODEC
 
-       System Type:
-         CONFIG_STM32_LCD=y                      : Enable the SLCD
+       System Type -> STM32 Peripheral Support:
+         CONFIG_STM32_LCD=y                      : Enable the Segment LCD
 
        When the LCD is enabled and the LEDs are disabled, the USART1
        serial console will automaticall move to PB6 and PB7 (you will get
@@ -811,9 +811,11 @@ Configuration sub-directories
          CONFIG_BINFMT_DISABLE=n                 : Don't disable binary support
          CONFIG_BUILTIN=y                        : Enable support for built-in binaries
 
-       Application Configuration:
+       Application Configuration -> NSH Library:
          CONFIG_NSH_BUILTIN_APPS=y               : Enable builtin apps in NSH
          CONFIG_NSH_ARCHINIT=y                   : Needed to initialize the SLCD
+
+       Application Configuration -> Examples:
          CONFIG_EXAMPLES_SLCD=y                  : Enable apps/examples/slcd
 
        To enable LCD debug output:
@@ -821,7 +823,7 @@ Configuration sub-directories
        Device Drivers:
          CONFIG_LCD=y                            : (Needed to enable LCD debug)
 
-       Build Setup:
+       Build Setup -> Debug Options:
          CONFIG_DEBUG=y                          : Enable debug features
          CONFIG_DEBUG_VERBOSE=y                  : Enable LCD debug
 
diff --git a/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c b/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c
index d843fba7e..789c2694a 100644
--- a/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c
+++ b/nuttx/configs/stm32ldiscovery/src/stm32_lcd.c
@@ -935,7 +935,7 @@ static void slcd_action(enum slcdcode_e code, uint8_t count)
              * number of characters to move.
              */
 
-            nchars = SLCD_CHARS - g_slcdstate.curpos;
+            nchars = SLCD_NCHARS - g_slcdstate.curpos;
             nmove  = MIN(nchars, count) - 1;
 
             /* Move all characters after the current cursor position left by 'nmove' characters */