Cleanup for 1.0.0

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d89d321..11a6ca0 100644 (file)
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,11 @@
-v0.9.8 - Ongoing
+v1.0.0 - Ongoing
 ================
+- *** Moved '/drivers/chibi' to '/drivers/rf/chibi' ***
+- *** Moved '/drivers/sensors/pn532' to '/drivers/rf/pn532' ***
+- *** Renamed '/drivers/spiflash' to '/drivers/storage/spiflash' ***
+- *** Renamed '/drivers/eeprom' to '/drivers/storage/eeprom' ***
 - *** Renamed '/drivers/lcd' to '/drivers/display' ***
+- Added basic AS1115 driver for segment displays
 - Added driver for HX8340-B based LCDs
 - Added flag to projectconfig.h to disable the default
   GPIO IRQ Handler functions in code/gpio/gpio.c

diff --git a/Makefile b/Makefile
index d8b61f3..c5ef352 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,11 +47,11 @@ OBJS += cmd_textw.o cmd_tsthreshhold.o cmd_tswait.o cmd_triangle.o
 ##########################################################################
 
 # Chibi Light-Weight Wireless Stack (AT86RF212)
-VPATH += drivers/chibi
+VPATH += drivers/rf/chibi
 OBJS += chb.o chb_buf.o chb_drvr.o chb_eeprom.o chb_spi.o
 
 # 4K EEPROM
-VPATH += drivers/eeprom drivers/eeprom/mcp24aa
+VPATH += drivers/storage/eeprom drivers/storage/eeprom/mcp24aa
 OBJS += eeprom.o mcp24aa.o
 
 # LM75B temperature sensor
@@ -106,7 +106,7 @@ VPATH += drivers/dac/mcp4725
 OBJS += mcp4725.o
 
 # RFID/NFC
-VPATH += drivers/sensors/pn532 drivers/sensors/pn532/helpers
+VPATH += drivers/rf/pn532 drivers/rf/pn532/helpers
 OBJS += pn532.o pn532_bus_i2c.o pn532_bus_uart.o
 OBJS += pn532_mifare_classic.o pn532_mifare_ultralight.o
 
@@ -115,7 +115,7 @@ VPATH += drivers/sensors/tcs3414 drivers/sensors/tsl2561
 OBJS += tcs3414.o tsl2561.o
 
 # SPI Flash
-VPATH += drivers/spiflash/w25q16bv
+VPATH += drivers/storage/spiflash/w25q16bv
 OBJS += w25q16bv.o
 
 ##########################################################################

diff --git a/build/codelite/LPC1343 Workspace.workspace.session b/build/codelite/LPC1343 Workspace.workspace.session
index 5865baa..1c9cbf6 100644 (file)
--- a/build/codelite/LPC1343 Workspace.workspace.session
+++ b/build/codelite/LPC1343 Workspace.workspace.session
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Session Name="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\build\codelite\LPC1343 Workspace.workspace">
-  <int Value="1" Name="m_selectedTab"/>
+  <int Value="0" Name="m_selectedTab"/>
   <wxString Value="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\build\codelite\LPC1343 Workspace.workspace" Name="m_workspaceName"/>
   <TabInfoArray Name="TabInfoArray">
     <TabInfo>
       <wxString Value="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\Makefile" Name="FileName"/>
-      <int Value="71" Name="FirstVisibleLine"/>
-      <int Value="90" Name="CurrentLine"/>
+      <int Value="93" Name="FirstVisibleLine"/>
+      <int Value="104" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>
     <TabInfo>
@@ -17,7 +17,7 @@
     </TabInfo>
     <TabInfo>
       <wxString Value="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" Name="FileName"/>
-      <int Value="9" Name="FirstVisibleLine"/>
+      <int Value="10" Name="FirstVisibleLine"/>
       <int Value="28" Name="CurrentLine"/>
       <wxArrayString Name="Bookmarks"/>
     </TabInfo>

diff --git a/build/codelite/LPC1343_CodeBase.project b/build/codelite/LPC1343_CodeBase.project
index 1a37ab1..66cb644 100644 (file)
--- a/build/codelite/LPC1343_CodeBase.project
+++ b/build/codelite/LPC1343_CodeBase.project
@@ -100,49 +100,11 @@
     </VirtualDirectory>
   </VirtualDirectory>
   <VirtualDirectory Name="drivers">
-    <VirtualDirectory Name="chibi">
-      <File Name="../../drivers/chibi/chb.c"/>
-      <File Name="../../drivers/chibi/chb.h"/>
-      <File Name="../../drivers/chibi/chb_buf.c"/>
-      <File Name="../../drivers/chibi/chb_buf.h"/>
-      <File Name="../../drivers/chibi/chb_drvr_at86rf212.c"/>
-      <File Name="../../drivers/chibi/chb_drvr_at86rf212.h"/>
-      <File Name="../../drivers/chibi/chb_eeprom.c"/>
-      <File Name="../../drivers/chibi/chb_eeprom.h"/>
-      <File Name="../../drivers/chibi/chb_spi.c"/>
-      <File Name="../../drivers/chibi/chb_spi.h"/>
-    </VirtualDirectory>
-    <VirtualDirectory Name="eeprom">
-      <VirtualDirectory Name="mcp24aa">
-        <File Name="../../drivers/eeprom/mcp24aa/mcp24aa.c"/>
-        <File Name="../../drivers/eeprom/mcp24aa/mcp24aa.h"/>
-      </VirtualDirectory>
-      <VirtualDirectory Name="at25040">
-        <File Name="../../drivers/eeprom/at25040/at25040.c"/>
-        <File Name="../../drivers/eeprom/at25040/at25040.h"/>
-      </VirtualDirectory>
-      <File Name="../../drivers/eeprom/eeprom.c"/>
-      <File Name="../../drivers/eeprom/eeprom.h"/>
-    </VirtualDirectory>
     <VirtualDirectory Name="sensors">
       <VirtualDirectory Name="lm75b">
         <File Name="../../drivers/sensors/lm75b/lm75b.c"/>
         <File Name="../../drivers/sensors/lm75b/lm75b.h"/>
       </VirtualDirectory>
-      <VirtualDirectory Name="pn532">
-        <File Name="../../drivers/sensors/pn532/pn532.c"/>
-        <File Name="../../drivers/sensors/pn532/pn532.h"/>
-        <VirtualDirectory Name="helpers">
-          <File Name="../../drivers/sensors/pn532/helpers/pn532_mifare.h"/>
-          <File Name="../../drivers/sensors/pn532/helpers/pn532_mifare_classic.c"/>
-          <File Name="../../drivers/sensors/pn532/helpers/pn532_mifare_classic.h"/>
-          <File Name="../../drivers/sensors/pn532/helpers/pn532_mifare_ultralight.c"/>
-          <File Name="../../drivers/sensors/pn532/helpers/pn532_mifare_ultralight.h"/>
-        </VirtualDirectory>
-        <File Name="../../drivers/sensors/pn532/pn532_bus.h"/>
-        <File Name="../../drivers/sensors/pn532/pn532_bus_i2c.c"/>
-        <File Name="../../drivers/sensors/pn532/pn532_bus_uart.c"/>
-      </VirtualDirectory>
       <VirtualDirectory Name="tcs3414">
         <File Name="../../drivers/sensors/tcs3414/tcs3414.c"/>
         <File Name="../../drivers/sensors/tcs3414/tcs3414.h"/>
@@ -267,11 +229,54 @@
         <File Name="../../drivers/rtc/isl12022m/isl12022m.h"/>
       </VirtualDirectory>
     </VirtualDirectory>
-    <VirtualDirectory Name="spiflash">
-      <File Name="../../drivers/spiflash/spiflash.h"/>
-      <VirtualDirectory Name="w25q16bv">
-        <File Name="../../drivers/spiflash/w25q16bv/w25q16bv.c"/>
-        <File Name="../../drivers/spiflash/w25q16bv/w25q16bv.h"/>
+    <VirtualDirectory Name="storage">
+      <VirtualDirectory Name="spiflash">
+        <VirtualDirectory Name="w25q16bv">
+          <File Name="../../drivers/storage/spiflash/w25q16bv/w25q16bv.c"/>
+          <File Name="../../drivers/storage/spiflash/w25q16bv/w25q16bv.h"/>
+        </VirtualDirectory>
+        <File Name="../../drivers/storage/spiflash/spiflash.h"/>
+      </VirtualDirectory>
+      <VirtualDirectory Name="eeprom">
+        <VirtualDirectory Name="at25040">
+          <File Name="../../drivers/storage/eeprom/at25040/at25040.c"/>
+          <File Name="../../drivers/storage/eeprom/at25040/at25040.h"/>
+        </VirtualDirectory>
+        <VirtualDirectory Name="mcp24aa">
+          <File Name="../../drivers/storage/eeprom/mcp24aa/mcp24aa.c"/>
+          <File Name="../../drivers/storage/eeprom/mcp24aa/mcp24aa.h"/>
+        </VirtualDirectory>
+        <File Name="../../drivers/storage/eeprom/eeprom.c"/>
+        <File Name="../../drivers/storage/eeprom/eeprom.h"/>
+      </VirtualDirectory>
+    </VirtualDirectory>
+    <VirtualDirectory Name="rf">
+      <VirtualDirectory Name="chibi">
+        <File Name="../../drivers/rf/chibi/chb.c"/>
+        <File Name="../../drivers/rf/chibi/chb.h"/>
+        <File Name="../../drivers/rf/chibi/chb_buf.c"/>
+        <File Name="../../drivers/rf/chibi/chb_buf.h"/>
+        <File Name="../../drivers/rf/chibi/chb_drvr.c"/>
+        <File Name="../../drivers/rf/chibi/chb_drvr.h"/>
+        <File Name="../../drivers/rf/chibi/chb_eeprom.c"/>
+        <File Name="../../drivers/rf/chibi/chb_eeprom.h"/>
+        <File Name="../../drivers/rf/chibi/chb_spi.c"/>
+        <File Name="../../drivers/rf/chibi/chb_spi.h"/>
+        <File Name="../../drivers/rf/chibi/types.h"/>
+      </VirtualDirectory>
+      <VirtualDirectory Name="pn532">
+        <File Name="../../drivers/rf/pn532/pn532.c"/>
+        <File Name="../../drivers/rf/pn532/pn532.h"/>
+        <File Name="../../drivers/rf/pn532/pn532_bus.h"/>
+        <File Name="../../drivers/rf/pn532/pn532_bus_i2c.c"/>
+        <File Name="../../drivers/rf/pn532/pn532_bus_uart.c"/>
+        <VirtualDirectory Name="helpers">
+          <File Name="../../drivers/rf/pn532/helpers/pn532_mifare.h"/>
+          <File Name="../../drivers/rf/pn532/helpers/pn532_mifare_classic.c"/>
+          <File Name="../../drivers/rf/pn532/helpers/pn532_mifare_classic.h"/>
+          <File Name="../../drivers/rf/pn532/helpers/pn532_mifare_ultralight.c"/>
+          <File Name="../../drivers/rf/pn532/helpers/pn532_mifare_ultralight.h"/>
+        </VirtualDirectory>
       </VirtualDirectory>
     </VirtualDirectory>
   </VirtualDirectory>

diff --git a/build/crossworks/LPC1343_CodeBase.hzp b/build/crossworks/LPC1343_CodeBase.hzp
index 1ebe6dd..dfad83d 100644 (file)
--- a/build/crossworks/LPC1343_CodeBase.hzp
+++ b/build/crossworks/LPC1343_CodeBase.hzp
@@ -121,41 +121,6 @@
       <file file_name="../../projectconfig.h"/>
       <file file_name="../../sysdefs.h"/>
       <folder Name="drivers">
-        <folder Name="eeprom">
-          <folder Name="at25040">
-            <file file_name="../../drivers/eeprom/at25040/at25040.c">
-              <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-            </file>
-          </folder>
-          <folder Name="mcp24aa">
-            <file file_name="../../drivers/eeprom/mcp24aa/mcp24aa.c">
-              <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-            </file>
-          </folder>
-          <file file_name="../../drivers/eeprom/eeprom.c"/>
-        </folder>
-        <folder Name="chibi" file_name="">
-          <file file_name="../../drivers/chibi/chb.c">
-            <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
-            <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-          </file>
-          <file file_name="../../drivers/chibi/chb_buf.c">
-            <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
-            <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-          </file>
-          <file file_name="../../drivers/chibi/chb_drvr.c">
-            <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
-            <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-          </file>
-          <file file_name="../../drivers/chibi/chb_eeprom.c">
-            <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
-            <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-          </file>
-          <file file_name="../../drivers/chibi/chb_spi.c">
-            <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
-            <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-          </file>
-        </folder>
         <folder Name="sensors">
           <folder Name="lm75b">
             <file file_name="../../drivers/sensors/lm75b/lm75b.c">
@@ -167,22 +132,6 @@
               <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
             </file>
           </folder>
-          <folder Name="pn532">
-            <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_bus_uart.c">
-              <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-            </file>
-            <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>
-            <file file_name="../../drivers/sensors/pn532/pn532_bus_i2c.c">
-              <configuration Name="THUMB Flash Debug" build_exclude_from_build="No"/>
-            </file>
-            <file file_name="../../drivers/sensors/pn532/pn532_bus.h"/>
-          </folder>
           <folder Name="tsl2561">
             <file file_name="../../drivers/sensors/tsl2561/tsl2561.c">
               <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
@@ -264,6 +213,13 @@
           </folder>
           <file file_name="../../drivers/displays/icons16.h"/>
           <file file_name="../../drivers/displays/smallfonts.c"/>
+          <folder Name="segment">
+            <folder Name="as1115">
+              <file file_name="../../drivers/displays/segment/as1115/as1115.c">
+                <configuration Name="THUMB Flash Release" build_exclude_from_build="No"/>
+              </file>
+            </folder>
+          </folder>
         </folder>
         <folder Name="fatfs" file_name="">
           <file file_name="../../drivers/fatfs/ff.c">
@@ -297,11 +253,40 @@
             <configuration Name="THUMB Flash Debug" build_exclude_from_build="Yes"/>
           </file>
         </folder>
-        <folder Name="spiflash">
-          <folder Name="w25q16bv">
-            <file file_name="../../drivers/spiflash/w25q16bv/w25q16bv.c"/>
+        <folder Name="rf">
+          <folder Name="chibi" file_name="">
+            <file file_name="../../drivers/rf/chibi/chb.c"/>
+            <file file_name="../../drivers/rf/chibi/chb_buf.c"/>
+            <file file_name="../../drivers/rf/chibi/chb_drvr.c"/>
+            <file file_name="../../drivers/rf/chibi/chb_eeprom.c"/>
+            <file file_name="../../drivers/rf/chibi/chb_spi.c"/>
+          </folder>
+          <folder Name="pn532">
+            <folder Name="helpers">
+              <file file_name="../../drivers/rf/pn532/helpers/pn532_mifare_classic.c"/>
+              <file file_name="../../drivers/rf/pn532/helpers/pn532_mifare_ultralight.c"/>
+            </folder>
+            <file file_name="../../drivers/rf/pn532/pn532.c"/>
+            <file file_name="../../drivers/rf/pn532/pn532_bus_i2c.c"/>
+            <file file_name="../../drivers/rf/pn532/pn532_bus_uart.c"/>
+          </folder>
+        </folder>
+        <folder Name="storage">
+          <folder Name="eeprom">
+            <folder Name="at25040">
+              <file file_name="../../drivers/storage/eeprom/at25040/at25040.c"/>
+            </folder>
+            <folder Name="mcp24aa">
+              <file file_name="../../drivers/storage/eeprom/mcp24aa/mcp24aa.c"/>
+            </folder>
+            <file file_name="../../drivers/storage/eeprom/eeprom.c"/>
+          </folder>
+          <folder Name="spiflash">
+            <folder Name="w25q16bv">
+              <file file_name="../../drivers/storage/spiflash/w25q16bv/w25q16bv.c"/>
+            </folder>
+            <file file_name="../../drivers/storage/spiflash/spiflash.h"/>
           </folder>
-          <file file_name="../../drivers/spiflash/spiflash.h"/>
         </folder>
       </folder>
       <file file_name="../../sysinit.c"/>

diff --git a/build/crossworks/LPC1343_CodeBase.hzs b/build/crossworks/LPC1343_CodeBase.hzs
index ece19cd..e583c29 100644 (file)
--- a/build/crossworks/LPC1343_CodeBase.hzs
+++ b/build/crossworks/LPC1343_CodeBase.hzs
@@ -33,10 +33,6 @@
   <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;displays" name="unnamed" />
-  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers;displays;tft" name="unnamed" />
-  <ProjectSessionItem path="LPC1343_CodeBase;LPC1343_CodeBase;Source Files;drivers;displays;tft;hw" name="unnamed" />
  </Project>
  <Register1>
   <RegisterWindow openNodes="USB;USB/USBRxPLen;USB/USBTxPLen;USB/USBCtrl" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="CPU;USB" decimalNodes="" octalNodes="" asciiNodes="" />
@@ -56,10 +52,10 @@
  </TraceWindow>
  <Watch1>
   <Watches active="1" update="Each Second" >
-   <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" />
+   <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" />
   </Watches>
  </Watch1>
  <Watch2>
@@ -71,6 +67,8 @@
  <Watch4>
   <Watches active="0" update="Never" />
  </Watch4>
- <Files/>
- <ARMCrossStudioWindow activeProject="LPC1343_CodeBase" autoConnectTarget="SEGGER J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\drivers\displays\tft\hw" fileDialogDefaultFilter="" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Flash Release" />
+ <Files>
+  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" y="67" path="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\main.c" left="0" selected="1" name="unnamed" top="19" />
+ </Files>
+ <ARMCrossStudioWindow activeProject="LPC1343_CodeBase" autoConnectTarget="Segger J-Link" debugSearchFileMap="" fileDialogInitialDirectory="C:\Dropbox\microBuilder\Code\LPC1343\LPC1343_CodeBase_GIT\drivers\rf\pn532\helpers" fileDialogDefaultFilter="" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Flash Release" />
 </session>

diff --git a/core/gpio/gpio.c b/core/gpio/gpio.c
index 44f394a..a7154e1 100644 (file)
--- a/core/gpio/gpio.c
+++ b/core/gpio/gpio.c
@@ -43,7 +43,7 @@
 #include "gpio.h"
 
 #ifdef CFG_CHIBI
-#include "drivers/chibi/chb_drvr.h"
+#include "drivers/rf/chibi/chb_drvr.h"
 volatile uint32_t chibi_counter  = 0;
 #endif
 

diff --git a/core/pmu/pmu.c b/core/pmu/pmu.c
index d90d228..10c8e6a 100644 (file)
--- a/core/pmu/pmu.c
+++ b/core/pmu/pmu.c
@@ -50,7 +50,7 @@
 #include "pmu.h"
 
 #ifdef CFG_CHIBI
-  #include "drivers/chibi/chb_drvr.h"
+  #include "drivers/rf/chibi/chb_drvr.h"
 #endif
 #define PMU_WDTCLOCKSPEED_HZ 7812
 

diff --git a/drivers/displays/tft/touchscreen.c b/drivers/displays/tft/touchscreen.c
index 90af15f..3370c5f 100644 (file)
--- a/drivers/displays/tft/touchscreen.c
+++ b/drivers/displays/tft/touchscreen.c
@@ -40,7 +40,7 @@
 #include "core/adc/adc.h"
 #include "core/gpio/gpio.h"
 #include "core/systick/systick.h"
-#include "drivers/eeprom/eeprom.h"
+#include "drivers/storage/eeprom/eeprom.h"
 #include "drivers/displays/tft/lcd.h"
 #include "drivers/displays/tft/drawing.h"
 #include "drivers/displays/tft/fonts/dejavusans9.h"

diff --git a/main.c b/main.c
index 703bf96..132f1fe 100644 (file)
--- a/main.c
+++ b/main.c
@@ -43,6 +43,8 @@
 #include "core/gpio/gpio.h"
 #include "core/systick/systick.h"
 
+#include "drivers/displays/segment/as1115/as1115.h"
+
 #ifdef CFG_INTERFACE
   #include "core/cmd/cmd.h"
 #endif
@@ -61,7 +63,23 @@ int main(void)
   uint32_t currentSecond, lastSecond;
   currentSecond = lastSecond = 0;
 
-  lcdTest();
+  // lcdTest();
+
+
+  // as1115Test();
+
+  uint8_t displaybuffer[8];
+
+  displaybuffer[0] = 0x01 | 0x80;
+  displaybuffer[1] = 0x02 | 0x40;
+  displaybuffer[2] = 0x04 | 0x20;
+  displaybuffer[3] = 0x08 | 0x10;
+  displaybuffer[4] = 0x10 | 0x08,
+  displaybuffer[5] = 0x20 | 0x04;
+  displaybuffer[6] = 0x40 | 0X02;
+  displaybuffer[7] = 0x80 | 0X01;
+
+  as1115WriteBuffer(displaybuffer); 
 
   while (1)
   {

diff --git a/project/commands/cmd_chibi_addr.c b/project/commands/cmd_chibi_addr.c
index d195262..1e7c302 100644 (file)
--- a/project/commands/cmd_chibi_addr.c
+++ b/project/commands/cmd_chibi_addr.c
@@ -43,8 +43,8 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_CHIBI
-  #include "drivers/chibi/chb.h"
-  #include "drivers/chibi/chb_drvr.h"
+  #include "drivers/rf/chibi/chb.h"
+  #include "drivers/rf/chibi/chb_drvr.h"
 
 /**************************************************************************/
 /*! 

diff --git a/project/commands/cmd_chibi_tx.c b/project/commands/cmd_chibi_tx.c
index eb2e43d..ec74d32 100644 (file)
--- a/project/commands/cmd_chibi_tx.c
+++ b/project/commands/cmd_chibi_tx.c
@@ -44,8 +44,8 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_CHIBI
-  #include "drivers/chibi/chb.h"
-  #include "drivers/chibi/chb_drvr.h"
+  #include "drivers/rf/chibi/chb.h"
+  #include "drivers/rf/chibi/chb_drvr.h"
 
 /**************************************************************************/
 /*! 

diff --git a/project/commands/cmd_i2ceeprom_read.c b/project/commands/cmd_i2ceeprom_read.c
index c27de8e..d32b8f5 100644 (file)
--- a/project/commands/cmd_i2ceeprom_read.c
+++ b/project/commands/cmd_i2ceeprom_read.c
@@ -43,7 +43,7 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_I2CEEPROM
-  #include "drivers/eeprom/eeprom.h"
+  #include "drivers/storage/eeprom/eeprom.h"
 
 /**************************************************************************/
 /*! 

diff --git a/project/commands/cmd_i2ceeprom_write.c b/project/commands/cmd_i2ceeprom_write.c
index 0eec71e..7b1621a 100644 (file)
--- a/project/commands/cmd_i2ceeprom_write.c
+++ b/project/commands/cmd_i2ceeprom_write.c
@@ -43,7 +43,7 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_I2CEEPROM
-  #include "drivers/eeprom/eeprom.h"
+  #include "drivers/storage/eeprom/eeprom.h"
 
 /**************************************************************************/
 /*! 

diff --git a/project/commands/cmd_reset.c b/project/commands/cmd_reset.c
index aa665f0..34a223a 100644 (file)
--- a/project/commands/cmd_reset.c
+++ b/project/commands/cmd_reset.c
@@ -44,7 +44,7 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_I2CEEPROM
-  #include "drivers/eeprom/eeprom.h"
+  #include "drivers/storage/eeprom/eeprom.h"
   #include "core/uart/uart.h"
 
 /**************************************************************************/

diff --git a/project/commands/cmd_sysinfo.c b/project/commands/cmd_sysinfo.c
index a742f0e..96a59db 100644 (file)
--- a/project/commands/cmd_sysinfo.c
+++ b/project/commands/cmd_sysinfo.c
@@ -45,8 +45,8 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_CHIBI
-  #include "drivers/chibi/chb.h"
-  #include "drivers/chibi/chb_drvr.h"
+  #include "drivers/rf/chibi/chb.h"
+  #include "drivers/rf/chibi/chb_drvr.h"
 #endif
 
 #ifdef CFG_PRINTF_UART

diff --git a/project/commands/cmd_uart.c b/project/commands/cmd_uart.c
index 91081f7..490626b 100644 (file)
--- a/project/commands/cmd_uart.c
+++ b/project/commands/cmd_uart.c
@@ -43,7 +43,7 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_I2CEEPROM
-  #include "drivers/eeprom/eeprom.h"
+  #include "drivers/storage/eeprom/eeprom.h"
   #include "core/uart/uart.h"
 
 /**************************************************************************/

diff --git a/project/commands/drawing/cmd_tsthreshhold.c b/project/commands/drawing/cmd_tsthreshhold.c
index 9e0144e..a195b36 100644 (file)
--- a/project/commands/drawing/cmd_tsthreshhold.c
+++ b/project/commands/drawing/cmd_tsthreshhold.c
@@ -44,7 +44,7 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_TFTLCD    
-  #include "drivers/eeprom/eeprom.h"
+  #include "drivers/storage/eeprom/eeprom.h"
   #include "drivers/displays/tft/touchscreen.h"
 
 /**************************************************************************/

diff --git a/projectconfig.h b/projectconfig.h
index 1d69e9c..ad7ad82 100644 (file)
--- a/projectconfig.h
+++ b/projectconfig.h
@@ -7,7 +7,7 @@
 
     Software License Agreement (BSD License)
 
-    Copyright (c) 2010, microBuilder SARL
+    Copyright (c) 2012, microBuilder SARL
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -111,9 +111,9 @@
         microBuilder.eu USB stick 802.15.4 868/915MHz RF transceiver
 
     -----------------------------------------------------------------------*/
-    // #define CFG_BRD_LPC1343_REFDESIGN
+    #define CFG_BRD_LPC1343_REFDESIGN
     // #define CFG_BRD_LPC1343_REFDESIGN_MINIMAL
-    #define CFG_BRD_LPC1343_TFTLCDSTANDALONE_USB
+    // #define CFG_BRD_LPC1343_TFTLCDSTANDALONE_USB
     // #define CFG_BRD_LPC1343_TFTLCDSTANDALONE_UART
     // #define CFG_BRD_LPC1343_802154USBSTICK
     // #define CFG_BRD_LPC1343_OLIMEX_P
@@ -198,9 +198,9 @@
 /*=========================================================================
     FIRMWARE VERSION SETTINGS
     -----------------------------------------------------------------------*/
-    #define CFG_FIRMWARE_VERSION_MAJOR            (0)
-    #define CFG_FIRMWARE_VERSION_MINOR            (9)
-    #define CFG_FIRMWARE_VERSION_REVISION         (8)
+    #define CFG_FIRMWARE_VERSION_MAJOR            (1)
+    #define CFG_FIRMWARE_VERSION_MINOR            (0)
+    #define CFG_FIRMWARE_VERSION_REVISION         (0)
 /*=========================================================================*/
 
 

diff --git a/sysinit.c b/sysinit.c
index 9734d23..94784b6 100644 (file)
--- a/sysinit.c
+++ b/sysinit.c
@@ -54,7 +54,7 @@
 #endif
 
 #ifdef CFG_CHIBI
-  #include "drivers/chibi/chb.h"
+  #include "drivers/rf/chibi/chb.h"
 #endif
 
 #ifdef CFG_USBHID
@@ -87,8 +87,8 @@
 #endif
 
 #ifdef CFG_I2CEEPROM
-  #include "drivers/eeprom/mcp24aa/mcp24aa.h"
-  #include "drivers/eeprom/eeprom.h"
+  #include "drivers/storage/eeprom/mcp24aa/mcp24aa.h"
+  #include "drivers/storage/eeprom/eeprom.h"
 #endif
 
 #ifdef CFG_PWM

diff --git a/tools/examples/chibi/receive/main.c b/tools/examples/chibi/receive/main.c
index 3daafcf..786d5f2 100644 (file)
--- a/tools/examples/chibi/receive/main.c
+++ b/tools/examples/chibi/receive/main.c
@@ -37,8 +37,8 @@
 #include "sysinit.h"
 
 #include "core/gpio/gpio.h"
-#include "drivers/chibi/chb.h"
-#include "drivers/chibi/chb_drvr.h"
+#include "drivers/rf/chibi/chb.h"
+#include "drivers/rf/chibi/chb_drvr.h"
 
 static chb_rx_data_t rx_data;
 

diff --git a/tools/examples/chibi/sniffer_wsbridge/main.c b/tools/examples/chibi/sniffer_wsbridge/main.c
index 0e3bcdc..8ca6361 100644 (file)
--- a/tools/examples/chibi/sniffer_wsbridge/main.c
+++ b/tools/examples/chibi/sniffer_wsbridge/main.c
@@ -41,8 +41,8 @@
 #if defined CFG_CHIBI
   #include <string.h>
   #include <stdlib.h>
-  #include "drivers/chibi/chb.h"
-  #include "drivers/chibi/chb_drvr.h"
+  #include "drivers/rf/chibi/chb.h"
+  #include "drivers/rf/chibi/chb_drvr.h"
   #include "core/uart/uart.h"
   static chb_rx_data_t rx_data;
 #endif

diff --git a/tools/examples/chibi/transmit/main.c b/tools/examples/chibi/transmit/main.c
index bd37cd4..63fb230 100644 (file)
--- a/tools/examples/chibi/transmit/main.c
+++ b/tools/examples/chibi/transmit/main.c
@@ -41,8 +41,8 @@
 #if defined CFG_CHIBI
   #include <string.h>
   #include <stdlib.h>
-  #include "drivers/chibi/chb.h"
-  #include "drivers/chibi/chb_drvr.h"
+  #include "drivers/rf/chibi/chb.h"
+  #include "drivers/rf/chibi/chb_drvr.h"
 #endif
 
 /**************************************************************************/

diff --git a/tools/examples/sensors/pn532/ISO14443A_ID/main.c b/tools/examples/sensors/pn532/ISO14443A_ID/main.c
index 551b3ab..09dadc1 100644 (file)
--- a/tools/examples/sensors/pn532/ISO14443A_ID/main.c
+++ b/tools/examples/sensors/pn532/ISO14443A_ID/main.c
@@ -38,8 +38,8 @@
 #include "projectconfig.h"
 #include "sysinit.h"
 
-#include "drivers/sensors/pn532/pn532.h"
-#include "drivers/sensors/pn532/pn532_bus.h"
+#include "drivers/rf/pn532/pn532.h"
+#include "drivers/rf/pn532/pn532_bus.h"
 
 /**************************************************************************/
 /*! 

diff --git a/tools/examples/sensors/pn532/MifareClassic_MemDump/main.c b/tools/examples/sensors/pn532/MifareClassic_MemDump/main.c
index 75f48d1..1bc76e9 100644 (file)
--- a/tools/examples/sensors/pn532/MifareClassic_MemDump/main.c
+++ b/tools/examples/sensors/pn532/MifareClassic_MemDump/main.c
@@ -39,10 +39,10 @@
 #include "sysinit.h"
 
 #include "core/i2c/i2c.h"
-#include "drivers/sensors/pn532/pn532.h"
-#include "drivers/sensors/pn532/pn532_bus.h"
-#include "drivers/sensors/pn532/helpers/pn532_mifare_classic.h"
-#include "drivers/sensors/pn532/helpers/pn532_mifare_ultralight.h"
+#include "drivers/rf/pn532/pn532.h"
+#include "drivers/rf/pn532/pn532_bus.h"
+#include "drivers/rf/pn532/helpers/pn532_mifare_classic.h"
+#include "drivers/rf/pn532/helpers/pn532_mifare_ultralight.h"
 
 /**************************************************************************/
 /*! 

diff --git a/tools/examples/sensors/pn532/MifareUltralight_MemDump/main.c b/tools/examples/sensors/pn532/MifareUltralight_MemDump/main.c
index 82797da..475de63 100644 (file)
--- a/tools/examples/sensors/pn532/MifareUltralight_MemDump/main.c
+++ b/tools/examples/sensors/pn532/MifareUltralight_MemDump/main.c
@@ -39,10 +39,10 @@
 #include "sysinit.h"
 
 #include "core/i2c/i2c.h"
-#include "drivers/sensors/pn532/pn532.h"
-#include "drivers/sensors/pn532/pn532_bus.h"
-#include "drivers/sensors/pn532/helpers/pn532_mifare_classic.h"
-#include "drivers/sensors/pn532/helpers/pn532_mifare_ultralight.h"
+#include "drivers/rf/pn532/pn532.h"
+#include "drivers/rf/pn532/pn532_bus.h"
+#include "drivers/rf/pn532/helpers/pn532_mifare_classic.h"
+#include "drivers/rf/pn532/helpers/pn532_mifare_ultralight.h"
 
 /**************************************************************************/
 /*! 

diff --git a/tools/examples/spiflash/erase_write_read/main.c b/tools/examples/spiflash/erase_write_read/main.c
index 4704a9f..b2eb131 100644 (file)
--- a/tools/examples/spiflash/erase_write_read/main.c
+++ b/tools/examples/spiflash/erase_write_read/main.c
@@ -42,7 +42,7 @@
 
 #include "core/gpio/gpio.h"
 #include "core/systick/systick.h"
-#include "drivers/spiflash/spiflash.h"
+#include "drivers/storage/spiflash/spiflash.h"
 
 #ifdef CFG_INTERFACE
   #include "core/cmd/cmd.h"