Skip to content

Commit

Permalink
Merge pull request #1970 from thinkyhead/rename_files
Browse files Browse the repository at this point in the history
Rename files to move them in the IDE
  • Loading branch information
thinkyhead committed Apr 26, 2015
2 parents ac9ca64 + 0ec4447 commit 1f530be
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Marlin/Makefile
Expand Up @@ -267,8 +267,8 @@ endif
CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \
SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \
stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \
watchdog.cpp SPI.cpp Servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
stepper.cpp temperature.cpp cardreader.cpp configuration_store.cpp \
watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
vector_3.cpp qr_solve.cpp
ifeq ($(LIQUID_TWI2), 0)
CXXSRC += LiquidCrystal.cpp
Expand Down
8 changes: 4 additions & 4 deletions Marlin/Marlin_main.cpp
Expand Up @@ -49,18 +49,18 @@
#include "motion_control.h"
#include "cardreader.h"
#include "watchdog.h"
#include "ConfigurationStore.h"
#include "configuration_store.h"
#include "language.h"
#include "pins_arduino.h"
#include "math.h"

#ifdef BLINKM
#include "BlinkM.h"
#include "blinkm.h"
#include "Wire.h"
#endif

#if NUM_SERVOS > 0
#include "Servo.h"
#include "servo.h"
#endif

#if HAS_DIGIPOTSS
Expand Down Expand Up @@ -4417,7 +4417,7 @@ inline void gcode_M503() {
if (code_seen('Z')) {
value = code_value();
if (Z_PROBE_OFFSET_RANGE_MIN <= value && value <= Z_PROBE_OFFSET_RANGE_MAX) {
zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
zprobe_zoffset = -value; // compare w/ line 278 of configuration_store.cpp
SERIAL_ECHO_START;
SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
SERIAL_EOL;
Expand Down
4 changes: 2 additions & 2 deletions Marlin/Servo.cpp
@@ -1,5 +1,5 @@
/*
Servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
Copyright (c) 2009 Michael Margolis. All right reserved.
This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -48,7 +48,7 @@
#include <avr/interrupt.h>
#include <Arduino.h>

#include "Servo.h"
#include "servo.h"

#define usToTicks(_us) (( clockCyclesPerMicrosecond()* _us) / 8) // converts microseconds to tick (assumes prescale of 8) // 12 Aug 2009
#define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
Expand Down
6 changes: 3 additions & 3 deletions Marlin/Servo.h
@@ -1,5 +1,5 @@
/*
Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
Copyright (c) 2009 Michael Margolis. All right reserved.
This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -42,8 +42,8 @@
detach() - Stops an attached servos from pulsing its i/o pin.
*/

#ifndef Servo_h
#define Servo_h
#ifndef servo_h
#define servo_h

#include <inttypes.h>

Expand Down
4 changes: 2 additions & 2 deletions Marlin/BlinkM.cpp → Marlin/blinkm.cpp
@@ -1,11 +1,11 @@
/*
BlinkM.cpp - Library for controlling a BlinkM over i2c
blinkm.cpp - Library for controlling a BlinkM over i2c
Created by Tim Koster, August 21 2013.
*/
#include "Marlin.h"
#ifdef BLINKM

#include "BlinkM.h"
#include "blinkm.h"

void SendColors(byte red, byte grn, byte blu) {
Wire.begin();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/BlinkM.h → Marlin/blinkm.h
@@ -1,5 +1,5 @@
/*
BlinkM.h
blinkm.h
Library header file for BlinkM library
*/
#if ARDUINO >= 100
Expand Down
@@ -1,5 +1,5 @@
/**
* ConfigurationStore.cpp
* configuration_store.cpp
*
* Configuration and EEPROM storage
*
Expand Down Expand Up @@ -93,7 +93,7 @@
#include "planner.h"
#include "temperature.h"
#include "ultralcd.h"
#include "ConfigurationStore.h"
#include "configuration_store.h"

#ifdef MESH_BED_LEVELING
#include "mesh_bed_leveling.h"
Expand Down
6 changes: 3 additions & 3 deletions Marlin/ConfigurationStore.h → Marlin/configuration_store.h
@@ -1,5 +1,5 @@
#ifndef CONFIGURATIONSTORE_H
#define CONFIGURATIONSTORE_H
#ifndef CONFIGURATION_STORE_H
#define CONFIGURATION_STORE_H

#include "Configuration.h"

Expand All @@ -19,4 +19,4 @@ void Config_ResetDefault();
FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
#endif

#endif //CONFIGURATIONSTORE_H
#endif //CONFIGURATION_STORE_H
File renamed without changes.
2 changes: 1 addition & 1 deletion Marlin/dogm_lcd_implementation.h
Expand Up @@ -29,7 +29,7 @@
#endif

#include <U8glib.h>
#include "DOGMbitmaps.h"
#include "dogm_bitmaps.h"

#include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/pins_SAV_MKI.h
Expand Up @@ -82,7 +82,7 @@
#define HOME_PIN -1 // A4 = marlin 44 - teensy = 42

#ifdef NUM_SERVOS
#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in Servo.cpp)
#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
#endif

#endif // SAV_3DLCD
2 changes: 1 addition & 1 deletion Marlin/ultralcd.cpp
Expand Up @@ -5,7 +5,7 @@
#include "cardreader.h"
#include "temperature.h"
#include "stepper.h"
#include "ConfigurationStore.h"
#include "configuration_store.h"

int8_t encoderDiff; /* encoderDiff is updated from interrupt context and added to encoderPosition every LCD update */

Expand Down

0 comments on commit 1f530be

Please sign in to comment.