Version 0.5.0 is committed

README.md

@@ -23,6 +23,8 @@ The library supports the following devices:
 For more information about this library please visit
 https://github.com/lexus2k/nixielib.
 If you found any problem, please report to Issues section.
+The library depends on NixieOs library:
+https://github.com/lexus2k/NixieOs.
 
 == License ==
 

examples/nixie_audio_demo/nixie_audio_demo.ino

@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <nixie_library.h>
+#include <nixieos.h>
 #include <nixie_audio_channel.h>
 #include <nixie_melodies.h>
 
@@ -27,12 +27,13 @@ NixieAudioChannel   s_audio(3);
 
 void setup()
 {
+    NixieOs::setup( nullptr );
     s_audio.init();
 }
 
 void loop()
 {
-    NixieLibrary::update();
+    NixieOs::refresh();
     s_audio.update(micros());
     if (!s_audio.isPlaying( ))
     {

examples/nixie_buttons_demo/nixie_buttons_demo.ino

@@ -26,8 +26,9 @@
  *                 
  */
 
-#include <nixie_library.h>
+#include <nixieos.h>
 #include <nixie_buttons.h>
+#include <nixieos.h>
 
                              //  BTN1   BTN2  BTN3   BTN4
 const int16_t buttons[4]    =  { 752,   542,  362,   188 };
@@ -44,14 +45,15 @@ void onButtonDown(uint8_t id, uint16_t timeDeltaMs)
 
 void setup()
 {
+    NixieOs::setup( nullptr );
     Serial.begin(9600);
     s_buttons.init();
     s_buttons.onButtonDown(&onButtonDown);
 }
 
 void loop()
 {
-    NixieLibrary::update();
+    NixieOs::refresh();
     s_buttons.update();
     if (s_buttons.isShortPress(0))
     {

examples/nixie_htu21/nixie_htu21.ino

@@ -25,7 +25,7 @@
  * HTU21 sensor is connected to I2C bus, and is powered from 3.3V supply.                
  */
 
-#include <nixie_library.h>
+#include <nixieos.h>
 #include <nixie_htu21.h>
 
 static NixieHTU21 s_htu21;
@@ -40,13 +40,14 @@ void onButtonDown(uint8_t id, uint16_t timeDeltaMs)
 
 void setup()
 {
+    NixieOs::setup( nullptr );
     Serial.begin(9600);
     s_htu21.init();
 }
 
 void loop()
 {
-    NixieLibrary::update();
+    NixieOs::refresh();
     int16_t temp = s_htu21.getTemperature();
     Serial.print("Temperature: ");
     Serial.println(temp/100); /* Print temperature in Celsius */

examples/nixie_single_tube/nixie_single_tube.ino

@@ -1,6 +1,6 @@
 #include <nixie_tube.h>
 #include <nixie_k155id1.h>
-#include <nixie_library.h>
+#include <nixieos.h>
 
 /*
  * In this example single Nixie Tubes is controlled through single K155ID1 chip.
@@ -31,6 +31,7 @@ NixieTube           g_tube(&g_driver, in14driverMap);
 
 void setup()
 {
+    NixieOs::setup( nullptr );
     Serial.begin(9600);
     g_tube.init();
     /* Start with zero-digit. Zero means that we start from 0-digit */
@@ -45,7 +46,7 @@ void loop()
 {
     static unsigned long timestamp = millis();
     /* The line below must be called in the beginning of each loop cycle */
-    NixieLibrary::update();
+    NixieOs::refresh();
     if (millis() - timestamp > 1000)
     {
         /* enumerate all digits one by one every 1000 mseconds */

examples/nixie_two_tubes/nixie_two_tubes.ino

@@ -1,6 +1,6 @@
 #include <nixie_display.h>
 #include <nixie_k155id1.h>
-#include <nixie_library.h>
+#include <nixieos.h>
 
 /*
  * In this example both Nixie Tubes are controlled through single K155ID1 chip.
@@ -39,6 +39,7 @@ NixieDisplay        g_display(g_driver, anodPins, in14driverMap, 2);
 
 void setup()
 {
+    NixieOs::setup( nullptr );
     Serial.begin(9600);
     g_display.init();
     /* Start with zero-digit. Index corresponds to the tube, we're referring to. */
@@ -48,14 +49,14 @@ void setup()
      * Display object will automatically call anodOn() and anodOff(), while
      * functioning. Refer to NixieDisplay::render() method
      */
-    g_display.turnOn();
+    g_display.powerOn();
 }
 
 void loop()
 {
     static unsigned long timestamp = millis();
     /* The line below must be called in the beginning of each loop cycle */
-    NixieLibrary::update();
+    NixieOs::refresh();
     if (millis() - timestamp > 1000)
     {
         /* enumerate all digits one by one every 1000 mseconds on first tube only */

library.properties

@@ -1,5 +1,5 @@
 name=NixieLibrary
-version=0.4.0
+version=0.5.0
 author=Alexey Dynda
 maintainer=Alexey Dynda <[email protected]>
 sentence=Nixie Library is intended for Nixie Clock software development.

src/nixie_audio_channel.cpp

@@ -18,7 +18,7 @@
 */
 
 #include <nixie_audio_channel.h>
-#include "nixie_booster.h"
+#include "nixieos.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////
 

src/nixie_buttons.cpp

@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "nixie_library.h"
+#include "nixieos.h"
 #include "nixie_buttons.h"
 
 #define BUTTONS_THRESHOLD         30 /// in sample units 0 - 1024

src/nixie_buttons.h

@@ -21,7 +21,7 @@
 #define _NIXIE_BUTTONS_H_
 
 #include "nixie_types.h"
-#include "nixie_booster.h"
+#include "nixieos.h"
 
 /**
  * TOnButtonEvent defines format of callback functions used by NixieAnalogButtons class

src/nixie_display.cpp

@@ -17,8 +17,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "nixie_library.h"
 #include "nixie_display.h"
+#include "nixieos.h"
 
 static const uint32_t s_newInterval = ( (uint32_t)CHANGE_INTERVAL * DISPLAY_BRIGHTNESS_RANGE ) / (uint32_t)NIXIE_MAX_BRIGHTNESS;
 static const uint32_t s_minChangeInterval = (uint32_t)CHANGE_INTERVAL - s_newInterval;
@@ -375,7 +375,7 @@ void NixieDisplay::powerOff()
 void NixieDisplay::powerOn ()
 {
     m_powerOn = true;
-    NixieLibrary::update();
+    NixieOs::refresh();
     for (uint8_t i=0; i<m_maxTubes; i++)
     {
         m_tubes[i].update();

src/nixie_driver.cpp

@@ -18,6 +18,6 @@
 */
 
 #include "nixie_driver.h"
-#include "nixie_booster.h"
+#include "nixieos.h"
 
 /* Base class NixieDriver doesn't require any specific implementation */