Adding a gitattributes and correcting line-endings

https://help.github.com/articles/dealing-with-line-endings/
This commit is contained in:
Rémy Léone 2015-09-03 13:45:48 +02:00
parent 8a7e2e5892
commit 7a5071dd30
37 changed files with 5865 additions and 5856 deletions

12
.gitattributes vendored Normal file
View file

@ -0,0 +1,12 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto whitespace=trailing-space
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text
*.java text
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

View file

@ -79,12 +79,12 @@ public class ViewRSSI extends JPanel{
// Draw the light grey channels from 11 to 26 // Draw the light grey channels from 11 to 26
double xpos = 10; double xpos = 10;
for(int i=4;i<TOTAL-4;i++){ for(int i=4;i<TOTAL-4;i++){
if (i==4+5*(INTERFERED_CHANNEL-11)) g.setColor(Color.cyan); if (i==4+5*(INTERFERED_CHANNEL-11)) g.setColor(Color.cyan);
else g.setColor(Color.lightGray); else g.setColor(Color.lightGray);
g.fillRect((int) (xpos+i*sSpacing), 0, (int) (sSpacing*3), h-MARGIN_BOTTOM); g.fillRect((int) (xpos+i*sSpacing), 0, (int) (sSpacing*3), h-MARGIN_BOTTOM);
i = i + 4; i = i + 4;
g.setColor(Color.blue); g.setColor(Color.blue);
g.drawString(String.valueOf(((i-8)/5)+11), (int) (xpos+(i-4)*sSpacing), MARGIN_TOP); g.drawString(String.valueOf(((i-8)/5)+11), (int) (xpos+(i-4)*sSpacing), MARGIN_TOP);
} }
g.drawString(String.valueOf("Channel"), (int) (w-MARGIN_RIGHT+20), MARGIN_TOP); g.drawString(String.valueOf("Channel"), (int) (w-MARGIN_RIGHT+20), MARGIN_TOP);
@ -92,13 +92,13 @@ public class ViewRSSI extends JPanel{
int base_dBm = -100; // The bottom corresponds to -100 dBm int base_dBm = -100; // The bottom corresponds to -100 dBm
int ytics = 10; // How many tics on the y-axis int ytics = 10; // How many tics on the y-axis
for(int i=-ytics;i<=0;i++){ for(int i=-ytics;i<=0;i++){
g.setColor(Color.red); g.setColor(Color.red);
g.drawString(String.valueOf(((ytics+i)*(base_dBm/ytics))+"dBm"), (int) (w-MARGIN_RIGHT+20), (int) (h+i*(h/ytics))-MARGIN_BOTTOM); g.drawString(String.valueOf(((ytics+i)*(base_dBm/ytics))+"dBm"), (int) (w-MARGIN_RIGHT+20), (int) (h+i*(h/ytics))-MARGIN_BOTTOM);
// Dashed line for the ytics // Dashed line for the ytics
final float dash1[] = {10.0f}; final float dash1[] = {10.0f};
final BasicStroke dashed = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f); final BasicStroke dashed = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f);
g2.setStroke(dashed); g2.setStroke(dashed);
g2.drawLine(0, (int) (h+i*(h/ytics))-MARGIN_BOTTOM, (int) (w-MARGIN_RIGHT+7), (int) (h+i*(h/ytics))-MARGIN_BOTTOM); g2.drawLine(0, (int) (h+i*(h/ytics))-MARGIN_BOTTOM, (int) (w-MARGIN_RIGHT+7), (int) (h+i*(h/ytics))-MARGIN_BOTTOM);
} }
// Write the x-axis with MHz // Write the x-axis with MHz

View file

@ -1195,4 +1195,3 @@ void halLcdScrollLine(int Line)
for (i = Row; i < Row + FONT_HEIGHT; i++) for (i = Row; i < Row + FONT_HEIGHT; i++)
halLcdScrollRow(i); halLcdScrollRow(i);
} }

View file

@ -95,16 +95,16 @@ public class CC2520Radio extends Radio implements CustomDataRadio {
if (len == expLen) { if (len == expLen) {
/*logger.debug("----- CC2520 CUSTOM DATA TRANSMITTED -----");*/ /*logger.debug("----- CC2520 CUSTOM DATA TRANSMITTED -----");*/
len -= 4; /* preamble */ len -= 4; /* preamble */
len -= 1; /* synch */ len -= 1; /* synch */
len -= radio.getFooterLength(); /* footer */ len -= radio.getFooterLength(); /* footer */
final byte[] packetdata = new byte[len]; final byte[] packetdata = new byte[len];
System.arraycopy(buffer, 4+1, packetdata, 0, len); System.arraycopy(buffer, 4+1, packetdata, 0, len);
lastOutgoingPacket = new RadioPacket() { lastOutgoingPacket = new RadioPacket() {
public byte[] getPacketData() { public byte[] getPacketData() {
return packetdata; return packetdata;
} }
}; };
/*logger.debug("----- CC2520 PACKET TRANSMITTED -----");*/ /*logger.debug("----- CC2520 PACKET TRANSMITTED -----");*/
setChanged(); setChanged();

View file

@ -11,4 +11,3 @@ GETTING_STARTED = \
<b>Getting started</b><br>\ <b>Getting started</b><br>\
<br>\ <br>\
<br><i>F1:</i> Toggle quick help</i> <br><i>F1:</i> Toggle quick help</i>

View file

@ -920,4 +920,3 @@ FT_STATUS WINAPI FT_Reload(
#endif /* FTD2XX_H */ #endif /* FTD2XX_H */