Browse Source

Merge pull request #1970 from thinkyhead/rename_files

Rename files to move them in the IDE
Scott Lahteine 9 years ago
parent
commit
1f530beaf1

+ 2
- 2
Marlin/Makefile View File

@@ -267,8 +267,8 @@ endif
267 267
 CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp	\
268 268
 	MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp	\
269 269
 	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\
270
-	stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \
271
-	watchdog.cpp SPI.cpp Servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
270
+	stepper.cpp temperature.cpp cardreader.cpp configuration_store.cpp \
271
+	watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
272 272
 	vector_3.cpp qr_solve.cpp
273 273
 ifeq ($(LIQUID_TWI2), 0)
274 274
 CXXSRC += LiquidCrystal.cpp

+ 4
- 4
Marlin/Marlin_main.cpp View File

@@ -49,18 +49,18 @@
49 49
 #include "motion_control.h"
50 50
 #include "cardreader.h"
51 51
 #include "watchdog.h"
52
-#include "ConfigurationStore.h"
52
+#include "configuration_store.h"
53 53
 #include "language.h"
54 54
 #include "pins_arduino.h"
55 55
 #include "math.h"
56 56
 
57 57
 #ifdef BLINKM
58
-  #include "BlinkM.h"
58
+  #include "blinkm.h"
59 59
   #include "Wire.h"
60 60
 #endif
61 61
 
62 62
 #if NUM_SERVOS > 0
63
-  #include "Servo.h"
63
+  #include "servo.h"
64 64
 #endif
65 65
 
66 66
 #if HAS_DIGIPOTSS
@@ -4417,7 +4417,7 @@ inline void gcode_M503() {
4417 4417
     if (code_seen('Z')) {
4418 4418
       value = code_value();
4419 4419
       if (Z_PROBE_OFFSET_RANGE_MIN <= value && value <= Z_PROBE_OFFSET_RANGE_MAX) {
4420
-        zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
4420
+        zprobe_zoffset = -value; // compare w/ line 278 of configuration_store.cpp
4421 4421
         SERIAL_ECHO_START;
4422 4422
         SERIAL_ECHOLNPGM(MSG_ZPROBE_ZOFFSET " " MSG_OK);
4423 4423
         SERIAL_EOL;

+ 2
- 2
Marlin/Servo.cpp View File

@@ -1,5 +1,5 @@
1 1
 /*
2
- Servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
2
+ servo.cpp - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
3 3
  Copyright (c) 2009 Michael Margolis.  All right reserved.
4 4
 
5 5
  This library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@
48 48
 #include <avr/interrupt.h>
49 49
 #include <Arduino.h>
50 50
 
51
-#include "Servo.h"
51
+#include "servo.h"
52 52
 
53 53
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
54 54
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds

+ 3
- 3
Marlin/Servo.h View File

@@ -1,5 +1,5 @@
1 1
 /*
2
-  Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
2
+  servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
3 3
   Copyright (c) 2009 Michael Margolis.  All right reserved.
4 4
 
5 5
   This library is free software; you can redistribute it and/or
@@ -42,8 +42,8 @@
42 42
    detach()    - Stops an attached servos from pulsing its i/o pin.
43 43
  */
44 44
 
45
-#ifndef Servo_h
46
-#define Servo_h
45
+#ifndef servo_h
46
+#define servo_h
47 47
 
48 48
 #include <inttypes.h>
49 49
 

Marlin/BlinkM.cpp → Marlin/blinkm.cpp View File

@@ -1,11 +1,11 @@
1 1
 /*
2
-  BlinkM.cpp - Library for controlling a BlinkM over i2c
2
+  blinkm.cpp - Library for controlling a BlinkM over i2c
3 3
   Created by Tim Koster, August 21 2013.
4 4
 */
5 5
 #include "Marlin.h"
6 6
 #ifdef BLINKM
7 7
 
8
-#include "BlinkM.h"
8
+#include "blinkm.h"
9 9
 
10 10
 void SendColors(byte red, byte grn, byte blu) {
11 11
   Wire.begin(); 

Marlin/BlinkM.h → Marlin/blinkm.h View File

@@ -1,5 +1,5 @@
1 1
 /*
2
-  BlinkM.h
2
+  blinkm.h
3 3
   Library header file for BlinkM library
4 4
  */
5 5
 #if ARDUINO >= 100

Marlin/ConfigurationStore.cpp → Marlin/configuration_store.cpp View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * ConfigurationStore.cpp
2
+ * configuration_store.cpp
3 3
  *
4 4
  * Configuration and EEPROM storage
5 5
  *
@@ -93,7 +93,7 @@
93 93
 #include "planner.h"
94 94
 #include "temperature.h"
95 95
 #include "ultralcd.h"
96
-#include "ConfigurationStore.h"
96
+#include "configuration_store.h"
97 97
 
98 98
 #ifdef MESH_BED_LEVELING
99 99
    #include "mesh_bed_leveling.h"

Marlin/ConfigurationStore.h → Marlin/configuration_store.h View File

@@ -1,5 +1,5 @@
1
-#ifndef CONFIGURATIONSTORE_H
2
-#define CONFIGURATIONSTORE_H
1
+#ifndef CONFIGURATION_STORE_H
2
+#define CONFIGURATION_STORE_H
3 3
 
4 4
 #include "Configuration.h"
5 5
 
@@ -19,4 +19,4 @@ void Config_ResetDefault();
19 19
   FORCE_INLINE void Config_RetrieveSettings() { Config_ResetDefault(); Config_PrintSettings(); }
20 20
 #endif
21 21
 
22
-#endif //CONFIGURATIONSTORE_H
22
+#endif //CONFIGURATION_STORE_H

Marlin/DOGMbitmaps.h → Marlin/dogm_bitmaps.h View File


+ 1
- 1
Marlin/dogm_lcd_implementation.h View File

@@ -29,7 +29,7 @@
29 29
 #endif
30 30
 
31 31
 #include <U8glib.h>
32
-#include "DOGMbitmaps.h"
32
+#include "dogm_bitmaps.h"
33 33
 
34 34
 #include "ultralcd.h"
35 35
 #include "ultralcd_st7920_u8glib_rrd.h"

+ 1
- 1
Marlin/pins_SAV_MKI.h View File

@@ -82,7 +82,7 @@
82 82
   #define HOME_PIN          -1 // A4 = marlin 44 - teensy = 42
83 83
 
84 84
   #ifdef NUM_SERVOS
85
-    #define SERVO0_PIN       41 // In teensy's pin definition for pinMode (in Servo.cpp)
85
+    #define SERVO0_PIN       41 // In teensy's pin definition for pinMode (in servo.cpp)
86 86
   #endif
87 87
 
88 88
 #endif // SAV_3DLCD

+ 1
- 1
Marlin/ultralcd.cpp View File

@@ -5,7 +5,7 @@
5 5
 #include "cardreader.h"
6 6
 #include "temperature.h"
7 7
 #include "stepper.h"
8
-#include "ConfigurationStore.h"
8
+#include "configuration_store.h"
9 9
 
10 10
 int8_t encoderDiff; /* encoderDiff is updated from interrupt context and added to encoderPosition every LCD update */
11 11
 

Loading…
Cancel
Save