Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SebiTimeWaster/Slave-Nixie-Clock
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4
Choose a base ref
...
head repository: SebiTimeWaster/Slave-Nixie-Clock
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 7, 2017

  1. Rename examples/example.py to Examples/example.py

    TimeWaster authored Apr 7, 2017
    Copy the full SHA
    ab31c90 View commit details

  2. Update README.md

    TimeWaster authored Apr 7, 2017
    Copy the full SHA
    2403fe5 View commit details

Commits on Apr 18, 2017

  1. added time base reset when computer was in sleep or user set new time

    TimeWaster authored Apr 18, 2017
    Copy the full SHA
    bfab9a3 View commit details

Commits on May 10, 2020

  1. changed license

    TimeWaster committed May 10, 2020
    Copy the full SHA
    9a2b07a View commit details

  2. Merge branch 'master' of github.com:SebiTimeWaster/Slave-Nixie-Clock

    TimeWaster committed May 10, 2020
    Copy the full SHA
    697c2c8 View commit details
Showing with 6 additions and 22 deletions.
  1. +3 −21 45 degree Stands/Stands.scad
  2. +2 −0 {examples → Examples}/example.py
  3. +1 −1 README.md
24 changes: 3 additions & 21 deletions 45 degree Stands/Stands.scad
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,7 @@
/**
* The MIT License (MIT)
*
* Slave Nixie Clock - Copyright (c) 2017 SebiTimeWaster
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
* This code is published under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0
* licence, please respect it.
*/

module holder() {
2 changes: 2 additions & 0 deletions examples/example.py → Examples/example.py
View file
Original file line number Diff line number Diff line change
@@ -91,6 +91,8 @@ def sendColorAnimation(speed):
def getRealDelay(desiredDelay):
global timeBase
timeBase += desiredDelay
if timeBase - time.time() > 11 or timeBase - time.time() < -11: # when time base deviated too much (i.e. because of sleep mode or user set new time) reset time base
setTimeBase();
return max(timeBase - time.time(), 0) # if negative say 0 to catch up to real time

def setTimeBase():
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ Download a release or clone this project with git.
## Usage
Open "Slave_Nixie_Clock/Slave_Nixie_Clock.ino" in your Arduino IDE of choice and upload it to your clock.

In "/examples" you will find an example Python script to control the Nixie Clock (It sends the computer time to the Nixie Clock). It comes without any guarantee (It was only tested under OS X), if you want to create your own scripts on top of it please don't ask me for support.
In "/Examples" you will find an example Python script to control the Nixie Clock (It sends the computer time to the Nixie Clock). It comes without any guarantee (It was only tested under OS X), if you want to create your own scripts on top of it please don't ask me for support.

In "/45 degree Stands" you will find a printable 3D model for stands to angle the clock at 45°, which makes it much more readable when it is standing on your desk. Just print the .stl file on your 3D printer of choice. [The stands on Thingiverse](http://www.thingiverse.com/thing:2232491)