Skip to content

Commit

Permalink
Fixing travis build now (#975)
Browse files Browse the repository at this point in the history
  • Loading branch information
xoseperez committed Jun 23, 2018
1 parent c52df1d commit 3edd899
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 13 deletions.
2 changes: 1 addition & 1 deletion code/espurna/config/arduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
//#define AITHINKER_AI_LIGHT
//#define MAGICHOME_LED_CONTROLLER
//#define MAGICHOME_LED_CONTROLLER_20
//#define HUACANXING_H801
#define HUACANXING_H801
//#define HUACANXING_H802
//#define JANGOE_WIFI_RELAY_NC
//#define JANGOE_WIFI_RELAY_NO
Expand Down
2 changes: 1 addition & 1 deletion code/espurna/libs/fs_math.c → code/espurna/fs_math.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

/* BEGIN fs_math.c */

#include "fs_math.h"
#include "libs/fs_math.h"

#include <float.h>
/*
Expand Down
32 changes: 22 additions & 10 deletions code/espurna/libs/pwm.h
Original file line number Diff line number Diff line change
@@ -1,23 +1,35 @@
/*
* Copyright (C) 2016 Stefan Brüns <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifndef __PWM_H__
#define __PWM_H__

/*pwm.h: function and macro definition of PWM API , driver level */
/*user_light.h: user interface for light API, user level*/
/*user_light_adj: API for color changing and lighting effects, user level*/


/*NOTE!! : DO NOT CHANGE THIS FILE*/

/*SUPPORT UP TO 8 PWM CHANNEL*/
//#define PWM_CHANNEL_NUM_MAX 8
/*SUPPORT UP TO 8 PWM CHANNEL*/
#ifndef PWM_CHANNEL_NUM_MAX
#define PWM_CHANNEL_NUM_MAX 8
#endif

struct pwm_param {
uint32 period;
uint32 freq;
uint32 duty[PWM_CHANNEL_NUM_MAX]; //PWM_CHANNEL<=8
};


/* pwm_init should be called only once, for now */
void pwm_init(uint32 period, uint32 *duty,uint32 pwm_channel_num,uint32 (*pin_info_list)[3]);
void pwm_start(void);
Expand Down
2 changes: 1 addition & 1 deletion code/espurna/libs/pwm.c → code/espurna/pwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
#endif

#include <c_types.h>
#include <pwm.h>
#include <eagle_soc.h>
#include <ets_sys.h>
#include "libs/pwm.h"

// from SDK hw_timer.c
#define TIMER1_DIVIDE_BY_16 0x0004
Expand Down

0 comments on commit 3edd899

Please sign in to comment.