Merge pull request #4 from clockspot/feature/alarm-skip

Feature/alarm skip

Author: clockspot

README.md

@@ -62,7 +62,7 @@ If your clock is equipped with an **Alt** button, it will do one of two things (
 
 * In most cases, the **Alt** button works as a function preset, similar to a preset button in a car radio. While viewing the function you want quick access to, hold **Alt** until it beeps twice; then you can use **Alt** to jump straight to that function. It works best for Alarm or Timer.
 
-  * TIP: If used with Alarm, the **Alt** button will also toggle the “skip” state – so to skip or unskip the next alarm, you only need to press the **Alt** button twice: once to show it, and once to change it.
+  * TIP: If used with Alarm, the **Alt** button will also toggle the skip mode – so to skip or unskip the next alarm, you only need to press the **Alt** button twice: once to display it, and once to change it.
 
 * If your clock has a switched relay with soft power switch enabled, the **Alt** button switches the relay on and off – great for using the clock as an appliance timer.
 

arduino-nixie/arduino-nixie.ino

@@ -9,21 +9,12 @@
 
 #include "configs/v8c-6tube.h"
 
-#include "song.h"
-
-// Song woody(0); //declare a Song object called woody
-//
-// void setup(){
-//   woody.play();
-// }
-//
-// void loop(){
-//   woody.check(false);
-// }
-
+////////// Software version //////////
+const byte vMajor = 1;
+const byte vMinor = 6;
+const byte vPatch = 0;
 
 ////////// Other includes, global consts, and vars //////////
-#include "version.h"
 #include <Wire.h> //Arduino - GNU LPGL
 #include <EEPROM.h> //Arduino - GNU LPGL
 #include <DS3231.h> //NorthernWidget - The Unlicense
@@ -1223,7 +1214,6 @@ void displaySun(char which, int d, int tod){
   //Old code to calculate sun at display time, with test serial output, is in commit 163ca33
   //which is 0=prev, 1=next
   int evtTime = 0; bool evtIsRise = 0;
-  serialPrintTime(tod);
   if(d==sunDate){ //displaying same day as calc
     //before sunrise: prev is calcday-1 sunset, next is calcday sunrise
     //daytime:        prev is calcday sunrise,  next is calcday sunset